From f080e4944749268529e3686c9e26704e4b942929 Mon Sep 17 00:00:00 2001 From: Sean Hall <r.sean.hall@gmail.com> Date: Wed, 9 Dec 2020 14:20:28 -0600 Subject: Update to latest. --- src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj | 4 ++-- src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj | 4 ++-- src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj | 4 ++-- src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj | 4 ++-- src/TestData/TestBA/TestBAWixlib/TestBA.wxs | 7 ++++--- src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj | 2 +- 6 files changed, 13 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj index 95f3ccf0..1e4806f3 100644 --- a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj +++ b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj @@ -10,7 +10,7 @@ <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" /> </ItemGroup> <ItemGroup> - <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" /> - <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" /> + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.72" /> + <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.54" /> </ItemGroup> </Project> \ No newline at end of file diff --git a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj index 4ecc3f8a..509e1a0e 100644 --- a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj +++ b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj @@ -11,7 +11,7 @@ <ProjectReference Include="..\PackageD\PackageD.wixproj" /> </ItemGroup> <ItemGroup> - <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" /> - <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" /> + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.72" /> + <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.54" /> </ItemGroup> </Project> \ No newline at end of file diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj index f0f304b6..bd22c3c6 100644 --- a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj +++ b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj @@ -8,7 +8,7 @@ <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" /> </ItemGroup> <ItemGroup> - <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" /> - <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" /> + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.72" /> + <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.54" /> </ItemGroup> </Project> \ No newline at end of file diff --git a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj index ec7b29a4..a3693dd2 100644 --- a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj +++ b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj @@ -11,7 +11,7 @@ <ProjectReference Include="..\PackageF\PackageF.wixproj" /> </ItemGroup> <ItemGroup> - <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" /> - <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" /> + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.72" /> + <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.54" /> </ItemGroup> </Project> \ No newline at end of file diff --git a/src/TestData/TestBA/TestBAWixlib/TestBA.wxs b/src/TestData/TestBA/TestBAWixlib/TestBA.wxs index dff94992..56ddd1aa 100644 --- a/src/TestData/TestBA/TestBAWixlib/TestBA.wxs +++ b/src/TestData/TestBA/TestBAWixlib/TestBA.wxs @@ -1,12 +1,13 @@ <!-- 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. --> -<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> <Fragment> - <BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost"> + <BootstrapperApplication> <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.x86)\TestBA.BootstrapperCore.config" /> <Payload SourceFile="!(bindpath.x86)\TestBA.dll" /> <Payload SourceFile="!(bindpath.x86)\mbanative.dll" /> <Payload SourceFile="!(bindpath.x86)\WixToolset.Mba.Core.dll" /> - </BootstrapperApplicationRef> + <bal:WixManagedBootstrapperApplicationHost /> + </BootstrapperApplication> <PackageGroup Id="TestBA"> <PackageGroupRef Id="NetFx48WebAsPrereq" /> diff --git a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj index 8c28b82c..65aab644 100644 --- a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj +++ b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj @@ -12,6 +12,6 @@ <ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" /> </ItemGroup> <ItemGroup> - <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" /> + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.72" /> </ItemGroup> </Project> \ No newline at end of file -- cgit v1.2.3-55-g6feb