From 9ed6f291d49599bb12a1baa3a0e000f1e0e254cf Mon Sep 17 00:00:00 2001
From: James Parsons <japarson@microsoft.com>
Date: Tue, 29 Sep 2020 00:10:57 -0700
Subject: Remove unsupported .NET Core 3.1 package definitions

---
 .../TestData/UsingDotNetCorePackages/Bundle.wxs    | 26 +++-------------------
 .../UsingDotNetCorePackages/Bundle_x64.wxs         | 26 +++-------------------
 2 files changed, 6 insertions(+), 46 deletions(-)

(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 a31848a7..49e8c022 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
@@ -6,29 +6,9 @@
             <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" />
         </BootstrapperApplicationRef>
         <Chain>
-            <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" />
+            <PackageGroupRef Id="AspNetCoreRuntime31Redist_x86" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x86" />
+            <PackageGroupRef Id="DotNetCoreRuntime31Redist_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
index a5e91532..09c7bcdd 100644
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
+++ b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
@@ -6,29 +6,9 @@
             <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" />
+            <PackageGroupRef Id="AspNetCoreRuntime31Redist_x64" />
+            <PackageGroupRef Id="DesktopNetCoreRuntime31Redist_x64" />
+            <PackageGroupRef Id="DotNetCoreRuntime31Redist_x64" />
         </Chain>
     </Bundle>
 </Wix>
-- 
cgit v1.2.3-55-g6feb