From 262f29b0ecd16c414a479e05a85cbfe14dc7c2d2 Mon Sep 17 00:00:00 2001
From: Jacques Eloff <joeloff@microsoft.com>
Date: Tue, 10 Sep 2019 15:42:19 -0700
Subject: [PATCH] Embed CAB files #13875

---
 src/Installers/Windows/SharedFramework/SharedFramework.wixproj | 3 +--
 src/Installers/Windows/SharedFrameworkLib/Library.wxs          | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
index ed2fa9e235..df7f9cdcc4 100644
--- a/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
+++ b/src/Installers/Windows/SharedFramework/SharedFramework.wixproj
@@ -8,7 +8,7 @@
     <Name>AspNetCoreSharedFramework</Name>
     <OutputName>$(Name)-$(Platform)</OutputName>
     <OutputType>Package</OutputType>
-    <EmbedCab>no</EmbedCab>
+    <EmbedCab>yes</EmbedCab>
     <Cabinet>sfx_$(Platform).cab</Cabinet>
     <ProjectGuid>C681D730-4505-42C6-9E6C-87F757C4FB32</ProjectGuid>
     <HarvestDirectoryAutoGenerateGuids>true</HarvestDirectoryAutoGenerateGuids>
@@ -84,7 +84,6 @@
   <Target Name="CreateSharedFrameworkNugetPackage" AfterTargets="CopyToArtifactsDirectory;Build">
     <PropertyGroup>
       <MsiFullPath>$(InstallersOutputPath)$(PackageFileName)</MsiFullPath>
-      <CabFullPath>$(InstallersOutputPath)$(Cabinet)</CabFullPath>
     </PropertyGroup>
       <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
                       '$(ProductNameShort)' ^
diff --git a/src/Installers/Windows/SharedFrameworkLib/Library.wxs b/src/Installers/Windows/SharedFrameworkLib/Library.wxs
index b2b7cadcf1..dde16acbd7 100644
--- a/src/Installers/Windows/SharedFrameworkLib/Library.wxs
+++ b/src/Installers/Windows/SharedFrameworkLib/Library.wxs
@@ -25,7 +25,6 @@
                         Vital="yes"
                         InstallCondition="$(var.SharedFrameworkInstallCondition)">
                 <MsiProperty Name="DOTNETHOME" Value="[$(var.DotNetHome)]" />
-                <Payload Name="sfx_$(var.Platform).cab" SourceFile="$(var.SharedFramework.TargetDir)sfx_$(var.Platform).cab"/>
             </MsiPackage>
         </PackageGroup>
 	</Fragment>