aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-12-09 12:55:17 -0600
committerSean Hall <r.sean.hall@gmail.com>2020-12-09 13:43:09 -0600
commit2be6f679830823096db9110042b2a4a3cf8abede (patch)
tree27b62274c135b806680c2ffd4f5a25a8b2386edc
parentae2e6a86aedc77d73a675befcdacb83820a8d82a (diff)
downloadwix-2be6f679830823096db9110042b2a4a3cf8abede.tar.gz
wix-2be6f679830823096db9110042b2a4a3cf8abede.tar.bz2
wix-2be6f679830823096db9110042b2a4a3cf8abede.zip
Update to latest Bal.wixext.
-rw-r--r--global.json2
-rw-r--r--src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs10
-rw-r--r--src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs10
3 files changed, 9 insertions, 13 deletions
diff --git a/global.json b/global.json
index 349951b0..de2585b8 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
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} 5}
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs
index 49e8c022..8e3d2c30 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs
@@ -1,10 +1,8 @@
1<?xml version="1.0" encoding="utf-8"?> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
4 <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2"> 2 <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
5 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense"> 3 <BootstrapperApplication>
6 <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" /> 4 <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
7 </BootstrapperApplicationRef> 5 </BootstrapperApplication>
8 <Chain> 6 <Chain>
9 <PackageGroupRef Id="AspNetCoreRuntime31Redist_x86" /> 7 <PackageGroupRef Id="AspNetCoreRuntime31Redist_x86" />
10 <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x86" /> 8 <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x86" />
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs
index 09c7bcdd..fc42ac99 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs
@@ -1,10 +1,8 @@
1<?xml version="1.0" encoding="utf-8"?> 1<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
4 <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2"> 2 <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
5 <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense"> 3 <BootstrapperApplication>
6 <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" /> 4 <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" />
7 </BootstrapperApplicationRef> 5 </BootstrapperApplication>
8 <Chain> 6 <Chain>
9 <PackageGroupRef Id="AspNetCoreRuntime31Redist_x64" /> 7 <PackageGroupRef Id="AspNetCoreRuntime31Redist_x64" />
10 <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x64" /> 8 <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x64" />