aboutsummaryrefslogtreecommitdiff
path: root/src/internal
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2025-02-16 23:15:41 -0500
committerBob Arnson <github@bobs.org>2025-03-03 14:25:07 -0500
commit3354cdba91ed4e67a00a23c4e556c9672b2b1f45 (patch)
tree7172a87b53050beb5b8d984305728e81e43df6c2 /src/internal
parentae96ff06cadd0141f48d88a7e9983ca81dace613 (diff)
downloadwix-3354cdba91ed4e67a00a23c4e556c9672b2b1f45.tar.gz
wix-3354cdba91ed4e67a00a23c4e556c9672b2b1f45.tar.bz2
wix-3354cdba91ed4e67a00a23c4e556c9672b2b1f45.zip
Convert WixToolsetTest.Sdk to MSTest.***
***Does not include a full conversion to traversal projects. The wix segment already uses traversal projects extensively so there isn't a significant per win, especially compared to the effort required...but MSTest's method-level parallelism cuts test run time in half (~60->~30).
Diffstat (limited to 'src/internal')
-rw-r--r--src/internal/SetBuildNumber/Directory.Packages.props.pp2
-rw-r--r--src/internal/WixBuildFinalize/WixBuildFinalize.proj2
-rw-r--r--src/internal/WixInternal.MSTestSupport/WixAssert.cs10
-rw-r--r--src/internal/internal.sln2
4 files changed, 12 insertions, 4 deletions
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index 18a9b5eb..8204df97 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -100,7 +100,7 @@
100 </ItemGroup> 100 </ItemGroup>
101 101
102 <ItemGroup> 102 <ItemGroup>
103 <PackageVersion Include="MSTest.TestFramework" Version="3.7.3" /> 103 <PackageVersion Include="MSTest.TestFramework" Version="3.8.0" />
104 </ItemGroup> 104 </ItemGroup>
105 105
106 <ItemGroup> 106 <ItemGroup>
diff --git a/src/internal/WixBuildFinalize/WixBuildFinalize.proj b/src/internal/WixBuildFinalize/WixBuildFinalize.proj
index bd68a471..1025fad1 100644
--- a/src/internal/WixBuildFinalize/WixBuildFinalize.proj
+++ b/src/internal/WixBuildFinalize/WixBuildFinalize.proj
@@ -6,7 +6,7 @@
6 <TargetFramework>net472</TargetFramework> 6 <TargetFramework>net472</TargetFramework>
7 </PropertyGroup> 7 </PropertyGroup>
8 8
9 <Target Name="ZipPdbs" BeforeTargets="AfterBuild"> 9 <Target Name="ZipPdbs" BeforeTargets="AfterBuild" Condition=" '$(Configuration)' == 'Release' ">
10 <ZipDirectory 10 <ZipDirectory
11 SourceDirectory="$(PdbsFolder)" 11 SourceDirectory="$(PdbsFolder)"
12 DestinationFile="$(ArtifactsFolder)\wix-pdbs.$(Version).zip" 12 DestinationFile="$(ArtifactsFolder)\wix-pdbs.$(Version).zip"
diff --git a/src/internal/WixInternal.MSTestSupport/WixAssert.cs b/src/internal/WixInternal.MSTestSupport/WixAssert.cs
index b4c59fa5..9110309d 100644
--- a/src/internal/WixInternal.MSTestSupport/WixAssert.cs
+++ b/src/internal/WixInternal.MSTestSupport/WixAssert.cs
@@ -92,6 +92,16 @@ namespace WixInternal.MSTestSupport
92 Assert.IsTrue(collection.All(predicate)); 92 Assert.IsTrue(collection.All(predicate));
93 } 93 }
94 94
95 public static void Any<T>(IEnumerable<T> collection, Func<T, bool> predicate)
96 {
97 Assert.IsTrue(collection.Any(predicate));
98 }
99
100 public static void NotEmpty<T>(IEnumerable<T> collection)
101 {
102 Assert.IsTrue(collection.Count() > 0);
103 }
104
95 public static void Empty<T>(IEnumerable<T> collection) 105 public static void Empty<T>(IEnumerable<T> collection)
96 { 106 {
97 Assert.AreEqual(0, collection.Count()); 107 Assert.AreEqual(0, collection.Count());
diff --git a/src/internal/internal.sln b/src/internal/internal.sln
index 5514e543..8a326615 100644
--- a/src/internal/internal.sln
+++ b/src/internal/internal.sln
@@ -9,8 +9,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixInternal.TestSupport.Nat
9EndProject 9EndProject
10Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixInternal.BaseBuildTasks.Sources", "WixInternal.BaseBuildTasks.Sources\WixInternal.BaseBuildTasks.Sources.csproj", "{6B654490-AB0D-4F94-B564-DAA80044D5A3}" 10Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixInternal.BaseBuildTasks.Sources", "WixInternal.BaseBuildTasks.Sources\WixInternal.BaseBuildTasks.Sources.csproj", "{6B654490-AB0D-4F94-B564-DAA80044D5A3}"
11EndProject 11EndProject
12Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixInternal.XunitTestSupport", "WixInternal.XunitTestSupport\WixInternal.XunitTestSupport.csproj", "{AF7C4730-583B-46F8-9BB6-16D1F0330932}"
13EndProject
14Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixInternal.MSTestSupport", "WixInternal.MSTestSupport\WixInternal.MSTestSupport.csproj", "{E70898F2-8D08-4FCE-9CFF-EF1792FCA2E2}" 12Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixInternal.MSTestSupport", "WixInternal.MSTestSupport\WixInternal.MSTestSupport.csproj", "{E70898F2-8D08-4FCE-9CFF-EF1792FCA2E2}"
15EndProject 13EndProject
16Global 14Global