aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-01-03 16:25:56 -0600
committerSean Hall <r.sean.hall@gmail.com>2021-01-03 16:25:56 -0600
commit02cf98e97df35b3d024d9ade2e80ac348939d29f (patch)
tree7d9c32a21529f34f25e89c77696540c630677743
parent3919acbbf2f983fa523ff40893ea1e3f634d522d (diff)
downloadwix-02cf98e97df35b3d024d9ade2e80ac348939d29f.tar.gz
wix-02cf98e97df35b3d024d9ade2e80ac348939d29f.tar.bz2
wix-02cf98e97df35b3d024d9ade2e80ac348939d29f.zip
Update to latest Tools, Bal, NetFx.
Diffstat
-rw-r--r--global.json2
-rw-r--r--src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj2
-rw-r--r--src/TestData/MsiTransactionTests/BundleAv1/BundleA.props4
-rw-r--r--src/TestData/MsiTransactionTests/BundleBv1/BundleB.props6
-rw-r--r--src/TestData/MsiTransactionTests/PackageF/PackageF.wixproj2
-rw-r--r--src/TestData/PrereqBaTests/BundleA/BundleA.wixproj2
-rw-r--r--src/TestData/PrereqBaTests/BundleB/BundleB.wixproj2
-rw-r--r--src/TestData/PrereqBaTests/PackageF/PackageF.wixproj2
-rw-r--r--src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj2
-rw-r--r--src/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj2
-rw-r--r--src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj2
11 files changed, 14 insertions, 14 deletions
diff --git a/global.json b/global.json
index 01b177c2..6b0e711a 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-0175" 3 "WixToolset.Sdk": "4.0.0-build-0176"
4 }, 4 },
5 "sdk": { 5 "sdk": {
6 "allowPrerelease": false 6 "allowPrerelease": false
diff --git a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj
index 3eac53a1..b7ef705b 100644
--- a/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj
+++ b/src/TestData/BasicFunctionalityTests/BundleA/BundleA.wixproj
@@ -12,6 +12,6 @@
12 <ProjectReference Include="..\PackageA\PackageA.wixproj" /> 12 <ProjectReference Include="..\PackageA\PackageA.wixproj" />
13 </ItemGroup> 13 </ItemGroup>
14 <ItemGroup> 14 <ItemGroup>
15 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" /> 15 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
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/MsiTransactionTests/BundleAv1/BundleA.props b/src/TestData/MsiTransactionTests/BundleAv1/BundleA.props
index ba3eb3e5..dd824926 100644
--- a/src/TestData/MsiTransactionTests/BundleAv1/BundleA.props
+++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleA.props
@@ -1,4 +1,4 @@
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<Project> 2<Project>
3 <PropertyGroup> 3 <PropertyGroup>
4 <OutputType>Bundle</OutputType> 4 <OutputType>Bundle</OutputType>
@@ -10,6 +10,6 @@
10 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" /> 10 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
11 </ItemGroup> 11 </ItemGroup>
12 <ItemGroup> 12 <ItemGroup>
13 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" /> 13 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
14 </ItemGroup> 14 </ItemGroup>
15</Project> 15</Project>
diff --git a/src/TestData/MsiTransactionTests/BundleBv1/BundleB.props b/src/TestData/MsiTransactionTests/BundleBv1/BundleB.props
index 23bd0ad3..e9367d44 100644
--- a/src/TestData/MsiTransactionTests/BundleBv1/BundleB.props
+++ b/src/TestData/MsiTransactionTests/BundleBv1/BundleB.props
@@ -1,4 +1,4 @@
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<Project> 2<Project>
3 <PropertyGroup> 3 <PropertyGroup>
4 <OutputType>Bundle</OutputType> 4 <OutputType>Bundle</OutputType>
@@ -11,7 +11,7 @@
11 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" /> 11 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
12 </ItemGroup> 12 </ItemGroup>
13 <ItemGroup> 13 <ItemGroup>
14 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" /> 14 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
15 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.56" /> 15 <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.57" />
16 </ItemGroup> 16 </ItemGroup>
17</Project> 17</Project>
diff --git a/src/TestData/MsiTransactionTests/PackageF/PackageF.wixproj b/src/TestData/MsiTransactionTests/PackageF/PackageF.wixproj
index 46def2c5..ca68fdbf 100644
--- a/src/TestData/MsiTransactionTests/PackageF/PackageF.wixproj
+++ b/src/TestData/MsiTransactionTests/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.66" /> 10 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.67" />
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/PrereqBaTests/BundleA/BundleA.wixproj b/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj
index b608bb8c..a8543d36 100644
--- a/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj
+++ b/src/TestData/PrereqBaTests/BundleA/BundleA.wixproj
@@ -16,6 +16,6 @@
16 <ProjectReference Include="..\PackageF\PackageF.wixproj" /> 16 <ProjectReference Include="..\PackageF\PackageF.wixproj" />
17 </ItemGroup> 17 </ItemGroup>
18 <ItemGroup> 18 <ItemGroup>
19 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" /> 19 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
20 </ItemGroup> 20 </ItemGroup>
21</Project> \ No newline at end of file 21</Project> \ No newline at end of file
diff --git a/src/TestData/PrereqBaTests/BundleB/BundleB.wixproj b/src/TestData/PrereqBaTests/BundleB/BundleB.wixproj
index bad720f9..cc2a7a34 100644
--- a/src/TestData/PrereqBaTests/BundleB/BundleB.wixproj
+++ b/src/TestData/PrereqBaTests/BundleB/BundleB.wixproj
@@ -16,6 +16,6 @@
16 <ProjectReference Include="..\PackageF\PackageF.wixproj" /> 16 <ProjectReference Include="..\PackageF\PackageF.wixproj" />
17 </ItemGroup> 17 </ItemGroup>
18 <ItemGroup> 18 <ItemGroup>
19 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" /> 19 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
20 </ItemGroup> 20 </ItemGroup>
21</Project> \ No newline at end of file 21</Project> \ No newline at end of file
diff --git a/src/TestData/PrereqBaTests/PackageF/PackageF.wixproj b/src/TestData/PrereqBaTests/PackageF/PackageF.wixproj
index 3d52e939..10ce9acc 100644
--- a/src/TestData/PrereqBaTests/PackageF/PackageF.wixproj
+++ b/src/TestData/PrereqBaTests/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.66" /> 10 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.67" />
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/RollbackBoundaryTests/BundleA/BundleA.wixproj b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
index 43a844ad..a97ef1d5 100644
--- a/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
+++ b/src/TestData/RollbackBoundaryTests/BundleA/BundleA.wixproj
@@ -15,6 +15,6 @@
15 <ProjectReference Include="..\PackageF\PackageF.wixproj" /> 15 <ProjectReference Include="..\PackageF\PackageF.wixproj" />
16 </ItemGroup> 16 </ItemGroup>
17 <ItemGroup> 17 <ItemGroup>
18 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" /> 18 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
19 </ItemGroup> 19 </ItemGroup>
20</Project> \ No newline at end of file 20</Project> \ No newline at end of file
diff --git a/src/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj b/src/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj
index d51fab1f..f1e4c6cf 100644
--- a/src/TestData/RollbackBoundaryTests/PackageF/PackageF.wixproj
+++ b/src/TestData/RollbackBoundaryTests/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.66" /> 10 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.67" />
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/TestBA/TestBAWixlib/testbawixlib.wixproj b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
index 4988b571..7d9706ff 100644
--- a/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
+++ b/src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
@@ -13,6 +13,6 @@
13 <ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" /> 13 <ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" />
14 </ItemGroup> 14 </ItemGroup>
15 <ItemGroup> 15 <ItemGroup>
16 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.77" /> 16 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
17 </ItemGroup> 17 </ItemGroup>
18</Project> \ No newline at end of file 18</Project> \ No newline at end of file
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 08:02:58 +0000