From e0a88194af923cb523384352165bca91780c4289 Mon Sep 17 00:00:00 2001
From: James Parsons <japarson@microsoft.com>
Date: Wed, 23 Sep 2020 14:06:22 -0700
Subject: Add package definitions for the latest version of .NET Core 3.1

---
 .../TestData/UsingDotNetCorePackages/Bundle.wxs    | 32 ++++++++++++++------
 .../UsingDotNetCorePackages/Bundle_x64.wxs         | 34 ++++++++++++++++++++++
 2 files changed, 57 insertions(+), 9 deletions(-)
 create mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_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 7c008171..a31848a7 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
@@ -6,15 +6,29 @@
             <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
         </BootstrapperApplicationRef>
         <Chain>
-            <PackageGroupRef Id="AspNetCoreRuntime310Redist_x64" />
-            <PackageGroupRef Id="DesktopNetCoreRuntime310Redist_x64" />
-            <PackageGroupRef Id="AspNetCoreRuntime311Redist_x64" />
-            <PackageGroupRef Id="DesktopNetCoreRuntime311Redist_x64" />
-            <PackageGroupRef Id="AspNetCoreRuntime312Redist_x64" />
-            <PackageGroupRef Id="DesktopNetCoreRuntime312Redist_x64" />
-            <PackageGroupRef Id="AspNetCoreRuntime313Redist_x64" />
-            <PackageGroupRef Id="DesktopNetCoreRuntime313Redist_x64" />
-            <PackageGroupRef Id="DotNetCoreRuntime313Redist_x64" />
+            <PackageGroupRef Id="AspNetCoreRuntime310Redist_x86" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime310Redist_x86" />
+            <PackageGroupRef Id="DotNetCoreRuntime310Redist_x86" />
+
+            <PackageGroupRef Id="AspNetCoreRuntime311Redist_x86" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime311Redist_x86" />
+            <PackageGroupRef Id="DotNetCoreRuntime311Redist_x86" />
+
+            <PackageGroupRef Id="AspNetCoreRuntime312Redist_x86" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime312Redist_x86" />
+            <PackageGroupRef Id="DotNetCoreRuntime312Redist_x86" />
+
+            <PackageGroupRef Id="AspNetCoreRuntime313Redist_x86" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime313Redist_x86" />
+            <PackageGroupRef Id="DotNetCoreRuntime313Redist_x86" />
+
+            <PackageGroupRef Id="AspNetCoreRuntime314Redist_x86" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime314Redist_x86" />
+            <PackageGroupRef Id="DotNetCoreRuntime314Redist_x86" />
+
+            <PackageGroupRef Id="AspNetCoreRuntime31LatestRedist_x86" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime31LatestRedist_x86" />
+            <PackageGroupRef Id="DotNetCoreRuntime31LatestRedist_x86" />
         </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
new file mode 100644
index 00000000..a5e91532
--- /dev/null
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
@@ -0,0 +1,34 @@
+<?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="AspNetCoreRuntime310Redist_x64" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime310Redist_x64" />
+            <PackageGroupRef Id="DotNetCoreRuntime310Redist_x64" />
+
+            <PackageGroupRef Id="AspNetCoreRuntime311Redist_x64" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime311Redist_x64" />
+            <PackageGroupRef Id="DotNetCoreRuntime311Redist_x64" />
+
+            <PackageGroupRef Id="AspNetCoreRuntime312Redist_x64" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime312Redist_x64" />
+            <PackageGroupRef Id="DotNetCoreRuntime312Redist_x64" />
+
+            <PackageGroupRef Id="AspNetCoreRuntime313Redist_x64" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime313Redist_x64" />
+            <PackageGroupRef Id="DotNetCoreRuntime313Redist_x64" />
+
+            <PackageGroupRef Id="AspNetCoreRuntime314Redist_x64" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime314Redist_x64" />
+            <PackageGroupRef Id="DotNetCoreRuntime314Redist_x64" />
+
+            <PackageGroupRef Id="AspNetCoreRuntime31LatestRedist_x64" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime31LatestRedist_x64" />
+            <PackageGroupRef Id="DotNetCoreRuntime31LatestRedist_x64" />
+        </Chain>
+    </Bundle>
+</Wix>
-- 
cgit v1.2.3-55-g6feb