aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-12-09 14:20:28 -0600
committerSean Hall <r.sean.hall@gmail.com>2020-12-09 14:20:28 -0600
commitf080e4944749268529e3686c9e26704e4b942929 (patch)
tree8bc6534cfe53318be8743329e33df680d466fb2c
parent83f5dfce5ad75ca6e4ab72c81656acc0242dc2c9 (diff)
downloadwix-f080e4944749268529e3686c9e26704e4b942929.tar.gz
wix-f080e4944749268529e3686c9e26704e4b942929.tar.bz2
wix-f080e4944749268529e3686c9e26704e4b942929.zip
Update to latest.
Diffstat
-rw-r--r--global.json2
-rw-r--r--src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj4
-rw-r--r--src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj4
-rw-r--r--src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj4
-rw-r--r--src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj4
-rw-r--r--src/TestData/TestBA/TestBAWixlib/TestBA.wxs7
-rw-r--r--src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj2
7 files changed, 14 insertions, 13 deletions
diff --git a/global.json b/global.json
index 3baefa28..d614f6f5 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-0171" 3 "WixToolset.Sdk": "4.0.0-build-0172"
4 }, 4 },
5 "sdk": { 5 "sdk": {
6 "allowPrerelease": false 6 "allowPrerelease": false
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 @@
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.70" /> 13 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.72" />
14 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" /> 14 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.54" />
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/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 @@
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.70" /> 14 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.72" />
15 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" /> 15 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.54" />
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/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 @@
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.70" /> 11 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.72" />
12 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" /> 12 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.54" />
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/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 @@
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.70" /> 14 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.72" />
15 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" /> 15 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.54" />
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/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 @@
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" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
3 <Fragment> 3 <Fragment>
4 <BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost"> 4 <BootstrapperApplication>
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 <bal:WixManagedBootstrapperApplicationHost />
10 </BootstrapperApplication>
10 11
11 <PackageGroup Id="TestBA"> 12 <PackageGroup Id="TestBA">
12 <PackageGroupRef Id="NetFx48WebAsPrereq" /> 13 <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 @@
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.70" /> 15 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.72" />
16 </ItemGroup> 16 </ItemGroup>
17</Project> \ No newline at end of file 17</Project> \ No newline at end of file
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 00:19:18 +0000