From 8006b25b1a40f1687053dc8d84531f3f609fbe80 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 19 Jul 2020 20:03:37 +1000 Subject: Update dependencies. --- global.json | 5 ++++- nuget.config | 1 - src/be/packages.config | 8 ++++---- src/be/utilbe.vcxproj | 16 ++++++++-------- src/ca/packages.config | 4 ++-- src/ca/utilca.vcxproj | 8 ++++---- src/test/WixToolsetTest.Util/UtilExtensionFixture.cs | 16 ++++++++-------- src/wixext/WixToolset.Util.wixext.csproj | 2 +- src/wixlib/util.wixproj | 2 +- 9 files changed, 32 insertions(+), 30 deletions(-) diff --git a/global.json b/global.json index 32c1b11f..41935656 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,8 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0145" + "WixToolset.Sdk": "4.0.0-build-0149" + }, + "sdk": { + "allowPrerelease": false } } diff --git a/nuget.config b/nuget.config index 11f88400..8d711148 100644 --- a/nuget.config +++ b/nuget.config @@ -3,7 +3,6 @@ - diff --git a/src/be/packages.config b/src/be/packages.config index a96fa834..da94bb02 100644 --- a/src/be/packages.config +++ b/src/be/packages.config @@ -3,8 +3,8 @@ - - - - + + + + \ No newline at end of file diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index 3675ccc0..48e577df 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj @@ -4,9 +4,9 @@ - - - + + + Debug @@ -79,7 +79,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}. @@ -90,9 +90,9 @@ - - - - + + + + \ No newline at end of file diff --git a/src/ca/packages.config b/src/ca/packages.config index a1d30df0..b8a9b796 100644 --- a/src/ca/packages.config +++ b/src/ca/packages.config @@ -3,7 +3,7 @@ - - + + \ No newline at end of file diff --git a/src/ca/utilca.vcxproj b/src/ca/utilca.vcxproj index f353a4e4..29273a8d 100644 --- a/src/ca/utilca.vcxproj +++ b/src/ca/utilca.vcxproj @@ -5,7 +5,7 @@ - + @@ -113,7 +113,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}. @@ -124,8 +124,8 @@ - - + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs index 848e4aa2..0125dcc1 100644 --- a/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs +++ b/src/test/WixToolsetTest.Util/UtilExtensionFixture.cs @@ -20,7 +20,7 @@ namespace WixToolsetTest.Util var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(Build, "Binary", "CustomAction", "Wix4FileShare", "Wix4FileSharePermissions"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Binary:Wix4UtilCA_X86\t[Binary data]", "CustomAction:Wix4ConfigureSmbInstall_X86\t1\tWix4UtilCA_X86\tConfigureSmbInstall\t", @@ -41,7 +41,7 @@ namespace WixToolsetTest.Util var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "Wix4FileShare", "Wix4FileSharePermissions"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Binary:Wix4UtilCA_X64\t[Binary data]", "CustomAction:Wix4ConfigureSmbInstall_X64\t1\tWix4UtilCA_X64\tConfigureSmbInstall\t", @@ -62,7 +62,7 @@ namespace WixToolsetTest.Util var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4CloseApplication"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Binary:Wix4UtilCA_A64\t[Binary data]", "CustomAction:Wix4CheckRebootRequired_A64\t65\tWix4UtilCA_A64\tWixCheckRebootRequired\t", @@ -79,7 +79,7 @@ namespace WixToolsetTest.Util var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(BuildX64, "Binary", "CustomAction", "RemoveFile", "Wix4InternetShortcut"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Binary:Wix4UtilCA_X64\t[Binary data]", "CustomAction:Wix4CreateInternetShortcuts_X64\t3073\tWix4UtilCA_X64\tWixCreateInternetShortcuts\t", @@ -97,12 +97,12 @@ namespace WixToolsetTest.Util var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(BuildX64, "Wix4SecureObject"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Wix4SecureObject:ExampleRegistryKey\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", "Wix4SecureObject:filF5_pLhBuF5b4N9XEo52g_hUM5Lo\tFile\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", "Wix4SecureObject:INSTALLFOLDER\tCreateFolder\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", - "Wix4SecureObject:regO7jgNdgqG_TfURLgXPo2jRcxzx8\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", + "Wix4SecureObject:regL6DnQ9yJpDJH5OdcVji4YXsdX2c\tRegistry\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", "Wix4SecureObject:testsvc\tServiceInstall\t\tEveryone\t1\t268435456\tfilF5_pLhBuF5b4N9XEo52g_hUM5Lo", }, results.OrderBy(s => s).ToArray()); } @@ -114,7 +114,7 @@ namespace WixToolsetTest.Util var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction", "Wix4EventManifest", "Wix4XmlFile"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Binary:Wix4UtilCA_A64\t[Binary data]", "CustomAction:Wix4ConfigureEventManifestRegister_A64\t1\tWix4UtilCA_A64\tConfigureEventManifestRegister\t", @@ -139,7 +139,7 @@ namespace WixToolsetTest.Util var build = new Builder(folder, typeof(UtilExtensionFactory), new[] { folder }); var results = build.BuildAndQuery(BuildARM64, "Binary", "CustomAction"); - Assert.Equal(new[] + WixAssert.CompareLineByLine(new[] { "Binary:Wix4UtilCA_A64\t[Binary data]", "CustomAction:Wix4BroadcastEnvironmentChange_A64\t65\tWix4UtilCA_A64\tWixBroadcastEnvironmentChange\t", diff --git a/src/wixext/WixToolset.Util.wixext.csproj b/src/wixext/WixToolset.Util.wixext.csproj index acadce55..022b9bb7 100644 --- a/src/wixext/WixToolset.Util.wixext.csproj +++ b/src/wixext/WixToolset.Util.wixext.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj index f350c877..e937750f 100644 --- a/src/wixlib/util.wixproj +++ b/src/wixlib/util.wixproj @@ -24,7 +24,7 @@ - + -- cgit v1.2.3-55-g6feb