From 20a546b0a6e278e7a8c37ca86887190ac2a85939 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 22 Feb 2021 20:47:43 -0600 Subject: Update dependencies to enable fixed skipstream tests. --- global.json | 2 +- src/TestBA/TestBA.cs | 2 +- src/TestBA/TestBA.csproj | 2 +- src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj | 2 +- src/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj | 2 +- src/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj | 2 +- src/TestData/ElevationTests/BundleA/BundleA.wixproj | 2 +- src/TestData/FailureTests/BundleA/BundleA.wixproj | 2 +- src/TestData/FailureTests/BundleB/BundleB.wixproj | 2 +- src/TestData/FailureTests/BundleC/BundleC.wixproj | 2 +- src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj | 2 +- src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj | 2 +- src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj | 2 +- src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj | 2 +- src/TestData/PatchTests/BundleA/BundleA.wixproj | 2 +- src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj | 2 +- src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj | 2 +- src/TestData/PrereqBaTests/BundleA/BundleA.wixproj | 2 +- src/TestData/PrereqBaTests/BundleB/BundleB.wixproj | 2 +- src/TestData/RegistrationTests/BundleA/BundleA.wixproj | 2 +- src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj | 2 +- src/TestData/SlipstreamTests/BundleA/BundleA.wixproj | 2 +- .../SlipstreamTests/BundleAReverse/BundleAReverse.wixproj | 2 +- src/TestData/SlipstreamTests/BundleB/BundleB.wixproj | 2 +- src/TestData/SlipstreamTests/BundleC/BundleC.wixproj | 2 +- src/TestData/SlipstreamTests/BundleD/BundleD.wixproj | 2 +- src/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj | 2 +- .../SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj | 2 +- src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj | 2 +- src/WixTestTools/WixTestTools.csproj | 2 +- src/WixToolsetTest.BurnE2E/SlipstreamTests.cs | 10 +++++----- src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj | 2 +- 32 files changed, 36 insertions(+), 36 deletions(-) diff --git a/global.json b/global.json index a4eb003d..9492f867 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0189" + "WixToolset.Sdk": "4.0.0-build-0190" }, "sdk": { "allowPrerelease": false diff --git a/src/TestBA/TestBA.cs b/src/TestBA/TestBA.cs index b9f869a6..12e027b2 100644 --- a/src/TestBA/TestBA.cs +++ b/src/TestBA/TestBA.cs @@ -257,7 +257,7 @@ namespace WixToolset.Test.BA } } - protected override void OnPlanTargetMsiPackage(PlanTargetMsiPackageEventArgs args) + protected override void OnPlanPatchTarget(PlanPatchTargetEventArgs args) { RequestState state; string action = this.ReadPackageAction(args.PackageId, "Requested"); diff --git a/src/TestBA/TestBA.csproj b/src/TestBA/TestBA.csproj index b6aea84b..90dc1d69 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 34ee9e33..698f2808 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/BundleKv1/BundleKv1.wixproj b/src/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj index 89ac2b0f..6e547534 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 f4f2258d..e3fbbf5c 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/ElevationTests/BundleA/BundleA.wixproj b/src/TestData/ElevationTests/BundleA/BundleA.wixproj index 414535b1..81cd4a3e 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 b8233c45..c95edbb8 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 6d36d120..0cce71a6 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 03f611fc..1122b526 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/MsiTransactionTests/BundleAv1/BundleAv1.wixproj b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj index 39270511..7565534e 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 f491bc8a..e2f332c0 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 180588a4..a6dfed2f 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 1e551535..d75328d8 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/PatchTests/BundleA/BundleA.wixproj b/src/TestData/PatchTests/BundleA/BundleA.wixproj index 1ea23444..7023e5b3 100644 --- a/src/TestData/PatchTests/BundleA/BundleA.wixproj +++ b/src/TestData/PatchTests/BundleA/BundleA.wixproj @@ -12,7 +12,7 @@ - + \ No newline at end of file diff --git a/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj b/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj index 78311db3..0b802713 100644 --- a/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj +++ b/src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj @@ -12,7 +12,7 @@ - + \ No newline at end of file diff --git a/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj b/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj index aa5d6000..403eecda 100644 --- a/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj +++ b/src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj @@ -13,7 +13,7 @@ - + \ No newline at end of file diff --git a/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj b/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj index fe3eb3ec..c9f22c43 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 5cae8cc7..2ae6866b 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/RegistrationTests/BundleA/BundleA.wixproj b/src/TestData/RegistrationTests/BundleA/BundleA.wixproj index 778eda6e..036923e4 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 4e392447..affd765e 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/SlipstreamTests/BundleA/BundleA.wixproj b/src/TestData/SlipstreamTests/BundleA/BundleA.wixproj index 926f46df..5eaba4dd 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 662defd3..db4c4c73 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 e2ca2e78..bffa404f 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 f3fee0c1..a7afbcd0 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 db257df6..7e99ba82 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 acb12a3a..c0e89c1e 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 72d48b74..90accef2 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 85ad69b3..c5321979 100644 --- a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj +++ b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj @@ -13,6 +13,6 @@ - + \ No newline at end of file diff --git a/src/WixTestTools/WixTestTools.csproj b/src/WixTestTools/WixTestTools.csproj index 0a2db104..4a5b2e05 100644 --- a/src/WixTestTools/WixTestTools.csproj +++ b/src/WixTestTools/WixTestTools.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/WixToolsetTest.BurnE2E/SlipstreamTests.cs b/src/WixToolsetTest.BurnE2E/SlipstreamTests.cs index 0d7be0ca..29632e2e 100644 --- a/src/WixToolsetTest.BurnE2E/SlipstreamTests.cs +++ b/src/WixToolsetTest.BurnE2E/SlipstreamTests.cs @@ -17,7 +17,7 @@ namespace WixToolsetTest.BurnE2E private const string V100 = "1.0.0.0"; private const string V101 = "1.0.1.0"; - [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")] + [Fact] public void CanInstallBundleWithSlipstreamedPatchThenRemoveIt() { var testRegistryValue = "PackageA"; @@ -45,7 +45,7 @@ namespace WixToolsetTest.BurnE2E /// BundleOnlyPatchA in uninstalled which should do nothing since BundleA has a dependency on it. /// Bundle is installed which should remove everything. /// - [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")] + [Fact] public void ReferenceCountsSlipstreamedPatch() { var testRegistryValue = "PackageA"; @@ -266,7 +266,7 @@ namespace WixToolsetTest.BurnE2E packageBv1.VerifyTestRegistryRootDeleted(); } - [Fact(Skip = "The bundle is slipstreaming the patches correctly, need to research why testRegistryValueB is getting patched because patch AB2 is not supposed to change it")] + [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6359")] public void CanAutomaticallyPredetermineSlipstreamPatchesAtBuildTime() { var testRegistryValueA = "PackageA"; @@ -300,7 +300,7 @@ namespace WixToolsetTest.BurnE2E packageAv1.VerifyTestRegistryRootDeleted(); } - [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")] + [Fact] public void CanInstallSlipstreamedPatchWithPackageDuringMajorUpgrade() { var testRegistryValue = "PackageA"; @@ -327,7 +327,7 @@ namespace WixToolsetTest.BurnE2E packageAv1.VerifyTestRegistryRootDeleted(); } - [Fact(Skip = "https://github.com/wixtoolset/issues/issues/3897")] + [Fact] public void RespectsSlipstreamedPatchInstallCondition() { var testRegistryValue = "PackageA"; diff --git a/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj b/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj index 5217826e..736691a7 100644 --- a/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj +++ b/src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj @@ -21,7 +21,7 @@ - + -- cgit v1.2.3-55-g6feb