From d20b6d41283f2f9decc8ef98cae1d36b09198159 Mon Sep 17 00:00:00 2001 From: chris_bednarski Date: Wed, 19 Jul 2023 10:11:18 +1000 Subject: [PATCH] feat(build): update xunit to version 2.5.0, fix occasional test timeout --- .../SetBuildNumber/Directory.Packages.props.pp | 10 +++++----- .../SetBuildNumber/SetBuildNumber.proj | 2 +- .../build/WixInternal.TestSupport.Native.props | 4 ++-- .../WixInternal.TestSupport.Native.targets | 18 +++++++++--------- .../packages.config | 12 ++++++------ .../XunitExtensions/WixAssert.cs | 2 +- .../burn/WixTestTools/ArpEntryInstaller.cs | 2 +- .../BundleFixture.cs | 6 +++--- .../LinkerFixture.cs | 6 +++--- .../PatchFixture.cs | 2 +- 10 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp index a14cf55ad..cea1def80 100644 --- a/src/internal/SetBuildNumber/Directory.Packages.props.pp +++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp @@ -86,12 +86,12 @@ - + - - - - + + + + diff --git a/src/internal/SetBuildNumber/SetBuildNumber.proj b/src/internal/SetBuildNumber/SetBuildNumber.proj index 5e5bf564e..cf98234ef 100644 --- a/src/internal/SetBuildNumber/SetBuildNumber.proj +++ b/src/internal/SetBuildNumber/SetBuildNumber.proj @@ -117,6 +117,6 @@ BeforeTargets="AfterBuild" /> - + 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 d9d9dab43..11f3baed7 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 ed3d728a0..15bdb33e2 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.5.0\lib\netstandard1.1\xunit.assert.dll - $(RootPackagesFolder)xunit.extensibility.core.2.4.2\lib\netstandard1.1\xunit.core.dll + $(RootPackagesFolder)xunit.extensibility.core.2.5.0\lib\netstandard1.1\xunit.core.dll - $(RootPackagesFolder)xunit.extensibility.execution.2.4.2\lib\net452\xunit.execution.desktop.dll + $(RootPackagesFolder)xunit.extensibility.execution.2.5.0\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 603b945aa..a9afa1faf 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 083e34f58..1df98d3bd 100644 --- a/src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs +++ b/src/internal/WixInternal.TestSupport/XunitExtensions/WixAssert.cs @@ -91,7 +91,7 @@ public static void StringCollectionEmpty(IList collection) { 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/test/burn/WixTestTools/ArpEntryInstaller.cs b/src/test/burn/WixTestTools/ArpEntryInstaller.cs index 96d9fab91..cc049ec71 100644 --- a/src/test/burn/WixTestTools/ArpEntryInstaller.cs +++ b/src/test/burn/WixTestTools/ArpEntryInstaller.cs @@ -31,7 +31,7 @@ public void Unregister(bool assertIfMissing = true) } 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 5bcd1f499..1b64e36c1 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/BundleFixture.cs @@ -152,7 +152,7 @@ public void CanBuildSimpleBundle() 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 @@ public void CanBuildX64Bundle() 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 @@ public void CannotBuildWithMissingBootstrapperApplication() 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 d1633b1ea..3667a2f2a 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/LinkerFixture.cs @@ -109,7 +109,7 @@ public void MissingEntrySectionDetectedPackage() 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 @@ public void MissingEntrySectionDetectedWixipl() 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 @@ public void MissingEntrySectionDetectedUnknown() 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."); } } } diff --git a/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs b/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs index 82dfc7e5d..49303df19 100644 --- a/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs +++ b/src/wix/test/WixToolsetTest.CoreIntegration/PatchFixture.cs @@ -575,7 +575,7 @@ private static void CreateAdminImage(string msiPath, string targetDir) var args = $"/a \"{Path.ChangeExtension(msiPath, "msi")}\" TARGETDIR=\"{targetDir}\" /qn"; var proc = Process.Start("msiexec.exe", args); - proc.WaitForExit(10000); + proc.WaitForExit(20000); Assert.Equal(0, proc.ExitCode); }