Additional fixes for some xunit Assert statements.

Set WixInternal.Core.TestPackage as only netstandard2.0 library.
Set Wixinternal.TestSupport as netstandard2.0 and net472.
System.Memory pinned to 4.5.5 to have consistent binding as transitive.


Signed-off-by: Bevan Weiss <[email protected]>

Author: bevanweiss

src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs

@@ -125,7 +125,7 @@ public void CanBuildUsingWixUIFeatureTree()
             {
                 "CustomAction:SetWIXUI_EXITDIALOGOPTIONALTEXT\t51\tWIXUI_EXITDIALOGOPTIONALTEXT\tThank you for installing [ProductName].\t",
             }, results.Where(r => r.StartsWith("CustomAction:")).ToArray());
-            Assert.Empty(results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("DoAction")));
+            Assert.DoesNotContain(results, result => result.StartsWith("ControlEvent:") && result.Contains("DoAction"));
             WixAssert.CompareLineByLine(new[]
             {
                 "InstallUISequence:WelcomeDlg\tNOT Installed OR PATCH\t1297",
@@ -189,8 +189,8 @@ public void CanBuildUsingWixUIMinimal()
                 "Binary:WixUI_Ico_Exclam\t[Binary data]",
                 "Binary:WixUI_Ico_Info\t[Binary data]",
             }, results.Where(r => r.StartsWith("Binary:")).ToArray());
-            Assert.Empty(results.Where(r => r.StartsWith("CustomAction:")));
-            Assert.Empty(results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("DoAction")));
+            Assert.DoesNotContain(results, r => r.StartsWith("CustomAction:"));
+            Assert.DoesNotContain(results, result => result.StartsWith("ControlEvent:") && result.Contains("DoAction"));
             WixAssert.CompareLineByLine(new[]
             {
                 "InstallUISequence:WelcomeDlg\tInstalled AND PATCH\t1296",
@@ -357,7 +357,7 @@ public void CanBuildWithInstallDirAndAddedDialog()
 
             Assert.Equal(10, results.Where(result => result.StartsWith("Control:") && result.Contains("SpecialDlg")).Count());
             Assert.Equal(5, results.Where(result => result.StartsWith("ControlEvent:") && result.Contains("SpecialDlg")).Count());
-            Assert.Single(results.Where(result => result.StartsWith("Dialog:") && result.Contains("SpecialDlg")));
+            Assert.Single(results, result => result.StartsWith("Dialog:") && result.Contains("SpecialDlg"));
         }
 
         [Fact]

src/internal/SetBuildNumber/Directory.Packages.props.pp

@@ -64,6 +64,7 @@
     <PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
     <PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
+    <PackageVersion Include="System.Memory" Version="4.5.5" />
 
     <PackageVersion Include="Microsoft.AspNetCore.Owin" Version="8.0.12" />
     <PackageVersion Include="Microsoft.VisualStudio.Setup.Configuration.Native" Version="3.11.2177" />

src/internal/WixInternal.TestSupport/TestData.cs

@@ -44,13 +44,13 @@ public static void CreateFile(string path, long size, bool fill = false)
 
         public static string Get(params string[] paths)
         {
-            var localPath = AppDomain.CurrentDomain.BaseDirectory;
+            var localPath = Path.GetDirectoryName(new Uri(Assembly.GetCallingAssembly().CodeBase).LocalPath);
             return Path.Combine(localPath, Path.Combine(paths));
         }
 
         public static string GetUnitTestLogsFolder([CallerFilePath] string path = "", [CallerMemberName] string method = "")
         {
-            var startingPath = AppDomain.CurrentDomain.BaseDirectory;
+            var startingPath = Path.GetDirectoryName(new Uri(Assembly.GetCallingAssembly().CodeBase).LocalPath);
             var buildPath = startingPath;
 
             while (!String.IsNullOrEmpty(buildPath))

src/wix/WixInternal.Core.TestPackage/WixInternal.Core.TestPackage.csproj

@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net472</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <Description>Internal WiX Toolset Test Package</Description>
     <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>

src/wix/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs

@@ -162,7 +162,7 @@ public void DetectUnconvertableQtExecCmdTimeout()
                 var result = RunConversion(targetFile);
 
                 Assert.Equal(13, result.ExitCode);
-                Assert.Single(result.Messages.Where(message => message.ToString().EndsWith("(QtExecCmdTimeoutAmbiguous)")));
+                Assert.Single(result.Messages, message => message.ToString().EndsWith("(QtExecCmdTimeoutAmbiguous)"));
 
                 var expected = File.ReadAllText(Path.Combine(folder, afterFileName)).Replace("\r\n", "\n");
                 var actual = File.ReadAllText(targetFile).Replace("\r\n", "\n");

src/wix/test/WixToolsetTest.Converters/UIExtensionFixture.cs

@@ -126,7 +126,7 @@ public void FixValidatePathCustomAction()
             var actual = UnformattedDocumentLines(document);
 
             WixAssert.CompareLineByLine(expected, actual);
-            Assert.Single(messaging.Messages.Where(m => m.Id == 65));
+            Assert.Single(messaging.Messages, m => m.Id == 65);
             Assert.Equal(2, errors);
         }
     }

src/wix/test/WixToolsetTest.CoreIntegration/WixlibFixture.cs

@@ -125,9 +125,9 @@ public void CanBuildWixlibWithBinariesFromNamedBindPaths()
                 var wixlib = Intermediate.Load(wixlibPath);
                 var binarySymbols = wixlib.Sections.SelectMany(s => s.Symbols).OfType<BinarySymbol>().ToList();
                 Assert.Equal(3, binarySymbols.Count);
-                Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll"));
-                Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll-1"));
-                Assert.Single(binarySymbols.Where(t => t.Data.Path == "wix-ir/foo.dll-2"));
+                Assert.Single(binarySymbols, t => t.Data.Path == "wix-ir/foo.dll");
+                Assert.Single(binarySymbols, t => t.Data.Path == "wix-ir/foo.dll-1");
+                Assert.Single(binarySymbols, t => t.Data.Path == "wix-ir/foo.dll-2");
             }
         }