diff options
| author | Bob Arnson <bob@firegiant.com> | 2025-02-14 22:29:39 -0500 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2025-03-03 14:25:07 -0500 |
| commit | ca6e44d496b0c589fdaabad69a00643f539c47cd (patch) | |
| tree | edf84727cecfc03092a2851b465d97622c5048eb /src/internal/SetBuildNumber | |
| parent | ba7fd5837ea149b2e319cc577fad27ce1162a064 (diff) | |
| download | wix-ca6e44d496b0c589fdaabad69a00643f539c47cd.tar.gz wix-ca6e44d496b0c589fdaabad69a00643f539c47cd.tar.bz2 wix-ca6e44d496b0c589fdaabad69a00643f539c47cd.zip | |
Convert ext\ to MSTest and traversal projects.
- Move ext\ unit tests to MSTest.
- MSBuildify ext projects with MSTest execution.
- Fork test support projects for MSTest:
- WixInternal.TestSupport
- WixInternal.Core.TestPackage
Diffstat (limited to '')
| -rw-r--r-- | src/internal/SetBuildNumber/Directory.Packages.props.pp | 6 | ||||
| -rw-r--r-- | src/internal/SetBuildNumber/global.json.pp | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp index 8cf271d7..18a9b5eb 100644 --- a/src/internal/SetBuildNumber/Directory.Packages.props.pp +++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | <PackageVersion Include="WixToolset.Dtf.WindowsInstaller.Package" Version="{packageversion}" /> | 17 | <PackageVersion Include="WixToolset.Dtf.WindowsInstaller.Package" Version="{packageversion}" /> |
| 18 | 18 | ||
| 19 | <PackageVersion Include="WixInternal.TestSupport" Version="{packageversion}" /> | 19 | <PackageVersion Include="WixInternal.TestSupport" Version="{packageversion}" /> |
| 20 | <PackageVersion Include="WixInternal.MSTestSupport" Version="{packageversion}" /> | ||
| 20 | <PackageVersion Include="WixInternal.TestSupport.Native" Version="{packageversion}" /> | 21 | <PackageVersion Include="WixInternal.TestSupport.Native" Version="{packageversion}" /> |
| 21 | <PackageVersion Include="WixInternal.BaseBuildTasks.Sources" Version="{packageversion}" /> | 22 | <PackageVersion Include="WixInternal.BaseBuildTasks.Sources" Version="{packageversion}" /> |
| 22 | 23 | ||
| @@ -37,6 +38,7 @@ | |||
| 37 | <PackageVersion Include="WixToolset.Core.Burn" Version="{packageversion}" /> | 38 | <PackageVersion Include="WixToolset.Core.Burn" Version="{packageversion}" /> |
| 38 | <PackageVersion Include="WixToolset.Core.WindowsInstaller" Version="{packageversion}" /> | 39 | <PackageVersion Include="WixToolset.Core.WindowsInstaller" Version="{packageversion}" /> |
| 39 | <PackageVersion Include="WixInternal.Core.TestPackage" Version="{packageversion}" /> | 40 | <PackageVersion Include="WixInternal.Core.TestPackage" Version="{packageversion}" /> |
| 41 | <PackageVersion Include="WixInternal.Core.MSTestPackage" Version="{packageversion}" /> | ||
| 40 | 42 | ||
| 41 | <PackageVersion Include="WixToolset.Heat" Version="{packageversion}" /> | 43 | <PackageVersion Include="WixToolset.Heat" Version="{packageversion}" /> |
| 42 | 44 | ||
| @@ -98,6 +100,10 @@ | |||
| 98 | </ItemGroup> | 100 | </ItemGroup> |
| 99 | 101 | ||
| 100 | <ItemGroup> | 102 | <ItemGroup> |
| 103 | <PackageVersion Include="MSTest.TestFramework" Version="3.7.3" /> | ||
| 104 | </ItemGroup> | ||
| 105 | |||
| 106 | <ItemGroup> | ||
| 101 | <PackageVersion Include="Microsoft.NET.Tools.NETCoreCheck.x86" Version="6.0.0" /> | 107 | <PackageVersion Include="Microsoft.NET.Tools.NETCoreCheck.x86" Version="6.0.0" /> |
| 102 | <PackageVersion Include="Microsoft.NET.Tools.NETCoreCheck.x64" Version="6.0.0" /> | 108 | <PackageVersion Include="Microsoft.NET.Tools.NETCoreCheck.x64" Version="6.0.0" /> |
| 103 | <PackageVersion Include="Microsoft.NET.Tools.NETCoreCheck.arm64" Version="6.0.0" /> | 109 | <PackageVersion Include="Microsoft.NET.Tools.NETCoreCheck.arm64" Version="6.0.0" /> |
diff --git a/src/internal/SetBuildNumber/global.json.pp b/src/internal/SetBuildNumber/global.json.pp index bad3c0bd..fe48e6cc 100644 --- a/src/internal/SetBuildNumber/global.json.pp +++ b/src/internal/SetBuildNumber/global.json.pp | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | { | 1 | { |
| 2 | "msbuild-sdks": { | 2 | "msbuild-sdks": { |
| 3 | "Microsoft.Build.Traversal": "3.2.0", | 3 | "MSTest.Sdk": "3.8.0", |
| 4 | "Microsoft.Build.Traversal": "4.1.82", | ||
| 4 | "Microsoft.Build.NoTargets": "3.5.6", | 5 | "Microsoft.Build.NoTargets": "3.5.6", |
| 5 | "WixToolset.Sdk": "{packageversion}" | 6 | "WixToolset.Sdk": "{packageversion}" |
| 6 | }, | 7 | }, |
