Merge branch 'master' into darc-master-4a58c12e-6e68-4dd7-ac92-7e714c7f68d7

2019-04-18 11:34:10 -07:00 · 2019-04-18 11:34:10 -07:00 · 0fe3cc40e5
commit 0fe3cc40e5
parent 48b908de02 771d1d1f67
15 changed files with 164 additions and 75 deletions
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -2,75 +2,75 @@
 <Dependencies>
  <ProductDependencies>
    <!-- Winforms / WPF -->
-    <Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview5-27617-01">
+    <Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview5-27617-04">
      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>3abca437fee294811fca2f81e9e5118a5b4c45fe</Sha>
+      <Sha>f28abecf151695f90d303dddc682de5fae1ec479</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27617-01">
+    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27617-04">
      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>3abca437fee294811fca2f81e9e5118a5b4c45fe</Sha>
+      <Sha>f28abecf151695f90d303dddc682de5fae1ec479</Sha>
    </Dependency>
-    <Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview5-27617-01">
+    <Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview5-27617-04">
      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>3abca437fee294811fca2f81e9e5118a5b4c45fe</Sha>
+      <Sha>f28abecf151695f90d303dddc682de5fae1ec479</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview5-19216-08">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview5-19218-02">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7</Sha>
+      <Sha>9c25375f0bf4b3adda1e16eda89597a49239b031</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview5-19216-08">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview5-19218-02">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7</Sha>
+      <Sha>9c25375f0bf4b3adda1e16eda89597a49239b031</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview5-19216-08">
+    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview5-19218-02">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7</Sha>
+      <Sha>9c25375f0bf4b3adda1e16eda89597a49239b031</Sha>
    </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="3.0.0-preview5-19216-08">
+    <Dependency Name="dotnet-dev-certs" Version="3.0.0-preview5-19218-02">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7</Sha>
+      <Sha>9c25375f0bf4b3adda1e16eda89597a49239b031</Sha>
    </Dependency>
-    <Dependency Name="dotnet-sql-cache" Version="3.0.0-preview5-19216-08">
+    <Dependency Name="dotnet-sql-cache" Version="3.0.0-preview5-19218-02">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7</Sha>
+      <Sha>9c25375f0bf4b3adda1e16eda89597a49239b031</Sha>
    </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="3.0.0-preview5-19216-08">
+    <Dependency Name="dotnet-user-secrets" Version="3.0.0-preview5-19218-02">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7</Sha>
+      <Sha>9c25375f0bf4b3adda1e16eda89597a49239b031</Sha>
    </Dependency>
-    <Dependency Name="dotnet-watch" Version="3.0.0-preview5-19216-08">
+    <Dependency Name="dotnet-watch" Version="3.0.0-preview5-19218-02">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>2dc5694ecd1bd95e9091f6942657ebe1da6e0bb7</Sha>
+      <Sha>9c25375f0bf4b3adda1e16eda89597a49239b031</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta5.19216.1">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta5.19217.1">
      <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>2426d6e864763c91faa0081fae898f71477f969f</Sha>
+      <Sha>b415d1449b526338fba996d87c92a9de7f5286b8</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview5.19217.5">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview5.19218.6">
      <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>f7288caac1b1fd1c460a28c1909f110c6a1dae64</Sha>
+      <Sha>f2edaad5577852a23a531396ddb26a0aee1f8def</Sha>
    </Dependency>
-    <Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19216.1">
+    <Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19217.2">
      <Uri>https://github.com/dotnet/standard</Uri>
-      <Sha>194f2eb8bcec69ab6963d4dc51fc62bcb907386b</Sha>
+      <Sha>25538d60f7f4c2c79cf098f2b808907d87b516a7</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview5.19216.1">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview5.19218.1">
      <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>9adbab0c75e49a753643c578c3e92949299d534d</Sha>
+      <Sha>acf9ebc74c43fc242a6529c0c9f31a3a6c13e378</Sha>
    </Dependency>
    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-preview4.19205.5">
      <Uri>https://github.com/dotnet/winforms</Uri>
      <Sha>a875e24eff58bcc7a1bb124a6f05792639a83536</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-preview5.19215.4">
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-preview5.19217.4">
      <Uri>https://github.com/dotnet/wpf</Uri>
-      <Sha>98d8e57e2c6ee4a8844a9b8f1f279cf5025f25aa</Sha>
+      <Sha>8beb1b2f8d5d6f7a7d85f32d09ce3fc33696e206</Sha>
    </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19217.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19218.1">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>4e21d52dabbb9f5705a90f097acb1465a0354c0d</Sha>
+      <Sha>46718d98c0fd03690a6a8c83da692a4a85a17902</Sha>
    </Dependency>
  </ToolsetDependencies>
 </Dependencies>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -12,7 +12,7 @@
    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
  </PropertyGroup>
  <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview5.19217.5</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview5.19218.6</MicrosoftDotnetToolsetInternalPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/winforms -->
@ -20,40 +20,41 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview5.19215.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview5.19217.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview5-19216-08</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview5-19216-08</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview5-19216-08</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
-    <dotnetdevcertsPackageVersion>3.0.0-preview5-19216-08</dotnetdevcertsPackageVersion>
-    <dotnetsqlcachePackageVersion>3.0.0-preview5-19216-08</dotnetsqlcachePackageVersion>
-    <dotnetusersecretsPackageVersion>3.0.0-preview5-19216-08</dotnetusersecretsPackageVersion>
-    <dotnetwatchPackageVersion>3.0.0-preview5-19216-08</dotnetwatchPackageVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview5-19218-02</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview5-19218-02</MicrosoftAspNetCoreAppRefPackageVersion>
+    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview5-19218-02</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
+    <dotnetdevcertsPackageVersion>3.0.0-preview5-19218-02</dotnetdevcertsPackageVersion>
+    <dotnetsqlcachePackageVersion>3.0.0-preview5-19218-02</dotnetsqlcachePackageVersion>
+    <dotnetusersecretsPackageVersion>3.0.0-preview5-19218-02</dotnetusersecretsPackageVersion>
+    <dotnetwatchPackageVersion>3.0.0-preview5-19218-02</dotnetwatchPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/cli -->
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview5.19216.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview5.19218.1</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta5.19216.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta5.19217.1</MicrosoftDotNetCommonItemTemplatesPackageVersion>
    <MicrosoftDotNetCommonProjectTemplates30PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates30PackageVersion>
    <MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.19155.2</MicrosoftDotNetTestProjectTemplates30PackageVersion>
    <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
    <NUnit3TemplatesVersion>1.6.1</NUnit3TemplatesVersion>
  </PropertyGroup>
  <PropertyGroup>
-    <MicrosoftNETCoreAppPackageVersion>3.0.0-preview5-27617-01</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>3.0.0-preview5-27617-04</MicrosoftNETCoreAppPackageVersion>
    <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
    <SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
    <HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
    <NetCoreAppTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppTargetingPackVersion>
-    <NETStandardLibraryRefPackageVersion>2.1.0-preview5-27617-01</NETStandardLibraryRefPackageVersion>
+    <NetCoreAppHostPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppHostPackVersion>
+    <NETStandardLibraryRefPackageVersion>2.1.0-preview5-27617-04</NETStandardLibraryRefPackageVersion>
    <WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</WindowsDesktopTargetingPackVersion>
    <AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
    <AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion>
-    <MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview5-27617-01</MicrosoftWindowsDesktopAppPackageVersion>
+    <MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview5-27617-04</MicrosoftWindowsDesktopAppPackageVersion>
    <MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
  </PropertyGroup>
  <!-- infrastructure and test only dependencies -->
--- a/eng/common/CheckSymbols.ps1
+++ b/eng/common/CheckSymbols.ps1
@ -9,7 +9,8 @@ Add-Type -AssemblyName System.IO.Compression.FileSystem
 function FirstMatchingSymbolDescriptionOrDefault {
  param( 
    [string] $FullPath,                  # Full path to the module that has to be checked
-    [string] $TargetServerParam          # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols
+    [string] $TargetServerParam,         # Parameter to pass to `Symbol Tool` indicating the server to lookup for symbols
+    [string] $SymbolsPath
  )

  $FileName = [System.IO.Path]::GetFileName($FullPath)
@ -33,9 +34,9 @@ function FirstMatchingSymbolDescriptionOrDefault {

  # DWARF file for a .dylib
  $DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf")
-  
-  .\dotnet-symbol.exe --symbols --modules $TargetServerParam $FullPath -o $SymbolsPath -d | Out-Null
-  
+ 
+  .\dotnet-symbol.exe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null
+
  if (Test-Path $PdbPath) {
    return "PDB"
  }
@ -73,8 +74,9 @@ function CountMissingSymbols {
  $MissingSymbols = 0

  $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath)
-  $ExtractPath = $ExtractPath + $PackageId;
-  $SymbolsPath = $ExtractPath + $PackageId + ".Symbols";
+  $PackageGuid = New-Guid
+  $ExtractPath = Join-Path -Path $ExtractPath -ChildPath $PackageGuid
+  $SymbolsPath = Join-Path -Path $ExtractPath -ChildPath "Symbols"
  
  [System.IO.Compression.ZipFile]::ExtractToDirectory($PackagePath, $ExtractPath)

@ -84,10 +86,15 @@ function CountMissingSymbols {
  Get-ChildItem -Recurse $ExtractPath |
    Where-Object {$RelevantExtensions -contains $_.Extension} |
    ForEach-Object {
-      Write-Host -NoNewLine "`t Checking file" $_.FullName "... "
+      if ($_.FullName -Match "\\ref\\") {
+        Write-Host "`t Ignoring reference assembly file" $_.FullName
+        return
+      }

-      $SymbolsOnMSDL = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--microsoft-symbol-server"
-      $SymbolsOnSymWeb = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--internal-server"
+      $SymbolsOnMSDL = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--microsoft-symbol-server" $SymbolsPath
+      $SymbolsOnSymWeb = FirstMatchingSymbolDescriptionOrDefault $_.FullName "--internal-server" $SymbolsPath
+
+      Write-Host -NoNewLine "`t Checking file" $_.FullName "... "
  
      if ($SymbolsOnMSDL -ne $null -and $SymbolsOnSymWeb -ne $null) {
        Write-Host "Symbols found on MSDL (" $SymbolsOnMSDL ") and SymWeb (" $SymbolsOnSymWeb ")"
@ -116,18 +123,35 @@ function CountMissingSymbols {

 function CheckSymbolsAvailable {
  if (Test-Path $ExtractPath) {
-    Remove-Item -recurse $ExtractPath
+    Remove-Item $ExtractPath -Force  -Recurse -ErrorAction SilentlyContinue
  }

  Get-ChildItem "$InputPath\*.nupkg" |
    ForEach-Object {
      $FileName = $_.Name
+	  
+      # These packages from Arcade-Services include some native libraries that
+      # our current symbol uploader can't handle. Below is a workaround until
+      # we get issue: https://github.com/dotnet/arcade/issues/2457 sorted.
+      if ($FileName -Match "Microsoft\.DotNet\.Darc\.") {
+        Write-Host "Ignoring Arcade-services file: $FileName"
+        Write-Host
+        return
+      }
+      elseif ($FileName -Match "Microsoft\.DotNet\.Maestro\.Tasks\.") {
+        Write-Host "Ignoring Arcade-services file: $FileName"
+        Write-Host
+        return
+      }
+	  
      Write-Host "Validating $FileName "
      $Status = CountMissingSymbols "$InputPath\$FileName"
  
      if ($Status -ne 0) {
        Write-Error "Missing symbols for $Status modules in the package $FileName"
      }
+
+      Write-Host
    }
 }

--- a/global.json
+++ b/global.json
@ -3,6 +3,6 @@
    "dotnet": "3.0.100-preview4-010564"
  },
  "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19217.1"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19218.1"
  }
 }
--- 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>
--- 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 -->
--- 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'))">
--- 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)' ^
--- 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)" />
--- 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>
--- 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%" }
--- 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>
--- 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%"
--- 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>
--- 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