@joebigelow / wix-1 / commits / 83f5dfce

Update to latest.

Sean Hall committed Dec 8, 2020 at 16:01 UTC 83f5dfce5ad75ca6e4ab72c81656acc0242dc2c9
16 files changed +30 -40
global.json
+1 -1
@@ -1,6 +1,6 @@
1 {
2 "msbuild-sdks": {
3 - "WixToolset.Sdk": "4.0.0-build-0170"
3 + "WixToolset.Sdk": "4.0.0-build-0171"
4 },
5 "sdk": {
6 "allowPrerelease": false
src/TestData/MsiTransaction/BundleAv1/BundleA.wxi
+2 -3
@@ -1,5 +1,4 @@
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<!-- 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. -->
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 <?ifndef Version?>
4 <?define Version = 1.0.0.0?>
@@ -7,7 +6,7 @@
6
7 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
8 <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{90ED10D5-B187-4470-B498-05D80DAB729A}" Compressed="yes">
10 - <Log Prefix="~$(var.TestGroupName)_BundleA"/>
9 + <Log Prefix="~$(var.TestGroupName)_BundleA" />
10
11 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
12
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.66" />
14 - <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" />
13 + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
14 + <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" />
15 </ItemGroup>
16 </Project>
\ No newline at end of file
src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs
+3 -4
@@ -1,13 +1,12 @@
1 -<?xml version='1.0' encoding='utf-8'?>
2 -<!-- 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. -->
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
5 -<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
4 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include BundleA.wxi ?>
6 <Fragment>
7 <PackageGroup Id="BundlePackages">
8 <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
10 - <RollbackBoundary Transaction='yes' />
9 + <RollbackBoundary Transaction="yes" />
10 <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv1.TargetPath)" />
11 <MsiPackage Id="PackageC" SourceFile="$(var.PackageCv1.TargetPath)" />
12 </PackageGroup>
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.66" />
15 - <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" />
14 + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
15 + <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" />
16 </ItemGroup>
17 </Project>
\ No newline at end of file
src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs
+3 -4
@@ -1,13 +1,12 @@
1 -<?xml version='1.0' encoding='utf-8'?>
2 -<!-- 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. -->
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
5 -<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
4 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include ..\BundleAv1\BundleA.wxi ?>
6 <Fragment>
7 <PackageGroup Id="BundlePackages">
8 <MsiPackage Id="PackageD" SourceFile="$(var.PackageD.TargetPath)" />
10 - <RollbackBoundary Transaction='yes' />
9 + <RollbackBoundary Transaction="yes" />
10 <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" />
11 <MsiPackage Id="PackageC" SourceFile="$(var.PackageCv2.TargetPath)" />
12 </PackageGroup>
src/TestData/MsiTransaction/BundleBv1/BundleB.wxi
+2 -3
@@ -1,5 +1,4 @@
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<!-- 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. -->
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 <?ifndef Version?>
4 <?define Version = 1.0.0.0?>
@@ -7,7 +6,7 @@
6
7 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
8 <Bundle Name="~$(var.TestGroupName) - Bundle B" Version="$(var.Version)" UpgradeCode="{552FD011-4DD6-42B2-A4C6-AD1417C829B2}" Compressed="yes">
10 - <Log Prefix="~$(var.TestGroupName)_BundleB"/>
9 + <Log Prefix="~$(var.TestGroupName)_BundleB" />
10
11 <Variable Name="TestGroupName" Value="$(var.TestGroupName)" />
12
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.66" />
12 - <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" />
11 + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
12 + <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" />
13 </ItemGroup>
14 </Project>
\ No newline at end of file
src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs
+2 -3
@@ -1,8 +1,7 @@
1 -<?xml version='1.0' encoding='utf-8'?>
2 -<!-- 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. -->
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
5 -<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
4 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include BundleB.wxi ?>
6 <Fragment>
7 <PackageGroup Id="BundlePackages">
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.66" />
15 - <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" />
14 + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
15 + <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" />
16 </ItemGroup>
17 </Project>
\ No newline at end of file
src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs
+3 -4
@@ -1,13 +1,12 @@
1 -<?xml version='1.0' encoding='utf-8'?>
2 -<!-- 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. -->
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
5 -<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
4 +<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
5 <?include ..\BundleBv1\BundleB.wxi ?>
6 <Fragment>
7 <PackageGroup Id="BundlePackages">
8 <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
10 - <RollbackBoundary Transaction='yes' />
9 + <RollbackBoundary Transaction="yes" />
10 <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" />
11 <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" />
12 </PackageGroup>
src/TestData/MsiTransaction/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.65" />
10 + <PackageReference Include="WixToolset.Util.wixext" Version="4.0.66" />
11 </ItemGroup>
12 </Project>
\ No newline at end of file
src/TestData/Templates/Package.wxs
-2
@@ -8,8 +8,6 @@
8
9 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
10 <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
11 -
12 -
11 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
12 <MediaTemplate EmbedCab="yes" />
13
src/TestData/Templates/PackageFail.wxs
-2
@@ -8,8 +8,6 @@
8
9 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
10 <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
11 -
12 -
11 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
12 <MediaTemplate EmbedCab="yes" />
13
src/TestData/TestBA/TestBAWixlib/TestBA.wxs
+4 -4
@@ -1,9 +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. -->
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">
3 <Fragment>
4 - <BootstrapperApplicationRef Id='ManagedBootstrapperApplicationHost'>
5 - <Payload Name='WixToolset.Mba.Host.config' SourceFile='!(bindpath.x86)\TestBA.BootstrapperCore.config' />
6 - <Payload SourceFile='!(bindpath.x86)\TestBA.dll' />
4 + <BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost">
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>
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.66" />
15 + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
16 </ItemGroup>
17 </Project>
\ No newline at end of file