From 07b074acf7d9964103754e44584e501b6e6efee8 Mon Sep 17 00:00:00 2001
From: John Beisner <johnbeisner@users.noreply.github.com>
Date: Wed, 17 Apr 2019 12:53:05 -0700
Subject: [PATCH] adding .Net core AppHost pack (#1519)

* adding .Net core AppHost pack
---
 eng/Versions.props                            |  1 +
 src/redist/targets/Branding.targets           |  1 +
 src/redist/targets/GenerateDebs.targets       | 13 ++++++++++
 src/redist/targets/GenerateLayout.targets     | 20 +++++++++-----
 src/redist/targets/GenerateMSIs.targets       |  1 +
 src/redist/targets/GeneratePKG.targets        | 15 +++++++++--
 src/redist/targets/GenerateRPMs.targets       | 11 ++++++++
 .../packaging/deb/dotnet-debian_config.json   |  1 +
 .../osx/clisdk/Distribution-Template          |  5 ++++
 .../targets/packaging/rpm/dotnet-config.json  |  4 +++
 .../packaging/windows/clisdk/bundle.wxs       |  3 +++
 .../windows/clisdk/generatebundle.ps1         | 26 ++++++++++++-------
 12 files changed, 83 insertions(+), 18 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index a880a6ce5..269e096b4 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -49,6 +49,7 @@
     <SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
     <HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
     <NetCoreAppTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppTargetingPackVersion>
+    <NetCoreAppHostPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppHostPackVersion>
     <NETStandardLibraryRefPackageVersion>2.1.0-preview5-27617-04</NETStandardLibraryRefPackageVersion>
     <WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</WindowsDesktopTargetingPackVersion>
     <AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets
index ee93a70c0..9f81239cd 100644
--- a/src/redist/targets/Branding.targets
+++ b/src/redist/targets/Branding.targets
@@ -7,6 +7,7 @@
       <SharedFrameworkBrandName>Microsoft .NET Core Runtime $(MicrosoftNETCoreAppPackageVersion)</SharedFrameworkBrandName>
       <NetCoreAppTargetingPackBrandName>Microsoft .NET Core Targeting Pack $(MicrosoftNETCoreAppPackageVersion)</NetCoreAppTargetingPackBrandName>
       <NetStandardTargetingPackBrandName>Microsoft .NET Standard 2.1 Targeting Pack $(MicrosoftNETCoreAppPackageVersion)</NetStandardTargetingPackBrandName>
+      <NetCoreAppHostPackBrandName>Microsoft .NET AppHost Pack $(MicrosoftNETCoreAppPackageVersion)</NetCoreAppHostPackBrandName>
       <SharedHostBrandName>Microsoft .NET Core Host $(MicrosoftNETCoreAppPackageVersion)</SharedHostBrandName>
       <HostFxrBrandName>Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreAppPackageVersion)</HostFxrBrandName>
       <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
diff --git a/src/redist/targets/GenerateDebs.targets b/src/redist/targets/GenerateDebs.targets
index 096596c28..5b9254aa2 100644
--- a/src/redist/targets/GenerateDebs.targets
+++ b/src/redist/targets/GenerateDebs.targets
@@ -53,6 +53,11 @@
       <NetStandardTargetingPackDebianPackageName>netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion.Split('.')[0]).$(NETStandardLibraryRefPackageVersion.Split('.')[1])</NetStandardTargetingPackDebianPackageName>
       <NetStandardTargetingPackDebianPackageName>$(NetStandardTargetingPackDebianPackageName.ToLower())</NetStandardTargetingPackDebianPackageName>
       <DownloadedNetStandardTargetingPackInstallerFile>$(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName)</DownloadedNetStandardTargetingPackInstallerFile>
+      <NetCoreAppHostPackDebianPackageFileName>dotnet-apphost-pack-$(SharedFxDebianPackageFileVersion)</NetCoreAppHostPackDebianPackageFileName>
+      <NetCoreAppHostPackDebianPackageFileName>$(NetCoreAppHostPackDebianPackageFileName.ToLower())</NetCoreAppHostPackDebianPackageFileName>
+      <NetCoreAppHostPackDebianPackageName>dotnet-apphost-pack-$(SharedFxDebianPackageVersion)</NetCoreAppHostPackDebianPackageName>
+      <NetCoreAppHostPackDebianPackageName>$(NetCoreAppHostPackDebianPackageName.ToLower())</NetCoreAppHostPackDebianPackageName>
+      <DownloadedNetCoreAppHostPackInstallerFile>$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)</DownloadedNetCoreAppHostPackInstallerFile>
       <HostFxrDebianPackageFileName>dotnet-hostfxr-$(HostFxrVersion)</HostFxrDebianPackageFileName>
       <HostFxrDebianPackageFileName>$(HostFxrDebianPackageFileName.ToLower())</HostFxrDebianPackageFileName>
       <HostFxrDebianPackageName>dotnet-hostfxr-$(HostFxrMajorMinorVersion)</HostFxrDebianPackageName>
@@ -125,6 +130,9 @@
       <DebianConfigTokenValues Include="%NETCOREAPP_TARGETING_PACK_DEBIAN_PACKAGE_NAME%">
         <ReplacementString>$(NetCoreAppTargetingPackDebianPackageName)</ReplacementString>
       </DebianConfigTokenValues>
+      <DebianConfigTokenValues Include="%NETCORE_APPHOST_PACK_DEBIAN_PACKAGE_NAME%">
+        <ReplacementString>$(NetCoreAppHostPackDebianPackageName)</ReplacementString>
+      </DebianConfigTokenValues>
       <DebianConfigTokenValues Include="%NETSTANDARD_TARGETING_PACK_DEBIAN_PACKAGE_NAME%">
         <ReplacementString>$(NetStandardTargetingPackDebianPackageName)</ReplacementString>
       </DebianConfigTokenValues>
@@ -222,6 +230,7 @@
       Inputs="@(CLISdkFiles)"
       Outputs="$(SdkDebInstallerFile)" >
       <!-- Install Shared Framework Packages -->
+      <Exec Command="sudo dpkg -i $(DownloadedNetCoreAppHostPackInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedNetCoreAppTargetingPackInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedNetStandardTargetingPackInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedAspNetTargetingPackInstallerFile)" />
@@ -305,6 +314,7 @@
         <SetupDebPackageToRemove Include="$(NetStandardTargetingPackDebianPackageFileName)" />
         <SetupDebPackageToRemove Include="$(NetCoreAppTargetingPackDebianPackageName)" />
         <SetupDebPackageToRemove Include="$(NetCoreAppTargetingPackDebianPackageFileName)" />
+        <SetupDebPackageToRemove Include="$(NetCoreAppHostPackDebianPackageFileName)" />
         <SetupDebPackageToRemove Include="$(RuntimeDepsPackageName)" />
       </ItemGroup>
       <!-- The following line is needed. So it won't warning dotnet folder is not empty after uninstall -->
@@ -316,6 +326,7 @@
       Condition=" '$(CLIBUILD_SKIP_TESTS)' != 'true' and '$(IsDebianBaseDistro)' == 'True' and '$(DebuildPresent)'  == 'true' "
       DependsOnTargets="GetAspNetSharedFxInstallArgs"
       Inputs="$(DownloadedRuntimeDepsInstallerFile);
+              $(DownloadedNetCoreAppHostPackInstallerFile);
               $(DownloadedNetCoreAppTargetingPackInstallerFile);
               $(DownloadedNetStandardTargetingPackInstallerFile);
               $(DownloadedAspNetTargetingPackInstallerFile);
@@ -329,6 +340,7 @@
 
       <!-- Install Dependencies and SDK Packages -->
       <Exec Command="sudo dpkg -i $(DownloadedRuntimeDepsInstallerFile)" />
+      <Exec Command="sudo dpkg -i $(DownloadedNetCoreAppHostPackInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedNetCoreAppTargetingPackInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedNetStandardTargetingPackInstallerFile)" />
       <Exec Command="sudo dpkg -i $(DownloadedAspNetTargetingPackInstallerFile)" />
@@ -359,6 +371,7 @@
         <TestSdkDebPackageToRemove Include="$(AspNetTargetingPackDebianPackageName)" />
         <TestSdkDebPackageToRemove Include="$(NetStandardTargetingPackDebianPackageName)" />
         <TestSdkDebPackageToRemove Include="$(NetCoreAppTargetingPackDebianPackageName)" />
+        <TestSdkDebPackageToRemove Include="$(NetCoreAppHostPackDebianPackageName)" />
         <TestSdkDebPackageToRemove Include="$(RuntimeDepsPackageName)"/>
       </ItemGroup>
       <!-- If package installed remove it -->
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index b0afc9f1a..50b4e54c8 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -29,6 +29,7 @@
       <DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
       <DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">windowsdesktop-runtime-$(MicrosoftWindowsDesktopPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName>
       <DownloadedNetCoreAppTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-targeting-pack-$(NetCoreAppTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetCoreAppTargetingPackInstallerFileName>
+      <DownloadedNetCoreAppHostPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetCoreAppHostPackInstallerFileName>
       <DownloadedWindowsDesktopTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">windowsdesktop-targeting-pack-$(WindowsDesktopTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWindowsDesktopTargetingPackInstallerFileName>
       <DownloadedNetStandardTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetStandardTargetingPackInstallerFileName>
       <NetStandardTargetingPackTargetFramework>netstandard$(NETStandardLibraryRefPackageVersion.Split('.')[0])$(NETStandardLibraryRefPackageVersion.Split('.')[1])</NetStandardTargetingPackTargetFramework>
@@ -71,7 +72,7 @@
       <AlternateAppHostRid Condition="'$(Architecture)' == 'x86'">win-x64</AlternateAppHostRid>
       <AlternateAppHostRid Condition="'$(Architecture)' == 'x64'">win-x86</AlternateAppHostRid>
     </PropertyGroup>
-    
+
     <ItemGroup>
       <BundledLayoutComponent Include="CombinedSharedHostAndFrameworkArchive">
         <BaseUrl>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)</BaseUrl>
@@ -109,15 +110,15 @@
       </BundledLayoutPackage>
 
       <BundledLayoutPackage Include="MicrosoftNetCoreAppHostPackNupkg">
-        <PackageName>runtime.$(SharedFrameworkRid).Microsoft.NETCore.DotNetAppHost</PackageName>
-        <PackageVersion>$(NetCoreAppTargetingPackVersion)</PackageVersion>
+        <PackageName>Microsoft.NETCore.App.Host.$(SharedFrameworkRid)</PackageName>
+        <PackageVersion>$(NetCoreAppHostPackVersion)</PackageVersion>
         <TargetFramework>$(TargetFramework)</TargetFramework>
         <RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
       </BundledLayoutPackage>
 
-      <BundledLayoutPackage Include="MicrosoftNetCoreAppHostPackNupkg_Altnernate" Condition="'$(AlternateAppHostRid)' != ''">
-        <PackageName>runtime.$(AlternateAppHostRid).Microsoft.NETCore.DotNetAppHost</PackageName>
-        <PackageVersion>$(NetCoreAppTargetingPackVersion)</PackageVersion>
+      <BundledLayoutPackage Include="MicrosoftNetCoreAppHostPackNupkg_Alternate" Condition="'$(AlternateAppHostRid)' != ''">
+        <PackageName>Microsoft.NETCore.App.Host.$(AlternateAppHostRid)</PackageName>
+        <PackageVersion>$(NetCoreAppHostPackVersion)</PackageVersion>
         <TargetFramework>$(TargetFramework)</TargetFramework>
         <RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
       </BundledLayoutPackage>
@@ -163,6 +164,13 @@
         <DownloadFileName>$(DownloadedNetStandardTargetingPackInstallerFileName)</DownloadFileName>
         <AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
       </BundledInstallerComponent>
+
+      <BundledInstallerComponent Include="DownloadedNetCoreAppHostPackInstallerFile"
+                     Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
+        <BaseUrl>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)</BaseUrl>
+        <DownloadFileName>$(DownloadedNetCoreAppHostPackInstallerFileName)</DownloadFileName>
+        <AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
+      </BundledInstallerComponent>
       
       <BundledInstallerComponent Include="DownloadedWindowsDesktopTargetingPackInstallerFile"
                                  Condition="'$(InstallerExtension)' == '.msi' And '$(SkipBuildingInstallers)' != 'true' And !$(Architecture.StartsWith('arm'))">
diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index 39b25f31b..77a06cef1 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -140,6 +140,7 @@
                       '$(DownloadsFolder)$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)' ^
                       '$(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName)' ^
                       '$(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName)' ^
+                      '$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)' ^
                       '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^
                       '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^
                       '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^
diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets
index 55f132b97..9add88c7f 100644
--- a/src/redist/targets/GeneratePKG.targets
+++ b/src/redist/targets/GeneratePKG.targets
@@ -7,8 +7,9 @@
       <SharedHostComponentId>com.microsoft.dotnet.sharedhost.$(SharedHostVersion).component.osx.x64</SharedHostComponentId>
       <HostFxrComponentId>com.microsoft.dotnet.hostfxr.$(HostFxrVersion).component.osx.x64</HostFxrComponentId>
       <SharedFrameworkComponentId>com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(MicrosoftNETCoreAppPackageVersion).component.osx.x64</SharedFrameworkComponentId>
-      <NetCoreAppTargetingPackComponentId>com.microsoft.dotnet.pack.targeting.$(MicrosoftNETCoreAppPackageVersion).component.osx.x64</NetCoreAppTargetingPackComponentId>
-      <NetStandardTargetingPackComponentId>com.microsoft.standard.pack.targeting.$(MicrosoftNETCoreAppPackageVersion).component.osx.x64</NetStandardTargetingPackComponentId>
+      <NetCoreAppTargetingPackComponentId>com.microsoft.dotnet.pack.targeting.$(NetCoreAppTargetingPackVersion).component.osx.x64</NetCoreAppTargetingPackComponentId>
+      <NetCoreAppHostPackComponentId>com.microsoft.dotnet.pack.apphost.$(NetCoreAppHostPackVersion).component.osx.x64</NetCoreAppHostPackComponentId>
+      <NetStandardTargetingPackComponentId>com.microsoft.standard.pack.targeting.$(NETStandardLibraryRefPackageVersion).component.osx.x64</NetStandardTargetingPackComponentId>
       <SdkComponentId>com.microsoft.dotnet.dev.$(SdkVersion).component.osx.x64</SdkComponentId>
       <SdkProductArchiveId>com.microsoft.dotnet.dev.$(SdkVersion).osx.x64</SdkProductArchiveId>
 
@@ -27,6 +28,7 @@
       <SdkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SdkComponentId).pkg</SdkPkgIntermediatePath>
       <SharedFrameworkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedFrameworkComponentId).pkg</SharedFrameworkPkgIntermediatePath>
       <NetCoreAppTargetingPackPkgIntermediatePath>$(PkgIntermediateDirectory)/$(NetCoreAppTargetingPackComponentId).pkg</NetCoreAppTargetingPackPkgIntermediatePath>
+      <NetCoreAppHostPackPkgIntermediatePath>$(PkgIntermediateDirectory)/$(NetCoreAppHostPackComponentId).pkg</NetCoreAppHostPackPkgIntermediatePath>
       <NetStandardTargetingPackPkgIntermediatePath>$(PkgIntermediateDirectory)/$(NetStandardTargetingPackComponentId).pkg</NetStandardTargetingPackPkgIntermediatePath>
       <SharedHostPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedHostComponentId).pkg</SharedHostPkgIntermediatePath>
       <HostFxrPkgIntermediatePath>$(PkgIntermediateDirectory)/$(HostFxrComponentId).pkg</HostFxrPkgIntermediatePath>
@@ -47,6 +49,9 @@
         <DistributionTemplateReplacement Include="{NetStandardTargetingPackComponentId}">
           <ReplacementString>$(NetStandardTargetingPackComponentId)</ReplacementString>
         </DistributionTemplateReplacement>
+        <DistributionTemplateReplacement Include="{NetCoreAppHostPackComponentId}">
+          <ReplacementString>$(NetCoreAppHostPackComponentId)</ReplacementString>
+        </DistributionTemplateReplacement>
         <DistributionTemplateReplacement Include="{SharedHostComponentId}">
           <ReplacementString>$(SharedHostComponentId)</ReplacementString>
         </DistributionTemplateReplacement>
@@ -68,6 +73,9 @@
         <DistributionTemplateReplacement Include="{NetCoreAppTargetingPackBrandName}">
           <ReplacementString>$(NetCoreAppTargetingPackBrandName)</ReplacementString>
         </DistributionTemplateReplacement>
+        <DistributionTemplateReplacement Include="{NetCoreAppHostPackBrandName}">
+          <ReplacementString>$(NetCoreAppHostPackBrandName)</ReplacementString>
+        </DistributionTemplateReplacement>
         <DistributionTemplateReplacement Include="{NetStandardTargetingPackBrandName}">
           <ReplacementString>$(NetStandardTargetingPackBrandName)</ReplacementString>
         </DistributionTemplateReplacement>
@@ -107,6 +115,7 @@
         <GenerateSdkProductArchiveInputs Include="$(SdkPKGInstallerFile)" />
         <GenerateSdkProductArchiveInputs Include="$(DownloadedSharedFrameworkInstallerFile)" />
         <GenerateSdkProductArchiveInputs Include="$(DownloadedNetCoreAppTargetingPackInstallerFile)" />
+        <GenerateSdkProductArchiveInputs Include="$(DownloadedNetCoreAppHostPackInstallerFile)" />
         <GenerateSdkProductArchiveInputs Include="$(DownloadedNetStandardTargetingPackInstallerFile)" />
         <GenerateSdkProductArchiveInputs Include="$(DownloadedHostFxrInstallerFile)" />
         <GenerateSdkProductArchiveInputs Include="$(DownloadedSharedHostInstallerFile)" />
@@ -161,12 +170,14 @@
         <PkgComponentsSourceFiles Include="$(SdkPKGInstallerFile);
                                 $(DownloadsFolder)$(DownloadedSharedFrameworkInstallerFileName);
                                 $(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName);
+                                $(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName);
                                 $(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName);
                                 $(DownloadsFolder)$(DownloadedHostFxrInstallerFileName);
                                 $(DownloadsFolder)$(DownloadedSharedHostInstallerFileName)" />
         <PkgComponentsDestinationFiles Include="$(SdkPkgIntermediatePath);
                                                 $(SharedFrameworkPkgIntermediatePath);
                                                 $(NetCoreAppTargetingPackPkgIntermediatePath);
+                                                $(NetCoreAppHostPackPkgIntermediatePath);
                                                 $(NetStandardTargetingPackPkgIntermediatePath);
                                                 $(HostFxrPkgIntermediatePath);
                                                 $(SharedHostPkgIntermediatePath)" />
diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets
index 82f54461a..bfec4fdc4 100644
--- a/src/redist/targets/GenerateRPMs.targets
+++ b/src/redist/targets/GenerateRPMs.targets
@@ -85,6 +85,9 @@
       <SDKTokenValue Include="%NETCOREAPP_TARGETING_PACK_RPM_PACKAGE_NAME%">
         <ReplacementString>$(NetCoreAppTargetingPackRpmPackageName)</ReplacementString>
       </SDKTokenValue>
+      <SDKTokenValue Include="%NETCORE_APPHOST_PACK_RPM_PACKAGE_NAME%">
+        <ReplacementString>$(NetCoreAppHostPackRpmPackageName)</ReplacementString>
+      </SDKTokenValue>
       <SDKTokenValue Include="%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_NAME%">
         <ReplacementString>$(NetStandardTargetingPackRpmPackageName)</ReplacementString>
       </SDKTokenValue>
@@ -196,6 +199,10 @@
       <NetCoreAppTargetingPackRpmPackageName>$(NetCoreAppTargetingPackRpmPackageName.ToLower())</NetCoreAppTargetingPackRpmPackageName>
       <NetCoreAppTargetingPackRpmPackageFileName>dotnet-targeting-pack-$(SharedFxRpmPackageFileVersion)</NetCoreAppTargetingPackRpmPackageFileName>
       <NetCoreAppTargetingPackRpmPackageFileName>$(NetCoreAppTargetingPackRpmPackageFileName.ToLower())</NetCoreAppTargetingPackRpmPackageFileName>
+      <NetCoreAppHostPackRpmPackageName>dotnet-apphost-pack-$(SharedFxRpmPackageVersion)</NetCoreAppHostPackRpmPackageName>
+      <NetCoreAppHostPackRpmPackageName>$(NetCoreAppHostPackRpmPackageName.ToLower())</NetCoreAppHostPackRpmPackageName>
+      <NetCoreAppHostPackRpmPackageFileName>dotnet-apphost-pack-$(SharedFxRpmPackageFileVersion)</NetCoreAppHostPackRpmPackageFileName>
+      <NetCoreAppHostPackRpmPackageFileName>$(NetCoreAppHostPackRpmPackageFileName.ToLower())</NetCoreAppHostPackRpmPackageFileName>
       <NetStandardTargetingPackRpmPackageName>netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion.Split('.')[0]).$(NETStandardLibraryRefPackageVersion.Split('.')[1])</NetStandardTargetingPackRpmPackageName>
       <NetStandardTargetingPackRpmPackageName>$(NetStandardTargetingPackRpmPackageName.ToLower())</NetStandardTargetingPackRpmPackageName>
       <NetStandardTargetingPackRpmPackageFileName>netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)</NetStandardTargetingPackRpmPackageFileName>
@@ -220,6 +227,7 @@
     <PropertyGroup>
       <DownloadedNetCoreAppTargetingPackInstallerFile>$(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName)</DownloadedNetCoreAppTargetingPackInstallerFile>
       <DownloadedNetStandardTargetingPackInstallerFile>$(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName)</DownloadedNetStandardTargetingPackInstallerFile>
+      <DownloadedNetCoreAppHostPackInstallerFile>$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)</DownloadedNetCoreAppHostPackInstallerFile>
       <DownloadedAspNetTargetingPackInstallerFile>$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)</DownloadedAspNetTargetingPackInstallerFile>
       <DownloadedRuntimeDepsInstallerFile>$(DownloadsFolder)$(DownloadedRuntimeDepsInstallerFileName)</DownloadedRuntimeDepsInstallerFile>
       <DownloadedSharedHostInstallerFile>$(DownloadsFolder)$(DownloadedSharedHostInstallerFileName)</DownloadedSharedHostInstallerFile>
@@ -253,6 +261,7 @@
           Condition="  '$(CLIBUILD_SKIP_TESTS)' != 'true' and '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' "
           Inputs="$(DownloadedNetCoreAppTargetingPackInstallerFile);
                   $(DownloadedNetStandardTargetingPackInstallerFile);
+                  $(DownloadedNetCoreAppHostPackInstallerFile);
                   $(DownloadedAspNetTargetingPackInstallerFile);
                   $(DownloadedRuntimeDepsInstallerFile);
                   $(DownloadedSharedHostInstallerFile);
@@ -265,6 +274,7 @@
 
     <!-- Install Dependencies and SDK Packages -->
     <Exec Command="sudo rpm -iv $(DownloadedRuntimeDepsInstallerFile)" />
+    <Exec Command="sudo rpm -iv $(DownloadedNetCoreAppHostPackInstallerFile)" />
     <Exec Command="sudo rpm -iv $(DownloadedNetCoreAppTargetingPackInstallerFile)" />
     <Exec Command="sudo rpm -iv $(DownloadedNetStandardTargetingPackInstallerFile)" />
     <Exec Command="sudo rpm -iv $(DownloadedAspNetTargetingPackInstallerFile)" />
@@ -292,6 +302,7 @@
     <Exec Command="sudo rpm -ev --nodeps $(AspNetTargetingPackRpmPackageName)" />
     <Exec Command="sudo rpm -ev --nodeps $(NetStandardTargetingPackRpmPackageName)" />
     <Exec Command="sudo rpm -ev --nodeps $(NetCoreAppTargetingPackRpmPackageName)" />
+    <Exec Command="sudo rpm -ev --nodeps $(NetCoreAppHostPackRpmPackageName)" />
     <Exec Command="sudo rpm -ev --nodeps $(RuntimeDepsPackageName)" />
   </Target>
 </Project>
diff --git a/src/redist/targets/packaging/deb/dotnet-debian_config.json b/src/redist/targets/packaging/deb/dotnet-debian_config.json
index 1c8b64dae..35a0f433f 100644
--- a/src/redist/targets/packaging/deb/dotnet-debian_config.json
+++ b/src/redist/targets/packaging/deb/dotnet-debian_config.json
@@ -31,6 +31,7 @@
     "debian_dependencies":{
         "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%,
         "%NETCOREAPP_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" },
+        "%NETCORE_APPHOST_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" },
         "%NETSTANDARD_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NET_STANDARD_DEBIAN_PACKAGE_VERSION%" },
         "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" },
         "%ASPNET_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" }
diff --git a/src/redist/targets/packaging/osx/clisdk/Distribution-Template b/src/redist/targets/packaging/osx/clisdk/Distribution-Template
index 912876cbe..036710240 100644
--- a/src/redist/targets/packaging/osx/clisdk/Distribution-Template
+++ b/src/redist/targets/packaging/osx/clisdk/Distribution-Template
@@ -13,6 +13,7 @@
     <choices-outline>
         <line choice="{NetCoreAppTargetingPackComponentId}.pkg" />
         <line choice="{NetStandardTargetingPackComponentId}.pkg" />
+        <line choice="{NetCoreAppHostPackComponentId}.pkg" />
         <line choice="{SharedFxComponentId}.pkg" />
         <line choice="{HostFxrComponentId}.pkg" />
         <line choice="{SharedHostComponentId}.pkg" />
@@ -24,6 +25,9 @@
     <choice id="{NetStandardTargetingPackComponentId}.pkg" visible="true" title="{NetStandardTargetingPackBrandName} (x64)" description="The .NET Standard 2.1 Targeting Pack">
         <pkg-ref id="{NetStandardTargetingPackComponentId}.pkg" />
     </choice>
+    <choice id="{NetCoreAppHostPackComponentId}.pkg" visible="true" title="{NetCoreAppHostPackBrandName} (x64)" description="The .NET App Host Pack">
+        <pkg-ref id="{NetCoreAppHostPackComponentId}.pkg" />
+    </choice>
     <choice id="{SharedFxComponentId}.pkg" visible="true" title="{SharedFxBrandName} (x64)" description="The .NET Core Shared Framework">
         <pkg-ref id="{SharedFxComponentId}.pkg" />
     </choice>
@@ -38,6 +42,7 @@
     </choice>
     <pkg-ref id="{NetCoreAppTargetingPackComponentId}.pkg">{NetCoreAppTargetingPackComponentId}.pkg</pkg-ref>
     <pkg-ref id="{NetStandardTargetingPackComponentId}.pkg">{NetStandardTargetingPackComponentId}.pkg</pkg-ref>
+    <pkg-ref id="{NetCoreAppHostPackComponentId}.pkg">{NetCoreAppHostPackComponentId}.pkg</pkg-ref>
     <pkg-ref id="{SharedFxComponentId}.pkg">{SharedFxComponentId}.pkg</pkg-ref>
     <pkg-ref id="{HostFxrComponentId}.pkg">{HostFxrComponentId}.pkg</pkg-ref>
     <pkg-ref id="{SharedHostComponentId}.pkg">{SharedHostComponentId}.pkg</pkg-ref>
diff --git a/src/redist/targets/packaging/rpm/dotnet-config.json b/src/redist/targets/packaging/rpm/dotnet-config.json
index 8128e9a9a..fd090e2d8 100644
--- a/src/redist/targets/packaging/rpm/dotnet-config.json
+++ b/src/redist/targets/packaging/rpm/dotnet-config.json
@@ -30,6 +30,10 @@
             "package_name": "%NETCOREAPP_TARGETING_PACK_RPM_PACKAGE_NAME%",
             "package_version": "%SHARED_FRAMEWORK_RPM_PACKAGE_VERSION%"
         },
+        {
+            "package_name": "%NETCORE_APPHOST_PACK_RPM_PACKAGE_NAME%",
+            "package_version": "%SHARED_FRAMEWORK_RPM_PACKAGE_VERSION%"
+        },
         {
             "package_name": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_NAME%",
             "package_version": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_VERSION%"
diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
index 3225f7a5a..e7f2020c7 100644
--- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
@@ -130,6 +130,9 @@
       <MsiPackage SourceFile="$(var.NetCoreAppTargetingPackMsiSourcePath)">
         <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
       </MsiPackage>
+      <MsiPackage SourceFile="$(var.NetCoreAppHostPackMsiSourcePath)">
+        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
+      </MsiPackage>
       <MsiPackage SourceFile="$(var.NetStandardTargetingPackMsiSourcePath)">
         <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
       </MsiPackage>
diff --git a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1 b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1
index 5d1219af3..94910f6e6 100644
--- a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1
@@ -9,6 +9,7 @@ param(
     [Parameter(Mandatory=$true)][string]$SharedHostMSIFile,
     [Parameter(Mandatory=$true)][string]$WinFormsAndWpfMSIFile,
     [Parameter(Mandatory=$true)][string]$NetCoreAppTargetingPackMSIFile,
+    [Parameter(Mandatory=$true)][string]$NetCoreAppHostPackMSIFile,
     [Parameter(Mandatory=$true)][string]$NetStandardTargetingPackMSIFile,
     [Parameter(Mandatory=$true)][string]$AspNetTargetingPackMSIFile,
     [Parameter(Mandatory=$true)][string]$WindowsDesktopTargetingPackMSIFile,
@@ -31,10 +32,10 @@ function RunCandleForBundle
     $result = $true
     pushd "$WixRoot"
 
-    Write-Output Running candle for bundle..
+    Write-Information "Running candle for bundle.."
     $AuthWsxRoot =  $PSScriptRoot
 
-    .\candle.exe -nologo `
+    $candleOutput = .\candle.exe -nologo `
         -dDotnetSrc="$inputDir" `
         -dMicrosoftEula="$PSScriptRoot\dummyeula.rtf" `
         -dProductMoniker="$ProductMoniker" `
@@ -49,6 +50,7 @@ function RunCandleForBundle
         -dSharedHostMsiSourcePath="$SharedHostMSIFile" `
         -dWinFormsAndWpfMsiSourcePath="$WinFormsAndWpfMSIFile" `
         -dNetCoreAppTargetingPackMsiSourcePath="$NetCoreAppTargetingPackMSIFile" `
+        -dNetCoreAppHostPackMsiSourcePath="$NetCoreAppHostPackMSIFile" `
         -dNetStandardTargetingPackMsiSourcePath="$NetStandardTargetingPackMSIFile" `
         -dAspNetTargetingPackMsiSourcePath="$AspNetTargetingPackMSIFile" `
         -dWindowsDesktopTargetingPackMsiSourcePath="$WindowsDesktopTargetingPackMSIFile" `
@@ -62,12 +64,14 @@ function RunCandleForBundle
         -ext WixBalExtension.dll `
         -ext WixUtilExtension.dll `
         -ext WixTagExtension.dll `
-        "$AuthWsxRoot\bundle.wxs" | Out-Host
+        "$AuthWsxRoot\bundle.wxs"
+
+    Write-Information "Candle output: $candleOutput"
 
     if($LastExitCode -ne 0)
     {
         $result = $false
-        Write-Output "Candle failed with exit code $LastExitCode."
+        Write-Information "Candle failed with exit code $LastExitCode."
     }
 
     popd
@@ -79,10 +83,10 @@ function RunLightForBundle
     $result = $true
     pushd "$WixRoot"
 
-    Write-Output Running light for bundle..
+    Write-Information "Running light for bundle.."
     $AuthWsxRoot =  $PSScriptRoot
 
-    .\light.exe -nologo `
+    $lightOutput = .\light.exe -nologo `
         -cultures:en-us `
         bundle.wixobj `
         $ASPNETRuntimeWixlibFile `
@@ -90,12 +94,14 @@ function RunLightForBundle
         -ext WixUtilExtension.dll `
         -ext WixTagExtension.dll `
         -b "$AuthWsxRoot" `
-        -out $DotnetBundleOutput | Out-Host
+        -out $DotnetBundleOutput
+
+    Write-Information "Light output: $lightOutput"
 
     if($LastExitCode -ne 0)
     {
         $result = $false
-        Write-Output "Light failed with exit code $LastExitCode."
+        Write-Information "Light failed with exit code $LastExitCode."
     }
 
     popd
@@ -113,7 +119,7 @@ if(!(Test-Path $ASPNETRuntimeWixLibFile))
     throw "$ASPNETRuntimeWixLibFile not found"
 }
 
-Write-Output "Creating dotnet Bundle at $DotnetBundleOutput"
+Write-Information "Creating dotnet Bundle at $DotnetBundleOutput"
 
 if([string]::IsNullOrEmpty($WixRoot))
 {
@@ -136,6 +142,6 @@ if(!(Test-Path $DotnetBundleOutput))
     Exit -1
 }
 
-Write-Output "Successfully created dotnet bundle - $DotnetBundleOutput"
+Write-Information "Successfully created dotnet bundle - $DotnetBundleOutput"
 
 exit $LastExitCode