From af731a9631a7f7f6d7c3b2ef84f38a07bb4db211 Mon Sep 17 00:00:00 2001
From: James Parsons <japarson@microsoft.com>
Date: Thu, 1 Oct 2020 23:05:25 -0700
Subject: Split up latest package and individual packages. Make corresponding
 changes to tests.

---
 .../TestData/UsingDotNetCorePackages/Bundle.wxs            |  6 +++---
 .../TestData/UsingDotNetCorePackages/BundleLatest.wxs      | 14 ++++++++++++++
 .../TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs  | 14 ++++++++++++++
 .../TestData/UsingDotNetCorePackages/Bundle_x64.wxs        |  6 +++---
 4 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs
 create mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs

(limited to 'src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages')

diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
index 49e8c022..d746226e 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
@@ -6,9 +6,9 @@
             <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
         </BootstrapperApplicationRef>
         <Chain>
-            <PackageGroupRef Id="AspNetCoreRuntime31Redist_x86" />
-            <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x86" />
-            <PackageGroupRef Id="DotNetCoreRuntime31Redist_x86" />
+            <PackageGroupRef Id="AspNetCoreRuntime318Redist_x86" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x86" />
+            <PackageGroupRef Id="DotNetCoreRuntime318Redist_x86" />
         </Chain>
     </Bundle>
 </Wix>
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs
new file mode 100644
index 00000000..49e8c022
--- /dev/null
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest.wxs
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+    <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
+        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
+            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
+        </BootstrapperApplicationRef>
+        <Chain>
+            <PackageGroupRef Id="AspNetCoreRuntime31Redist_x86" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x86" />
+            <PackageGroupRef Id="DotNetCoreRuntime31Redist_x86" />
+        </Chain>
+    </Bundle>
+</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs
new file mode 100644
index 00000000..09c7bcdd
--- /dev/null
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/BundleLatest_x64.wxs
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+    <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2">
+        <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkLicense">
+            <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
+        </BootstrapperApplicationRef>
+        <Chain>
+            <PackageGroupRef Id="AspNetCoreRuntime31Redist_x64" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x64" />
+            <PackageGroupRef Id="DotNetCoreRuntime31Redist_x64" />
+        </Chain>
+    </Bundle>
+</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
index 09c7bcdd..4d1ba73e 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
@@ -6,9 +6,9 @@
             <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
         </BootstrapperApplicationRef>
         <Chain>
-            <PackageGroupRef Id="AspNetCoreRuntime31Redist_x64" />
-            <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x64" />
-            <PackageGroupRef Id="DotNetCoreRuntime31Redist_x64" />
+            <PackageGroupRef Id="AspNetCoreRuntime318Redist_x64" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x64" />
+            <PackageGroupRef Id="DotNetCoreRuntime318Redist_x64" />
         </Chain>
     </Bundle>
 </Wix>
-- 
cgit v1.2.3-55-g6feb