diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets
index a7abac29e..743981cd8 100644
--- a/src/redist/targets/Branding.targets
+++ b/src/redist/targets/Branding.targets
@@ -4,11 +4,10 @@
cli
Microsoft .NET Core SDK $(CliBrandingVersion)
.NET Standard Support for Visual Studio 2015
-
- Microsoft .NET Core Runtime $(CliVersionNoSuffix) - Preview
- Microsoft .NET Core Host $(CliVersionNoSuffix) - Preview
- Microsoft .NET Core Host FX Resolver $(CliVersionNoSuffix) - Preview
-
+ Microsoft .NET Core Runtime $(MicrosoftNETCoreAppPackageVersion)
+ Microsoft .NET Core Targeting Pack $(MicrosoftNETCoreAppPackageVersion)
+ Microsoft .NET Core Host $(MicrosoftNETCoreAppPackageVersion)
+ Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreAppPackageVersion)
Microsoft.NETCore.App
$(SharedFrameworkName)
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index e76001017..9d6cf1fbf 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -47,9 +47,10 @@
aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib
aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)
-
+
aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)$(InstallerExtension)
+ aspnetcore-targeting-pack-$(AspNetCoreVersion)$(ArchiveExtension)
aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)
dotnet-extension-$(MicrosoftWindowsDesktopPackageVersion)-$(Architecture)$(ArchiveExtension)
@@ -159,15 +160,23 @@
-
+
$(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)
$(AspNetCoreSharedFxArchiveFileName)
$(CoreSetupBlobAccessTokenParam)
-
+
+
+ $(AspNetCoreSharedFxRootUrl)$(AspNetCoreVersion)
+ $(AspNetTargetingPackArchiveFileName)
+ $(CoreSetupBlobAccessTokenParam)
+
+
+
$(AspNetCoreSharedFxRootUrl)$(AspNetTargetingPackVersion)
diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets
index 3234b935a..8bf79cb79 100644
--- a/src/redist/targets/GeneratePKG.targets
+++ b/src/redist/targets/GeneratePKG.targets
@@ -7,6 +7,7 @@
com.microsoft.dotnet.sharedhost.$(SharedHostVersion).component.osx.x64
com.microsoft.dotnet.hostfxr.$(HostFxrVersion).component.osx.x64
com.microsoft.dotnet.sharedframework.$(SharedFrameworkNugetName).$(MicrosoftNETCoreAppPackageVersion).component.osx.x64
+ com.microsoft.dotnet.pack.targeting.$(MicrosoftNETCoreAppPackageVersion).component.osx.x64
com.microsoft.dotnet.dev.$(SdkVersion).component.osx.x64
com.microsoft.dotnet.dev.$(SdkVersion).osx.x64
@@ -24,6 +25,7 @@
$(PkgIntermediateDirectory)/$(SdkComponentId).pkg
$(PkgIntermediateDirectory)/$(SharedFrameworkComponentId).pkg
+ $(PkgIntermediateDirectory)/$(NetCoreAppTargetingPackComponentId).pkg
$(PkgIntermediateDirectory)/$(SharedHostComponentId).pkg
$(PkgIntermediateDirectory)/$(HostFxrComponentId).pkg
@@ -37,6 +39,9 @@
$(SharedFrameworkComponentId)
+
+ $(NetCoreAppTargetingPackComponentId)
+
$(SharedHostComponentId)
@@ -55,6 +60,9 @@
$(SharedFrameworkBrandName)
+
+ $(NetCoreAppTargetingPackBrandName)
+
$(SharedHostBrandName)
@@ -90,6 +98,7 @@
+
@@ -103,9 +112,11 @@
DependsOnTargets="GenerateLayout;SetupPkgInputsOutputs"
Condition=" '$(OSName)' == 'osx' ">
-
+
+
diff --git a/src/redist/targets/packaging/osx/clisdk/Distribution-Template b/src/redist/targets/packaging/osx/clisdk/Distribution-Template
index f2e95c46d..65a653fad 100644
--- a/src/redist/targets/packaging/osx/clisdk/Distribution-Template
+++ b/src/redist/targets/packaging/osx/clisdk/Distribution-Template
@@ -11,11 +11,15 @@
+
+
+
+
@@ -28,6 +32,7 @@
+ {NetCoreAppTargetingPackComponentId}.pkg
{SharedFxComponentId}.pkg
{HostFxrComponentId}.pkg
{SharedHostComponentId}.pkg