@joebigelow / wix / commits / 20a546b0

Update dependencies to enable fixed skipstream tests.

Sean Hall committed Feb 22, 2021 at 20:47 UTC 20a546b0a6e278e7a8c37ca86887190ac2a85939
32 files changed +36 -36
global.json
+1 -1
@@ -1,6 +1,6 @@
1 {
2 "msbuild-sdks": {
3 - "WixToolset.Sdk": "4.0.0-build-0189"
3 + "WixToolset.Sdk": "4.0.0-build-0190"
4 },
5 "sdk": {
6 "allowPrerelease": false
src/TestBA/TestBA.cs
+1 -1
@@ -257,7 +257,7 @@ namespace WixToolset.Test.BA
257 }
258 }
259
260 - protected override void OnPlanTargetMsiPackage(PlanTargetMsiPackageEventArgs args)
260 + protected override void OnPlanPatchTarget(PlanPatchTargetEventArgs args)
261 {
262 RequestState state;
263 string action = this.ReadPackageAction(args.PackageId, "Requested");
src/TestBA/TestBA.csproj
+1 -1
@@ -19,6 +19,6 @@
19 </ItemGroup>
20
21 <ItemGroup>
22 - <PackageReference Include="WixToolset.Mba.Core" Version="4.0.48" />
22 + <PackageReference Include="WixToolset.Mba.Core" Version="4.0.49" />
23 </ItemGroup>
24 </Project>
\ No newline at end of file
src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj
+1 -1
@@ -12,6 +12,6 @@
12 <ProjectReference Include="..\PackageA\PackageA.wixproj" />
13 </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>
17 </Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj
+1 -1
@@ -6,7 +6,7 @@
6 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
7 </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" />
11 </ItemGroup>
12 </Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj
+1 -1
@@ -9,7 +9,7 @@
9 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
10 </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" />
14 </ItemGroup>
15 </Project>
\ No newline at end of file
src/TestData/ElevationTests/BundleA/BundleA.wixproj
+1 -1
@@ -12,7 +12,7 @@
12 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
13 </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" />
17 </ItemGroup>
18 </Project>
\ No newline at end of file
src/TestData/FailureTests/BundleA/BundleA.wixproj
+1 -1
@@ -13,7 +13,7 @@
13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14 </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" />
18 </ItemGroup>
19 </Project>
\ No newline at end of file
src/TestData/FailureTests/BundleB/BundleB.wixproj
+1 -1
@@ -10,7 +10,7 @@
10 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
11 </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" />
15 </ItemGroup>
16 </Project>
\ No newline at end of file
src/TestData/FailureTests/BundleC/BundleC.wixproj
+1 -1
@@ -13,7 +13,7 @@
13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14 </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" />
18 </ItemGroup>
19 </Project>
\ No newline at end of file
src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj
+1 -1
@@ -7,6 +7,6 @@
7 <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" />
8 </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>
12 </Project>
\ No newline at end of file
src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj
+1 -1
@@ -10,6 +10,6 @@
10 <ProjectReference Include="..\PackageD\PackageD.wixproj" />
11 </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>
15 </Project>
\ No newline at end of file
src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj
+1 -1
@@ -5,7 +5,7 @@
5 <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
6 </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" />
10 </ItemGroup>
11 </Project>
\ No newline at end of file
src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
+1 -1
@@ -12,7 +12,7 @@
12 <ProjectReference Include="..\PackageF\PackageF.wixproj" />
13 </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" />
17 </ItemGroup>
18 </Project>
\ No newline at end of file
src/TestData/PatchTests/BundleA/BundleA.wixproj
+1 -1
@@ -12,7 +12,7 @@
12 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
13 </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" />
17 </ItemGroup>
18 </Project>
\ No newline at end of file
src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
+1 -1
@@ -12,7 +12,7 @@
12 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
13 </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" />
17 </ItemGroup>
18 </Project>
\ No newline at end of file
src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj
+1 -1
@@ -13,7 +13,7 @@
13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14 </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" />
18 </ItemGroup>
19 </Project>
\ No newline at end of file
src/TestData/PrereqBaTests/BundleA/BundleA.wixproj
+1 -1
@@ -16,6 +16,6 @@
16 <ProjectReference Include="..\PackageF\PackageF.wixproj" />
17 </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>
21 </Project>
\ No newline at end of file
src/TestData/PrereqBaTests/BundleB/BundleB.wixproj
+1 -1
@@ -16,6 +16,6 @@
16 <ProjectReference Include="..\PackageF\PackageF.wixproj" />
17 </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>
21 </Project>
\ No newline at end of file
src/TestData/RegistrationTests/BundleA/BundleA.wixproj
+1 -1
@@ -12,7 +12,7 @@
12 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
13 </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" />
17 </ItemGroup>
18 </Project>
\ No newline at end of file
src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
+1 -1
@@ -15,6 +15,6 @@
15 <ProjectReference Include="..\PackageF\PackageF.wixproj" />
16 </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>
20 </Project>
\ No newline at end of file
src/TestData/SlipstreamTests/BundleA/BundleA.wixproj
+1 -1
@@ -13,7 +13,7 @@
13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14 </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" />
18 </ItemGroup>
19 </Project>
\ No newline at end of file
src/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj
+1 -1
@@ -13,7 +13,7 @@
13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14 </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" />
18 </ItemGroup>
19 </Project>
\ No newline at end of file
src/TestData/SlipstreamTests/BundleB/BundleB.wixproj
+1 -1
@@ -14,7 +14,7 @@
14 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
15 </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" />
19 </ItemGroup>
20 </Project>
\ No newline at end of file
src/TestData/SlipstreamTests/BundleC/BundleC.wixproj
+1 -1
@@ -15,7 +15,7 @@
15 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
16 </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" />
20 </ItemGroup>
21 </Project>
\ No newline at end of file
src/TestData/SlipstreamTests/BundleD/BundleD.wixproj
+1 -1
@@ -13,7 +13,7 @@
13 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14 </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" />
18 </ItemGroup>
19 </Project>
\ No newline at end of file
src/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj
+1 -1
@@ -12,7 +12,7 @@
12 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
13 </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" />
17 </ItemGroup>
18 </Project>
\ No newline at end of file
src/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj
+1 -1
@@ -12,7 +12,7 @@
12 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
13 </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" />
17 </ItemGroup>
18 </Project>
\ No newline at end of file
src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+1 -1
@@ -13,6 +13,6 @@
13 <ProjectReference Include="..\..\..\TestBA\TestBA.csproj" />
14 </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>
18 </Project>
\ No newline at end of file
src/WixTestTools/WixTestTools.csproj
+1 -1
@@ -12,7 +12,7 @@
12 <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
13 <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.48" />
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>
17
18 <ItemGroup>
src/WixToolsetTest.BurnE2E/SlipstreamTests.cs
+5 -5
@@ -17,7 +17,7 @@ namespace WixToolsetTest.BurnE2E
17 private const string V100 = "1.0.0.0";
18 private const string V101 = "1.0.1.0";
19
20 - [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")]
20 + [Fact]
21 public void CanInstallBundleWithSlipstreamedPatchThenRemoveIt()
22 {
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.
46 /// Bundle is installed which should remove everything.
47 /// </summary>
48 - [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")]
48 + [Fact]
49 public void ReferenceCountsSlipstreamedPatch()
50 {
51 var testRegistryValue = "PackageA";
@@ -266,7 +266,7 @@ namespace WixToolsetTest.BurnE2E
266 packageBv1.VerifyTestRegistryRootDeleted();
267 }
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()
271 {
272 var testRegistryValueA = "PackageA";
@@ -300,7 +300,7 @@ namespace WixToolsetTest.BurnE2E
300 packageAv1.VerifyTestRegistryRootDeleted();
301 }
302
303 - [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")]
303 + [Fact]
304 public void CanInstallSlipstreamedPatchWithPackageDuringMajorUpgrade()
305 {
306 var testRegistryValue = "PackageA";
@@ -327,7 +327,7 @@ namespace WixToolsetTest.BurnE2E
327 packageAv1.VerifyTestRegistryRootDeleted();
328 }
329
330 - [Fact(Skip = "https://github.com/wixtoolset/issues/issues/3897")]
330 + [Fact]
331 public void RespectsSlipstreamedPatchInstallCondition()
332 {
333 var testRegistryValue = "PackageA";
src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
+1 -1
@@ -21,7 +21,7 @@
21 <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
22 <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.48" />
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>
26
27 <ItemGroup>