diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-02-22 20:47:43 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-02-22 21:05:23 -0600 |
| commit | 20a546b0a6e278e7a8c37ca86887190ac2a85939 (patch) | |
| tree | 784f04f9886db7da45a1d973c25bc6214cd7d042 /src | |
| parent | b60898e0bccbb0b0ddad74df6370e826cb9b7494 (diff) | |
| download | wix-20a546b0a6e278e7a8c37ca86887190ac2a85939.tar.gz wix-20a546b0a6e278e7a8c37ca86887190ac2a85939.tar.bz2 wix-20a546b0a6e278e7a8c37ca86887190ac2a85939.zip | |
Update dependencies to enable fixed skipstream tests.
Diffstat (limited to 'src')
31 files changed, 35 insertions, 35 deletions
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 | |||
| 257 | } | 257 | } |
| 258 | } | 258 | } |
| 259 | 259 | ||
| 260 | protected override void OnPlanTargetMsiPackage(PlanTargetMsiPackageEventArgs args) | 260 | protected override void OnPlanPatchTarget(PlanPatchTargetEventArgs args) |
| 261 | { | 261 | { |
| 262 | RequestState state; | 262 | RequestState state; |
| 263 | string action = this.ReadPackageAction(args.PackageId, "Requested"); | 263 | 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 @@ | |||
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | 20 | ||
| 21 | <ItemGroup> | 21 | <ItemGroup> |
| 22 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.48" /> | 22 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.49" /> |
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | </Project> \ No newline at end of file | 24 | </Project> \ 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 @@ | |||
| 12 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> | 12 | <ProjectReference Include="..\PackageA\PackageA.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | </Project> \ No newline at end of file | 17 | </Project> \ 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 @@ | |||
| 6 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 6 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 7 | </ItemGroup> | 7 | </ItemGroup> |
| 8 | <ItemGroup> | 8 | <ItemGroup> |
| 9 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 9 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 10 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 10 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | </Project> \ No newline at end of file | 12 | </Project> \ 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 @@ | |||
| 9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 9 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 10 | </ItemGroup> | 10 | </ItemGroup> |
| 11 | <ItemGroup> | 11 | <ItemGroup> |
| 12 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 12 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 13 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 13 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | </Project> \ No newline at end of file | 15 | </Project> \ 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 @@ | |||
| 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | </Project> \ No newline at end of file | 18 | </Project> \ 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 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 19 | </Project> \ 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 @@ | |||
| 10 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 10 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | <ItemGroup> | 12 | <ItemGroup> |
| 13 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 13 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 14 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 14 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | </Project> \ No newline at end of file | 16 | </Project> \ 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 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 19 | </Project> \ 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 @@ | |||
| 7 | <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" /> | 7 | <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" /> |
| 8 | </ItemGroup> | 8 | </ItemGroup> |
| 9 | <ItemGroup> | 9 | <ItemGroup> |
| 10 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 10 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | </Project> \ No newline at end of file | 12 | </Project> \ 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 @@ | |||
| 10 | <ProjectReference Include="..\PackageD\PackageD.wixproj" /> | 10 | <ProjectReference Include="..\PackageD\PackageD.wixproj" /> |
| 11 | </ItemGroup> | 11 | </ItemGroup> |
| 12 | <ItemGroup> | 12 | <ItemGroup> |
| 13 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 13 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | </Project> \ No newline at end of file | 15 | </Project> \ 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 @@ | |||
| 5 | <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" /> | 5 | <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" /> |
| 6 | </ItemGroup> | 6 | </ItemGroup> |
| 7 | <ItemGroup> | 7 | <ItemGroup> |
| 8 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 8 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 9 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 9 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 10 | </ItemGroup> | 10 | </ItemGroup> |
| 11 | </Project> \ No newline at end of file | 11 | </Project> \ 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 @@ | |||
| 12 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> | 12 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | </Project> \ No newline at end of file | 18 | </Project> \ 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 @@ | |||
| 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | </Project> \ No newline at end of file | 18 | </Project> \ 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 @@ | |||
| 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | </Project> \ No newline at end of file | 18 | </Project> \ 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 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 19 | </Project> \ 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 @@ | |||
| 16 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> | 16 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | <ItemGroup> | 18 | <ItemGroup> |
| 19 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 19 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | </Project> \ No newline at end of file | 21 | </Project> \ 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 @@ | |||
| 16 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> | 16 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | <ItemGroup> | 18 | <ItemGroup> |
| 19 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 19 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | </Project> \ No newline at end of file | 21 | </Project> \ 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 @@ | |||
| 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | </Project> \ No newline at end of file | 18 | </Project> \ 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 @@ | |||
| 15 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> | 15 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | <ItemGroup> | 17 | <ItemGroup> |
| 18 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 18 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | </Project> \ No newline at end of file | 20 | </Project> \ 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 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 19 | </Project> \ 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 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 19 | </Project> \ 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 @@ | |||
| 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 14 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 15 | </ItemGroup> | 15 | </ItemGroup> |
| 16 | <ItemGroup> | 16 | <ItemGroup> |
| 17 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 17 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 18 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 18 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 19 | </ItemGroup> | 19 | </ItemGroup> |
| 20 | </Project> \ No newline at end of file | 20 | </Project> \ 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 @@ | |||
| 15 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 15 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | <ItemGroup> | 17 | <ItemGroup> |
| 18 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 18 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 19 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 19 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 20 | </ItemGroup> | 20 | </ItemGroup> |
| 21 | </Project> \ No newline at end of file | 21 | </Project> \ 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 @@ | |||
| 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 13 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 17 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 18 | </ItemGroup> | 18 | </ItemGroup> |
| 19 | </Project> \ No newline at end of file | 19 | </Project> \ 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 @@ | |||
| 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | </Project> \ No newline at end of file | 18 | </Project> \ 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 @@ | |||
| 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> | 12 | <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> |
| 13 | </ItemGroup> | 13 | </ItemGroup> |
| 14 | <ItemGroup> | 14 | <ItemGroup> |
| 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 15 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> | 16 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.61" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | </Project> \ No newline at end of file | 18 | </Project> \ 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 @@ | |||
| 13 | <ProjectReference Include="..\..\..\TestBA\TestBA.csproj" /> | 13 | <ProjectReference Include="..\..\..\TestBA\TestBA.csproj" /> |
| 14 | </ItemGroup> | 14 | </ItemGroup> |
| 15 | <ItemGroup> | 15 | <ItemGroup> |
| 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.83" /> | 16 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.84" /> |
| 17 | </ItemGroup> | 17 | </ItemGroup> |
| 18 | </Project> \ No newline at end of file | 18 | </Project> \ 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 @@ | |||
| 12 | <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" /> | 12 | <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" /> |
| 13 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.48" /> | 13 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.48" /> |
| 14 | <PackageReference Include="WixToolset.Data" Version="4.0.185" /> | 14 | <PackageReference Include="WixToolset.Data" Version="4.0.185" /> |
| 15 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.48" /> | 15 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.49" /> |
| 16 | </ItemGroup> | 16 | </ItemGroup> |
| 17 | 17 | ||
| 18 | <ItemGroup> | 18 | <ItemGroup> |
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 | |||
| 17 | private const string V100 = "1.0.0.0"; | 17 | private const string V100 = "1.0.0.0"; |
| 18 | private const string V101 = "1.0.1.0"; | 18 | private const string V101 = "1.0.1.0"; |
| 19 | 19 | ||
| 20 | [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")] | 20 | [Fact] |
| 21 | public void CanInstallBundleWithSlipstreamedPatchThenRemoveIt() | 21 | public void CanInstallBundleWithSlipstreamedPatchThenRemoveIt() |
| 22 | { | 22 | { |
| 23 | var testRegistryValue = "PackageA"; | 23 | var testRegistryValue = "PackageA"; |
| @@ -45,7 +45,7 @@ namespace WixToolsetTest.BurnE2E | |||
| 45 | /// BundleOnlyPatchA in uninstalled which should do nothing since BundleA has a dependency on it. | 45 | /// BundleOnlyPatchA in uninstalled which should do nothing since BundleA has a dependency on it. |
| 46 | /// Bundle is installed which should remove everything. | 46 | /// Bundle is installed which should remove everything. |
| 47 | /// </summary> | 47 | /// </summary> |
| 48 | [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")] | 48 | [Fact] |
| 49 | public void ReferenceCountsSlipstreamedPatch() | 49 | public void ReferenceCountsSlipstreamedPatch() |
| 50 | { | 50 | { |
| 51 | var testRegistryValue = "PackageA"; | 51 | var testRegistryValue = "PackageA"; |
| @@ -266,7 +266,7 @@ namespace WixToolsetTest.BurnE2E | |||
| 266 | packageBv1.VerifyTestRegistryRootDeleted(); | 266 | packageBv1.VerifyTestRegistryRootDeleted(); |
| 267 | } | 267 | } |
| 268 | 268 | ||
| 269 | [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")] | 269 | [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6359")] |
| 270 | public void CanAutomaticallyPredetermineSlipstreamPatchesAtBuildTime() | 270 | public void CanAutomaticallyPredetermineSlipstreamPatchesAtBuildTime() |
| 271 | { | 271 | { |
| 272 | var testRegistryValueA = "PackageA"; | 272 | var testRegistryValueA = "PackageA"; |
| @@ -300,7 +300,7 @@ namespace WixToolsetTest.BurnE2E | |||
| 300 | packageAv1.VerifyTestRegistryRootDeleted(); | 300 | packageAv1.VerifyTestRegistryRootDeleted(); |
| 301 | } | 301 | } |
| 302 | 302 | ||
| 303 | [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")] | 303 | [Fact] |
| 304 | public void CanInstallSlipstreamedPatchWithPackageDuringMajorUpgrade() | 304 | public void CanInstallSlipstreamedPatchWithPackageDuringMajorUpgrade() |
| 305 | { | 305 | { |
| 306 | var testRegistryValue = "PackageA"; | 306 | var testRegistryValue = "PackageA"; |
| @@ -327,7 +327,7 @@ namespace WixToolsetTest.BurnE2E | |||
| 327 | packageAv1.VerifyTestRegistryRootDeleted(); | 327 | packageAv1.VerifyTestRegistryRootDeleted(); |
| 328 | } | 328 | } |
| 329 | 329 | ||
| 330 | [Fact(Skip = "https://github.com/wixtoolset/issues/issues/3897")] | 330 | [Fact] |
| 331 | public void RespectsSlipstreamedPatchInstallCondition() | 331 | public void RespectsSlipstreamedPatchInstallCondition() |
| 332 | { | 332 | { |
| 333 | var testRegistryValue = "PackageA"; | 333 | 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 @@ | |||
| 21 | <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" /> | 21 | <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" /> |
| 22 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.48" /> | 22 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.48" /> |
| 23 | <PackageReference Include="WixToolset.Data" Version="4.0.185" /> | 23 | <PackageReference Include="WixToolset.Data" Version="4.0.185" /> |
| 24 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.48" /> | 24 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.49" /> |
| 25 | </ItemGroup> | 25 | </ItemGroup> |
| 26 | 26 | ||
| 27 | <ItemGroup> | 27 | <ItemGroup> |
