diff options
author | Rob Mensching <rob@firegiant.com> | 2022-10-01 02:38:00 -0700 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2022-10-03 12:29:27 -0700 |
commit | 464575def4341d65bc3fa72298798755cdee527e (patch) | |
tree | 815adc229c92756260dcd65782102511359bf50f /src/test/msi | |
parent | ed6593322d34ff0e655be9347f340d0cc96c0784 (diff) | |
download | wix-464575def4341d65bc3fa72298798755cdee527e.tar.gz wix-464575def4341d65bc3fa72298798755cdee527e.tar.bz2 wix-464575def4341d65bc3fa72298798755cdee527e.zip |
Standardize on .NET 6 as the minimum for .NET Core platform.
Closes 6942
Diffstat (limited to 'src/test/msi')
-rw-r--r-- | src/test/msi/Directory.wixproj.props | 2 | ||||
-rw-r--r-- | src/test/msi/README.md | 4 | ||||
-rw-r--r-- | src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/test/msi/Directory.wixproj.props b/src/test/msi/Directory.wixproj.props index f824ff2a..de825e30 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)netcoreapp3.1\TestData\$(TestGroupName)\</OutputPath> | 6 | <OutputPath>$(OutputPath)net6.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 2b4ff9a4..f4c42029 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\netcoreapp3.1 folder to your VM. | 13 | 1. Copy the build\IntegrationMsi\Debug\net6.0-windows folder to your VM. |
14 | 1. Open an elevated command prompt and navigate to the netcoreapp3.1 folder. | 14 | 1. Open an elevated command prompt and navigate to the net6.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/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj b/src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj index 348d97ad..b2e384b1 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>netcoreapp3.1</TargetFramework> | 6 | <TargetFramework>net6.0-windows</TargetFramework> |
7 | <PlatformTarget>x64</PlatformTarget> | 7 | <PlatformTarget>x64</PlatformTarget> |
8 | <RollForward>Major</RollForward> | 8 | <RollForward>Major</RollForward> |
9 | <IsWixTestProject>true</IsWixTestProject> | 9 | <IsWixTestProject>true</IsWixTestProject> |