From 9a00d9fdb5db903c91f8fbeeb219183bc8a2d3b7 Mon Sep 17 00:00:00 2001
From: James Parsons <japarson@microsoft.com>
Date: Thu, 15 Oct 2020 15:23:07 -0700
Subject: Fix 3.1.8 desktop runtime payloads and remove version specific tests

---
 .../WixToolsetTest.Netfx/NetfxExtensionFixture.cs  | 50 ----------------------
 .../TestData/UsingDotNetCorePackages/Bundle.wxs    | 14 ------
 .../UsingDotNetCorePackages/Bundle_x64.wxs         | 14 ------
 .../WixToolsetTest.Netfx.csproj                    |  2 -
 src/wixlib/NetCore3.1.8_x64.wxs                    |  8 ++--
 src/wixlib/NetCore3.1.8_x86.wxs                    |  8 ++--
 6 files changed, 8 insertions(+), 88 deletions(-)
 delete mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
 delete mode 100644 src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs

(limited to 'src')

diff --git a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
index c9391074..72d4a682 100644
--- a/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
+++ b/src/test/WixToolsetTest.Netfx/NetfxExtensionFixture.cs
@@ -61,56 +61,6 @@ namespace WixToolsetTest.Netfx
             }
         }
 
-        [Fact]
-        public void CanBuildUsingDotNetCorePackages()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
-                var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var compileResult = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(bundleSourceFolder, "Bundle.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
-                    "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundleFile,
-                });
-                compileResult.AssertSuccess();
-
-                Assert.True(File.Exists(bundleFile));
-            }
-        }
-
-        [Fact]
-        public void CanBuildUsingDotNetCorePackages_X64()
-        {
-            using (var fs = new DisposableFileSystem())
-            {
-                var baseFolder = fs.GetFolder();
-                var bundleFile = Path.Combine(baseFolder, "bin", "test.exe");
-                var bundleSourceFolder = TestData.Get(@"TestData\UsingDotNetCorePackages");
-                var intermediateFolder = Path.Combine(baseFolder, "obj");
-
-                var compileResult = WixRunner.Execute(new[]
-                {
-                    "build",
-                    Path.Combine(bundleSourceFolder, "Bundle_x64.wxs"),
-                    "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"),
-                    "-ext", TestData.Get(@"WixToolset.Netfx.wixext.dll"),
-                    "-intermediateFolder", intermediateFolder,
-                    "-o", bundleFile,
-                });
-                compileResult.AssertSuccess();
-
-                Assert.True(File.Exists(bundleFile));
-            }
-        }
-
         [Fact]
         public void CanBuildUsingNativeImage()
         {
diff --git a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs b/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
deleted file mode 100644
index d746226e..00000000
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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="AspNetCoreRuntime318Redist_x86" />
-            <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x86" />
-            <PackageGroupRef Id="DotNetCoreRuntime318Redist_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
deleted file mode 100644
index 4d1ba73e..00000000
--- a/src/test/WixToolsetTest.Netfx/TestData/UsingDotNetCorePackages/Bundle_x64.wxs
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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="AspNetCoreRuntime318Redist_x64" />
-            <PackageGroupRef Id="DesktopNetCoreRuntime318Redist_x64" />
-            <PackageGroupRef Id="DotNetCoreRuntime318Redist_x64" />
-        </Chain>
-    </Bundle>
-</Wix>
diff --git a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
index a9e5cd2b..4dea73da 100644
--- a/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+++ b/src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
@@ -12,8 +12,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Content Include="TestData\UsingDotNetCorePackages\Bundle.wxs" CopyToOutputDirectory="PreserveNewest" />
-    <Content Include="TestData\UsingDotNetCorePackages\Bundle_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\UsingDotNetCorePackages\BundleLatest.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\UsingDotNetCorePackages\BundleLatest_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
     <Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" />
diff --git a/src/wixlib/NetCore3.1.8_x64.wxs b/src/wixlib/NetCore3.1.8_x64.wxs
index 56f498de..d6877e56 100644
--- a/src/wixlib/NetCore3.1.8_x64.wxs
+++ b/src/wixlib/NetCore3.1.8_x64.wxs
@@ -76,10 +76,10 @@
                 <RemotePayload
                     CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
                     CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
-                    Description="Microsoft .NET Core Runtime - 3.1.8 (x64)"
-                    Hash="C51D55F163788404ECADE0BF32B3D7796EEAE449"
-                    ProductName="Microsoft .NET Core Runtime - 3.1.8 (x64)"
-                    Size="26089480"
+                    Description="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
+                    Hash="6DEE30E0C636B13650E7CE1D13E8CCC99CB2A7AC"
+                    ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x64)"
+                    Size="54253328"
                     Version="3.1.8.29220" />
             </ExePackage>
         </PackageGroup>
diff --git a/src/wixlib/NetCore3.1.8_x86.wxs b/src/wixlib/NetCore3.1.8_x86.wxs
index 87d780c3..bf639c22 100644
--- a/src/wixlib/NetCore3.1.8_x86.wxs
+++ b/src/wixlib/NetCore3.1.8_x86.wxs
@@ -76,10 +76,10 @@
                 <RemotePayload
                     CertificatePublicKey="3756E9BBF4461DCD0AA68E0D1FCFFA9CEA47AC18"
                     CertificateThumbprint="2485A7AFA98E178CB8F30C9838346B514AEA4769"
-                    Description="Microsoft .NET Core Runtime - 3.1.8 (x86)"
-                    Hash="E3B05751BA0E48D81EF3EB60DABFC6388BAA5E91"
-                    ProductName="Microsoft .NET Core Runtime - 3.1.8 (x86)"
-                    Size="23183576"
+                    Description="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
+                    Hash="6105823D7417C265929DF2978A7214E7394E404F"
+                    ProductName="Microsoft Windows Desktop Runtime - 3.1.8 (x86)"
+                    Size="48377976"
                     Version="3.1.8.29220" />
             </ExePackage>
         </PackageGroup>
-- 
cgit v1.2.3-55-g6feb