Add tests to verify #4991 and #5702.
Sean Hall committed
Mar 11, 2021 at 20:57 UTC
7cc4271c9d78ed60e354f585d03b612a9efb7cf3
64 files changed
+224
-53
global.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0195"
3
+ "WixToolset.Sdk": "4.0.0-build-0196"
4
},
5
"sdk": {
6
"allowPrerelease": false
src/TestBA/TestBA.cs
+5
@@ -236,6 +236,11 @@ namespace WixToolset.Test.BA
236
}
237
}
238
239
+ protected override void OnDetectRelatedBundle(DetectRelatedBundleEventArgs args)
240
+ {
241
+ this.Log("OnDetectRelatedBundle() - id: {0}, missing from cache: {1}", args.ProductCode, args.MissingFromCache);
242
+ }
243
+
244
protected override void OnElevateBegin(ElevateBeginEventArgs args)
245
{
246
if (this.explicitlyElevateAndPlanFromOnElevateBegin)
src/TestBA/TestBA.csproj
+1
-1
@@ -19,6 +19,6 @@
19
</ItemGroup>
20
21
<ItemGroup>
22
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.51" />
22
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.52" />
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.89" />
15
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
16
</ItemGroup>
17
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleAv1/BundleAv1.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.89" />
12
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
13
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
14
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
15
</ItemGroup>
src/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.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.89" />
12
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
13
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
14
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
15
</ItemGroup>
src/TestData/DependencyTests/BundleB/BundleB.wixproj
+1
-1
@@ -11,7 +11,7 @@
11
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
12
</ItemGroup>
13
<ItemGroup>
14
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
14
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
15
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
16
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
17
</ItemGroup>
src/TestData/DependencyTests/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.89" />
18
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
19
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
20
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
21
</ItemGroup>
src/TestData/DependencyTests/BundleD/BundleD.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.89" />
18
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
19
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
20
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
21
</ItemGroup>
src/TestData/DependencyTests/BundleE/BundleE.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.89" />
17
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
18
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
19
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
20
</ItemGroup>
src/TestData/DependencyTests/BundleF/BundleF.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.89" />
17
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
18
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
19
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
20
</ItemGroup>
src/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.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.89" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
17
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
18
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
19
</ItemGroup>
src/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.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.89" />
17
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
18
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
19
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
20
</ItemGroup>
src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.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.89" />
12
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
13
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
14
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
15
</ItemGroup>
src/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.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.89" />
13
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
14
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
15
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
16
</ItemGroup>
src/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj
+1
-1
@@ -7,7 +7,7 @@
7
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
8
</ItemGroup>
9
<ItemGroup>
10
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
10
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
11
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
12
</ItemGroup>
13
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleHv2/BundleHv2.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.89" />
13
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
14
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
15
</ItemGroup>
16
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleJ/BundleJ.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.89" />
17
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
18
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
19
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
20
</ItemGroup>
src/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.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.89" />
17
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
18
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
19
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
20
</ItemGroup>
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.89" />
9
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
10
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
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.89" />
12
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
13
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
14
</ItemGroup>
15
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleL/BundleL.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.89" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
17
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
18
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.77" />
19
</ItemGroup>
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.89" />
15
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
16
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
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.89" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
17
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
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.89" />
13
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
14
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
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.89" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
17
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
18
</ItemGroup>
19
</Project>
\ No newline at end of file
src/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.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.89" />
9
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
10
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
11
</ItemGroup>
12
</Project>
\ No newline at end of file
src/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.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.89" />
15
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
16
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
17
</ItemGroup>
18
</Project>
\ No newline at end of file
src/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.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.89" />
9
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
10
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
11
</ItemGroup>
12
</Project>
\ No newline at end of file
src/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.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.89" />
15
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
16
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
17
</ItemGroup>
18
</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.89" />
10
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
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.89" />
13
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
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.89" />
8
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
9
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
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.89" />
15
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
16
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
17
</ItemGroup>
18
</Project>
\ No newline at end of file
src/TestData/PatchTests/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.89" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
17
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
18
</ItemGroup>
19
</Project>
\ No newline at end of file
src/TestData/PatchTests/BundlePatchA/BundlePatchA.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.89" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
17
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
18
</ItemGroup>
19
</Project>
\ No newline at end of file
src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.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.89" />
17
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
18
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
19
</ItemGroup>
20
</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.89" />
19
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
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.89" />
19
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
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.89" />
15
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
16
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
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.89" />
18
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
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.89" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
17
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
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.89" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
17
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
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.89" />
17
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
18
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
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.89" />
18
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
19
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
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.89" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
17
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
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.89" />
15
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
16
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
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.89" />
15
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
16
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
17
</ItemGroup>
18
</Project>
\ No newline at end of file
src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+1
-1
@@ -14,6 +14,6 @@
14
<ProjectReference Include="..\..\..\TestExe\TestExe.csproj" />
15
</ItemGroup>
16
<ItemGroup>
17
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.89" />
17
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
18
</ItemGroup>
19
</Project>
\ No newline at end of file
src/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleA.props
new
+10
@@ -0,0 +1,10 @@
1
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
+<Project>
3
+ <PropertyGroup>
4
+ <OutputType>Bundle</OutputType>
5
+ <UpgradeCode>{8C01FD92-87BE-419B-88EC-36754E93CA67}</UpgradeCode>
6
+ </PropertyGroup>
7
+ <ItemGroup>
8
+ <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
9
+ </ItemGroup>
10
+</Project>
src/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj
new
+12
@@ -0,0 +1,12 @@
1
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
+<Project Sdk="WixToolset.Sdk">
3
+ <Import Project="BundleA.props" />
4
+ <ItemGroup>
5
+ <ProjectReference Include="..\PackageAv1\PackageAv1.wixproj" />
6
+ <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
7
+ </ItemGroup>
8
+ <ItemGroup>
9
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
10
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
11
+ </ItemGroup>
12
+</Project>
\ No newline at end of file
src/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wxs
new
+10
@@ -0,0 +1,10 @@
1
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
+
3
+
4
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
+ <Fragment>
6
+ <PackageGroup Id="BundlePackages">
7
+ <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv1.TargetPath)" />
8
+ </PackageGroup>
9
+ </Fragment>
10
+</Wix>
src/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj
new
+15
@@ -0,0 +1,15 @@
1
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
+<Project Sdk="WixToolset.Sdk">
3
+ <Import Project="..\BundleAv1\BundleA.props" />
4
+ <PropertyGroup>
5
+ <Version>2.0.0.0</Version>
6
+ </PropertyGroup>
7
+ <ItemGroup>
8
+ <ProjectReference Include="..\PackageAv2\PackageAv2.wixproj" />
9
+ <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
10
+ </ItemGroup>
11
+ <ItemGroup>
12
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.90" />
13
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.64" />
14
+ </ItemGroup>
15
+</Project>
\ No newline at end of file
src/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wxs
new
+10
@@ -0,0 +1,10 @@
1
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
+
3
+
4
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5
+ <Fragment>
6
+ <PackageGroup Id="BundlePackages">
7
+ <MsiPackage Id="PackageA" SourceFile="$(var.PackageAv2.TargetPath)" />
8
+ </PackageGroup>
9
+ </Fragment>
10
+</Wix>
src/TestData/UpgradeRelatedBundleTests/PackageAv1/PackageA.props
new
+9
@@ -0,0 +1,9 @@
1
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
+<Project>
3
+ <PropertyGroup>
4
+ <UpgradeCode>{E7AF5E0D-EC10-4339-9126-76A76011DA3A}</UpgradeCode>
5
+ </PropertyGroup>
6
+ <ItemGroup>
7
+ <Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
8
+ </ItemGroup>
9
+</Project>
\ No newline at end of file
src/TestData/UpgradeRelatedBundleTests/PackageAv1/PackageAv1.wixproj
new
+4
@@ -0,0 +1,4 @@
1
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
+<Project Sdk="WixToolset.Sdk">
3
+ <Import Project="PackageA.props" />
4
+</Project>
\ No newline at end of file
src/TestData/UpgradeRelatedBundleTests/PackageAv2/PackageAv2.wixproj
new
+7
@@ -0,0 +1,7 @@
1
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
+<Project Sdk="WixToolset.Sdk">
3
+ <Import Project="..\PackageAv1\PackageA.props" />
4
+ <PropertyGroup>
5
+ <Version>2.0.0.0</Version>
6
+ </PropertyGroup>
7
+</Project>
\ No newline at end of file
src/WixTestTools/BundleInstaller.cs
+12
@@ -36,6 +36,18 @@ namespace WixTestTools
36
return this.RunBundleWithArguments(expectedExitCode, MSIExec.MSIExecMode.Install, arguments);
37
}
38
39
+ /// <summary>
40
+ /// Installs the bundle with optional arguments.
41
+ /// </summary>
42
+ /// <param name="bundlePath">This should be the bundle in the package cache.</param>
43
+ /// <param name="expectedExitCode">Expected exit code, defaults to success.</param>
44
+ /// <param name="arguments">Optional arguments to pass to the tool.</param>
45
+ /// <returns>Path to the generated log file.</returns>
46
+ public string Install(string bundlePath, int expectedExitCode = (int)MSIExec.MSIExecReturnCode.SUCCESS, params string[] arguments)
47
+ {
48
+ return this.RunBundleWithArguments(expectedExitCode, MSIExec.MSIExecMode.Install, arguments, bundlePath: bundlePath);
49
+ }
50
+
51
/// <summary>
52
/// Modify the bundle with optional arguments.
53
/// </summary>
src/WixTestTools/BundleVerifier.cs
+14
@@ -56,6 +56,20 @@ namespace WixTestTools
56
return Path.Combine(cachePath, Path.GetFileName(this.Bundle));
57
}
58
59
+ public string ManuallyCache()
60
+ {
61
+ var expectedCachePath = this.GetExpectedCachedBundlePath();
62
+ Directory.CreateDirectory(Path.GetDirectoryName(expectedCachePath));
63
+ File.Copy(this.Bundle, expectedCachePath);
64
+ return expectedCachePath;
65
+ }
66
+
67
+ public void ManuallyUncache()
68
+ {
69
+ var expectedCachePath = this.GetExpectedCachedBundlePath();
70
+ File.Delete(expectedCachePath);
71
+ }
72
+
73
public bool TryGetRegistration(out BundleRegistration registration)
74
{
75
var bundleSymbol = this.GetBundleSymbol();
src/WixTestTools/WixTestTools.csproj
+2
-2
@@ -11,8 +11,8 @@
11
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
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.198" />
15
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.51" />
14
+ <PackageReference Include="WixToolset.Data" Version="4.0.199" />
15
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.52" />
16
</ItemGroup>
17
18
<ItemGroup>
src/WixToolsetTest.BurnE2E/DependencyTests.cs
+1
-1
@@ -593,7 +593,7 @@ namespace WixToolsetTest.BurnE2E
593
packageDv2.VerifyInstalled(true);
594
595
Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Skipping cross-scope dependency registration on package: PackageA, bundle scope: PerUser, package scope: PerMachine"));
596
- Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Detected related bundle: \{[0-9A-Za-z\-]{36}\}, type: Upgrade, scope: PerUser, version: 1\.0\.0\.0, operation: MajorUpgrade"));
596
+ 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"));
597
598
bundleHv2.Uninstall();
599
bundleHv2.VerifyUnregisteredAndRemovedFromPackageCache();
src/WixToolsetTest.BurnE2E/RegistrationTests.cs
+27
@@ -10,6 +10,21 @@ namespace WixToolsetTest.BurnE2E
10
{
11
public RegistrationTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
12
13
+ [Fact]
14
+ public void AutomaticallyUncachesBundleWhenNotInstalled()
15
+ {
16
+ var bundleA = this.CreateBundleInstaller("BundleA");
17
+ var testBAController = this.CreateTestBAController();
18
+
19
+ var cachedBundlePath = bundleA.ManuallyCache();
20
+
21
+ testBAController.SetQuitAfterDetect();
22
+
23
+ bundleA.Install(cachedBundlePath);
24
+
25
+ bundleA.VerifyUnregisteredAndRemovedFromPackageCache();
26
+ }
27
+
28
[Fact]
29
public void AutomaticallyUninstallsBundleWithoutBADoingApply()
30
{
@@ -22,6 +37,18 @@ namespace WixToolsetTest.BurnE2E
37
this.InstallBundleThenManuallyUninstallPackageAndRemovePackageFromCacheThenRunAndQuitWithoutApply(false);
38
}
39
40
+ [Fact]
41
+ public void RegistersInARPIfPrecached()
42
+ {
43
+ var bundleA = this.CreateBundleInstaller("BundleA");
44
+
45
+ bundleA.ManuallyCache();
46
+
47
+ // Verifies https://github.com/wixtoolset/issues/issues/5702
48
+ bundleA.Install();
49
+ bundleA.VerifyRegisteredAndInPackageCache();
50
+ }
51
+
52
private void InstallBundleThenManuallyUninstallPackageAndRemovePackageFromCacheThenRunAndQuitWithoutApply(bool detect)
53
{
54
var packageA = this.CreatePackageInstaller("PackageA");
src/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
new
+36
@@ -0,0 +1,36 @@
1
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
2
+
3
+namespace WixToolsetTest.BurnE2E
4
+{
5
+ using System;
6
+ using System.IO;
7
+ using WixTestTools;
8
+ using Xunit;
9
+ using Xunit.Abstractions;
10
+
11
+ public class UpgradeRelatedBundleTests : BurnE2ETests
12
+ {
13
+ public UpgradeRelatedBundleTests(ITestOutputHelper testOutputHelper) : base(testOutputHelper) { }
14
+
15
+ [Fact]
16
+ public void ReportsRelatedBundleMissingFromCache()
17
+ {
18
+ var packageAv1 = this.CreatePackageInstaller("PackageAv1");
19
+ var packageAv2 = this.CreatePackageInstaller("PackageAv2");
20
+ var bundleAv1 = this.CreateBundleInstaller("BundleAv1");
21
+ var bundleAv2 = this.CreateBundleInstaller("BundleAv2");
22
+
23
+ bundleAv1.Install();
24
+ bundleAv1.VerifyRegisteredAndInPackageCache();
25
+
26
+ bundleAv1.ManuallyUncache();
27
+
28
+ // Verify https://github.com/wixtoolset/issues/issues/4991
29
+ var bundleAv2InstallLogFilePath = bundleAv2.Install();
30
+ bundleAv2.VerifyRegisteredAndInPackageCache();
31
+
32
+ Assert.True(LogVerifier.MessageInLogFileRegex(bundleAv2InstallLogFilePath, @"OnDetectRelatedBundle\(\) - id: \{[0-9A-Za-z\-]{36}\}, missing from cache: True"));
33
+ 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"));
34
+ }
35
+ }
36
+}
src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
+2
-2
@@ -20,8 +20,8 @@
20
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
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.198" />
24
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.51" />
23
+ <PackageReference Include="WixToolset.Data" Version="4.0.199" />
24
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.52" />
25
</ItemGroup>
26
27
<ItemGroup>