From a5b99dfd10f8c429af08c7b33de97ffbbf8502c9 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 1 Jan 2018 16:49:10 -0800 Subject: Set default culture and update to latest dependencies --- src/FindLocalWix.props | 2 +- src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 6 +++--- src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj | 6 +++--- src/wixext/UtilCompiler.cs | 3 +-- src/wixext/UtilExtensionData.cs | 2 ++ src/wixext/WixToolset.Util.wixext.csproj | 8 +++++--- src/wixext/WixToolset.Util.wixext.targets | 5 ++++- src/wixlib/packages.config | 2 +- src/wixlib/util.wixproj | 4 ++-- 9 files changed, 22 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/src/FindLocalWix.props b/src/FindLocalWix.props index 016dac77..1301b0e5 100644 --- a/src/FindLocalWix.props +++ b/src/FindLocalWix.props @@ -3,6 +3,6 @@ - $(MSBuildThisFileDirectory)..\..\Core\build\Release\publish\net461\wix.targets + $(MSBuildThisFileDirectory)..\..\Core\build\Debug\net461\wix.targets diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 5ce9f5ea..41c872d4 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -8,7 +8,7 @@ namespace WixToolsetTest.VisualStudio using WixToolset.Util; using Xunit; - public class VisualStudioExtensionFixture + public class UtilExtensionFixture { [Fact] public void CanBuildUsingFileShare() @@ -19,8 +19,8 @@ namespace WixToolsetTest.VisualStudio var results = build.BuildAndQuery(Build, "FileShare", "FileSharePermissions"); Assert.Equal(new[] { - "FileShare:SetVS2010Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2010_VSIX_INSTALLER_PATH]\t0", - "FileSharePermissions:SetVS2012Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2012_VSIX_INSTALLER_PATH]\t0", + "FileShare:ExampleFileShare\texample\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo\tAn example file share\tINSTALLFOLDER\t\t0", + "FileSharePermissions:ExampleFileShare\tEveryone\t1", }, results.OrderBy(s => s).ToArray()); } diff --git a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj index 9559059d..056a86e5 100644 --- a/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj +++ b/src/test/WixToolsetTest.Util/WixToolsetTest.Util.csproj @@ -23,9 +23,9 @@ - - - + + + diff --git a/src/wixext/UtilCompiler.cs b/src/wixext/UtilCompiler.cs index da48e412..59b36d1c 100644 --- a/src/wixext/UtilCompiler.cs +++ b/src/wixext/UtilCompiler.cs @@ -2676,8 +2676,7 @@ namespace WixToolset.Util attributes |= WixProductSearchAttributes.UpgradeCode; } - var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixProductSearch"); - row.Set(0, id); + var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixProductSearch", id); row.Set(1, productCode ?? upgradeCode); row.Set(2, (int)attributes); } diff --git a/src/wixext/UtilExtensionData.cs b/src/wixext/UtilExtensionData.cs index 7eefc238..55c9b046 100644 --- a/src/wixext/UtilExtensionData.cs +++ b/src/wixext/UtilExtensionData.cs @@ -7,6 +7,8 @@ namespace WixToolset.Util public sealed class UtilExtensionData : BaseExtensionData { + public override string DefaultCulture => "en-US"; + public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition) { tupleDefinition = UtilTupleDefinitions.ByName(name); diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index a06298a3..23fa2cd0 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -19,9 +19,11 @@ - - - + + + + + diff --git a/src/wixext/WixToolset.Util.wixext.targets b/src/wixext/WixToolset.Util.wixext.targets index 3b43c25c..e298b06e 100644 --- a/src/wixext/WixToolset.Util.wixext.targets +++ b/src/wixext/WixToolset.Util.wixext.targets @@ -2,7 +2,10 @@ + + $(MSBuildThisFileDirectory)..\tools\WixToolset.Util.wixext.dll" + - + diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 89544f1d..4250845c 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index 2fc8c589..b94e8ca0 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -1,7 +1,7 @@ - + {1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2} @@ -46,7 +46,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file -- cgit v1.2.3-55-g6feb