diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-12-08 16:01:28 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-12-08 16:01:28 -0600 |
commit | 83f5dfce5ad75ca6e4ab72c81656acc0242dc2c9 (patch) | |
tree | cd0612f60c685da1c552b73b75083c5251312ad9 | |
parent | 50b8c862c46123db90797e92f4e8f9b5c0b11528 (diff) | |
download | wix-83f5dfce5ad75ca6e4ab72c81656acc0242dc2c9.tar.gz wix-83f5dfce5ad75ca6e4ab72c81656acc0242dc2c9.tar.bz2 wix-83f5dfce5ad75ca6e4ab72c81656acc0242dc2c9.zip |
Update to latest.
-rw-r--r-- | global.json | 2 | ||||
-rw-r--r-- | src/TestData/MsiTransaction/BundleAv1/BundleA.wxi | 5 | ||||
-rw-r--r-- | src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj | 4 | ||||
-rw-r--r-- | src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs | 7 | ||||
-rw-r--r-- | src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj | 4 | ||||
-rw-r--r-- | src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs | 7 | ||||
-rw-r--r-- | src/TestData/MsiTransaction/BundleBv1/BundleB.wxi | 5 | ||||
-rw-r--r-- | src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj | 4 | ||||
-rw-r--r-- | src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs | 5 | ||||
-rw-r--r-- | src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj | 4 | ||||
-rw-r--r-- | src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs | 7 | ||||
-rw-r--r-- | src/TestData/MsiTransaction/PackageF/PackageF.wixproj | 2 | ||||
-rw-r--r-- | src/TestData/Templates/Package.wxs | 2 | ||||
-rw-r--r-- | src/TestData/Templates/PackageFail.wxs | 2 | ||||
-rw-r--r-- | src/TestData/TestBA/TestBAWixlib/TestBA.wxs | 8 | ||||
-rw-r--r-- | src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj | 2 |
16 files changed, 30 insertions, 40 deletions
diff --git a/global.json b/global.json index 4c402d5e..3baefa28 100644 --- a/global.json +++ b/global.json | |||
@@ -1,6 +1,6 @@ | |||
1 | { | 1 | { |
2 | "msbuild-sdks": { | 2 | "msbuild-sdks": { |
3 | "WixToolset.Sdk": "4.0.0-build-0170" | 3 | "WixToolset.Sdk": "4.0.0-build-0171" |
4 | }, | 4 | }, |
5 | "sdk": { | 5 | "sdk": { |
6 | "allowPrerelease": false | 6 | "allowPrerelease": false |
diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi b/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi index 83b901cb..b31be737 100644 --- a/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi +++ b/src/TestData/MsiTransaction/BundleAv1/BundleA.wxi | |||
@@ -1,5 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 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 | <!-- 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. --> | ||
3 | 2 | ||
4 | <?ifndef Version?> | 3 | <?ifndef Version?> |
5 | <?define Version = 1.0.0.0?> | 4 | <?define Version = 1.0.0.0?> |
@@ -7,7 +6,7 @@ | |||
7 | 6 | ||
8 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 7 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
9 | <Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{90ED10D5-B187-4470-B498-05D80DAB729A}" Compressed="yes"> | 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" /> |
11 | 10 | ||
12 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> | 11 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> |
13 | 12 | ||
diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj index 59f856ce..95f3ccf0 100644 --- a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj +++ b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj | |||
@@ -10,7 +10,7 @@ | |||
10 | <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" /> | 10 | <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" /> |
11 | </ItemGroup> | 11 | </ItemGroup> |
12 | <ItemGroup> | 12 | <ItemGroup> |
13 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.66" /> | 13 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" /> |
14 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" /> | 14 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" /> |
15 | </ItemGroup> | 15 | </ItemGroup> |
16 | </Project> \ No newline at end of file | 16 | </Project> \ No newline at end of file |
diff --git a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs index 24ef3273..f8355aa6 100644 --- a/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs +++ b/src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs | |||
@@ -1,13 +1,12 @@ | |||
1 | <?xml version='1.0' encoding='utf-8'?> | 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 | <!-- 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. --> | ||
3 | 2 | ||
4 | 3 | ||
5 | <Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
6 | <?include BundleA.wxi ?> | 5 | <?include BundleA.wxi ?> |
7 | <Fragment> | 6 | <Fragment> |
8 | <PackageGroup Id="BundlePackages"> | 7 | <PackageGroup Id="BundlePackages"> |
9 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" /> | 8 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" /> |
10 | <RollbackBoundary Transaction='yes' /> | 9 | <RollbackBoundary Transaction="yes" /> |
11 | <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv1.TargetPath)" /> | 10 | <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv1.TargetPath)" /> |
12 | <MsiPackage Id="PackageC" SourceFile="$(var.PackageCv1.TargetPath)" /> | 11 | <MsiPackage Id="PackageC" SourceFile="$(var.PackageCv1.TargetPath)" /> |
13 | </PackageGroup> | 12 | </PackageGroup> |
diff --git a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj index 3b7806d1..4ecc3f8a 100644 --- a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj +++ b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj | |||
@@ -11,7 +11,7 @@ | |||
11 | <ProjectReference Include="..\PackageD\PackageD.wixproj" /> | 11 | <ProjectReference Include="..\PackageD\PackageD.wixproj" /> |
12 | </ItemGroup> | 12 | </ItemGroup> |
13 | <ItemGroup> | 13 | <ItemGroup> |
14 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.66" /> | 14 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" /> |
15 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" /> | 15 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" /> |
16 | </ItemGroup> | 16 | </ItemGroup> |
17 | </Project> \ No newline at end of file | 17 | </Project> \ No newline at end of file |
diff --git a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs index 7feab97b..11360c22 100644 --- a/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs +++ b/src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs | |||
@@ -1,13 +1,12 @@ | |||
1 | <?xml version='1.0' encoding='utf-8'?> | 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 | <!-- 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. --> | ||
3 | 2 | ||
4 | 3 | ||
5 | <Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
6 | <?include ..\BundleAv1\BundleA.wxi ?> | 5 | <?include ..\BundleAv1\BundleA.wxi ?> |
7 | <Fragment> | 6 | <Fragment> |
8 | <PackageGroup Id="BundlePackages"> | 7 | <PackageGroup Id="BundlePackages"> |
9 | <MsiPackage Id="PackageD" SourceFile="$(var.PackageD.TargetPath)" /> | 8 | <MsiPackage Id="PackageD" SourceFile="$(var.PackageD.TargetPath)" /> |
10 | <RollbackBoundary Transaction='yes' /> | 9 | <RollbackBoundary Transaction="yes" /> |
11 | <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" /> | 10 | <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" /> |
12 | <MsiPackage Id="PackageC" SourceFile="$(var.PackageCv2.TargetPath)" /> | 11 | <MsiPackage Id="PackageC" SourceFile="$(var.PackageCv2.TargetPath)" /> |
13 | </PackageGroup> | 12 | </PackageGroup> |
diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi b/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi index 5eeaa6d7..cb7a602d 100644 --- a/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi +++ b/src/TestData/MsiTransaction/BundleBv1/BundleB.wxi | |||
@@ -1,5 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 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 | <!-- 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. --> | ||
3 | 2 | ||
4 | <?ifndef Version?> | 3 | <?ifndef Version?> |
5 | <?define Version = 1.0.0.0?> | 4 | <?define Version = 1.0.0.0?> |
@@ -7,7 +6,7 @@ | |||
7 | 6 | ||
8 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 7 | <Include xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
9 | <Bundle Name="~$(var.TestGroupName) - Bundle B" Version="$(var.Version)" UpgradeCode="{552FD011-4DD6-42B2-A4C6-AD1417C829B2}" Compressed="yes"> | 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" /> |
11 | 10 | ||
12 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> | 11 | <Variable Name="TestGroupName" Value="$(var.TestGroupName)" /> |
13 | 12 | ||
diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj index f65eb0ad..f0f304b6 100644 --- a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj +++ b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj | |||
@@ -8,7 +8,7 @@ | |||
8 | <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" /> | 8 | <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" /> |
9 | </ItemGroup> | 9 | </ItemGroup> |
10 | <ItemGroup> | 10 | <ItemGroup> |
11 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.66" /> | 11 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" /> |
12 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" /> | 12 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" /> |
13 | </ItemGroup> | 13 | </ItemGroup> |
14 | </Project> \ No newline at end of file | 14 | </Project> \ No newline at end of file |
diff --git a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs index 3efe2f5d..420d5157 100644 --- a/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs +++ b/src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs | |||
@@ -1,8 +1,7 @@ | |||
1 | <?xml version='1.0' encoding='utf-8'?> | 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 | <!-- 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. --> | ||
3 | 2 | ||
4 | 3 | ||
5 | <Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
6 | <?include BundleB.wxi ?> | 5 | <?include BundleB.wxi ?> |
7 | <Fragment> | 6 | <Fragment> |
8 | <PackageGroup Id="BundlePackages"> | 7 | <PackageGroup Id="BundlePackages"> |
diff --git a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj index 3f748db0..ec7b29a4 100644 --- a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj +++ b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj | |||
@@ -11,7 +11,7 @@ | |||
11 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> | 11 | <ProjectReference Include="..\PackageF\PackageF.wixproj" /> |
12 | </ItemGroup> | 12 | </ItemGroup> |
13 | <ItemGroup> | 13 | <ItemGroup> |
14 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.66" /> | 14 | <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" /> |
15 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" /> | 15 | <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" /> |
16 | </ItemGroup> | 16 | </ItemGroup> |
17 | </Project> \ No newline at end of file | 17 | </Project> \ No newline at end of file |
diff --git a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs index d5b88b40..39197d7d 100644 --- a/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs +++ b/src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs | |||
@@ -1,13 +1,12 @@ | |||
1 | <?xml version='1.0' encoding='utf-8'?> | 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 | <!-- 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. --> | ||
3 | 2 | ||
4 | 3 | ||
5 | <Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'> | 4 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
6 | <?include ..\BundleBv1\BundleB.wxi ?> | 5 | <?include ..\BundleBv1\BundleB.wxi ?> |
7 | <Fragment> | 6 | <Fragment> |
8 | <PackageGroup Id="BundlePackages"> | 7 | <PackageGroup Id="BundlePackages"> |
9 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" /> | 8 | <MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" /> |
10 | <RollbackBoundary Transaction='yes' /> | 9 | <RollbackBoundary Transaction="yes" /> |
11 | <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" /> | 10 | <MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" /> |
12 | <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" /> | 11 | <MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" /> |
13 | </PackageGroup> | 12 | </PackageGroup> |
diff --git a/src/TestData/MsiTransaction/PackageF/PackageF.wixproj b/src/TestData/MsiTransaction/PackageF/PackageF.wixproj index e83006ac..46def2c5 100644 --- a/src/TestData/MsiTransaction/PackageF/PackageF.wixproj +++ b/src/TestData/MsiTransaction/PackageF/PackageF.wixproj | |||
@@ -7,6 +7,6 @@ | |||
7 | <Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" /> | 7 | <Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" /> |
8 | </ItemGroup> | 8 | </ItemGroup> |
9 | <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> | 11 | </ItemGroup> |
12 | </Project> \ No newline at end of file | 12 | </Project> \ No newline at end of file |
diff --git a/src/TestData/Templates/Package.wxs b/src/TestData/Templates/Package.wxs index 813e03d0..ff5e71c7 100644 --- a/src/TestData/Templates/Package.wxs +++ b/src/TestData/Templates/Package.wxs | |||
@@ -8,8 +8,6 @@ | |||
8 | 8 | ||
9 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 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"> | 10 | <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes"> |
11 | |||
12 | |||
13 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 11 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
14 | <MediaTemplate EmbedCab="yes" /> | 12 | <MediaTemplate EmbedCab="yes" /> |
15 | 13 | ||
diff --git a/src/TestData/Templates/PackageFail.wxs b/src/TestData/Templates/PackageFail.wxs index 8754d3f6..7cbf7ebc 100644 --- a/src/TestData/Templates/PackageFail.wxs +++ b/src/TestData/Templates/PackageFail.wxs | |||
@@ -8,8 +8,6 @@ | |||
8 | 8 | ||
9 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util"> | 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"> | 10 | <Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes"> |
11 | |||
12 | |||
13 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | 11 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> |
14 | <MediaTemplate EmbedCab="yes" /> | 12 | <MediaTemplate EmbedCab="yes" /> |
15 | 13 | ||
diff --git a/src/TestData/TestBA/TestBAWixlib/TestBA.wxs b/src/TestData/TestBA/TestBAWixlib/TestBA.wxs index c16da2e5..dff94992 100644 --- a/src/TestData/TestBA/TestBAWixlib/TestBA.wxs +++ b/src/TestData/TestBA/TestBAWixlib/TestBA.wxs | |||
@@ -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"> | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
3 | <Fragment> | 3 | <Fragment> |
4 | <BootstrapperApplicationRef Id='ManagedBootstrapperApplicationHost'> | 4 | <BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost"> |
5 | <Payload Name='WixToolset.Mba.Host.config' SourceFile='!(bindpath.x86)\TestBA.BootstrapperCore.config' /> | 5 | <Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.x86)\TestBA.BootstrapperCore.config" /> |
6 | <Payload SourceFile='!(bindpath.x86)\TestBA.dll' /> | 6 | <Payload SourceFile="!(bindpath.x86)\TestBA.dll" /> |
7 | <Payload SourceFile="!(bindpath.x86)\mbanative.dll" /> | 7 | <Payload SourceFile="!(bindpath.x86)\mbanative.dll" /> |
8 | <Payload SourceFile="!(bindpath.x86)\WixToolset.Mba.Core.dll" /> | 8 | <Payload SourceFile="!(bindpath.x86)\WixToolset.Mba.Core.dll" /> |
9 | </BootstrapperApplicationRef> | 9 | </BootstrapperApplicationRef> |
diff --git a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj index 1d8debac..8c28b82c 100644 --- a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj +++ b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj | |||
@@ -12,6 +12,6 @@ | |||
12 | <ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" /> | 12 | <ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" /> |
13 | </ItemGroup> | 13 | </ItemGroup> |
14 | <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> | 16 | </ItemGroup> |
17 | </Project> \ No newline at end of file | 17 | </Project> \ No newline at end of file |