Update dependencies.
Sean Hall committed
Apr 20, 2021 at 00:13 UTC
d07f3262657866a795716994595bbd627cbb151f
74 files changed
+151
-144
global.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0209"
3
+ "WixToolset.Sdk": "4.0.0-build-0210"
4
},
5
"sdk": {
6
"allowPrerelease": false
src/TestBA/TestBA.cs
+15
-8
@@ -331,6 +331,21 @@ namespace WixToolset.Test.BA
331
}
332
}
333
334
+ protected override void OnCacheContainerOrPayloadVerifyProgress(CacheContainerOrPayloadVerifyProgressEventArgs args)
335
+ {
336
+ this.Log("OnCacheContainerOrPayloadVerifyProgress() - container/package: {0}, payload: {1}, progress: {2}, total: {3}, overall progress: {4}%", args.PackageOrContainerId, args.PayloadId, args.Progress, args.Total, args.OverallPercentage);
337
+ }
338
+
339
+ protected override void OnCachePayloadExtractProgress(CachePayloadExtractProgressEventArgs args)
340
+ {
341
+ this.Log("OnCachePayloadExtractProgress() - container/package: {0}, payload: {1}, progress: {2}, total: {3}, overall progress: {4}%", args.PackageOrContainerId, args.PayloadId, args.Progress, args.Total, args.OverallPercentage);
342
+ }
343
+
344
+ protected override void OnCacheVerifyProgress(CacheVerifyProgressEventArgs args)
345
+ {
346
+ this.Log("OnCacheVerifyProgress() - container/package: {0}, payload: {1}, progress: {2}, total: {3}, overall progress: {4}%, step: {5}", args.PackageOrContainerId, args.PayloadId, args.Progress, args.Total, args.OverallPercentage, args.Step);
347
+ }
348
+
349
protected override void OnExecutePackageBegin(ExecutePackageBeginEventArgs args)
350
{
351
this.Log("OnExecutePackageBegin() - package: {0}, rollback: {1}", args.PackageId, !args.ShouldExecute);
@@ -445,14 +460,6 @@ namespace WixToolset.Test.BA
460
}
461
}
462
448
- protected override void OnResolveSource(ResolveSourceEventArgs args)
449
- {
450
- if (!String.IsNullOrEmpty(args.DownloadSource))
451
- {
452
- args.Action = BOOTSTRAPPER_RESOLVESOURCE_ACTION.Download;
453
- }
454
- }
455
-
463
protected override void OnApplyBegin(ApplyBeginEventArgs args)
464
{
465
this.cancelOnProgressAtProgress = -1;
src/TestBA/TestBA.csproj
+1
-1
@@ -19,6 +19,6 @@
19
</ItemGroup>
20
21
<ItemGroup>
22
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.55" />
22
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.57" />
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.95" />
15
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
16
</ItemGroup>
17
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleAv1/BundleAv1.wixproj
+3
-3
@@ -9,8 +9,8 @@
9
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
10
</ItemGroup>
11
<ItemGroup>
12
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
13
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
14
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
12
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
13
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
14
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
15
</ItemGroup>
16
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleAv1_0_1/BundleAv1_0_1.wixproj
+3
-3
@@ -9,8 +9,8 @@
9
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
10
</ItemGroup>
11
<ItemGroup>
12
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
13
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
14
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
12
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
13
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
14
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
15
</ItemGroup>
16
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleB/BundleB.wixproj
+3
-3
@@ -11,8 +11,8 @@
11
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
12
</ItemGroup>
13
<ItemGroup>
14
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
15
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
16
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
14
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
15
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
16
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
17
</ItemGroup>
18
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleC/BundleC.wixproj
+3
-3
@@ -15,8 +15,8 @@
15
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
16
</ItemGroup>
17
<ItemGroup>
18
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
19
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
20
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
18
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
19
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
20
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
21
</ItemGroup>
22
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleD/BundleD.wixproj
+3
-3
@@ -15,8 +15,8 @@
15
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
16
</ItemGroup>
17
<ItemGroup>
18
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
19
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
20
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
18
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
19
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
20
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
21
</ItemGroup>
22
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleE/BundleE.wixproj
+3
-3
@@ -14,8 +14,8 @@
14
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
15
</ItemGroup>
16
<ItemGroup>
17
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
18
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
19
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
17
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
18
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
19
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
20
</ItemGroup>
21
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleF/BundleF.wixproj
+3
-3
@@ -14,8 +14,8 @@
14
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
15
</ItemGroup>
16
<ItemGroup>
17
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
18
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
19
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
17
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
18
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
19
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
20
</ItemGroup>
21
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleF_AddOnA/BundleF_AddOnA.wixproj
+3
-3
@@ -13,8 +13,8 @@
13
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14
</ItemGroup>
15
<ItemGroup>
16
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
17
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
18
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
17
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
18
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
19
</ItemGroup>
20
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleF_AddOnB/BundleF_AddOnB.wixproj
+3
-3
@@ -14,8 +14,8 @@
14
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
15
</ItemGroup>
16
<ItemGroup>
17
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
18
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
19
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
17
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
18
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
19
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
20
</ItemGroup>
21
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleF_PatchAv1_0_1/BundleF_PatchAv1_0_1.wixproj
+3
-3
@@ -9,8 +9,8 @@
9
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
10
</ItemGroup>
11
<ItemGroup>
12
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
13
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
14
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
12
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
13
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
14
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
15
</ItemGroup>
16
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleF_PatchAv1_0_2/BundleF_PatchAv1_0_2.wixproj
+3
-3
@@ -10,8 +10,8 @@
10
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
11
</ItemGroup>
12
<ItemGroup>
13
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
14
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
15
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
13
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
14
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
15
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
16
</ItemGroup>
17
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleHv1/BundleHv1.wixproj
+2
-2
@@ -7,7 +7,7 @@
7
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
8
</ItemGroup>
9
<ItemGroup>
10
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
11
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
10
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
11
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
12
</ItemGroup>
13
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleHv2/BundleHv2.wixproj
+2
-2
@@ -10,7 +10,7 @@
10
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
11
</ItemGroup>
12
<ItemGroup>
13
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
14
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
13
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
14
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
15
</ItemGroup>
16
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleJ/BundleJ.wixproj
+3
-3
@@ -14,8 +14,8 @@
14
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
15
</ItemGroup>
16
<ItemGroup>
17
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
18
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
19
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
17
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
18
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
19
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
20
</ItemGroup>
21
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleJ_Patch/BundleJ_Patch.wixproj
+3
-3
@@ -14,8 +14,8 @@
14
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
15
</ItemGroup>
16
<ItemGroup>
17
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
18
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
19
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
17
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
18
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
19
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
20
</ItemGroup>
21
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleKv1/BundleKv1.wixproj
+2
-2
@@ -6,7 +6,7 @@
6
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
7
</ItemGroup>
8
<ItemGroup>
9
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
10
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
9
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
10
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
11
</ItemGroup>
12
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleKv2/BundleKv2.wixproj
+2
-2
@@ -9,7 +9,7 @@
9
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
10
</ItemGroup>
11
<ItemGroup>
12
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
13
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
12
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
13
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
14
</ItemGroup>
15
</Project>
\ No newline at end of file
src/TestData/DependencyTests/BundleL/BundleL.wixproj
+3
-3
@@ -13,8 +13,8 @@
13
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14
</ItemGroup>
15
<ItemGroup>
16
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
17
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
18
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
17
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
18
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
19
</ItemGroup>
20
</Project>
\ No newline at end of file
src/TestData/DependencyTests/PackageAv1/PackageAv1.wixproj
+1
-1
@@ -2,6 +2,6 @@
2
<Project Sdk="WixToolset.Sdk">
3
<Import Project="PackageA.props" />
4
<ItemGroup>
5
- <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.27" />
5
+ <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.28" />
6
</ItemGroup>
7
</Project>
\ No newline at end of file
src/TestData/DependencyTests/PackageAv1_0_1/PackageAv1_0_1.wixproj
+1
-1
@@ -8,6 +8,6 @@
8
<Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
9
</ItemGroup>
10
<ItemGroup>
11
- <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.27" />
11
+ <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.28" />
12
</ItemGroup>
13
</Project>
\ No newline at end of file
src/TestData/DependencyTests/PackageAv1_0_2/PackageAv1_0_2.wixproj
+1
-1
@@ -8,6 +8,6 @@
8
<Compile Include="..\PackageAv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
9
</ItemGroup>
10
<ItemGroup>
11
- <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.27" />
11
+ <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.28" />
12
</ItemGroup>
13
</Project>
\ No newline at end of file
src/TestData/DependencyTests/PackageB/PackageB.wixproj
+1
-1
@@ -8,6 +8,6 @@
8
<Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
9
</ItemGroup>
10
<ItemGroup>
11
- <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.27" />
11
+ <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.28" />
12
</ItemGroup>
13
</Project>
\ No newline at end of file
src/TestData/DependencyTests/PackageC/PackageC.wixproj
+2
-2
@@ -7,7 +7,7 @@
7
<Compile Include="..\..\Templates\Package.wxs" Link="Package.wxs" />
8
</ItemGroup>
9
<ItemGroup>
10
- <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.27" />
11
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
10
+ <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.28" />
11
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
12
</ItemGroup>
13
</Project>
\ No newline at end of file
src/TestData/DependencyTests/PackageDv1/PackageDv1.wixproj
+1
-1
@@ -2,6 +2,6 @@
2
<Project Sdk="WixToolset.Sdk">
3
<Import Project="PackageD.props" />
4
<ItemGroup>
5
- <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.27" />
5
+ <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.28" />
6
</ItemGroup>
7
</Project>
\ No newline at end of file
src/TestData/DependencyTests/PackageDv2/PackageDv2.wixproj
+1
-1
@@ -8,6 +8,6 @@
8
<Compile Include="..\PackageDv1\Package.wxs" Link="Package.wxs" />
9
</ItemGroup>
10
<ItemGroup>
11
- <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.27" />
11
+ <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.28" />
12
</ItemGroup>
13
</Project>
\ No newline at end of file
src/TestData/DependencyTests/PackageEv1/PackageEv1.wixproj
+1
-1
@@ -2,6 +2,6 @@
2
<Project Sdk="WixToolset.Sdk">
3
<Import Project="PackageE.props" />
4
<ItemGroup>
5
- <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.27" />
5
+ <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.28" />
6
</ItemGroup>
7
</Project>
\ No newline at end of file
src/TestData/DependencyTests/PackageEv1_0_1/PackageEv1_0_1.wixproj
+1
-1
@@ -8,6 +8,6 @@
8
<Compile Include="..\PackageEv1\ProductComponents.wxs" Link="ProductComponents.wxs" />
9
</ItemGroup>
10
<ItemGroup>
11
- <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.27" />
11
+ <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.28" />
12
</ItemGroup>
13
</Project>
\ No newline at end of file
src/TestData/DependencyTests/PatchA/PatchA.wixproj
+1
-1
@@ -10,6 +10,6 @@
10
<ProjectReference Include="..\PackageAv1_0_1\PackageAv1_0_1.wixproj" />
11
</ItemGroup>
12
<ItemGroup>
13
- <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.27" />
13
+ <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.28" />
14
</ItemGroup>
15
</Project>
\ No newline at end of file
src/TestData/DependencyTests/PatchB/PatchB.wixproj
+1
-1
@@ -10,6 +10,6 @@
10
<ProjectReference Include="..\PackageAv1_0_2\PackageAv1_0_2.wixproj" />
11
</ItemGroup>
12
<ItemGroup>
13
- <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.27" />
13
+ <PackageReference Include="WixToolset.Dependency.wixext" Version="4.0.28" />
14
</ItemGroup>
15
</Project>
\ No newline at end of file
src/TestData/ElevationTests/BundleA/BundleA.wixproj
+2
-2
@@ -12,7 +12,7 @@
12
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
13
</ItemGroup>
14
<ItemGroup>
15
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
16
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
15
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
16
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
17
</ItemGroup>
18
</Project>
\ No newline at end of file
src/TestData/FailureTests/BundleA/BundleA.wixproj
+2
-2
@@ -13,7 +13,7 @@
13
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14
</ItemGroup>
15
<ItemGroup>
16
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
17
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
17
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
18
</ItemGroup>
19
</Project>
\ No newline at end of file
src/TestData/FailureTests/BundleB/BundleB.wixproj
+2
-2
@@ -10,7 +10,7 @@
10
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
11
</ItemGroup>
12
<ItemGroup>
13
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
14
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
13
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
14
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
15
</ItemGroup>
16
</Project>
\ No newline at end of file
src/TestData/FailureTests/BundleC/BundleC.wixproj
+2
-2
@@ -13,7 +13,7 @@
13
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14
</ItemGroup>
15
<ItemGroup>
16
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
17
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
17
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
18
</ItemGroup>
19
</Project>
\ No newline at end of file
src/TestData/ForwardCompatibleBundleTests/BundleAv1/BundleAv1.wixproj
+2
-2
@@ -6,7 +6,7 @@
6
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
7
</ItemGroup>
8
<ItemGroup>
9
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
10
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
9
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
10
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
11
</ItemGroup>
12
</Project>
\ No newline at end of file
src/TestData/ForwardCompatibleBundleTests/BundleAv2/BundleAv2.wixproj
+2
-2
@@ -12,7 +12,7 @@
12
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
13
</ItemGroup>
14
<ItemGroup>
15
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
16
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
15
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
16
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
17
</ItemGroup>
18
</Project>
\ No newline at end of file
src/TestData/ForwardCompatibleBundleTests/BundleCv1/BundleCv1.wixproj
+2
-2
@@ -6,7 +6,7 @@
6
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
7
</ItemGroup>
8
<ItemGroup>
9
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
10
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
9
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
10
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
11
</ItemGroup>
12
</Project>
\ No newline at end of file
src/TestData/ForwardCompatibleBundleTests/BundleCv2/BundleCv2.wixproj
+2
-2
@@ -12,7 +12,7 @@
12
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
13
</ItemGroup>
14
<ItemGroup>
15
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
16
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
15
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
16
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
17
</ItemGroup>
18
</Project>
\ No newline at end of file
src/TestData/LayoutTests/BundleA/BundleA.wixproj
+2
-2
@@ -9,8 +9,8 @@
9
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
10
</ItemGroup>
11
<ItemGroup>
12
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
13
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
12
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
13
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
14
</ItemGroup>
15
<!-- Workaround wix.targets brokenness -->
16
<Target Name="CopyUncompressedFiles" AfterTargets="AfterBuild">
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.95" />
10
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
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.95" />
13
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
14
</ItemGroup>
15
</Project>
\ No newline at end of file
src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj
+2
-2
@@ -5,7 +5,7 @@
5
<ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
6
</ItemGroup>
7
<ItemGroup>
8
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
9
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
8
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
9
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
10
</ItemGroup>
11
</Project>
\ No newline at end of file
src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
+2
-2
@@ -12,7 +12,7 @@
12
<ProjectReference Include="..\PackageF\PackageF.wixproj" />
13
</ItemGroup>
14
<ItemGroup>
15
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
16
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
15
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
16
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
17
</ItemGroup>
18
</Project>
\ No newline at end of file
src/TestData/MsiTransactionTests/PackageF/PackageF.wixproj
+1
-1
@@ -7,6 +7,6 @@
7
<Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" />
8
</ItemGroup>
9
<ItemGroup>
10
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
10
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
11
</ItemGroup>
12
</Project>
\ No newline at end of file
src/TestData/PatchTests/BundleA/BundleA.wixproj
+2
-2
@@ -13,7 +13,7 @@
13
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14
</ItemGroup>
15
<ItemGroup>
16
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
17
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
17
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
18
</ItemGroup>
19
</Project>
\ No newline at end of file
src/TestData/PatchTests/BundlePatchA/BundlePatchA.wixproj
+2
-2
@@ -13,7 +13,7 @@
13
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14
</ItemGroup>
15
<ItemGroup>
16
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
17
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
17
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
18
</ItemGroup>
19
</Project>
\ No newline at end of file
src/TestData/PatchTests/BundlePatchA2/BundlePatchA2.wixproj
+2
-2
@@ -14,7 +14,7 @@
14
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
15
</ItemGroup>
16
<ItemGroup>
17
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
18
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
17
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
18
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
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.95" />
19
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
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.95" />
19
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
20
</ItemGroup>
21
</Project>
\ No newline at end of file
src/TestData/PrereqBaTests/PackageF/PackageF.wixproj
+1
-1
@@ -7,6 +7,6 @@
7
<Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" />
8
</ItemGroup>
9
<ItemGroup>
10
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
10
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
11
</ItemGroup>
12
</Project>
\ No newline at end of file
src/TestData/RegistrationTests/BundleA/BundleA.wixproj
+2
-2
@@ -12,7 +12,7 @@
12
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
13
</ItemGroup>
14
<ItemGroup>
15
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
16
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
15
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
16
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
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.95" />
18
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
19
</ItemGroup>
20
</Project>
\ No newline at end of file
src/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj
+1
-1
@@ -7,6 +7,6 @@
7
<Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" />
8
</ItemGroup>
9
<ItemGroup>
10
- <PackageReference Include="WixToolset.Util.wixext" Version="4.0.91" />
10
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.93" />
11
</ItemGroup>
12
</Project>
\ No newline at end of file
src/TestData/SlipstreamTests/BundleA/BundleA.wixproj
+2
-2
@@ -13,7 +13,7 @@
13
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14
</ItemGroup>
15
<ItemGroup>
16
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
17
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
17
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
18
</ItemGroup>
19
</Project>
\ No newline at end of file
src/TestData/SlipstreamTests/BundleAReverse/BundleAReverse.wixproj
+2
-2
@@ -13,7 +13,7 @@
13
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14
</ItemGroup>
15
<ItemGroup>
16
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
17
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
17
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
18
</ItemGroup>
19
</Project>
\ No newline at end of file
src/TestData/SlipstreamTests/BundleB/BundleB.wixproj
+2
-2
@@ -14,7 +14,7 @@
14
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
15
</ItemGroup>
16
<ItemGroup>
17
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
18
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
17
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
18
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
19
</ItemGroup>
20
</Project>
\ No newline at end of file
src/TestData/SlipstreamTests/BundleC/BundleC.wixproj
+2
-2
@@ -15,7 +15,7 @@
15
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
16
</ItemGroup>
17
<ItemGroup>
18
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
19
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
18
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
19
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
20
</ItemGroup>
21
</Project>
\ No newline at end of file
src/TestData/SlipstreamTests/BundleD/BundleD.wixproj
+2
-2
@@ -13,7 +13,7 @@
13
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
14
</ItemGroup>
15
<ItemGroup>
16
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
17
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
16
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
17
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
18
</ItemGroup>
19
</Project>
\ No newline at end of file
src/TestData/SlipstreamTests/BundleOnlyA/BundleOnlyA.wixproj
+2
-2
@@ -12,7 +12,7 @@
12
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
13
</ItemGroup>
14
<ItemGroup>
15
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
16
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
15
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
16
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
17
</ItemGroup>
18
</Project>
\ No newline at end of file
src/TestData/SlipstreamTests/BundleOnlyPatchA/BundleOnlyPatchA.wixproj
+2
-2
@@ -12,7 +12,7 @@
12
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
13
</ItemGroup>
14
<ItemGroup>
15
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
16
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
15
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
16
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
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.95" />
17
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
18
</ItemGroup>
19
</Project>
\ No newline at end of file
src/TestData/UpdateBundleTests/BundleAv1/BundleAv1.wixproj
+2
-2
@@ -6,7 +6,7 @@
6
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
7
</ItemGroup>
8
<ItemGroup>
9
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
10
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
9
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
10
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
11
</ItemGroup>
12
</Project>
\ No newline at end of file
src/TestData/UpdateBundleTests/BundleAv2/BundleAv2.wixproj
+2
-2
@@ -9,7 +9,7 @@
9
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
10
</ItemGroup>
11
<ItemGroup>
12
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
13
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
12
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
13
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
14
</ItemGroup>
15
</Project>
\ No newline at end of file
src/TestData/UpdateBundleTests/BundleBv1/BundleBv1.wixproj
+2
-2
@@ -9,8 +9,8 @@
9
<Feeds Include="*.xml" />
10
</ItemGroup>
11
<ItemGroup>
12
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
13
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
12
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
13
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
14
</ItemGroup>
15
<Target Name="CopyFeeds" AfterTargets="AfterBuild">
16
<Copy SourceFiles="@(Feeds)" DestinationFolder="$(OutputPath)" />
src/TestData/UpdateBundleTests/BundleBv2/BundleBv2.wixproj
+2
-2
@@ -12,7 +12,7 @@
12
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
13
</ItemGroup>
14
<ItemGroup>
15
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
16
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
15
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
16
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
17
</ItemGroup>
18
</Project>
\ No newline at end of file
src/TestData/UpgradeRelatedBundleTests/BundleAv1/BundleAv1.wixproj
+2
-2
@@ -6,7 +6,7 @@
6
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
7
</ItemGroup>
8
<ItemGroup>
9
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
10
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
9
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
10
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
11
</ItemGroup>
12
</Project>
\ No newline at end of file
src/TestData/UpgradeRelatedBundleTests/BundleAv2/BundleAv2.wixproj
+2
-2
@@ -9,7 +9,7 @@
9
<ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
10
</ItemGroup>
11
<ItemGroup>
12
- <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.95" />
13
- <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.69" />
12
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.98" />
13
+ <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.70" />
14
</ItemGroup>
15
</Project>
\ No newline at end of file
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.214" />
15
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.55" />
14
+ <PackageReference Include="WixToolset.Data" Version="4.0.216" />
15
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.57" />
16
</ItemGroup>
17
18
<ItemGroup>
src/WixToolsetTest.BurnE2E/DependencyTests.cs
+1
-1
@@ -596,7 +596,7 @@ namespace WixToolsetTest.BurnE2E
596
packageDv2.VerifyInstalled(true);
597
598
Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Skipping cross-scope dependency registration on package: PackageA, bundle scope: PerUser, package scope: PerMachine"));
599
- 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"));
599
+ Assert.True(LogVerifier.MessageInLogFileRegex(bundleHv2InstallLogFilePath, @"Detected related bundle: \{[0-9A-Za-z\-]{36}\}, type: Upgrade, scope: PerUser, version: 1\.0\.0\.0, operation: MajorUpgrade, cached: Yes"));
600
601
bundleHv2.Uninstall();
602
bundleHv2.VerifyUnregisteredAndRemovedFromPackageCache();
src/WixToolsetTest.BurnE2E/UpgradeRelatedBundleTests.cs
+1
-1
@@ -30,7 +30,7 @@ namespace WixToolsetTest.BurnE2E
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"));
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: No"));
34
}
35
}
36
}
src/WixToolsetTest.BurnE2E/WixToolsetTest.BurnE2E.csproj
+2
-2
@@ -21,8 +21,8 @@
21
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
22
<PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
23
<PackageReference Include="WixBuildTools.TestSupport" Version="4.0.48" />
24
- <PackageReference Include="WixToolset.Data" Version="4.0.214" />
25
- <PackageReference Include="WixToolset.Mba.Core" Version="4.0.55" />
24
+ <PackageReference Include="WixToolset.Data" Version="4.0.216" />
25
+ <PackageReference Include="WixToolset.Mba.Core" Version="4.0.57" />
26
</ItemGroup>
27
28
<ItemGroup>