From 464575def4341d65bc3fa72298798755cdee527e Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 1 Oct 2022 02:38:00 -0700 Subject: Standardize on .NET 6 as the minimum for .NET Core platform. Closes 6942 --- src/test/msi/Directory.wixproj.props | 2 +- src/test/msi/README.md | 4 ++-- src/test/msi/WixToolsetTest.MsiE2E/WixToolsetTest.MsiE2E.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/test/msi') 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 @@ $([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory))))) $(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\ - $(OutputPath)netcoreapp3.1\TestData\$(TestGroupName)\ + $(OutputPath)net6.0-windows\TestData\$(TestGroupName)\ None -wx true 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 They should be run on a VM instead, where you can easily roll back. 1. Run build.cmd to build everything (the tests will not automatically run). -1. Copy the build\IntegrationMsi\Debug\netcoreapp3.1 folder to your VM. -1. Open an elevated command prompt and navigate to the netcoreapp3.1 folder. +1. Copy the build\IntegrationMsi\Debug\net6.0-windows folder to your VM. +1. Open an elevated command prompt and navigate to the net6.0-windows folder. 1. Run the runtests.cmd file to run the tests. 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 @@ - netcoreapp3.1 + net6.0-windows x64 Major true -- cgit v1.2.3-55-g6feb