From df016066100df955d5ff98811e113fb2b1bd4b8a Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 26 Apr 2021 11:31:05 -0700 Subject: Implement integrated build process --- .../TestData/BadInput/OrphanPayload.wxs | 11 ----- .../BadInput/PackageInMultipleContainers.wxs | 14 ------- .../Container/HarvestIntoAttachedContainer.wxs | 17 -------- .../Container/LayoutPayloadInContainer.wxs | 28 ------------- .../Container/PayloadInMultipleContainers.wxs | 28 ------------- src/test/burn/BurnE2ETests.sln | 8 ++-- src/test/burn/Directory.Build.props | 28 +++---------- src/test/burn/Directory.Build.targets | 48 +--------------------- src/test/burn/Directory.wixproj.props | 11 +++++ src/test/burn/Directory.wixproj.targets | 17 ++++++++ src/test/burn/TestBA/TestBA.csproj | 4 +- src/test/burn/TestBA/TestBA_x64.csproj | 4 +- .../BundleA/BundleA.wixproj | 2 +- .../BundleA_x64/BundleA_x64.wixproj | 2 +- .../BundleB/BundleB.wixproj | 4 +- .../BundleB_x64/BundleB_x64.wixproj | 4 +- .../BundleC/BundleC.wixproj | 4 +- .../BundleC_x64/BundleC_x64.wixproj | 4 +- .../TestData/CacheTests/BundleA/BundleA.wixproj | 4 +- .../TestData/CacheTests/BundleB/BundleB.wixproj | 4 +- .../TestData/CacheTests/BundleC/BundleC.wixproj | 4 +- .../DependencyTests/BundleAv1/BundleAv1.wixproj | 6 +-- .../BundleAv1_0_1/BundleAv1_0_1.wixproj | 6 +-- .../DependencyTests/BundleB/BundleB.wixproj | 6 +-- .../DependencyTests/BundleC/BundleC.wixproj | 6 +-- .../DependencyTests/BundleD/BundleD.wixproj | 6 +-- .../DependencyTests/BundleE/BundleE.wixproj | 6 +-- .../DependencyTests/BundleF/BundleF.wixproj | 6 +-- .../BundleF_AddOnA/BundleF_AddOnA.wixproj | 6 +-- .../BundleF_AddOnB/BundleF_AddOnB.wixproj | 6 +-- .../BundleF_PatchAv1_0_1.wixproj | 6 +-- .../BundleF_PatchAv1_0_2.wixproj | 6 +-- .../DependencyTests/BundleHv1/BundleHv1.wixproj | 4 +- .../DependencyTests/BundleHv2/BundleHv2.wixproj | 4 +- .../DependencyTests/BundleJ/BundleJ.wixproj | 6 +-- .../BundleJ_Patch/BundleJ_Patch.wixproj | 6 +-- .../DependencyTests/BundleKv1/BundleKv1.wixproj | 4 +- .../DependencyTests/BundleKv2/BundleKv2.wixproj | 4 +- .../DependencyTests/BundleL/BundleL.wixproj | 6 +-- .../DependencyTests/PackageAv1/PackageAv1.wixproj | 2 +- .../PackageAv1_0_1/PackageAv1_0_1.wixproj | 2 +- .../PackageAv1_0_2/PackageAv1_0_2.wixproj | 2 +- .../DependencyTests/PackageB/PackageB.wixproj | 2 +- .../DependencyTests/PackageC/PackageC.wixproj | 4 +- .../DependencyTests/PackageDv1/PackageDv1.wixproj | 2 +- .../DependencyTests/PackageDv2/PackageDv2.wixproj | 2 +- .../DependencyTests/PackageEv1/PackageEv1.wixproj | 2 +- .../PackageEv1_0_1/PackageEv1_0_1.wixproj | 2 +- .../TestData/DependencyTests/PatchA/PatchA.wixproj | 2 +- .../TestData/DependencyTests/PatchB/PatchB.wixproj | 2 +- .../ElevationTests/BundleA/BundleA.wixproj | 4 +- .../TestData/FailureTests/BundleA/BundleA.wixproj | 4 +- .../TestData/FailureTests/BundleB/BundleB.wixproj | 4 +- .../TestData/FailureTests/BundleC/BundleC.wixproj | 4 +- .../BundleAv1/BundleAv1.wixproj | 4 +- .../BundleAv2/BundleAv2.wixproj | 4 +- .../BundleCv1/BundleCv1.wixproj | 4 +- .../BundleCv2/BundleCv2.wixproj | 4 +- .../TestData/LayoutTests/BundleA/BundleA.wixproj | 4 +- .../BundleAv1/BundleAv1.wixproj | 2 +- .../BundleAv2/BundleAv2.wixproj | 2 +- .../BundleBv1/BundleBv1.wixproj | 4 +- .../BundleBv2/BundleBv2.wixproj | 4 +- .../MsiTransactionTests/PackageF/PackageF.wixproj | 2 +- .../TestData/PatchTests/BundleA/BundleA.wixproj | 4 +- .../PatchTests/BundlePatchA/BundlePatchA.wixproj | 4 +- .../PatchTests/BundlePatchA2/BundlePatchA2.wixproj | 4 +- .../TestData/PrereqBaTests/BundleA/BundleA.wixproj | 2 +- .../TestData/PrereqBaTests/BundleB/BundleB.wixproj | 2 +- .../PrereqBaTests/PackageF/PackageF.wixproj | 2 +- .../RegistrationTests/BundleA/BundleA.wixproj | 4 +- .../RollbackBoundaryTests/BundleA/BundleA.wixproj | 2 +- .../PackageF/PackageF.wixproj | 2 +- .../SlipstreamTests/BundleA/BundleA.wixproj | 4 +- .../BundleAReverse/BundleAReverse.wixproj | 4 +- .../SlipstreamTests/BundleB/BundleB.wixproj | 4 +- .../SlipstreamTests/BundleC/BundleC.wixproj | 4 +- .../SlipstreamTests/BundleD/BundleD.wixproj | 4 +- .../BundleOnlyA/BundleOnlyA.wixproj | 4 +- .../BundleOnlyPatchA/BundleOnlyPatchA.wixproj | 4 +- .../TestBA/TestBAWixlib/testbawixlib.wixproj | 2 +- .../TestBAWixlib_x64/testbawixlib_x64.wixproj | 2 +- src/test/burn/TestData/TestData.proj | 3 +- .../UpdateBundleTests/BundleAv1/BundleAv1.wixproj | 4 +- .../UpdateBundleTests/BundleAv2/BundleAv2.wixproj | 4 +- .../UpdateBundleTests/BundleBv1/BundleBv1.wixproj | 4 +- .../UpdateBundleTests/BundleBv2/BundleBv2.wixproj | 4 +- .../BundleAv1/BundleAv1.wixproj | 4 +- .../BundleAv2/BundleAv2.wixproj | 4 +- src/test/burn/TestExe/TestExe.csproj | 2 +- src/test/burn/TestExe/TestExe_x64.csproj | 2 +- src/test/burn/Wix.Build.props | 11 ----- src/test/burn/Wix.Build.targets | 17 -------- src/test/burn/WixTestTools/WixTestTools.csproj | 12 +++--- .../WixToolsetTest.BurnE2E.csproj | 18 ++++---- src/test/burn/appveyor.cmd | 11 ----- src/test/burn/appveyor.yml | 27 ------------ src/test/burn/global.json | 8 ---- src/test/burn/nuget.config | 16 -------- src/test/burn/test_burn.cmd | 17 ++++++++ src/test/run_test.cmd | 15 +++++++ src/test/run_test.yml | 26 ++++++++++++ src/test/test.cmd | 14 +++++++ 103 files changed, 277 insertions(+), 428 deletions(-) delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/OrphanPayload.wxs delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/PackageInMultipleContainers.wxs delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/Container/HarvestIntoAttachedContainer.wxs delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/Container/LayoutPayloadInContainer.wxs delete mode 100644 src/test/WixToolsetTest.CoreIntegration/TestData/Container/PayloadInMultipleContainers.wxs create mode 100644 src/test/burn/Directory.wixproj.props create mode 100644 src/test/burn/Directory.wixproj.targets delete mode 100644 src/test/burn/Wix.Build.props delete mode 100644 src/test/burn/Wix.Build.targets delete mode 100644 src/test/burn/appveyor.cmd delete mode 100644 src/test/burn/appveyor.yml delete mode 100644 src/test/burn/global.json delete mode 100644 src/test/burn/nuget.config create mode 100644 src/test/burn/test_burn.cmd create mode 100644 src/test/run_test.cmd create mode 100644 src/test/run_test.yml create mode 100644 src/test/test.cmd (limited to 'src/test') diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/OrphanPayload.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/OrphanPayload.wxs deleted file mode 100644 index 92a9602f..00000000 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/OrphanPayload.wxs +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/PackageInMultipleContainers.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/PackageInMultipleContainers.wxs deleted file mode 100644 index a00874ce..00000000 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/BadInput/PackageInMultipleContainers.wxs +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/HarvestIntoAttachedContainer.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Container/HarvestIntoAttachedContainer.wxs deleted file mode 100644 index ec757c5d..00000000 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/HarvestIntoAttachedContainer.wxs +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/LayoutPayloadInContainer.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Container/LayoutPayloadInContainer.wxs deleted file mode 100644 index 0c5f8c7e..00000000 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/LayoutPayloadInContainer.wxs +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/PayloadInMultipleContainers.wxs b/src/test/WixToolsetTest.CoreIntegration/TestData/Container/PayloadInMultipleContainers.wxs deleted file mode 100644 index c7f549a3..00000000 --- a/src/test/WixToolsetTest.CoreIntegration/TestData/Container/PayloadInMultipleContainers.wxs +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/burn/BurnE2ETests.sln b/src/test/burn/BurnE2ETests.sln index 7cdb0cf0..f7850250 100644 --- a/src/test/burn/BurnE2ETests.sln +++ b/src/test/burn/BurnE2ETests.sln @@ -3,13 +3,13 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29503.13 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestBA", "src\TestBA\TestBA.csproj", "{04022D35-6D75-49D0-91D2-4208E09DBA6D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestBA", "TestBA\TestBA.csproj", "{04022D35-6D75-49D0-91D2-4208E09DBA6D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestExe", "src\TestExe\TestExe.csproj", "{B038B342-BE42-4951-82A9-7789412CF37F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestExe", "TestExe\TestExe.csproj", "{B038B342-BE42-4951-82A9-7789412CF37F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixTestTools", "src\WixTestTools\WixTestTools.csproj", "{3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixTestTools", "WixTestTools\WixTestTools.csproj", "{3D3B02F3-79B6-4BD5-AD49-2889DA3849A7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BurnE2E", "src\WixToolsetTest.BurnE2E\WixToolsetTest.BurnE2E.csproj", "{FED9D707-E5C3-4867-87B0-FABDB5EB0823}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.BurnE2E", "WixToolsetTest.BurnE2E\WixToolsetTest.BurnE2E.csproj", "{FED9D707-E5C3-4867-87B0-FABDB5EB0823}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/test/burn/Directory.Build.props b/src/test/burn/Directory.Build.props index f83cc154..1b3f67fe 100644 --- a/src/test/burn/Directory.Build.props +++ b/src/test/burn/Directory.Build.props @@ -1,29 +1,11 @@ - - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset + IntegrationBurn + false - - - - - + + + diff --git a/src/test/burn/Directory.Build.targets b/src/test/burn/Directory.Build.targets index 265b5cfd..4e97b6ca 100644 --- a/src/test/burn/Directory.Build.targets +++ b/src/test/burn/Directory.Build.targets @@ -1,50 +1,6 @@ - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - - + + diff --git a/src/test/burn/Directory.wixproj.props b/src/test/burn/Directory.wixproj.props new file mode 100644 index 00000000..06cf5b1d --- /dev/null +++ b/src/test/burn/Directory.wixproj.props @@ -0,0 +1,11 @@ + + + + $([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory))))) + $(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\ + $(OutputPath)netcoreapp3.1\TestData\$(TestGroupName)\ + None + -wx + 1154;$(SuppressSpecificWarnings) + + diff --git a/src/test/burn/Directory.wixproj.targets b/src/test/burn/Directory.wixproj.targets new file mode 100644 index 00000000..17a46e2a --- /dev/null +++ b/src/test/burn/Directory.wixproj.targets @@ -0,0 +1,17 @@ + + + + + $(MSBuildProjectName) + $(MSBuildProjectName) + http://localhost:9999/e2e/ + TestGroupName=$(TestGroupName);PackageName=$(PackageName);BundleName=$(BundleName);WebServerBaseUrl=$(WebServerBaseUrl);$(DefineConstants) + BA=$(BA);$(DefineConstants) + CabPrefix=$(CabPrefix);$(DefineConstants) + SoftwareTag=1;$(DefineConstants) + ProductCode=$(ProductCode);$(DefineConstants) + ProductComponents=1;$(DefineConstants) + UpgradeCode=$(UpgradeCode);$(DefineConstants) + Version=$(Version);$(DefineConstants) + + diff --git a/src/test/burn/TestBA/TestBA.csproj b/src/test/burn/TestBA/TestBA.csproj index 74df28dc..183ea02d 100644 --- a/src/test/burn/TestBA/TestBA.csproj +++ b/src/test/burn/TestBA/TestBA.csproj @@ -19,6 +19,6 @@ - + - \ No newline at end of file + diff --git a/src/test/burn/TestBA/TestBA_x64.csproj b/src/test/burn/TestBA/TestBA_x64.csproj index 1368e0f0..8e2bf513 100644 --- a/src/test/burn/TestBA/TestBA_x64.csproj +++ b/src/test/burn/TestBA/TestBA_x64.csproj @@ -19,6 +19,6 @@ - + - \ No newline at end of file + diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj index 591272b3..dcd38527 100644 --- a/src/test/burn/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj @@ -12,6 +12,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj index 3f405ce5..7e29856f 100644 --- a/src/test/burn/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj +++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleA_x64/BundleA_x64.wixproj @@ -13,6 +13,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj index 8ea9afe0..6f39097a 100644 --- a/src/test/burn/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleB/BundleB.wixproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj index 1b1a5006..c940f02a 100644 --- a/src/test/burn/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj +++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleB_x64/BundleB_x64.wixproj @@ -15,7 +15,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj index 104a6003..0eb66ee3 100644 --- a/src/test/burn/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj +++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleC/BundleC.wixproj @@ -14,7 +14,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj b/src/test/burn/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj index 3b9d7360..af028ed4 100644 --- a/src/test/burn/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj +++ b/src/test/burn/TestData/BasicFunctionalityTests/BundleC_x64/BundleC_x64.wixproj @@ -15,7 +15,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/CacheTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/CacheTests/BundleA/BundleA.wixproj index 360bcf86..4fe00693 100644 --- a/src/test/burn/TestData/CacheTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/CacheTests/BundleA/BundleA.wixproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/CacheTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/CacheTests/BundleB/BundleB.wixproj index 698b1d62..ab711157 100644 --- a/src/test/burn/TestData/CacheTests/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/CacheTests/BundleB/BundleB.wixproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj index 0acc29c4..69f53a86 100644 --- a/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj +++ b/src/test/burn/TestData/CacheTests/BundleC/BundleC.wixproj @@ -12,8 +12,8 @@ - - + + diff --git a/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj index 3f7882cf..8a5c9594 100644 --- a/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj @@ -9,8 +9,8 @@ - - - + + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj index e71ef750..4c6a0993 100644 --- a/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj @@ -9,8 +9,8 @@ - - - + + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj index 58a613d6..2d2f4eaa 100644 --- a/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleB/BundleB.wixproj @@ -11,8 +11,8 @@ - - - + + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/DependencyTests/BundleC/BundleC.wixproj index ffa7e897..cd65ea69 100644 --- a/src/test/burn/TestData/DependencyTests/BundleC/BundleC.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleC/BundleC.wixproj @@ -15,8 +15,8 @@ - - - + + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj index 6de1c0c1..25af31de 100644 --- a/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleD/BundleD.wixproj @@ -15,8 +15,8 @@ - - - + + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj index cd4e89ca..3fddc2d4 100644 --- a/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleE/BundleE.wixproj @@ -14,8 +14,8 @@ - - - + + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj index 33154672..4473657a 100644 --- a/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleF/BundleF.wixproj @@ -14,8 +14,8 @@ - - - + + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj index a0708443..2674b9d6 100644 --- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj @@ -13,8 +13,8 @@ - - - + + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj index 3c09fd2c..542f3562 100644 --- a/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj @@ -14,8 +14,8 @@ - - - + + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj index c7d907a2..1c8ad4d3 100644 --- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj @@ -9,8 +9,8 @@ - - - + + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj index 949309dc..dcc89f67 100644 --- a/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj @@ -10,8 +10,8 @@ - - - + + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj b/src/test/burn/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj index 6ff25fcb..14817b3a 100644 --- a/src/test/burn/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj @@ -7,7 +7,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj b/src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj index 794e72bc..6a96e230 100644 --- a/src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj @@ -10,7 +10,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj index 85fd0f92..5a418642 100644 --- a/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleJ/BundleJ.wixproj @@ -14,8 +14,8 @@ - - - + + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj index 212ef3d6..e31d3423 100644 --- a/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj @@ -14,8 +14,8 @@ - - - + + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj b/src/test/burn/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj index e7abd24a..f0b03f2d 100644 --- a/src/test/burn/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj @@ -6,7 +6,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj b/src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj index e9e7478e..a00ff3b5 100644 --- a/src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj @@ -9,7 +9,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/BundleL/BundleL.wixproj b/src/test/burn/TestData/DependencyTests/BundleL/BundleL.wixproj index c5727cf6..e1a60b4e 100644 --- a/src/test/burn/TestData/DependencyTests/BundleL/BundleL.wixproj +++ b/src/test/burn/TestData/DependencyTests/BundleL/BundleL.wixproj @@ -13,8 +13,8 @@ - - - + + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj b/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj index 1cac7394..5ebce845 100644 --- a/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj index d395391e..73a7cb6f 100644 --- a/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj b/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj index e7a497f4..37e88de9 100644 --- a/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/PackageB/PackageB.wixproj b/src/test/burn/TestData/DependencyTests/PackageB/PackageB.wixproj index a82822f8..86cf23bb 100644 --- a/src/test/burn/TestData/DependencyTests/PackageB/PackageB.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageB/PackageB.wixproj @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/PackageC/PackageC.wixproj b/src/test/burn/TestData/DependencyTests/PackageC/PackageC.wixproj index ef61d053..4eb2d00b 100644 --- a/src/test/burn/TestData/DependencyTests/PackageC/PackageC.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageC/PackageC.wixproj @@ -7,7 +7,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj b/src/test/burn/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj index 3d9cf384..55093cdc 100644 --- a/src/test/burn/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj b/src/test/burn/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj index 2bb6e8bd..41df45d5 100644 --- a/src/test/burn/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj b/src/test/burn/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj index 091b7b24..10aa2101 100644 --- a/src/test/burn/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj b/src/test/burn/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj index 1fb93130..888b3ceb 100644 --- a/src/test/burn/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj +++ b/src/test/burn/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wixproj b/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wixproj index b6653a19..4809934d 100644 --- a/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wixproj +++ b/src/test/burn/TestData/DependencyTests/PatchA/PatchA.wixproj @@ -10,6 +10,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/DependencyTests/PatchB/PatchB.wixproj b/src/test/burn/TestData/DependencyTests/PatchB/PatchB.wixproj index cf28a9c9..c099f008 100644 --- a/src/test/burn/TestData/DependencyTests/PatchB/PatchB.wixproj +++ b/src/test/burn/TestData/DependencyTests/PatchB/PatchB.wixproj @@ -10,6 +10,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/ElevationTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/ElevationTests/BundleA/BundleA.wixproj index a1650507..27c6e583 100644 --- a/src/test/burn/TestData/ElevationTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/ElevationTests/BundleA/BundleA.wixproj @@ -12,7 +12,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/FailureTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/FailureTests/BundleA/BundleA.wixproj index 321f139c..9cd861af 100644 --- a/src/test/burn/TestData/FailureTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/FailureTests/BundleA/BundleA.wixproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj index 1a5d5837..4b2da9fd 100644 --- a/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/FailureTests/BundleB/BundleB.wixproj @@ -10,7 +10,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/FailureTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/FailureTests/BundleC/BundleC.wixproj index 60bd5ef7..37784e81 100644 --- a/src/test/burn/TestData/FailureTests/BundleC/BundleC.wixproj +++ b/src/test/burn/TestData/FailureTests/BundleC/BundleC.wixproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj index d968e8ab..ee0e38cb 100644 --- a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj +++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj @@ -6,7 +6,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj index a50dbb87..b094f48a 100644 --- a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj +++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj @@ -12,7 +12,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj index 5b025236..18a3e364 100644 --- a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj +++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj @@ -6,7 +6,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj index e0512e06..e3fc3a86 100644 --- a/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj +++ b/src/test/burn/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj @@ -12,7 +12,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj index 4cf9c875..3b1e871c 100644 --- a/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/LayoutTests/BundleA/BundleA.wixproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/test/burn/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj index cb9f4b89..2a284491 100644 --- a/src/test/burn/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj +++ b/src/test/burn/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj index 8272c6bd..a259ed2e 100644 --- a/src/test/burn/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj +++ b/src/test/burn/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj @@ -10,6 +10,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj b/src/test/burn/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj index 1a56957b..8ee83380 100644 --- a/src/test/burn/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj +++ b/src/test/burn/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj @@ -5,7 +5,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj b/src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj index e1cb68db..70bec122 100644 --- a/src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj +++ b/src/test/burn/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj @@ -12,7 +12,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/MsiTransactionTests/PackageF/PackageF.wixproj b/src/test/burn/TestData/MsiTransactionTests/PackageF/PackageF.wixproj index 753b054e..575ffe5a 100644 --- a/src/test/burn/TestData/MsiTransactionTests/PackageF/PackageF.wixproj +++ b/src/test/burn/TestData/MsiTransactionTests/PackageF/PackageF.wixproj @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/PatchTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/PatchTests/BundleA/BundleA.wixproj index 72419d2d..8ca41da7 100644 --- a/src/test/burn/TestData/PatchTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/PatchTests/BundleA/BundleA.wixproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj b/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj index a506e843..9b91b3f4 100644 --- a/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj +++ b/src/test/burn/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj b/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj index 9a022091..b80d5613 100644 --- a/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj +++ b/src/test/burn/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj @@ -14,7 +14,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj index 13bb159b..e09a6aa4 100644 --- a/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/PrereqBaTests/BundleA/BundleA.wixproj @@ -16,6 +16,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj index cfbc77b5..d4288d4b 100644 --- a/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/PrereqBaTests/BundleB/BundleB.wixproj @@ -16,6 +16,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/PrereqBaTests/PackageF/PackageF.wixproj b/src/test/burn/TestData/PrereqBaTests/PackageF/PackageF.wixproj index 0a750fe0..00ffb7d8 100644 --- a/src/test/burn/TestData/PrereqBaTests/PackageF/PackageF.wixproj +++ b/src/test/burn/TestData/PrereqBaTests/PackageF/PackageF.wixproj @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wixproj index a6ccd842..1a1df1b6 100644 --- a/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/RegistrationTests/BundleA/BundleA.wixproj @@ -12,7 +12,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj index 648cc934..5d7e7756 100644 --- a/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj @@ -15,6 +15,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj b/src/test/burn/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj index 071c40a0..004f0d01 100644 --- a/src/test/burn/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj +++ b/src/test/burn/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/SlipstreamTests/BundleA/BundleA.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleA/BundleA.wixproj index b6ab068a..80c91e07 100644 --- a/src/test/burn/TestData/SlipstreamTests/BundleA/BundleA.wixproj +++ b/src/test/burn/TestData/SlipstreamTests/BundleA/BundleA.wixproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj index ac33c5ad..0a320fa5 100644 --- a/src/test/burn/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj +++ b/src/test/burn/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/SlipstreamTests/BundleB/BundleB.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleB/BundleB.wixproj index 3ca849a3..e489a5cf 100644 --- a/src/test/burn/TestData/SlipstreamTests/BundleB/BundleB.wixproj +++ b/src/test/burn/TestData/SlipstreamTests/BundleB/BundleB.wixproj @@ -14,7 +14,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/SlipstreamTests/BundleC/BundleC.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleC/BundleC.wixproj index 377e939c..5e8f6d13 100644 --- a/src/test/burn/TestData/SlipstreamTests/BundleC/BundleC.wixproj +++ b/src/test/burn/TestData/SlipstreamTests/BundleC/BundleC.wixproj @@ -15,7 +15,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wixproj index 12f11444..7a3a99a7 100644 --- a/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wixproj +++ b/src/test/burn/TestData/SlipstreamTests/BundleD/BundleD.wixproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj index 193244ca..72634a2f 100644 --- a/src/test/burn/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj +++ b/src/test/burn/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj @@ -12,7 +12,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj b/src/test/burn/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj index 11995ddd..1f950289 100644 --- a/src/test/burn/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj +++ b/src/test/burn/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj @@ -12,7 +12,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj index ae90dd73..d2ab7907 100644 --- a/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj +++ b/src/test/burn/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj @@ -14,6 +14,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj index 9b7d3c17..7f3c5890 100644 --- a/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj +++ b/src/test/burn/TestData/TestBA/TestBAWixlib_x64/testbawixlib_x64.wixproj @@ -15,6 +15,6 @@ - + \ No newline at end of file diff --git a/src/test/burn/TestData/TestData.proj b/src/test/burn/TestData/TestData.proj index c5682fc7..3f56d5b7 100644 --- a/src/test/burn/TestData/TestData.proj +++ b/src/test/burn/TestData/TestData.proj @@ -1,7 +1,6 @@  - @@ -22,4 +21,4 @@ - \ No newline at end of file + diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj index d968e8ab..ee0e38cb 100644 --- a/src/test/burn/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj +++ b/src/test/burn/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj @@ -6,7 +6,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj index 07e9581b..13001858 100644 --- a/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj +++ b/src/test/burn/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj @@ -9,7 +9,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj index b2685e2e..93a1dae6 100644 --- a/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj +++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj b/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj index a11fc252..877b4971 100644 --- a/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj +++ b/src/test/burn/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj @@ -12,7 +12,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj index d968e8ab..ee0e38cb 100644 --- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj +++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj @@ -6,7 +6,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj index 07e9581b..13001858 100644 --- a/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj +++ b/src/test/burn/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj @@ -9,7 +9,7 @@ - - + + \ No newline at end of file diff --git a/src/test/burn/TestExe/TestExe.csproj b/src/test/burn/TestExe/TestExe.csproj index 5a130422..016ae4e5 100644 --- a/src/test/burn/TestExe/TestExe.csproj +++ b/src/test/burn/TestExe/TestExe.csproj @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/src/test/burn/TestExe/TestExe_x64.csproj b/src/test/burn/TestExe/TestExe_x64.csproj index 1dd2d8e6..ef981d73 100644 --- a/src/test/burn/TestExe/TestExe_x64.csproj +++ b/src/test/burn/TestExe/TestExe_x64.csproj @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/src/test/burn/Wix.Build.props b/src/test/burn/Wix.Build.props deleted file mode 100644 index 06cf5b1d..00000000 --- a/src/test/burn/Wix.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - $([System.IO.Path]::GetFileName($([System.IO.Path]::GetDirectoryName($(MSBuildProjectDirectory))))) - $(BaseOutputPath)obj\$(TestGroupName)\$(ProjectName)\ - $(OutputPath)netcoreapp3.1\TestData\$(TestGroupName)\ - None - -wx - 1154;$(SuppressSpecificWarnings) - - diff --git a/src/test/burn/Wix.Build.targets b/src/test/burn/Wix.Build.targets deleted file mode 100644 index 17a46e2a..00000000 --- a/src/test/burn/Wix.Build.targets +++ /dev/null @@ -1,17 +0,0 @@ - - - - - $(MSBuildProjectName) - $(MSBuildProjectName) - http://localhost:9999/e2e/ - TestGroupName=$(TestGroupName);PackageName=$(PackageName);BundleName=$(BundleName);WebServerBaseUrl=$(WebServerBaseUrl);$(DefineConstants) - BA=$(BA);$(DefineConstants) - CabPrefix=$(CabPrefix);$(DefineConstants) - SoftwareTag=1;$(DefineConstants) - ProductCode=$(ProductCode);$(DefineConstants) - ProductComponents=1;$(DefineConstants) - UpgradeCode=$(UpgradeCode);$(DefineConstants) - Version=$(Version);$(DefineConstants) - - diff --git a/src/test/burn/WixTestTools/WixTestTools.csproj b/src/test/burn/WixTestTools/WixTestTools.csproj index 58f02be7..7b726560 100644 --- a/src/test/burn/WixTestTools/WixTestTools.csproj +++ b/src/test/burn/WixTestTools/WixTestTools.csproj @@ -8,14 +8,14 @@ - - - - - + + + + + - + diff --git a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj index 2aee1157..88b8dcb0 100644 --- a/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj +++ b/src/test/burn/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj @@ -17,17 +17,17 @@ - - - - - - + + + + + + - - - + + + diff --git a/src/test/burn/appveyor.cmd b/src/test/burn/appveyor.cmd deleted file mode 100644 index c0d965e5..00000000 --- a/src/test/burn/appveyor.cmd +++ /dev/null @@ -1,11 +0,0 @@ -@setlocal -@pushd %~dp0 -@set _C=Release - -msbuild -p:Configuration=%_C% -warnaserror -Restore || exit /b -msbuild -p:Configuration=%_C% src\TestData -Restore || exit /b - -dotnet test -c %_C% --no-build src\WixToolsetTest.BurnE2E || exit /b - -@popd -@endlocal diff --git a/src/test/burn/appveyor.yml b/src/test/burn/appveyor.yml deleted file mode 100644 index d12975dc..00000000 --- a/src/test/burn/appveyor.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. - - -image: Visual Studio 2019 - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - RuntimeTestsEnabled: true - - -install: - - reg add HKLM\Software\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f - - reg add HKLM\Software\WOW6432Node\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f - -build_script: - - appveyor.cmd - -test: off - -skip_branch_with_pr: true -skip_tags: true - -on_finish: - - ps: 7z a ('logs_' + (Get-Date).tostring("yyyyMMddHHmmss") + '.zip') $env:TEMP\*.log $env:TEMP\..\*.log - - ps: Push-AppveyorArtifact logs_*.zip diff --git a/src/test/burn/global.json b/src/test/burn/global.json deleted file mode 100644 index 697f5687..00000000 --- a/src/test/burn/global.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0213" - }, - "sdk": { - "allowPrerelease": false - } -} diff --git a/src/test/burn/nuget.config b/src/test/burn/nuget.config deleted file mode 100644 index 9187a22e..00000000 --- a/src/test/burn/nuget.config +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/burn/test_burn.cmd b/src/test/burn/test_burn.cmd new file mode 100644 index 00000000..81df9f26 --- /dev/null +++ b/src/test/burn/test_burn.cmd @@ -0,0 +1,17 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo Burn integration tests %_C% + +msbuild -t:Build -Restore -p:Configuration=%_C% -warnaserror || exit /b +msbuild -t:Build -Restore -p:Configuration=%_C% TestData\TestData.proj || exit /b + +if /i "%RuntimeTestsEnabled%"=="true" dotnet test -c %_C% --no-build src\WixToolsetTest.BurnE2E + +@popd +@endlocal diff --git a/src/test/run_test.cmd b/src/test/run_test.cmd new file mode 100644 index 00000000..ef6de9bd --- /dev/null +++ b/src/test/run_test.cmd @@ -0,0 +1,15 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo Run integration tests %_C% + +@SET RuntimeTestsEnabled=true +@call burn\test_burn.cmd + +@popd +@endlocal diff --git a/src/test/run_test.yml b/src/test/run_test.yml new file mode 100644 index 00000000..787edeff --- /dev/null +++ b/src/test/run_test.yml @@ -0,0 +1,26 @@ +# Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. + + +image: Visual Studio 2019 + +environment: + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + DOTNET_CLI_TELEMETRY_OPTOUT: 1 + NUGET_XMLDOC_MODE: skip + RuntimeTestsEnabled: true + +install: + - reg add HKLM\Software\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f + - reg add HKLM\Software\WOW6432Node\Policies\Microsoft\Windows\Installer /t REG_SZ /v Logging /d voicewarmupx /f + +build_script: + - run_test.cmd + +test: off + +skip_branch_with_pr: true +skip_tags: true + +on_finish: + - ps: 7z a ('logs_' + (Get-Date).tostring("yyyyMMddHHmmss") + '.zip') $env:TEMP\*.log $env:TEMP\..\*.log + - ps: Push-AppveyorArtifact logs_*.zip diff --git a/src/test/test.cmd b/src/test/test.cmd new file mode 100644 index 00000000..b327ba75 --- /dev/null +++ b/src/test/test.cmd @@ -0,0 +1,14 @@ +@setlocal +@pushd %~dp0 + +@set _C=Debug +:parse_args +@if /i "%1"=="release" set _C=Release& shift +@if not "%1"=="" shift & goto parse_args + +@echo Build integration tests %_C% + +@call burn\test_burn.cmd %_C% + +@popd +@endlocal -- cgit v1.2.3-55-g6feb