diff options
Diffstat (limited to 'src/test/burn')
-rw-r--r-- | src/test/burn/Directory.wixproj.props | 2 | ||||
-rw-r--r-- | src/test/burn/README.md | 4 | ||||
-rw-r--r-- | src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj | 2 | ||||
-rw-r--r-- | src/test/burn/TestData/Manual/BundleB/BundleB.wixproj | 4 | ||||
-rw-r--r-- | src/test/burn/TestExe/TestExe.csproj | 2 | ||||
-rw-r--r-- | src/test/burn/WixTestTools/WixTestTools.csproj | 2 | ||||
-rw-r--r-- | src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj | 2 | ||||
-rw-r--r-- | src/test/burn/test_burn.cmd | 4 |
8 files changed, 11 insertions, 11 deletions
diff --git a/src/test/burn/Directory.wixproj.props b/src/test/burn/Directory.wixproj.props index 21ab5107..49a6ba62 100644 --- a/src/test/burn/Directory.wixproj.props +++ b/src/test/burn/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 | <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings> | 9 | <SuppressSpecificWarnings>1154;$(SuppressSpecificWarnings)</SuppressSpecificWarnings> |
diff --git a/src/test/burn/README.md b/src/test/burn/README.md index 6c9edb3c..30623b7e 100644 --- a/src/test/burn/README.md +++ b/src/test/burn/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\IntegrationBurn\Debug\netcoreapp3.1 folder to your VM. | 13 | 1. Copy the build\IntegrationBurn\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/burn/TestData/CacheTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj index 69f53a86..cea07ded 100644 --- a/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj +++ b/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj | |||
@@ -17,7 +17,7 @@ | |||
17 | </ItemGroup> | 17 | </ItemGroup> |
18 | <!-- We do this dynamically to avoid committing such a large file to source control. --> | 18 | <!-- We do this dynamically to avoid committing such a large file to source control. --> |
19 | <Target Name="CreateLargeFile" AfterTargets="BeforeBuild" Inputs="$(MSBuildProjectFullPath)" Outputs="$(MSBuildProjectDirectory)\fivegb.file"> | 19 | <Target Name="CreateLargeFile" AfterTargets="BeforeBuild" Inputs="$(MSBuildProjectFullPath)" Outputs="$(MSBuildProjectDirectory)\fivegb.file"> |
20 | <Exec Command='"$(BaseOutputPath)$(Configuration)\netcoreapp3.1\win-x86\testexe.exe" /lf "fivegb.file|5368709120' WorkingDirectory="$(MSBuildProjectDirectory)" /> | 20 | <Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /lf "fivegb.file|5368709120' WorkingDirectory="$(MSBuildProjectDirectory)" /> |
21 | </Target> | 21 | </Target> |
22 | <!-- We do this to avoid copying such a large file to the VM to run the tests. --> | 22 | <!-- We do this to avoid copying such a large file to the VM to run the tests. --> |
23 | <Target Name="DeleteLargeFile" AfterTargets="AfterBuild"> | 23 | <Target Name="DeleteLargeFile" AfterTargets="AfterBuild"> |
diff --git a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj index bd6e222a..069affaf 100644 --- a/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/Manual/BundleB/BundleB.wixproj | |||
@@ -27,7 +27,7 @@ | |||
27 | </ItemGroup> | 27 | </ItemGroup> |
28 | <!-- We do this dynamically to avoid committing so many files to source control. --> | 28 | <!-- We do this dynamically to avoid committing so many files to source control. --> |
29 | <Target Name="CreateThousandsOfFiles" AfterTargets="BeforeBuild"> | 29 | <Target Name="CreateThousandsOfFiles" AfterTargets="BeforeBuild"> |
30 | <Exec Command='"$(BaseOutputPath)$(Configuration)\netcoreapp3.1\win-x86\testexe.exe" /gf "BAPayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" /> | 30 | <Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /gf "BAPayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" /> |
31 | <Exec Command='"$(BaseOutputPath)$(Configuration)\netcoreapp3.1\win-x86\testexe.exe" /gf "PackagePayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" /> | 31 | <Exec Command='"$(BaseOutputPath)$(Configuration)\net6.0\win-x86\testexe.exe" /gf "PackagePayloads|10000' WorkingDirectory="$(MSBuildProjectDirectory)" /> |
32 | </Target> | 32 | </Target> |
33 | </Project> \ No newline at end of file | 33 | </Project> \ No newline at end of file |
diff --git a/src/test/burn/TestExe/TestExe.csproj b/src/test/burn/TestExe/TestExe.csproj index 016ae4e5..446d0ee3 100644 --- a/src/test/burn/TestExe/TestExe.csproj +++ b/src/test/burn/TestExe/TestExe.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
5 | <PropertyGroup> | 5 | <PropertyGroup> |
6 | <TargetFrameworks>net35;netcoreapp3.1</TargetFrameworks> | 6 | <TargetFrameworks>net35;net6.0</TargetFrameworks> |
7 | <AssemblyName>TestExe</AssemblyName> | 7 | <AssemblyName>TestExe</AssemblyName> |
8 | <RootNamespace>TestExe</RootNamespace> | 8 | <RootNamespace>TestExe</RootNamespace> |
9 | <OutputType>Exe</OutputType> | 9 | <OutputType>Exe</OutputType> |
diff --git a/src/test/burn/WixTestTools/WixTestTools.csproj b/src/test/burn/WixTestTools/WixTestTools.csproj index 535e6f44..47456868 100644 --- a/src/test/burn/WixTestTools/WixTestTools.csproj +++ b/src/test/burn/WixTestTools/WixTestTools.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 | <IsWixTestSupportProject>true</IsWixTestSupportProject> | 8 | <IsWixTestSupportProject>true</IsWixTestSupportProject> |
9 | </PropertyGroup> | 9 | </PropertyGroup> |
diff --git a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj index 1bedb34b..811f3ed2 100644 --- a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj +++ b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.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> |
diff --git a/src/test/burn/test_burn.cmd b/src/test/burn/test_burn.cmd index 80467f39..72ffd448 100644 --- a/src/test/burn/test_burn.cmd +++ b/src/test/burn/test_burn.cmd | |||
@@ -16,8 +16,8 @@ | |||
16 | msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\test_burn_build.binlog || exit /b | 16 | msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror -bl:%_L%\test_burn_build.binlog || exit /b |
17 | msbuild -t:Build -Restore TestData\TestData.proj -p:Configuration=%_C% -m -bl:%_L%\test_burn_data_build.binlog || exit /b | 17 | msbuild -t:Build -Restore TestData\TestData.proj -p:Configuration=%_C% -m -bl:%_L%\test_burn_data_build.binlog || exit /b |
18 | 18 | ||
19 | "%_B%\net35\win-x86\testexe.exe" /dm "%_B%\netcoreapp3.1\testhost.exe" | 19 | "%_B%\net35\win-x86\testexe.exe" /dm "%_B%\net6.0-windows\testhost.exe" |
20 | mt.exe -manifest "WixToolsetTest.BurnE2E\testhost.longpathaware.manifest" -updateresource:"%_B%\netcoreapp3.1\testhost.exe" | 20 | mt.exe -manifest "WixToolsetTest.BurnE2E\testhost.longpathaware.manifest" -updateresource:"%_B%\net6.0-windows\testhost.exe" |
21 | 21 | ||
22 | @if not "%RuntimeTestsEnabled%"=="true" goto :LExit | 22 | @if not "%RuntimeTestsEnabled%"=="true" goto :LExit |
23 | 23 | ||