From d07f3262657866a795716994595bbd627cbb151f Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 20 Apr 2021 00:13:51 -0500 Subject: Update dependencies. --- src/TestBA/TestBA.cs | 23 ++++++++++++++-------- src/TestBA/TestBA.csproj | 2 +- .../BundleA/BundleA.wixproj | 2 +- .../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 +- src/TestData/DependencyTests/PatchA/PatchA.wixproj | 2 +- src/TestData/DependencyTests/PatchB/PatchB.wixproj | 2 +- .../ElevationTests/BundleA/BundleA.wixproj | 4 ++-- src/TestData/FailureTests/BundleA/BundleA.wixproj | 4 ++-- src/TestData/FailureTests/BundleB/BundleB.wixproj | 4 ++-- src/TestData/FailureTests/BundleC/BundleC.wixproj | 4 ++-- .../BundleAv1/BundleAv1.wixproj | 4 ++-- .../BundleAv2/BundleAv2.wixproj | 4 ++-- .../BundleCv1/BundleCv1.wixproj | 4 ++-- .../BundleCv2/BundleCv2.wixproj | 4 ++-- src/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 +- src/TestData/PatchTests/BundleA/BundleA.wixproj | 4 ++-- .../PatchTests/BundlePatchA/BundlePatchA.wixproj | 4 ++-- .../PatchTests/BundlePatchA2/BundlePatchA2.wixproj | 4 ++-- src/TestData/PrereqBaTests/BundleA/BundleA.wixproj | 2 +- src/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 +- .../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/WixTestTools/WixTestTools.csproj | 4 ++-- src/WixToolsetTest.BurnE2E/DependencyTests.cs | 2 +- .../UpgradeRelatedBundleTests.cs | 2 +- .../WixToolsetTest.BurnE2E.csproj | 4 ++-- 73 files changed, 150 insertions(+), 143 deletions(-) (limited to 'src') diff --git a/src/TestBA/TestBA.cs b/src/TestBA/TestBA.cs index 18b1fd0c..09378bc5 100644 --- a/src/TestBA/TestBA.cs +++ b/src/TestBA/TestBA.cs @@ -331,6 +331,21 @@ namespace WixToolset.Test.BA } } + protected override void OnCacheContainerOrPayloadVerifyProgress(CacheContainerOrPayloadVerifyProgressEventArgs args) + { + this.Log("OnCacheContainerOrPayloadVerifyProgress() - container/package: {0}, payload: {1}, progress: {2}, total: {3}, overall progress: {4}%", args.PackageOrContainerId, args.PayloadId, args.Progress, args.Total, args.OverallPercentage); + } + + protected override void OnCachePayloadExtractProgress(CachePayloadExtractProgressEventArgs args) + { + this.Log("OnCachePayloadExtractProgress() - container/package: {0}, payload: {1}, progress: {2}, total: {3}, overall progress: {4}%", args.PackageOrContainerId, args.PayloadId, args.Progress, args.Total, args.OverallPercentage); + } + + protected override void OnCacheVerifyProgress(CacheVerifyProgressEventArgs args) + { + this.Log("OnCacheVerifyProgress() - container/package: {0}, payload: {1}, progress: {2}, total: {3}, overall progress: {4}%, step: {5}", args.PackageOrContainerId, args.PayloadId, args.Progress, args.Total, args.OverallPercentage, args.Step); + } + protected override void OnExecutePackageBegin(ExecutePackageBeginEventArgs args) { this.Log("OnExecutePackageBegin() - package: {0}, rollback: {1}", args.PackageId, !args.ShouldExecute); @@ -445,14 +460,6 @@ namespace WixToolset.Test.BA } } - protected override void OnResolveSource(ResolveSourceEventArgs args) - { - if (!String.IsNullOrEmpty(args.DownloadSource)) - { - args.Action = BOOTSTRAPPER_RESOLVESOURCE_ACTION.Download; - } - } - protected override void OnApplyBegin(ApplyBeginEventArgs args) { this.cancelOnProgressAtProgress = -1; diff --git a/src/TestBA/TestBA.csproj b/src/TestBA/TestBA.csproj index 645ab475..3d5a20ef 100644 --- a/src/TestBA/TestBA.csproj +++ b/src/TestBA/TestBA.csproj @@ -19,6 +19,6 @@ - + \ No newline at end of file diff --git a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj index a0dfc532..c28d03fb 100644 --- a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj +++ b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj @@ -12,6 +12,6 @@ - + \ No newline at end of file diff --git a/src/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj b/src/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj index 26e587c3..d75e1d40 100644 --- a/src/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj +++ b/src/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj @@ -9,8 +9,8 @@ - - - + + + \ No newline at end of file diff --git a/src/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj b/src/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj index 13bcb956..73108c15 100644 --- a/src/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj +++ b/src/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj @@ -9,8 +9,8 @@ - - - + + + \ No newline at end of file diff --git a/src/TestData/DependencyTests/BundleB/BundleB.wixproj b/src/TestData/DependencyTests/BundleB/BundleB.wixproj index 986b21a0..c8218005 100644 --- a/src/TestData/DependencyTests/BundleB/BundleB.wixproj +++ b/src/TestData/DependencyTests/BundleB/BundleB.wixproj @@ -11,8 +11,8 @@ - - - + + + \ No newline at end of file diff --git a/src/TestData/DependencyTests/BundleC/BundleC.wixproj b/src/TestData/DependencyTests/BundleC/BundleC.wixproj index eb7c1996..a8640272 100644 --- a/src/TestData/DependencyTests/BundleC/BundleC.wixproj +++ b/src/TestData/DependencyTests/BundleC/BundleC.wixproj @@ -15,8 +15,8 @@ - - - + + + \ No newline at end of file diff --git a/src/TestData/DependencyTests/BundleD/BundleD.wixproj b/src/TestData/DependencyTests/BundleD/BundleD.wixproj index 60634af3..e8e8394a 100644 --- a/src/TestData/DependencyTests/BundleD/BundleD.wixproj +++ b/src/TestData/DependencyTests/BundleD/BundleD.wixproj @@ -15,8 +15,8 @@ - - - + + + \ No newline at end of file diff --git a/src/TestData/DependencyTests/BundleE/BundleE.wixproj b/src/TestData/DependencyTests/BundleE/BundleE.wixproj index 26211155..7210b32a 100644 --- a/src/TestData/DependencyTests/BundleE/BundleE.wixproj +++ b/src/TestData/DependencyTests/BundleE/BundleE.wixproj @@ -14,8 +14,8 @@ - - - + + + \ No newline at end of file diff --git a/src/TestData/DependencyTests/BundleF/BundleF.wixproj b/src/TestData/DependencyTests/BundleF/BundleF.wixproj index 1b108dcb..78a59d2e 100644 --- a/src/TestData/DependencyTests/BundleF/BundleF.wixproj +++ b/src/TestData/DependencyTests/BundleF/BundleF.wixproj @@ -14,8 +14,8 @@ - - - + + + \ No newline at end of file diff --git a/src/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj b/src/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj index 64bfc5a2..a6a68a76 100644 --- a/src/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj +++ b/src/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj @@ -13,8 +13,8 @@ - - - + + + \ No newline at end of file diff --git a/src/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj b/src/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj index bae4b4c4..bc33926f 100644 --- a/src/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj +++ b/src/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj @@ -14,8 +14,8 @@ - - - + + + \ No newline at end of file diff --git a/src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj b/src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj index dd7e93f4..98570b94 100644 --- a/src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj +++ b/src/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/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj b/src/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj index afd5cb1a..ac0a0b6b 100644 --- a/src/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj +++ b/src/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/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj b/src/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj index 31a125d3..9de30db5 100644 --- a/src/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj +++ b/src/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj @@ -7,7 +7,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj b/src/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj index 74959153..796ff292 100644 --- a/src/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj +++ b/src/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj @@ -10,7 +10,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/DependencyTests/BundleJ/BundleJ.wixproj b/src/TestData/DependencyTests/BundleJ/BundleJ.wixproj index db6de4ed..86084c35 100644 --- a/src/TestData/DependencyTests/BundleJ/BundleJ.wixproj +++ b/src/TestData/DependencyTests/BundleJ/BundleJ.wixproj @@ -14,8 +14,8 @@ - - - + + + \ No newline at end of file diff --git a/src/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj b/src/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj index bc09ba64..7643c5c1 100644 --- a/src/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj +++ b/src/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj @@ -14,8 +14,8 @@ - - - + + + \ No newline at end of file diff --git a/src/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj b/src/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj index 22081dbc..be2007ed 100644 --- a/src/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj +++ b/src/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj @@ -6,7 +6,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj b/src/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj index d758a559..e33860c4 100644 --- a/src/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj +++ b/src/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj @@ -9,7 +9,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/DependencyTests/BundleL/BundleL.wixproj b/src/TestData/DependencyTests/BundleL/BundleL.wixproj index 6984f283..3e064353 100644 --- a/src/TestData/DependencyTests/BundleL/BundleL.wixproj +++ b/src/TestData/DependencyTests/BundleL/BundleL.wixproj @@ -13,8 +13,8 @@ - - - + + + \ No newline at end of file diff --git a/src/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj b/src/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj index 69d40222..c9102489 100644 --- a/src/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj +++ b/src/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj b/src/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj index e8d1633f..491a51bd 100644 --- a/src/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj +++ b/src/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/src/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj b/src/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj index 67464a9e..3f38682e 100644 --- a/src/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj +++ b/src/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/src/TestData/DependencyTests/PackageB/PackageB.wixproj b/src/TestData/DependencyTests/PackageB/PackageB.wixproj index 7ef659fc..c5e62d39 100644 --- a/src/TestData/DependencyTests/PackageB/PackageB.wixproj +++ b/src/TestData/DependencyTests/PackageB/PackageB.wixproj @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/src/TestData/DependencyTests/PackageC/PackageC.wixproj b/src/TestData/DependencyTests/PackageC/PackageC.wixproj index 41e95aee..e50f2d56 100644 --- a/src/TestData/DependencyTests/PackageC/PackageC.wixproj +++ b/src/TestData/DependencyTests/PackageC/PackageC.wixproj @@ -7,7 +7,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj b/src/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj index 8c735104..0eeed022 100644 --- a/src/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj +++ b/src/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj b/src/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj index ab2efd1e..7355686e 100644 --- a/src/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj +++ b/src/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/src/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj b/src/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj index 07a96512..d870451a 100644 --- a/src/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj +++ b/src/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj b/src/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj index ea6462af..5900bf2c 100644 --- a/src/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj +++ b/src/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/src/TestData/DependencyTests/PatchA/PatchA.wixproj b/src/TestData/DependencyTests/PatchA/PatchA.wixproj index a2f69235..824991a4 100644 --- a/src/TestData/DependencyTests/PatchA/PatchA.wixproj +++ b/src/TestData/DependencyTests/PatchA/PatchA.wixproj @@ -10,6 +10,6 @@ - + \ No newline at end of file diff --git a/src/TestData/DependencyTests/PatchB/PatchB.wixproj b/src/TestData/DependencyTests/PatchB/PatchB.wixproj index 75c8a8e3..b7ed6085 100644 --- a/src/TestData/DependencyTests/PatchB/PatchB.wixproj +++ b/src/TestData/DependencyTests/PatchB/PatchB.wixproj @@ -10,6 +10,6 @@ - + \ No newline at end of file diff --git a/src/TestData/ElevationTests/BundleA/BundleA.wixproj b/src/TestData/ElevationTests/BundleA/BundleA.wixproj index 1bb4c63a..f6c48a86 100644 --- a/src/TestData/ElevationTests/BundleA/BundleA.wixproj +++ b/src/TestData/ElevationTests/BundleA/BundleA.wixproj @@ -12,7 +12,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/FailureTests/BundleA/BundleA.wixproj b/src/TestData/FailureTests/BundleA/BundleA.wixproj index f1e78657..e17c6c8c 100644 --- a/src/TestData/FailureTests/BundleA/BundleA.wixproj +++ b/src/TestData/FailureTests/BundleA/BundleA.wixproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/FailureTests/BundleB/BundleB.wixproj b/src/TestData/FailureTests/BundleB/BundleB.wixproj index b6f18c98..33beee89 100644 --- a/src/TestData/FailureTests/BundleB/BundleB.wixproj +++ b/src/TestData/FailureTests/BundleB/BundleB.wixproj @@ -10,7 +10,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/FailureTests/BundleC/BundleC.wixproj b/src/TestData/FailureTests/BundleC/BundleC.wixproj index 3afaa817..ea97f32b 100644 --- a/src/TestData/FailureTests/BundleC/BundleC.wixproj +++ b/src/TestData/FailureTests/BundleC/BundleC.wixproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj b/src/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj index 3542d3f1..4a6a53b9 100644 --- a/src/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj +++ b/src/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj @@ -6,7 +6,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj b/src/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj index 6258b376..8f4a1c23 100644 --- a/src/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj +++ b/src/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj @@ -12,7 +12,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj b/src/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj index 6b488bb2..07dabf28 100644 --- a/src/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj +++ b/src/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj @@ -6,7 +6,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj b/src/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj index 72a1d514..db8dfa97 100644 --- a/src/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj +++ b/src/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj @@ -12,7 +12,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/LayoutTests/BundleA/BundleA.wixproj b/src/TestData/LayoutTests/BundleA/BundleA.wixproj index 6bece34f..c9928bc1 100644 --- a/src/TestData/LayoutTests/BundleA/BundleA.wixproj +++ b/src/TestData/LayoutTests/BundleA/BundleA.wixproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj index d8d6bfb9..630bf15d 100644 --- a/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj +++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj index a1964484..3ec45b8d 100644 --- a/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj +++ b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj @@ -10,6 +10,6 @@ - + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj index 743b3042..a84927bf 100644 --- a/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj +++ b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj @@ -5,7 +5,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj index 347f452b..7e91b83d 100644 --- a/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj +++ b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj @@ -12,7 +12,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/PackageF/PackageF.wixproj b/src/TestData/MsiTransactionTests/PackageF/PackageF.wixproj index 009e67bb..aa973dc8 100644 --- a/src/TestData/MsiTransactionTests/PackageF/PackageF.wixproj +++ b/src/TestData/MsiTransactionTests/PackageF/PackageF.wixproj @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/src/TestData/PatchTests/BundleA/BundleA.wixproj b/src/TestData/PatchTests/BundleA/BundleA.wixproj index fc566996..bccdeeb4 100644 --- a/src/TestData/PatchTests/BundleA/BundleA.wixproj +++ b/src/TestData/PatchTests/BundleA/BundleA.wixproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj b/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj index ead7e64b..809fea0e 100644 --- a/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj +++ b/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj b/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj index 0a91df81..813b4710 100644 --- a/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj +++ b/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj @@ -14,7 +14,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj b/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj index f07363ae..db718990 100644 --- a/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj +++ b/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj @@ -16,6 +16,6 @@ - + \ No newline at end of file diff --git a/src/TestData/PrereqBaTests/BundleB/BundleB.wixproj b/src/TestData/PrereqBaTests/BundleB/BundleB.wixproj index b1791988..5dd1ef8c 100644 --- a/src/TestData/PrereqBaTests/BundleB/BundleB.wixproj +++ b/src/TestData/PrereqBaTests/BundleB/BundleB.wixproj @@ -16,6 +16,6 @@ - + \ No newline at end of file diff --git a/src/TestData/PrereqBaTests/PackageF/PackageF.wixproj b/src/TestData/PrereqBaTests/PackageF/PackageF.wixproj index 4990ca8e..7a233e27 100644 --- a/src/TestData/PrereqBaTests/PackageF/PackageF.wixproj +++ b/src/TestData/PrereqBaTests/PackageF/PackageF.wixproj @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/src/TestData/RegistrationTests/BundleA/BundleA.wixproj b/src/TestData/RegistrationTests/BundleA/BundleA.wixproj index 4db9789b..48d0bbda 100644 --- a/src/TestData/RegistrationTests/BundleA/BundleA.wixproj +++ b/src/TestData/RegistrationTests/BundleA/BundleA.wixproj @@ -12,7 +12,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj index 4a553295..acd10b38 100644 --- a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj +++ b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj @@ -15,6 +15,6 @@ - + \ No newline at end of file diff --git a/src/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj b/src/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj index 2e4d2e96..3abc3874 100644 --- a/src/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj +++ b/src/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj @@ -7,6 +7,6 @@ - + \ No newline at end of file diff --git a/src/TestData/SlipstreamTests/BundleA/BundleA.wixproj b/src/TestData/SlipstreamTests/BundleA/BundleA.wixproj index 2c5cde82..d7d4ac85 100644 --- a/src/TestData/SlipstreamTests/BundleA/BundleA.wixproj +++ b/src/TestData/SlipstreamTests/BundleA/BundleA.wixproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj b/src/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj index 2500d443..42910845 100644 --- a/src/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj +++ b/src/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/SlipstreamTests/BundleB/BundleB.wixproj b/src/TestData/SlipstreamTests/BundleB/BundleB.wixproj index ebc80ed5..0e13fadc 100644 --- a/src/TestData/SlipstreamTests/BundleB/BundleB.wixproj +++ b/src/TestData/SlipstreamTests/BundleB/BundleB.wixproj @@ -14,7 +14,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/SlipstreamTests/BundleC/BundleC.wixproj b/src/TestData/SlipstreamTests/BundleC/BundleC.wixproj index 85616e0a..25dde6ef 100644 --- a/src/TestData/SlipstreamTests/BundleC/BundleC.wixproj +++ b/src/TestData/SlipstreamTests/BundleC/BundleC.wixproj @@ -15,7 +15,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/SlipstreamTests/BundleD/BundleD.wixproj b/src/TestData/SlipstreamTests/BundleD/BundleD.wixproj index e78f4f12..3c5123fb 100644 --- a/src/TestData/SlipstreamTests/BundleD/BundleD.wixproj +++ b/src/TestData/SlipstreamTests/BundleD/BundleD.wixproj @@ -13,7 +13,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj b/src/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj index b86f057b..7bbfed49 100644 --- a/src/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj +++ b/src/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj @@ -12,7 +12,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj b/src/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj index 2c08aed3..e91e9374 100644 --- a/src/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj +++ b/src/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj @@ -12,7 +12,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj index 6fe78cc9..c8ad06b2 100644 --- a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj +++ b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj @@ -14,6 +14,6 @@ - + \ No newline at end of file diff --git a/src/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj b/src/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj index 3542d3f1..4a6a53b9 100644 --- a/src/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj +++ b/src/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj @@ -6,7 +6,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj b/src/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj index 69173bff..cda405ad 100644 --- a/src/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj +++ b/src/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj @@ -9,7 +9,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj b/src/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj index 86c80e29..db4a0165 100644 --- a/src/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj +++ b/src/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj b/src/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj index bd76e4bb..c6bdc60e 100644 --- a/src/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj +++ b/src/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj @@ -12,7 +12,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj b/src/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj index 3542d3f1..4a6a53b9 100644 --- a/src/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj +++ b/src/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj @@ -6,7 +6,7 @@ - - + + \ No newline at end of file diff --git a/src/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj b/src/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj index 69173bff..cda405ad 100644 --- a/src/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj +++ b/src/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj @@ -9,7 +9,7 @@ - - + + \ No newline at end of file diff --git a/src/WixTestTools/WixTestTools.csproj b/src/WixTestTools/WixTestTools.csproj index 19d33ec7..2300d438 100644 --- a/src/WixTestTools/WixTestTools.csproj +++ b/src/WixTestTools/WixTestTools.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/src/WixToolsetTest.BurnE2E/DependencyTests.cs b/src/WixToolsetTest.BurnE2E/DependencyTests.cs index 5742ec3e..d563bbe7 100644 --- a/src/WixToolsetTest.BurnE2E/DependencyTests.cs +++ b/src/WixToolsetTest.BurnE2E/DependencyTests.cs @@ -596,7 +596,7 @@ namespace WixToolsetTest.BurnE2E packageDv2.VerifyInstalled(true); Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Skipping cross-scope dependency registration on package: PackageA, bundle scope: PerUser, package scope: PerMachine")); - Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Detected related bundle: \{[0-9A-Za-z\-]{36}\}, type: Upgrade, scope: PerUser, version: 1\.0\.0\.0, operation: MajorUpgrade, cached: Complete")); + Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Detected related bundle: \{[0-9A-Za-z\-]{36}\}, type: Upgrade, scope: PerUser, version: 1\.0\.0\.0, operation: MajorUpgrade, cached: Yes")); bundleHv2.Uninstall(); bundleHv2.VerifyUnregisteredAndRemovedFromPackageCache(); diff --git a/src/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs b/src/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs index a48f45f4..70c0c474 100644 --- a/src/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs +++ b/src/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs @@ -30,7 +30,7 @@ namespace WixToolsetTest.BurnE2E bundleAv2.VerifyRegisteredAndInPackageCache(); Assert.True(LogVerifier.MessageInLogFileRegex(bundleAv2InstallLogFilePath, @"OnDetectRelatedBundle\(\) - id: \{[0-9A-Za-z\-]{36}\}, missing from cache: True")); - Assert.True(LogVerifier.MessageInLogFileRegex(bundleAv2InstallLogFilePath, @"Detected related bundle: \{[0-9A-Za-z\-]{36}\}, type: Upgrade, scope: PerMachine, version: 1\.0\.0\.0, operation: MajorUpgrade, cached: None")); + Assert.True(LogVerifier.MessageInLogFileRegex(bundleAv2InstallLogFilePath, @"Detected related bundle: \{[0-9A-Za-z\-]{36}\}, type: Upgrade, scope: PerMachine, version: 1\.0\.0\.0, operation: MajorUpgrade, cached: No")); } } } diff --git a/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj b/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj index 04d30f36..0e972538 100644 --- a/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj +++ b/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj @@ -21,8 +21,8 @@ - - + + -- cgit v1.2.3-55-g6feb