From d474b56ced25cabfacda8efea1e61f13644abd23 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sun, 7 Jul 2024 01:23:03 -0700 Subject: Update dependencies Fixes 8569 --- .../SetBuildNumber/Directory.Packages.props.pp | 29 +++++++++++----------- .../build/WixInternal.TestSupport.Native.props | 4 +-- .../build/WixInternal.TestSupport.Native.targets | 18 +++++++------- .../WixInternal.TestSupport.Native/packages.config | 12 ++++----- .../XunitExtensions/WixAssert.cs | 2 +- src/setup/MetadataTask/GenerateMetadata.cs | 2 +- src/test/burn/WixTestTools/ArpEntryInstaller.cs | 2 +- .../BundleFixture.cs | 6 ++--- .../LinkerFixture.cs | 6 ++--- 9 files changed, 41 insertions(+), 40 deletions(-) diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp index 8ec6f78c..92e13d9a 100644 --- a/src/internal/SetBuildNumber/Directory.Packages.props.pp +++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp @@ -40,19 +40,20 @@ - + - + + - - + + - + @@ -68,16 +69,16 @@ - - - + + + - - + + @@ -88,10 +89,10 @@ - - - - + + + + diff --git a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props index d9d9dab4..2362a8de 100644 --- a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props +++ b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.props @@ -5,8 +5,8 @@ $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), .gitignore)) - - + + v4.7.2 diff --git a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets index ed3d728a..a882ad8d 100644 --- a/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets +++ b/src/internal/WixInternal.TestSupport.Native/build/WixInternal.TestSupport.Native.targets @@ -22,28 +22,28 @@ $(RootPackagesFolder)xunit.abstractions.2.0.3\lib\netstandard2.0\xunit.abstractions.dll - $(RootPackagesFolder)xunit.assert.2.4.2\lib\netstandard1.1\xunit.assert.dll + $(RootPackagesFolder)xunit.assert.2.8.1\lib\netstandard1.1\xunit.assert.dll - $(RootPackagesFolder)xunit.extensibility.core.2.4.2\lib\netstandard1.1\xunit.core.dll + $(RootPackagesFolder)xunit.extensibility.core.2.8.1\lib\netstandard1.1\xunit.core.dll - $(RootPackagesFolder)xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll + $(RootPackagesFolder)xunit.extensibility.execution.2.8.1\lib\net452\xunit.execution.desktop.dll - + 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}. - - - + + + - - + + diff --git a/src/internal/WixInternal.TestSupport.Native/packages.config b/src/internal/WixInternal.TestSupport.Native/packages.config index 603b945a..21567bf3 100644 --- a/src/internal/WixInternal.TestSupport.Native/packages.config +++ b/src/internal/WixInternal.TestSupport.Native/packages.config @@ -7,10 +7,10 @@ when any of these versions are updated. --> - - - - - - + + + + + + diff --git a/src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs b/src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs index 083e34f5..1df98d3b 100644 --- a/src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs +++ b/src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs @@ -91,7 +91,7 @@ namespace WixInternal.TestSupport { if (collection.Count > 0) { - Assert.True(false, $"The collection was expected to be empty, but instead was [{Environment.NewLine}\"{String.Join($"\", {Environment.NewLine}\"", collection)}\"{Environment.NewLine}]"); + Assert.Fail($"The collection was expected to be empty, but instead was [{Environment.NewLine}\"{String.Join($"\", {Environment.NewLine}\"", collection)}\"{Environment.NewLine}]"); } } diff --git a/src/setup/MetadataTask/GenerateMetadata.cs b/src/setup/MetadataTask/GenerateMetadata.cs index efe4ee39..65e6f7a4 100644 --- a/src/setup/MetadataTask/GenerateMetadata.cs +++ b/src/setup/MetadataTask/GenerateMetadata.cs @@ -19,7 +19,7 @@ namespace WixToolset.Tasks private static readonly JsonSerializerOptions SerializerOptions = new JsonSerializerOptions { PropertyNamingPolicy = JsonNamingPolicy.CamelCase, - IgnoreNullValues = true, + DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull, WriteIndented = true, Converters = { new JsonStringEnumConverter(JsonNamingPolicy.CamelCase) }, }; diff --git a/src/test/burn/WixTestTools/ArpEntryInstaller.cs b/src/test/burn/WixTestTools/ArpEntryInstaller.cs index 96d9fab9..cc049ec7 100644 --- a/src/test/burn/WixTestTools/ArpEntryInstaller.cs +++ b/src/test/burn/WixTestTools/ArpEntryInstaller.cs @@ -31,7 +31,7 @@ namespace WixTestTools } else { - Assert.True(false, "Tried to unregister when not registered."); + Assert.Fail("Tried to unregister when not registered."); } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs index 5bcd1f49..1b64e36c 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs @@ -152,7 +152,7 @@ namespace WixToolsetTest.CoreIntegration WixAssert.StringEqual("http://wixtoolset.org/schemas/v4/2008/Burn", attribute.Value); break; default: - Assert.False(true, $"Attribute: '{attribute.LocalName}', Value: '{attribute.Value}'"); + Assert.Fail($"Attribute: '{attribute.LocalName}', Value: '{attribute.Value}'"); break; } } @@ -264,7 +264,7 @@ namespace WixToolsetTest.CoreIntegration WixAssert.StringEqual("http://wixtoolset.org/schemas/v4/2008/Burn", attribute.Value); break; default: - Assert.False(true, $"Attribute: '{attribute.LocalName}', Value: '{attribute.Value}'"); + Assert.Fail($"Attribute: '{attribute.LocalName}', Value: '{attribute.Value}'"); break; } } @@ -808,7 +808,7 @@ namespace WixToolsetTest.CoreIntegration return; } - Assert.False(true, "Expected exception not accepted."); + Assert.Fail("Expected exception not accepted."); } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs index d1633b1e..3667a2f2 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs @@ -109,7 +109,7 @@ namespace WixToolsetTest.CoreIntegration return; } - Assert.True(false, "Expected WixException for missing entry section but expectations were not met."); + Assert.Fail("Expected WixException for missing entry section but expectations were not met."); } } @@ -139,7 +139,7 @@ namespace WixToolsetTest.CoreIntegration return; } - Assert.True(false, "Expected WixException for missing entry section but expectations were not met."); + Assert.Fail("Expected WixException for missing entry section but expectations were not met."); } } @@ -169,7 +169,7 @@ namespace WixToolsetTest.CoreIntegration return; } - Assert.True(false, "Expected WixException for missing entry section but expectations were not met."); + Assert.Fail("Expected WixException for missing entry section but expectations were not met."); } } } -- cgit v1.2.3-55-g6feb