Merge branch 'master' into merges/release/3.0.1xx-to-master-0419

2019-04-19 16:23:21 -07:00 · 2019-04-19 16:23:21 -07:00 · ee70e29cd5
commit ee70e29cd5
parent a6ebafc180 eccc09f444
25 changed files with 453 additions and 94 deletions
--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@

 [![Join the chat at https://gitter.im/dotnet/cli](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/dotnet/cli?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

-This repo contains the source code for the cross-platform [.NET Core](http://github.com/dotnet/core) SDK. It aggregates the .NET Toolchain, the .NET Core runtime, the templates, the offline packages cache, the ASP.NET Runtime store, and the .NET Core Windows Desktop runtime. It produces zip, tarballs, and native packages for various supported platforms.
+This repo contains the source code for the cross-platform [.NET Core](http://github.com/dotnet/core) SDK. It aggregates the .NET Toolchain, the .NET Core runtime, the templates, and the .NET Core Windows Desktop runtime. It produces zip, tarballs, and native packages for various supported platforms.

 Looking for V2 of the .NET Core tooling?
 ----------------------------------------
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -2,71 +2,79 @@
 <Dependencies>
  <ProductDependencies>
    <!-- Winforms / WPF -->
-    <Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview4-27613-28">
-      <Uri>https://dev.azure.com/devdiv/DevDiv/_git/DotNet-Trusted</Uri>
-      <Sha>c825427fa2e10dc808afbedd2bfff9b1c4569ab8</Sha>
-    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview4-27615-11">
+    <Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview5-27619-10">
      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>ee54d4cbd2b305eadf6f341bdc9d4abccdb50559</Sha>
+      <Sha>ef496a091be8d8b43ab8c4ed3622ca89bce251cb</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview4-19216-03">
+    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview5-27619-10">
+      <Uri>https://github.com/dotnet/core-setup</Uri>
+      <Sha>ef496a091be8d8b43ab8c4ed3622ca89bce251cb</Sha>
+    </Dependency>
+    <Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview5-27619-10">
+      <Uri>https://github.com/dotnet/core-setup</Uri>
+      <Sha>ef496a091be8d8b43ab8c4ed3622ca89bce251cb</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview5-19218-09">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>865acae3e95d5ade51b66ea578ba9d7764d562ba</Sha>
+      <Sha>acf45106fcc972d2c28f7cdfc198be7c98c8c574</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview4-19216-03">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview5-19218-09">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>865acae3e95d5ade51b66ea578ba9d7764d562ba</Sha>
+      <Sha>acf45106fcc972d2c28f7cdfc198be7c98c8c574</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview4-19216-03">
+    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview5-19218-09">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>865acae3e95d5ade51b66ea578ba9d7764d562ba</Sha>
+      <Sha>acf45106fcc972d2c28f7cdfc198be7c98c8c574</Sha>
    </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="3.0.0-preview4-19216-03">
+    <Dependency Name="dotnet-dev-certs" Version="3.0.0-preview5-19218-09">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>865acae3e95d5ade51b66ea578ba9d7764d562ba</Sha>
+      <Sha>acf45106fcc972d2c28f7cdfc198be7c98c8c574</Sha>
    </Dependency>
-    <Dependency Name="dotnet-sql-cache" Version="3.0.0-preview4-19216-03">
+    <Dependency Name="dotnet-sql-cache" Version="3.0.0-preview5-19218-09">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>865acae3e95d5ade51b66ea578ba9d7764d562ba</Sha>
+      <Sha>acf45106fcc972d2c28f7cdfc198be7c98c8c574</Sha>
    </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="3.0.0-preview4-19216-03">
+    <Dependency Name="dotnet-user-secrets" Version="3.0.0-preview5-19218-09">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>865acae3e95d5ade51b66ea578ba9d7764d562ba</Sha>
+      <Sha>acf45106fcc972d2c28f7cdfc198be7c98c8c574</Sha>
    </Dependency>
-    <Dependency Name="dotnet-watch" Version="3.0.0-preview4-19216-03">
+    <Dependency Name="dotnet-watch" Version="3.0.0-preview5-19218-09">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>865acae3e95d5ade51b66ea578ba9d7764d562ba</Sha>
+      <Sha>acf45106fcc972d2c28f7cdfc198be7c98c8c574</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta5.19208.4">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="1.0.2-beta5.19218.1">
      <Uri>https://github.com/dotnet/templating</Uri>
-      <Sha>0fd9a865045026041f2ea4942eb8c91782193078</Sha>
+      <Sha>c25748ad974957739a8ea6696087903bdb5f104b</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview4.19219.9">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview5.19219.7">
      <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>9a9a0d21b4b3c63adce7858486c8ef47d6a822d8</Sha>
+      <Sha>677183543306a9b41960a1bc1e2db369bbf4dc44</Sha>
    </Dependency>
-    <Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19208.5">
+    <Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19219.2">
      <Uri>https://github.com/dotnet/standard</Uri>
-      <Sha>8ef5ada20b5343b0cb9e7fd577341426dab76cd8</Sha>
+      <Sha>ab24a5de1bf2d8b71eff678798b65bd562630ae2</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview4.19218.4">
+    <Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-preview5.19212.8">
+      <Uri>https://github.com/dotnet/sdk</Uri>
+      <Sha>6916b50efb78f126aa68a5d183993f55fb6e03c9</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview5.19219.4">
      <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>202dfdc2465db515c862fa10c7f91baf42aec744</Sha>
+      <Sha>6487f2fd7a2d9cb44bad72d6c36af289de2d721f</Sha>
    </Dependency>
    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-preview4.19213.1">
      <Uri>https://github.com/dotnet/winforms</Uri>
      <Sha>b1ee29b8b8e14c1200adff02847391dde471d0d2</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-preview4.19213.3">
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-preview5.19218.4">
      <Uri>https://github.com/dotnet/wpf</Uri>
-      <Sha>d378b1ec6b8555c52b7da1c40ffc0784cb0f5cad</Sha>
+      <Sha>71d36bacfd89c53e240f1ae542ab1c67bcdce780</Sha>
    </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19206.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19218.4">
      <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9d8abf998866f10bc19d97e1916ff1c0ada3fd42</Sha>
+      <Sha>1d4c87ff798d7de521128e6c3d890055c2401e80</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-preview4.19219.9</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview5.19219.7</MicrosoftDotnetToolsetInternalPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/winforms -->
@ -20,47 +20,45 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview4.19213.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview5.19218.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview4-19216-03</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview4-19216-03</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview4-19216-03</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
-    <dotnetdevcertsPackageVersion>3.0.0-preview4-19216-03</dotnetdevcertsPackageVersion>
-    <dotnetsqlcachePackageVersion>3.0.0-preview4-19216-03</dotnetsqlcachePackageVersion>
-    <dotnetusersecretsPackageVersion>3.0.0-preview4-19216-03</dotnetusersecretsPackageVersion>
-    <dotnetwatchPackageVersion>3.0.0-preview4-19216-03</dotnetwatchPackageVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview5-19218-09</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview5-19218-09</MicrosoftAspNetCoreAppRefPackageVersion>
+    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview5-19218-09</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
+    <dotnetdevcertsPackageVersion>3.0.0-preview5-19218-09</dotnetdevcertsPackageVersion>
+    <dotnetsqlcachePackageVersion>3.0.0-preview5-19218-09</dotnetsqlcachePackageVersion>
+    <dotnetusersecretsPackageVersion>3.0.0-preview5-19218-09</dotnetusersecretsPackageVersion>
+    <dotnetwatchPackageVersion>3.0.0-preview5-19218-09</dotnetwatchPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/cli -->
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview4.19218.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview5.19219.4</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
-    <MicrosoftNETCoreAppPackageVersion>3.0.0-preview4-27615-11</MicrosoftNETCoreAppPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <NETStandardLibraryPackageVersion>2.1.0-prerelease.19208.5</NETStandardLibraryPackageVersion>
-    <!-- Use a different property name here, as NETStandardLibraryPackageVersion is also set by targets in the NETStandard.Library package,
-         which ends up overriding the value set here. -->
-    <NETSTandardTargetingPackVersion>$(NETStandardLibraryPackageVersion)</NETSTandardTargetingPackVersion>
-  </PropertyGroup>
-  <PropertyGroup>
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta5.19208.4</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta5.19218.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>
+    <!-- Dependencies from https://github.com/dotnet/sdk (to run tests) -->
+    <MicrosoftNETSdkPackageVersion>3.0.100-preview5.19212.8</MicrosoftNETSdkPackageVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <MicrosoftNETCoreAppPackageVersion>3.0.0-preview5-27619-10</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
    <SharedHostVersion>$(MicrosoftNETCoreAppPackageVersion)</SharedHostVersion>
    <HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
    <NetCoreAppTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppTargetingPackVersion>
+    <NetCoreAppHostPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppHostPackVersion>
+    <NETStandardLibraryRefPackageVersion>2.1.0-preview5-27619-10</NETStandardLibraryRefPackageVersion>
    <WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</WindowsDesktopTargetingPackVersion>
    <AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
    <AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion>
-    <MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview4-27613-28</MicrosoftWindowsDesktopAppPackageVersion>
+    <MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview5-27619-10</MicrosoftWindowsDesktopAppPackageVersion>
    <MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
  </PropertyGroup>
  <!-- infrastructure and test only dependencies -->
--- a/eng/build.yml
+++ b/eng/build.yml
@ -20,9 +20,7 @@ phases:
    name: ${{ parameters.agentOs }}
    ${{ if eq(parameters.agentOs, 'Windows_NT') }}:
      enableMicrobuild: true
-    enablePublishBuildArtifacts: true
    enablePublishBuildAssets: true
-    enablePublishTestResults: true
    enableTelemetry: true
    helixRepo: dotnet/core-sdk
    pool: ${{ parameters.pool }}
@ -30,6 +28,7 @@ phases:
      strategy: ${{ parameters.strategy }}

    variables: 
+      - _AgentOSName: ${{ parameters.agentOs }}
      - _TeamName: Roslyn-Project-System
      - _BuildArgs: ''
      - _SignType: test
@ -99,6 +98,36 @@ phases:
                  $(_AdditionalBuildParameters)
        displayName: Build

+    - task: PublishTestResults@1	
+      displayName: Publish Test Results	
+      inputs:	
+        testRunner: XUnit	
+        testResultsFiles: 'artifacts/TestResults/$(_BuildConfig)/*.xml'	
+        testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'	
+        platform: '$(BuildPlatform)'	
+        configuration: '$(_BuildConfig)'	
+      condition: not(succeeded())
+
+    - task: CopyFiles@2	
+      displayName: Gather Logs	
+      inputs:	
+        SourceFolder: '$(Build.SourcesDirectory)/artifacts'	
+        Contents: |	
+         log/$(_BuildConfig)/**/*	
+         TestResults/$(_BuildConfig)/**/*	
+        TargetFolder: '$(Build.ArtifactStagingDirectory)'	
+      continueOnError: true	
+      condition: not(succeeded())	
+
+    - task: PublishBuildArtifacts@1	
+      displayName: Publish Logs to VSTS	
+      inputs:	
+        PathtoPublish: '$(Build.ArtifactStagingDirectory)'	
+        ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'	
+        publishLocation: Container	
+      continueOnError: true	
+      condition: not(succeeded())
+
    - ${{ if and(eq(parameters.enablePublishBuildAssets, true), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
      - task: CopyFiles@2
        displayName: Gather Asset Manifests
--- a/eng/common/CheckSymbols.ps1
+++ b/eng/common/CheckSymbols.ps1
@ -0,0 +1,158 @@
+param(
+  [Parameter(Mandatory=$true)][string] $InputPath,       # Full path to directory where NuGet packages to be checked are stored
+  [Parameter(Mandatory=$true)][string] $ExtractPath,     # Full path to directory where the packages will be extracted during validation
+  [Parameter(Mandatory=$true)][string] $SymbolToolPath   # Full path to directory where dotnet symbol-tool was installed
+)
+
+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] $SymbolsPath
+  )
+
+  $FileName = [System.IO.Path]::GetFileName($FullPath)
+  $Extension = [System.IO.Path]::GetExtension($FullPath)
+
+  # Those below are potential symbol files that the `dotnet symbol` might
+  # return. Which one will be returned depend on the type of file we are
+  # checking and which type of file was uploaded.
+
+  # The file itself is returned
+  $SymbolPath = $SymbolsPath + "\" + $FileName
+
+  # PDB file for the module
+  $PdbPath = $SymbolPath.Replace($Extension, ".pdb")
+
+  # PDB file for R2R module (created by crossgen)
+  $NGenPdb = $SymbolPath.Replace($Extension, ".ni.pdb")
+
+  # DBG file for a .so library
+  $SODbg = $SymbolPath.Replace($Extension, ".so.dbg")
+
+  # DWARF file for a .dylib
+  $DylibDwarf = $SymbolPath.Replace($Extension, ".dylib.dwarf")
+ 
+  .\dotnet-symbol.exe --symbols --modules --windows-pdbs $TargetServerParam $FullPath -o $SymbolsPath | Out-Null
+
+  if (Test-Path $PdbPath) {
+    return "PDB"
+  }
+  elseif (Test-Path $NGenPdb) {
+    return "NGen PDB"
+  }
+  elseif (Test-Path $SODbg) {
+    return "DBG for SO"
+  }  
+  elseif (Test-Path $DylibDwarf) {
+    return "Dwarf for Dylib"
+  }  
+  elseif (Test-Path $SymbolPath) {
+    return "Module"
+  }
+  else {
+    return $null
+  }
+}
+
+function CountMissingSymbols {
+  param( 
+    [string] $PackagePath          # Path to a NuGet package
+  )
+
+  # Ensure input file exist
+  if (!(Test-Path $PackagePath)) {
+    throw "Input file does not exist: $PackagePath"
+  }
+  
+  # Extensions for which we'll look for symbols
+  $RelevantExtensions = @(".dll", ".exe", ".so", ".dylib")
+
+  # How many files are missing symbol information
+  $MissingSymbols = 0
+
+  $PackageId = [System.IO.Path]::GetFileNameWithoutExtension($PackagePath)
+  $PackageGuid = New-Guid
+  $ExtractPath = Join-Path -Path $ExtractPath -ChildPath $PackageGuid
+  $SymbolsPath = Join-Path -Path $ExtractPath -ChildPath "Symbols"
+  
+  [System.IO.Compression.ZipFile]::ExtractToDirectory($PackagePath, $ExtractPath)
+
+  # Makes easier to reference `symbol tool`
+  Push-Location $SymbolToolPath
+
+  Get-ChildItem -Recurse $ExtractPath |
+    Where-Object {$RelevantExtensions -contains $_.Extension} |
+    ForEach-Object {
+      if ($_.FullName -Match "\\ref\\") {
+        Write-Host "`t Ignoring reference assembly file" $_.FullName
+        return
+      }
+
+      $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 ")"
+      }
+      else {
+        $MissingSymbols++
+
+        if ($SymbolsOnMSDL -eq $null -and $SymbolsOnSymWeb -eq $null) {
+          Write-Host "No symbols found on MSDL or SymWeb!"
+        }
+        else {
+          if ($SymbolsOnMSDL -eq $null) {
+            Write-Host "No symbols found on MSDL!"
+          }
+          else {
+            Write-Host "No symbols found on SymWeb!"
+          }
+        }
+      }
+    }
+  
+  Pop-Location
+
+  return $MissingSymbols
+}
+
+function CheckSymbolsAvailable {
+  if (Test-Path $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
+    }
+}
+
+CheckSymbolsAvailable
--- a/eng/common/PublishToSymbolServers.proj
+++ b/eng/common/PublishToSymbolServers.proj
@ -24,6 +24,14 @@
    <ItemGroup>
      <FilesToPublishToSymbolServer Include="$(PDBArtifactsDirectory)\*.pdb"/>
      <PackagesToPublishToSymbolServer Include="$(BlobBasePath)\*.symbols.nupkg"/>
+
+      <!--
+        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.
+      -->
+      <PackagesToPublishToSymbolServer Remove="$(BlobBasePath)\Microsoft.DotNet.Darc.*" />
+      <PackagesToPublishToSymbolServer Remove="$(BlobBasePath)\Microsoft.DotNet.Maestro.Tasks.*" />
    </ItemGroup>

    <PropertyGroup>
--- a/eng/common/internal/Tools.csproj
+++ b/eng/common/internal/Tools.csproj
@ -12,8 +12,12 @@
    <PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
  </ItemGroup>
  <PropertyGroup>
-    <RestoreSources>
-      https://devdiv.pkgs.visualstudio.com/_packaging/8f470c7e-ac49-4afe-a6ee-cf784e438b93/nuget/v3/index.json;
+    <RestoreSources></RestoreSources>
+    <RestoreSources Condition="'$(UsingToolIbcOptimization)' == 'true'">
+      https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json;
+    </RestoreSources>
+    <RestoreSources Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'">
+      $(RestoreSources);
      https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json;
    </RestoreSources>
  </PropertyGroup>
--- a/eng/common/templates/phases/publish-build-assets.yml
+++ b/eng/common/templates/phases/publish-build-assets.yml
@ -5,6 +5,7 @@ parameters:
  condition: succeeded()
  continueOnError: false
  runAsPublic: false
+  publishUsingPipelines: false
 phases:
  - phase: Asset_Registry_Publish
    displayName: Publish to Build Asset Registry
@ -36,6 +37,7 @@ phases:
              /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
              /p:BuildAssetRegistryToken=$(MaestroAccessToken)
              /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
+              /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
              /p:Configuration=$(_BuildConfig)
          condition: ${{ parameters.condition }}
          continueOnError: ${{ parameters.continueOnError }}
--- a/global.json
+++ b/global.json
@ -1,8 +1,8 @@
 {
  "tools": {
-    "dotnet": "3.0.100-preview-009812"
+    "dotnet": "3.0.100-preview4-010564"
  },
  "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19206.5"
+    "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19218.4"
  }
 }
--- a/src/CopyToLatest/targets/BranchInfo.props
+++ b/src/CopyToLatest/targets/BranchInfo.props
@ -1,5 +1,5 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
-    <Channel>release/3.0.1xx</Channel>
+    <Channel>master</Channel>
  </PropertyGroup>
 </Project>
--- a/src/redist/targets/Branding.targets
+++ b/src/redist/targets/Branding.targets
@ -6,6 +6,8 @@
      <MSBuildExtensionsBrandName>.NET Standard Support for Visual Studio 2015</MSBuildExtensionsBrandName>
      <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/DownloadPackage.csproj
+++ b/src/redist/targets/DownloadPackage.csproj
@ -14,4 +14,6 @@

  <!-- Workaround newer sdk preventing us from downloading Microsoft.AspNetCore.App via PackageReference above. -->
  <Target Name="UpdateAspNetToFrameworkReference" />
+  <!-- Workaround: prevents a downgrade error for arm* legs from 'ResolveAppHosts' -->
+  <Target Name="ResolveFrameworkReferences" />
 </Project>
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@ -202,7 +202,7 @@ Copyright (c) .NET Foundation. All rights reserved.

    <KnownAppHostPack Include="Microsoft.NETCore.App"
                      TargetFramework="netcoreapp3.0"
-                      AppHostPackNamePattern="runtime.**RID**.Microsoft.NETCore.DotNetAppHost"
+                      AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
                      AppHostPackVersion="$(_NETCoreAppPackageVersion)"
                      AppHostRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')"
                      />
@ -231,9 +231,8 @@ Copyright (c) .NET Foundation. All rights reserved.
                              
     <KnownFrameworkReference Include="NETStandard.Library"
                              TargetFramework="netstandard2.1"
-                              TargetingPackName="NETStandard.Library"
-                              TargetingPackVersion="$(NETSTandardTargetingPackVersion)"
-                              TargetingPackFormat="NETStandardLegacy"
+                              TargetingPackName="NETStandard.Library.Ref"
+                              TargetingPackVersion="$(NETStandardLibraryRefPackageVersion)"
                              />

  </ItemGroup>
--- a/src/redist/targets/GenerateDebs.targets
+++ b/src/redist/targets/GenerateDebs.targets
@ -48,6 +48,16 @@
      <NetCoreAppTargetingPackDebianPackageName>dotnet-targeting-pack-$(SharedFxDebianPackageVersion)</NetCoreAppTargetingPackDebianPackageName>
      <NetCoreAppTargetingPackDebianPackageName>$(NetCoreAppTargetingPackDebianPackageName.ToLower())</NetCoreAppTargetingPackDebianPackageName>
      <DownloadedNetCoreAppTargetingPackInstallerFile>$(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName)</DownloadedNetCoreAppTargetingPackInstallerFile>
+      <NetStandardTargetingPackDebianPackageFileName>netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)</NetStandardTargetingPackDebianPackageFileName>
+      <NetStandardTargetingPackDebianPackageFileName>$(NetStandardTargetingPackDebianPackageFileName.ToLower())</NetStandardTargetingPackDebianPackageFileName>
+      <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>
@ -65,7 +75,7 @@
      <AspNetTargetingPackDebianPackageName>aspnetcore-targeting-pack-$(AspNetCoreMajorMinorVersion)</AspNetTargetingPackDebianPackageName>
      <AspNetTargetingPackDebianPackageName>$(AspNetTargetingPackDebianPackageName.ToLower())</AspNetTargetingPackDebianPackageName>
      <DownloadedAspNetTargetingPackInstallerFile>$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)</DownloadedAspNetTargetingPackInstallerFile>
-</PropertyGroup>
+    </PropertyGroup>

    <!-- Inputs -->
    <PropertyGroup>
@ -120,6 +130,12 @@
      <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>
      <DebianConfigTokenValues Include="%ASPNET_TARGETING_PACK_DEBIAN_PACKAGE_NAME%">
        <ReplacementString>$(AspNetTargetingPackDebianPackageName)</ReplacementString>
      </DebianConfigTokenValues>
@ -143,6 +159,9 @@
      <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%">
        <ReplacementString>$(MicrosoftNETCoreAppPackageVersionWithTilda)</ReplacementString>
      </DebianConfigTokenValues>
+      <DebianConfigTokenValues Include="%NET_STANDARD_DEBIAN_PACKAGE_VERSION%">
+        <ReplacementString>$(NetStandardTargetingPackPackageVersionWithTilda)</ReplacementString>
+      </DebianConfigTokenValues>
      <DebianConfigTokenValues Include="%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%">
        <ReplacementString>$(AspNetCoreVersionWithTilda)</ReplacementString>
      </DebianConfigTokenValues>
@ -211,7 +230,9 @@
      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)" />
      <Exec Command="sudo dpkg -i $(DownloadedRuntimeDepsInstallerFile)" />
      <Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
@ -289,8 +310,11 @@
        <SetupDebPackageToRemove Include="$(SharedHostDebianPackageName)" />
        <SetupDebPackageToRemove Include="$(AspNetTargetingPackDebianPackageName)" />
        <SetupDebPackageToRemove Include="$(AspNetTargetingPackDebianPackageFileName)" />
+        <SetupDebPackageToRemove Include="$(NetStandardTargetingPackDebianPackageName)" />
+        <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 -->
@ -302,7 +326,9 @@
      Condition=" '$(CLIBUILD_SKIP_TESTS)' != 'true' and '$(IsDebianBaseDistro)' == 'True' and '$(DebuildPresent)'  == 'true' "
      DependsOnTargets="GetAspNetSharedFxInstallArgs"
      Inputs="$(DownloadedRuntimeDepsInstallerFile);
+              $(DownloadedNetCoreAppHostPackInstallerFile);
              $(DownloadedNetCoreAppTargetingPackInstallerFile);
+              $(DownloadedNetStandardTargetingPackInstallerFile);
              $(DownloadedAspNetTargetingPackInstallerFile);
              $(DownloadedSharedHostInstallerFile);
              $(DownloadedHostFxrInstallerFile);
@ -314,7 +340,9 @@

      <!-- 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)" />
      <Exec Command="sudo dpkg -i $(DownloadedSharedHostInstallerFile)" />
      <Exec Command="sudo dpkg -i $(DownloadedHostFxrInstallerFile)" />
@ -341,7 +369,9 @@
        <TestSdkDebPackageToRemove Include="$(HostFxrDebianPackageName)" />
        <TestSdkDebPackageToRemove Include="$(SharedHostDebianPackageName)" />
        <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
@ -9,7 +9,6 @@
    <PropertyGroup>
      <SdkOutputDirectory>$(RedistLayoutPath)sdk\$(SdkVersion)\</SdkOutputDirectory>
      <CoreSetupBlobRootUrl>https://dotnetcli.azureedge.net/dotnet/</CoreSetupBlobRootUrl>
-      <DotnetExtensionsBlobRootUrl Condition="'$(DotnetExtensionsBlobRootUrl)' == ''">https://dotnetcli.blob.core.windows.net/dotnet/</DotnetExtensionsBlobRootUrl>
      <DotnetToolsetBlobRootUrl Condition="'$(DotnetToolsetBlobRootUrl)' == ''">https://dotnetfeed.blob.core.windows.net/dotnet-toolset/</DotnetToolsetBlobRootUrl>
      
      <CoreSetupRid>$(HostRid)</CoreSetupRid>
@ -28,9 +27,12 @@
      <DownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedHostInstallerFileName>
      <DownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedHostFxrInstallerFileName>
      <DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
-      <DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-extension-$(MicrosoftWindowsDesktopPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName>
+      <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>

      <!-- Use the portable "linux-x64" Rid when downloading Linux shared framework compressed file. -->
      <SharedFrameworkRid>$(CoreSetupRid)</SharedFrameworkRid>
@ -52,7 +54,7 @@
      <DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(IsDebianBaseDistro)' == 'true' ">aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
      <AspNetTargetingPackArchiveFileName>aspnetcore-targeting-pack-$(AspNetCoreVersion)$(ArchiveExtension)</AspNetTargetingPackArchiveFileName>
      <AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>
-      <WinFormsAndWpfSharedFxArchiveFileName>dotnet-extension-$(MicrosoftWindowsDesktopPackageVersion)-$(Architecture)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>
+      <WinFormsAndWpfSharedFxArchiveFileName>windowsdesktop-runtime-$(MicrosoftWindowsDesktopPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)</WinFormsAndWpfSharedFxArchiveFileName>

      <!-- Used to detect if ASP.NET Core is built against the same version of Microsoft.NETCore.App. -->
      <AspNetCoreSharedFxBaseRuntimeVersionFileName>aspnetcore_base_runtime.version</AspNetCoreSharedFxBaseRuntimeVersionFileName>
@ -61,7 +63,7 @@
    <PropertyGroup>
      <CoreSetupRootUrl>$(CoreSetupBlobRootUrl)Runtime/</CoreSetupRootUrl>
      <AspNetCoreSharedFxRootUrl>$(CoreSetupBlobRootUrl)aspnetcore/Runtime/</AspNetCoreSharedFxRootUrl>
-      <WinFormsAndWpfSharedFxRootUrl>$(DotnetExtensionsBlobRootUrl)dotnet-extensions/</WinFormsAndWpfSharedFxRootUrl>
+      <WinFormsAndWpfSharedFxRootUrl>$(CoreSetupRootUrl)</WinFormsAndWpfSharedFxRootUrl>
      <CoreSetupDownloadDirectory>$(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppPackageVersion)</CoreSetupDownloadDirectory>
      <CombinedSharedHostAndFrameworkArchive>$(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension)</CombinedSharedHostAndFrameworkArchive>
    </PropertyGroup>
@ -70,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>
@ -82,30 +84,42 @@
      <BundledLayoutPackage Include="MicrosoftNetCoreAppTargetingPackNupkg">
        <PackageName>Microsoft.NETCore.App.Ref</PackageName>
        <PackageVersion>$(NetCoreAppTargetingPackVersion)</PackageVersion>
+        <TargetFramework>$(TargetFramework)</TargetFramework>
        <RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
      </BundledLayoutPackage>

+      <BundledLayoutPackage Include="MicrosoftNetStandardTargetingPackNupkg">
+        <PackageName>NETStandard.Library.Ref</PackageName>
+        <PackageVersion>$(NETStandardLibraryRefPackageVersion)</PackageVersion>
+        <TargetFramework>$(NetStandardTargetingPackTargetFramework)</TargetFramework>
+        <RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
+      </BundledLayoutPackage>
+      
      <BundledLayoutPackage Include="MicrosoftAspNetCoreAppTargetingPackNupkg">
        <PackageName>Microsoft.AspNetCore.App.Ref</PackageName>
        <PackageVersion>$(AspNetTargetingPackVersion)</PackageVersion>
+        <TargetFramework>$(TargetFramework)</TargetFramework>
        <RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
      </BundledLayoutPackage>

      <BundledLayoutPackage Include="MicrosoftWindowsDesktopAppTargetingPackNupkg">
        <PackageName>Microsoft.WindowsDesktop.App.Ref</PackageName>
        <PackageVersion>$(WindowsDesktopTargetingPackVersion)</PackageVersion>
+        <TargetFramework>$(TargetFramework)</TargetFramework>
        <RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
      </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>

@ -144,6 +158,20 @@
        <AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
      </BundledInstallerComponent>

+      <BundledInstallerComponent Include="DownloadedNetStandardTargetingPackInstallerFile"
+                           Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
+        <BaseUrl>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)</BaseUrl>
+        <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'))">
        <BaseUrl>$(CoreSetupRootUrl)$(WindowsDesktopTargetingPackVersion)</BaseUrl>
@ -245,7 +273,7 @@
        <Properties>
          PackageToRestore=%(BundledLayoutPackage.PackageName);
          PackageVersionToRestore=%(BundledLayoutPackage.PackageVersion);
-          TargetFramework=$(TargetFramework);
+          TargetFramework=%(BundledLayoutPackage.TargetFramework);
          LayoutPackageDescription=%(BundledLayoutPackage.Identity)
        </Properties>
      </BundledLayoutPackageDownloadProject>
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@ -139,6 +139,8 @@
                      '$(DownloadsFolder)$(DownloadedSharedHostInstallerFileName)' ^
                      '$(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,7 +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>
+      <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>

@ -26,6 +28,8 @@
      <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>

@ -42,6 +46,12 @@
        <DistributionTemplateReplacement Include="{NetCoreAppTargetingPackComponentId}">
          <ReplacementString>$(NetCoreAppTargetingPackComponentId)</ReplacementString>
        </DistributionTemplateReplacement>
+        <DistributionTemplateReplacement Include="{NetStandardTargetingPackComponentId}">
+          <ReplacementString>$(NetStandardTargetingPackComponentId)</ReplacementString>
+        </DistributionTemplateReplacement>
+        <DistributionTemplateReplacement Include="{NetCoreAppHostPackComponentId}">
+          <ReplacementString>$(NetCoreAppHostPackComponentId)</ReplacementString>
+        </DistributionTemplateReplacement>
        <DistributionTemplateReplacement Include="{SharedHostComponentId}">
          <ReplacementString>$(SharedHostComponentId)</ReplacementString>
        </DistributionTemplateReplacement>
@ -63,6 +73,12 @@
        <DistributionTemplateReplacement Include="{NetCoreAppTargetingPackBrandName}">
          <ReplacementString>$(NetCoreAppTargetingPackBrandName)</ReplacementString>
        </DistributionTemplateReplacement>
+        <DistributionTemplateReplacement Include="{NetCoreAppHostPackBrandName}">
+          <ReplacementString>$(NetCoreAppHostPackBrandName)</ReplacementString>
+        </DistributionTemplateReplacement>
+        <DistributionTemplateReplacement Include="{NetStandardTargetingPackBrandName}">
+          <ReplacementString>$(NetStandardTargetingPackBrandName)</ReplacementString>
+        </DistributionTemplateReplacement>
        <DistributionTemplateReplacement Include="{SharedHostBrandName}">
          <ReplacementString>$(SharedHostBrandName)</ReplacementString>
        </DistributionTemplateReplacement>
@ -99,6 +115,8 @@
        <GenerateSdkProductArchiveInputs Include="$(SdkPKGInstallerFile)" />
        <GenerateSdkProductArchiveInputs Include="$(DownloadedSharedFrameworkInstallerFile)" />
        <GenerateSdkProductArchiveInputs Include="$(DownloadedNetCoreAppTargetingPackInstallerFile)" />
+        <GenerateSdkProductArchiveInputs Include="$(DownloadedNetCoreAppHostPackInstallerFile)" />
+        <GenerateSdkProductArchiveInputs Include="$(DownloadedNetStandardTargetingPackInstallerFile)" />
        <GenerateSdkProductArchiveInputs Include="$(DownloadedHostFxrInstallerFile)" />
        <GenerateSdkProductArchiveInputs Include="$(DownloadedSharedHostInstallerFile)" />
        <GenerateSdkProductArchiveInputs Include="$(SdkProductArchiveDistributionTemplateFile)" />
@ -152,11 +170,15 @@
        <PkgComponentsSourceFiles Include="$(SdkPKGInstallerFile);
                                $(DownloadsFolder)$(DownloadedSharedFrameworkInstallerFileName);
                                $(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName);
+                                $(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName);
+                                $(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName);
                                $(DownloadsFolder)$(DownloadedHostFxrInstallerFileName);
                                $(DownloadsFolder)$(DownloadedSharedHostInstallerFileName)" />
        <PkgComponentsDestinationFiles Include="$(SdkPkgIntermediatePath);
                                                $(SharedFrameworkPkgIntermediatePath);
                                                $(NetCoreAppTargetingPackPkgIntermediatePath);
+                                                $(NetCoreAppHostPackPkgIntermediatePath);
+                                                $(NetStandardTargetingPackPkgIntermediatePath);
                                                $(HostFxrPkgIntermediatePath);
                                                $(SharedHostPkgIntermediatePath)" />
      </ItemGroup>
--- a/src/redist/targets/GenerateRPMs.targets
+++ b/src/redist/targets/GenerateRPMs.targets
@ -73,6 +73,9 @@
      <SDKTokenValue Include="%SHARED_FRAMEWORK_RPM_PACKAGE_VERSION%">
        <ReplacementString>$(MicrosoftNETCoreAppMajorMinorPatchVersion)</ReplacementString>
      </SDKTokenValue>
+      <SDKTokenValue Include="%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_VERSION%">
+        <ReplacementString>$(NetStandardTargetingPackMajorMinorPatchVersion)</ReplacementString>
+      </SDKTokenValue>
      <SDKTokenValue Include="%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%">
        <ReplacementString>$(AspNetCoreMajorMinorPatchVersion)</ReplacementString>
      </SDKTokenValue>
@ -82,6 +85,12 @@
      <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>
      <SDKTokenValue Include="%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%">
        <ReplacementString>$(AspNetCoreSharedFxRpmPackageName)</ReplacementString>
      </SDKTokenValue>
@ -190,6 +199,14 @@
      <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>
+      <NetStandardTargetingPackRpmPackageFileName>$(NetStandardTargetingPackRpmPackageFileName.ToLower())</NetStandardTargetingPackRpmPackageFileName>
      <HostFxrRpmPackageName>dotnet-hostfxr-$(SharedFxRpmPackageVersion)</HostFxrRpmPackageName>
      <HostFxrRpmPackageName>$(HostFxrRpmPackageName.ToLower())</HostFxrRpmPackageName>
      <RuntimeDepsPackageName>dotnet-runtime-deps-$(SharedFxRpmPackageVersion)</RuntimeDepsPackageName>
@ -209,6 +226,8 @@

    <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>
@ -241,6 +260,8 @@
  <Target Name="TestSdkRpm"
          Condition="  '$(CLIBUILD_SKIP_TESTS)' != 'true' and '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' "
          Inputs="$(DownloadedNetCoreAppTargetingPackInstallerFile);
+                  $(DownloadedNetStandardTargetingPackInstallerFile);
+                  $(DownloadedNetCoreAppHostPackInstallerFile);
                  $(DownloadedAspNetTargetingPackInstallerFile);
                  $(DownloadedRuntimeDepsInstallerFile);
                  $(DownloadedSharedHostInstallerFile);
@ -253,7 +274,9 @@

    <!-- 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)" />
    <Exec Command="sudo rpm -iv $(DownloadedSharedHostInstallerFile)" />
    <Exec Command="sudo rpm -iv $(DownloadedHostFxrInstallerFile)" />
@ -277,7 +300,9 @@
    <Exec Command="sudo rpm -ev --nodeps $(HostFxrRpmPackageName)" />
    <Exec Command="sudo rpm -ev --nodeps $(SharedHostRpmPackageName)" />
    <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/LinuxNativeInstallerDependencyVersions.targets
+++ b/src/redist/targets/LinuxNativeInstallerDependencyVersions.targets
@ -14,6 +14,14 @@
      <MicrosoftNETCoreAppPackageVersionWithTilda>$(MicrosoftNETCoreAppMajorMinorPatchVersion)</MicrosoftNETCoreAppPackageVersionWithTilda>
      <MicrosoftNETCoreAppPackageVersionWithTilda Condition=" '$(MicrosoftNETCoreAppVersionPreReleaseSeparator)' != -1 ">$(MicrosoftNETCoreAppMajorMinorPatchVersion)~$(MicrosoftNETCoreVersionSuffix)</MicrosoftNETCoreAppPackageVersionWithTilda>

+      <NetStandardTargetingPackVersionPreReleaseSeparator>$(NETStandardLibraryRefPackageVersion.IndexOf('-'))</NetStandardTargetingPackVersionPreReleaseSeparator>
+      <NetStandardTargetingPackMajorMinorPatchVersion>$(NETStandardLibraryRefPackageVersion)</NetStandardTargetingPackMajorMinorPatchVersion>
+      <NetStandardTargetingPackMajorMinorPatchVersion Condition=" '$(NetStandardTargetingPackVersionPreReleaseSeparator)' != -1 ">$(NETStandardLibraryRefPackageVersion.Substring(0, $(NetStandardTargetingPackVersionPreReleaseSeparator)))</NetStandardTargetingPackMajorMinorPatchVersion>
+      <NetStandardTargetingPackVersionPreReleaseSeparatorStartIndex>$([MSBuild]::Add($(NetStandardTargetingPackVersionPreReleaseSeparator), 1))</NetStandardTargetingPackVersionPreReleaseSeparatorStartIndex>
+      <NetStandardTargetingPackVersionSuffix Condition=" '$(NetStandardTargetingPackVersionPreReleaseSeparator)' != -1 ">$(NETStandardLibraryRefPackageVersion.Substring($(NetStandardTargetingPackVersionPreReleaseSeparatorStartIndex)))</NetStandardTargetingPackVersionSuffix>
+      <NetStandardTargetingPackPackageVersionWithTilda>$(NetStandardTargetingPackMajorMinorPatchVersion)</NetStandardTargetingPackPackageVersionWithTilda>
+      <NetStandardTargetingPackPackageVersionWithTilda Condition=" '$(NetStandardTargetingPackVersionPreReleaseSeparator)' != -1 ">$(NetStandardTargetingPackMajorMinorPatchVersion)~$(NetStandardTargetingPackVersionSuffix)</NetStandardTargetingPackPackageVersionWithTilda>
+
      <AspNetCoreVersionPatchSeparatorIndex>$([MSBuild]::Add($(AspNetCoreVersion.IndexOf('.')), 1))</AspNetCoreVersionPatchSeparatorIndex>
      <AspNetCoreVersionPatchSeparatorIndex>$(AspNetCoreVersion.IndexOf('.', $(AspNetCoreVersionPatchSeparatorIndex)))</AspNetCoreVersionPatchSeparatorIndex>
      <AspNetCoreMajorMinorVersion>$(AspNetCoreVersion.Substring(0, $(AspNetCoreVersionPatchSeparatorIndex)))</AspNetCoreMajorMinorVersion>
--- a/src/redist/targets/Versions.targets
+++ b/src/redist/targets/Versions.targets
@ -4,7 +4,7 @@
    <VersionMinor>0</VersionMinor>
    <VersionSDKMinor>1</VersionSDKMinor>
    <VersionPatch>00</VersionPatch>
-    <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview4</ReleaseSuffix>
+    <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview5</ReleaseSuffix>
  </PropertyGroup>
  
  <Target Name="GetCoreSdkGitCommitInfo">
--- a/src/redist/targets/packaging/deb/dotnet-debian_config.json
+++ b/src/redist/targets/packaging/deb/dotnet-debian_config.json
@ -31,6 +31,8 @@
    "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
@ -12,6 +12,8 @@
    </volume-check>
    <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" />
@ -20,6 +22,12 @@
    <choice id="{NetCoreAppTargetingPackComponentId}.pkg" visible="true" title="{NetCoreAppTargetingPackBrandName} (x64)" description="The .NET Core Targeting Pack">
        <pkg-ref id="{NetCoreAppTargetingPackComponentId}.pkg" />
    </choice>
+    <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>
@ -33,6 +41,8 @@
        <pkg-ref id="{CLISdkComponentId}.pkg"/>
    </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
@ -26,14 +26,22 @@
            "package_name": "%SHARED_FRAMEWORK_RPM_PACKAGE_NAME%",
            "package_version": "%SHARED_FRAMEWORK_RPM_PACKAGE_VERSION%"
        },
-        {
-            "package_name": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%",
-            "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%"
-        },
        {
            "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%"
+        },
+        {
+            "package_name": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%",
+            "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%"
+        },
        {
            "package_name": "%ASPNET_TARGETING_PACK_RPM_PACKAGE_NAME%",
            "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%"
--- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
@ -130,6 +130,12 @@
      <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>
      <MsiPackage SourceFile="$(var.AspNetTargetingPackMsiSourcePath)">
        <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,8 @@ 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,
    [Parameter(Mandatory=$true)][string]$DotnetBundleOutput,
@ -30,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" `
@ -48,6 +50,8 @@ function RunCandleForBundle
        -dSharedHostMsiSourcePath="$SharedHostMSIFile" `
        -dWinFormsAndWpfMsiSourcePath="$WinFormsAndWpfMSIFile" `
        -dNetCoreAppTargetingPackMsiSourcePath="$NetCoreAppTargetingPackMSIFile" `
+        -dNetCoreAppHostPackMsiSourcePath="$NetCoreAppHostPackMSIFile" `
+        -dNetStandardTargetingPackMsiSourcePath="$NetStandardTargetingPackMSIFile" `
        -dAspNetTargetingPackMsiSourcePath="$AspNetTargetingPackMSIFile" `
        -dWindowsDesktopTargetingPackMsiSourcePath="$WindowsDesktopTargetingPackMSIFile" `
        -dWinFormsAndWpfVersion="$WindowsDesktopVersion" `
@ -60,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
@ -77,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 `
@ -88,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
@ -111,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))
 {
@ -134,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