@joebigelow / wix / commits / f080e494

Update to latest.

Sean Hall committed Dec 9, 2020 at 14:20 UTC f080e4944749268529e3686c9e26704e4b942929
7 files changed +14 -13
global.json
+1 -1
@@ -1,6 +1,6 @@
1 {
2 "msbuild-sdks": {
3 - "WixToolset.Sdk": "4.0.0-build-0171"
3 + "WixToolset.Sdk": "4.0.0-build-0172"
4 },
5 "sdk": {
6 "allowPrerelease": false
src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj
+2 -2
@@ -10,7 +10,7 @@
10 <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" />
11 </ItemGroup>
12 <ItemGroup>
13 - <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
14 - <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" />
13 + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.72" />
14 + <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.54" />
15 </ItemGroup>
16 </Project>
\ No newline at end of file
src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj
+2 -2
@@ -11,7 +11,7 @@
11 <ProjectReference Include="..\PackageD\PackageD.wixproj" />
12 </ItemGroup>
13 <ItemGroup>
14 - <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
15 - <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" />
14 + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.72" />
15 + <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.54" />
16 </ItemGroup>
17 </Project>
\ No newline at end of file
src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj
+2 -2
@@ -8,7 +8,7 @@
8 <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
9 </ItemGroup>
10 <ItemGroup>
11 - <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
12 - <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" />
11 + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.72" />
12 + <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.54" />
13 </ItemGroup>
14 </Project>
\ No newline at end of file
src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj
+2 -2
@@ -11,7 +11,7 @@
11 <ProjectReference Include="..\PackageF\PackageF.wixproj" />
12 </ItemGroup>
13 <ItemGroup>
14 - <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
15 - <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" />
14 + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.72" />
15 + <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.54" />
16 </ItemGroup>
17 </Project>
\ No newline at end of file
src/TestData/TestBA/TestBAWixlib/TestBA.wxs
+4 -3
@@ -1,12 +1,13 @@
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 -<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
2 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
3 <Fragment>
4 - <BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost">
4 + <BootstrapperApplication>
5 <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.x86)\TestBA.BootstrapperCore.config" />
6 <Payload SourceFile="!(bindpath.x86)\TestBA.dll" />
7 <Payload SourceFile="!(bindpath.x86)\mbanative.dll" />
8 <Payload SourceFile="!(bindpath.x86)\WixToolset.Mba.Core.dll" />
9 - </BootstrapperApplicationRef>
9 + <bal:WixManagedBootstrapperApplicationHost />
10 + </BootstrapperApplication>
11
12 <PackageGroup Id="TestBA">
13 <PackageGroupRef Id="NetFx48WebAsPrereq" />
src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+1 -1
@@ -12,6 +12,6 @@
12 <ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" />
13 </ItemGroup>
14 <ItemGroup>
15 - <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
15 + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.72" />
16 </ItemGroup>
17 </Project>
\ No newline at end of file