diff options
| author | Bob Arnson <bob@firegiant.com> | 2026-06-03 22:20:43 -0400 |
|---|---|---|
| committer | Bob Arnson <github@bobs.org> | 2026-06-09 15:38:28 -0400 |
| commit | 318f5300cf4244d6eb440b00278c062f1da56e91 (patch) | |
| tree | a2c16f519e8acfae561920b8e3e20aa2215e3f91 /src/test/msi | |
| parent | a5ec0724f3681bd3076a0b914e6a5f5e09ce1d40 (diff) | |
| download | wix-318f5300cf4244d6eb440b00278c062f1da56e91.tar.gz wix-318f5300cf4244d6eb440b00278c062f1da56e91.tar.bz2 wix-318f5300cf4244d6eb440b00278c062f1da56e91.zip | |
Target VS2026 and .NET 10 for WiX v8.
VS2022/v143 toolsets are no longer required.
Diffstat (limited to 'src/test/msi')
4 files changed, 9 insertions, 9 deletions
diff --git a/src/test/msi/Directory.wixproj.props b/src/test/msi/Directory.wixproj.props index 9325dcb6..6108ed4d 100644 --- a/src/test/msi/Directory.wixproj.props +++ b/src/test/msi/Directory.wixproj.props | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | <PropertyGroup> | 3 | <PropertyGroup> |
| 4 | <TestGroupName Condition=" '$(TestGroupName)'=='' ">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))))</TestGroupName> | 4 | <TestGroupName Condition=" '$(TestGroupName)'=='' ">$([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory)))))</TestGroupName> |
| 5 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\</BaseIntermediateOutputPath> | 5 | <BaseIntermediateOutputPath>$(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\</BaseIntermediateOutputPath> |
| 6 | <OutputPath>$(OutputPath)net8.0-windows\TestData\$(TestGroupName)\</OutputPath> | 6 | <OutputPath>$(OutputPath)net10.0-windows\TestData\$(TestGroupName)\</OutputPath> |
| 7 | <DefaultCompressionLevel>None</DefaultCompressionLevel> | 7 | <DefaultCompressionLevel>None</DefaultCompressionLevel> |
| 8 | <CompilerAdditionalOptions>-wx</CompilerAdditionalOptions> | 8 | <CompilerAdditionalOptions>-wx</CompilerAdditionalOptions> |
| 9 | <SuppressValidation>true</SuppressValidation> | 9 | <SuppressValidation>true</SuppressValidation> |
diff --git a/src/test/msi/README.md b/src/test/msi/README.md index bb7d9ee4..8e7296a6 100644 --- a/src/test/msi/README.md +++ b/src/test/msi/README.md | |||
| @@ -10,8 +10,8 @@ They modify machine state so it's strongly recommended *not* to run these tests | |||
| 10 | They should be run on a VM instead, where you can easily roll back. | 10 | They should be run on a VM instead, where you can easily roll back. |
| 11 | 11 | ||
| 12 | 1. Run build.cmd to build everything (the tests will not automatically run). | 12 | 1. Run build.cmd to build everything (the tests will not automatically run). |
| 13 | 1. Copy the build\IntegrationMsi\Debug\net8.0-windows folder to your VM. | 13 | 1. Copy the build\IntegrationMsi\Debug\net10.0-windows folder to your VM. |
| 14 | 1. Open an elevated command prompt and navigate to the net8.0-windows folder. | 14 | 1. Open an elevated command prompt and navigate to the net10.0-windows folder. |
| 15 | 1. Run the runtests.cmd file to run the tests. | 15 | 1. Run the runtests.cmd file to run the tests. |
| 16 | 16 | ||
| 17 | You can modify the runtests.cmd to run specific tests. | 17 | You can modify the runtests.cmd to run specific tests. |
diff --git a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj index d2e7b2b6..0678cacc 100644 --- a/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj +++ b/src/test/msi/TestData/ComPlusExtensionTests/Components/TestComponentNative/TestComponentNative.vcxproj | |||
| @@ -28,25 +28,25 @@ | |||
| 28 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | 28 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> |
| 29 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 29 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 30 | <UseDebugLibraries>true</UseDebugLibraries> | 30 | <UseDebugLibraries>true</UseDebugLibraries> |
| 31 | <PlatformToolset>v143</PlatformToolset> | 31 | <PlatformToolset>v145</PlatformToolset> |
| 32 | <CharacterSet>Unicode</CharacterSet> | 32 | <CharacterSet>Unicode</CharacterSet> |
| 33 | </PropertyGroup> | 33 | </PropertyGroup> |
| 34 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | 34 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> |
| 35 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 35 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 36 | <UseDebugLibraries>false</UseDebugLibraries> | 36 | <UseDebugLibraries>false</UseDebugLibraries> |
| 37 | <PlatformToolset>v143</PlatformToolset> | 37 | <PlatformToolset>v145</PlatformToolset> |
| 38 | <CharacterSet>Unicode</CharacterSet> | 38 | <CharacterSet>Unicode</CharacterSet> |
| 39 | </PropertyGroup> | 39 | </PropertyGroup> |
| 40 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | 40 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> |
| 41 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 41 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 42 | <UseDebugLibraries>true</UseDebugLibraries> | 42 | <UseDebugLibraries>true</UseDebugLibraries> |
| 43 | <PlatformToolset>v143</PlatformToolset> | 43 | <PlatformToolset>v145</PlatformToolset> |
| 44 | <CharacterSet>Unicode</CharacterSet> | 44 | <CharacterSet>Unicode</CharacterSet> |
| 45 | </PropertyGroup> | 45 | </PropertyGroup> |
| 46 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | 46 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> |
| 47 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 47 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 48 | <UseDebugLibraries>false</UseDebugLibraries> | 48 | <UseDebugLibraries>false</UseDebugLibraries> |
| 49 | <PlatformToolset>v143</PlatformToolset> | 49 | <PlatformToolset>v145</PlatformToolset> |
| 50 | <CharacterSet>Unicode</CharacterSet> | 50 | <CharacterSet>Unicode</CharacterSet> |
| 51 | </PropertyGroup> | 51 | </PropertyGroup> |
| 52 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 52 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| @@ -288,4 +288,4 @@ | |||
| 288 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 288 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 289 | <ImportGroup Label="ExtensionTargets"> | 289 | <ImportGroup Label="ExtensionTargets"> |
| 290 | </ImportGroup> | 290 | </ImportGroup> |
| 291 | </Project> \ No newline at end of file | 291 | </Project> |
diff --git a/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj b/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj index f0bf8a5d..f73e5a58 100644 --- a/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj +++ b/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>net8.0-windows</TargetFramework> | 6 | <TargetFramework>net10.0-windows</TargetFramework> |
| 7 | <PlatformTarget>x64</PlatformTarget> | 7 | <PlatformTarget>x64</PlatformTarget> |
| 8 | <IsWixTestProject>true</IsWixTestProject> | 8 | <IsWixTestProject>true</IsWixTestProject> |
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
