From d987a525c897e53de043618b5369577d8b77926e Mon Sep 17 00:00:00 2001
From: John Beisner <johnbeisner@users.noreply.github.com>
Date: Thu, 16 May 2019 16:33:29 -0700
Subject: [PATCH] Resolve named CAB collision and drop the CABs (#1976)

* Resolve named CAB collision; drop the CABs.

* Resolving naming convention warning: 8 chars plus {0} are allowed.

* Update src/redist/targets/packaging/windows/clisdk/dotnet.wxs

Co-Authored-By: Peter Huene <pehuene@microsoft.com>
---
 eng/Publishing.props                                 |  1 +
 .../targets/packaging/windows/clisdk/bundle.wxs      |  2 +-
 .../targets/packaging/windows/clisdk/dotnet.wxs      | 12 ++++++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 69268f8b1..30a74f1ac 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -45,6 +45,7 @@
     <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.rpm" />
     <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.msi" />
     <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.nupkg" />
+    <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.cab" />
     <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.svg" Condition=" '$(PublishBinariesAndBadge)' == 'true' ">
       <ExcludeFromManifest>true</ExcludeFromManifest>
     </SdkAssetsToPublish>
diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
index 3aa86c716..24a99d16d 100644
--- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
@@ -147,7 +147,7 @@
         <MsiProperty Name="DOTNETHOME_X86" Value="[DOTNETHOME_X86]" />
         <MsiProperty Name="DOTNETHOME_X64" Value="[DOTNETHOME_X64]" />
         <MsiProperty Name="EXEFULLPATH" Value="[WixBundleOriginalSource]" />
-        <MsiProperty Name="ALLOWCLISDKMSIINSTALL" Value="True" />
+        <MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
       </MsiPackage>
       <?if $(var.Platform)=x86?>
         <PackageGroupRef Id="PG_AspNetCoreSharedFramework_x86"/>
diff --git a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
index 939059f6d..5e86d3ab8 100644
--- a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
@@ -4,14 +4,18 @@
   <Product Id="*" Name="$(var.ProductName)" Language="$(var.ProductLanguage)" Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
     <Package Compressed="yes" InstallScope="perMachine" InstallerVersion="200" />
 
-    <Condition Message="$(var.ProductName) must be installed as part of an SDK bundle installation.">
-        Installed OR ALLOWCLISDKMSIINSTALL
+    <Condition Message="$(var.ProductName) must be installed as part of a coordinated SDK installation.">
+      Installed OR ALLOWMSIINSTALL
     </Condition>
 
     <MajorUpgrade DowngradeErrorMessage="$(var.DowngradeErrorMessage)" Schedule="afterInstallInitialize"/>
 
-    <MediaTemplate CabinetTemplate="dnet-{0}.cab" CompressionLevel="high" />
-
+    <?if $(var.Platform)=x86?>
+      <MediaTemplate CabinetTemplate="dnetx86-{0}.cab" CompressionLevel="high" />
+    <?elseif $(var.Platform)=x64?>
+      <MediaTemplate CabinetTemplate="dnetx64-{0}.cab" CompressionLevel="high" />
+    <?endif?>
+      
     <Feature Id="MainFeature" Title="Main Feature" Level="1">
       <ComponentGroupRef Id="InstallFiles" />
       <ComponentGroupRef Id="AuthoredRegistryKeys_x86node"/>