From 2bee59a9bc0227c38737cf28c24c2880e8b53885 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Tue, 6 Nov 2018 14:29:00 -0800
Subject: [PATCH] Create Mac PKG

---
 src/redist/redist.csproj                      |   1 +
 src/redist/targets/Branding.targets           |   2 +
 src/redist/targets/GenerateDebs.targets       |  17 +--
 src/redist/targets/GenerateMSIs.targets       |  30 ++---
 src/redist/targets/GeneratePKG.targets        | 116 +++++++++---------
 src/redist/targets/GenerateRPMs.targets       |   8 +-
 .../osx/clisdk/Distribution-Template          |   0
 .../clisdk/resources/cs.lproj/conclusion.html |   0
 .../clisdk/resources/cs.lproj/welcome.html    |   0
 .../clisdk/resources/de.lproj/conclusion.html |   0
 .../clisdk/resources/de.lproj/welcome.html    |   0
 .../clisdk/resources/en.lproj/conclusion.html |   0
 .../clisdk/resources/en.lproj/welcome.html    |   0
 .../clisdk/resources/es.lproj/conclusion.html |   0
 .../clisdk/resources/es.lproj/welcome.html    |   0
 .../clisdk/resources/fr.lproj/conclusion.html |   0
 .../clisdk/resources/fr.lproj/welcome.html    |   0
 .../clisdk/resources/it.lproj/conclusion.html |   0
 .../clisdk/resources/it.lproj/welcome.html    |   0
 .../clisdk/resources/ja.lproj/conclusion.html |   0
 .../clisdk/resources/ja.lproj/welcome.html    |   0
 .../clisdk/resources/ko.lproj/conclusion.html |   0
 .../clisdk/resources/ko.lproj/welcome.html    |   0
 .../clisdk/resources/pl.lproj/conclusion.html |   0
 .../clisdk/resources/pl.lproj/welcome.html    |   0
 .../resources/pt-br.lproj/conclusion.html     |   0
 .../clisdk/resources/pt-br.lproj/welcome.html |   0
 .../clisdk/resources/ru.lproj/conclusion.html |   0
 .../clisdk/resources/ru.lproj/welcome.html    |   0
 .../clisdk/resources/tr.lproj/conclusion.html |   0
 .../clisdk/resources/tr.lproj/welcome.html    |   0
 .../resources/zh-hans.lproj/conclusion.html   |   0
 .../resources/zh-hans.lproj/welcome.html      |   0
 .../resources/zh-hant.lproj/conclusion.html   |   0
 .../resources/zh-hant.lproj/welcome.html      |   0
 .../packaging/osx/clisdk/scripts/postinstall  |   0
 36 files changed, 90 insertions(+), 84 deletions(-)
 rename {old => src/redist/targets}/packaging/osx/clisdk/Distribution-Template (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/cs.lproj/conclusion.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/cs.lproj/welcome.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/de.lproj/conclusion.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/de.lproj/welcome.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/en.lproj/conclusion.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/en.lproj/welcome.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/es.lproj/conclusion.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/es.lproj/welcome.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/fr.lproj/conclusion.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/fr.lproj/welcome.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/it.lproj/conclusion.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/it.lproj/welcome.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/ja.lproj/conclusion.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/ja.lproj/welcome.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/ko.lproj/conclusion.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/ko.lproj/welcome.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/pl.lproj/conclusion.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/pl.lproj/welcome.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/ru.lproj/conclusion.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/ru.lproj/welcome.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/tr.lproj/conclusion.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/tr.lproj/welcome.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html (100%)
 rename {old => src/redist/targets}/packaging/osx/clisdk/scripts/postinstall (100%)

diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index e547222cd..b87bd8041 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -18,5 +18,6 @@
   <Import Project="targets\LinuxNativeInstallerDependencyVersions.targets" />
   <Import Project="targets\GenerateDebs.targets" />
   <Import Project="targets\GenerateRPMs.targets" />
+  <Import Project="targets\GeneratePKG.targets" />
 
 </Project>
diff --git a/src/redist/targets/Branding.targets b/src/redist/targets/Branding.targets
index 516c9eaf0..a7abac29e 100644
--- a/src/redist/targets/Branding.targets
+++ b/src/redist/targets/Branding.targets
@@ -9,6 +9,8 @@
       <SharedHostBrandName>Microsoft .NET Core Host $(CliVersionNoSuffix) - Preview</SharedHostBrandName>
       <HostFxrBrandName>Microsoft .NET Core Host FX Resolver $(CliVersionNoSuffix) - Preview</HostFxrBrandName>
 
+      <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
+      <SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName>
     </PropertyGroup>
   </Target>
   
diff --git a/src/redist/targets/GenerateDebs.targets b/src/redist/targets/GenerateDebs.targets
index f6eeb425a..1fd192e50 100644
--- a/src/redist/targets/GenerateDebs.targets
+++ b/src/redist/targets/GenerateDebs.targets
@@ -11,7 +11,8 @@
                           GetCurrentRuntimeInformation;
                           SetupFileExtensions;
                           CalculateLinuxNativeInstallerDependencyVersions;
-                          SetSdkBrandingInfo">
+                          SetSdkBrandingInfo;
+                          SetInstallerInfo">
     <PropertyGroup>
       <DotnetDebToolDir>$(MSBuildProjectDirectory)</DotnetDebToolDir>
       <!--<DotnetDebToolDir>$(MSBuildThisFileDirectory)/dotnet-deb-tool-consumer</DotnetDebToolDir>-->
@@ -69,7 +70,7 @@
     <!-- Output Directories -->
     <PropertyGroup>
       <InstallerOutputDirectory>$(ArtifactsShippingPackagesDir)</InstallerOutputDirectory>
-      <SdkInstallerFile>$(InstallerOutputDirectory)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</SdkInstallerFile>
+      <SdkDebInstallerFile>$(InstallerOutputDirectory)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</SdkDebInstallerFile>
       <SdkDebianIntermediateDirectory>$(IntermediateOutputPath)debian/sdk/</SdkDebianIntermediateDirectory>
       <DotNetDebToolOutputDirectory>$(SdkDebianIntermediateDirectory)deb-tool-output</DotNetDebToolOutputDirectory>
       <DebianTestResultsXmlFile>$(SdkDebianIntermediateDirectory)debian-testResults.xml</DebianTestResultsXmlFile>
@@ -139,7 +140,7 @@
       <TestSdkDebTaskEnvironmentVariables Include="PreviousStageProps=$(NextStagePropsPath)" />-->
 
       <!-- Consumed By Publish -->
-      <GeneratedInstallers Include="$(SdkInstallerFile)" />
+      <GeneratedInstallers Include="$(SdkDebInstallerFile)" />
     </ItemGroup>
   </Target>
 
@@ -190,7 +191,7 @@
                         PrepareDotnetDebTool;
                         GetAspNetSharedFxInstallArgs;"
       Inputs="@(CLISdkFiles)"
-      Outputs="$(SdkInstallerFile)" >
+      Outputs="$(SdkDebInstallerFile)" >
       <!-- Install Shared Framework Packages -->
 
       <Exec Command="sudo dpkg -i $(DownloadsFolder)$(DownloadedRuntimeDepsInstallerFileName)" />
@@ -251,7 +252,7 @@
       <Error Text="@(GeneratedDebFiles->Count()) .deb files generated." Condition="'@(GeneratedDebFiles->Count())' != 1" />
 
       <Copy
-        DestinationFiles="$(SdkInstallerFile)"
+        DestinationFiles="$(SdkDebInstallerFile)"
         SourceFiles="@(GeneratedDebFiles)"
         OverwriteReadOnlyFiles="True"
         SkipUnchangedFiles="False"
@@ -280,7 +281,7 @@
       Inputs="$(DownloadedSharedHostInstallerFile);
               $(DownloadedHostFxrInstallerFile);
               $(DownloadedSharedFrameworkInstallerFile);
-              $(SdkInstallerFile);"
+              $(SdkDebInstallerFile);"
       Outputs="$(DebianTestResultsXmlFile)" >
 
       <!-- Install Dependencies and SDK Packages -->
@@ -290,7 +291,7 @@
       <Exec Command="sudo dpkg -i $(DownloadedSharedFrameworkInstallerFile)" />
       <Exec Command="sudo dpkg $(InstallAspNetCoreSharedFxArgs) -i $(DownloadedAspNetCoreSharedFxInstallerFile)" />
 
-      <Exec Command="sudo dpkg -i $(SdkInstallerFile)" />
+      <Exec Command="sudo dpkg -i $(SdkDebInstallerFile)" />
 
       <!-- Run E2E -->
       <DotNetRestore ProjectPath="$(EndToEndTestProject)"
@@ -321,7 +322,7 @@
     <!-- Clean the workspace -->
     <ItemGroup>
       <FilesToClean Remove="*" />
-      <FilesToClean Include="$(SdkInstallerFile)" />
+      <FilesToClean Include="$(SdkDebInstallerFile)" />
 
       <WorkspaceDirectories Remove="*" />
       <WorkspaceDirectories Include="$(SdkDebianIntermediateDirectory);
diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets
index be96408eb..f254d8ab3 100644
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@@ -28,8 +28,8 @@
     </PropertyGroup>
 
     <PropertyGroup>
-      <SdkInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>
-      <CombinedFrameworkSdkHostInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostInstallerFile>
+      <SdkMSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMSIInstallerFile>
+      <CombinedFrameworkSdkHostMSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostMSIInstallerFile>
 
       <!--<SdkDebianIntermediateDirectory>$(IntermediateOutputPath)debian/sdk/</SdkDebianIntermediateDirectory>
       <LayoutDirectory Condition=" '$(OSName)' == 'ubuntu' OR '$(OSName)' == 'debian' ">$(SdkDebianIntermediateDirectory)debianLayoutDirectory</LayoutDirectory>
@@ -49,7 +49,7 @@
 
     <!-- Consumed By Publish -->
     <ItemGroup>
-      <GeneratedInstallers Include="$(SdkInstallerFile);$(CombinedFrameworkSdkHostInstallerFile)" />
+      <GeneratedInstallers Include="$(SdkMSIInstallerFile);$(CombinedFrameworkSdkHostMSIInstallerFile)" />
     </ItemGroup>
 
     <GenerateMsiVersion CommitCount="$(GitCommitCount)"
@@ -59,12 +59,12 @@
       <Output TaskParameter="MsiVersion" PropertyName="MsiVersion" />
     </GenerateMsiVersion>
 
-    <GenerateGuidFromName Name="$(SdkInstallerFile)">
+    <GenerateGuidFromName Name="$(SdkMSIInstallerFile)">
       <Output TaskParameter="OutputGuid"
           PropertyName="SdkInstallerUpgradeCode" />
     </GenerateGuidFromName>
 
-    <GenerateGuidFromName Name="$(CombinedFrameworkSdkHostInstallerFile)">
+    <GenerateGuidFromName Name="$(CombinedFrameworkSdkHostMSIInstallerFile)">
       <Output TaskParameter="OutputGuid"
           PropertyName="CombinedFrameworkSDKHostInstallerUpgradeCode" />
     </GenerateGuidFromName>
@@ -98,11 +98,11 @@
           DependsOnTargets="GenerateLayout;AcquireWix;MsiTargetsSetupInputOutputs;SetSdkBrandingInfo"
           Condition=" '$(OS)' == 'Windows_NT'"
           Inputs="@(GenerateSdkMsiInputs)"
-          Outputs="$(SdkInstallerFile)">
+          Outputs="$(SdkMSIInstallerFile)">
 
     <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateMsiPowershellScript) ^
                       '$(SdkInternalLayoutPath.TrimEnd('\'))' ^
-                      '$(SdkInstallerFile)' ^
+                      '$(SdkMSIInstallerFile)' ^
                       '$(WixRoot)' ^
                       '$(SdkBrandName)' ^
                       '$(MsiVersion)' ^
@@ -117,21 +117,21 @@
   <Target Name="GenerateSdkBundle"
           DependsOnTargets="GenerateLayout;AcquireWix;MsiTargetsSetupInputOutputs;GenerateSdkMsi"
           Condition=" '$(OS)' == 'Windows_NT'"
-          Inputs="$(SdkInstallerFile);
+          Inputs="$(SdkMSIInstallerFile);
                     $(DownloadedSharedFrameworkInstallerFile);
                     $(DownloadedHostFxrInstallerFile);
                     $(DownloadedSharedHostInstallerFile);
                     $(SdkGenerateBundlePowershellScript)"
-          Outputs="$(CombinedFrameworkSdkHostInstallerFile)">
+          Outputs="$(CombinedFrameworkSdkHostMSIInstallerFile)">
     
     <Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateBundlePowershellScript) ^
-                      '$(SdkInstallerFile)' ^
+                      '$(SdkMSIInstallerFile)' ^
                       '$(IntermediateOutputPath)downloads\$(DownloadedAspNetCoreSharedFxInstallerFileName)' ^
                       '$(IntermediateOutputPath)downloads\$(DownloadedSharedFrameworkInstallerFileName)' ^
                       '$(IntermediateOutputPath)downloads\$(DownloadedHostFxrInstallerFileName)' ^
                       '$(IntermediateOutputPath)downloads\$(DownloadedSharedHostInstallerFileName)' ^
                       '$(IntermediateOutputPath)downloads\$(DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName)' ^
-                      '$(CombinedFrameworkSdkHostInstallerFile)' ^
+                      '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^
                       '$(WixRoot)' ^
                       '$(SdkBrandName)' ^
                       '$(MsiVersion)' ^
@@ -147,13 +147,13 @@
   <Target Name="GenerateSdkNupkg"
           DependsOnTargets="GenerateLayout;MsiTargetsSetupInputOutputs;GenerateSdkBundle"
           Condition=" '$(OS)' == 'Windows_NT'"
-          Inputs="$(CombinedFrameworkSdkHostInstallerFile);
+          Inputs="$(CombinedFrameworkSdkHostMSIInstallerFile);
                     $(SdkInstallerNuspecFile);
                     $(SdkGenerateNupkgPowershellScript)"
           Outputs="$(SdkInstallerNupkgFile)">
 
     <!--<Exec Command="powershell -NoProfile -NoLogo $(SdkGenerateNupkgPowershellScript) ^
-                      '$(CombinedFrameworkSdkHostInstallerFile)' ^
+                      '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^
                       '$(FullNugetVersion)' ^
                       '$(SdkInstallerNuspecFile)' ^
                       '$(SdkInstallerNupkgFile)'" />-->
@@ -193,11 +193,11 @@
   <!-- These targets are used in signing, don't remove them! -->
   <!--<Target Name="ExtractEngineFromSdkBundle"
             DependsOnTargets="MsiTargetsSetupInputOutputs">
-      <Exec Command="$(WixRoot)/insignia.exe -ib $(CombinedFrameworkSdkHostInstallerFile) -o $(CombinedFrameworkSdkHostBundleEngineName)" />
+      <Exec Command="$(WixRoot)/insignia.exe -ib $(CombinedFrameworkSdkHostMSIInstallerFile) -o $(CombinedFrameworkSdkHostBundleEngineName)" />
     </Target>
 
     <Target Name="ReattachEngineToSdkBundle"
             DependsOnTargets="MsiTargetsSetupInputOutputs">
-      <Exec Command="$(WixRoot)/insignia.exe -ab $(CombinedFrameworkSdkHostBundleEngineName) $(CombinedFrameworkSdkHostInstallerFile) -o $(CombinedFrameworkSdkHostInstallerFile)" />
+      <Exec Command="$(WixRoot)/insignia.exe -ab $(CombinedFrameworkSdkHostBundleEngineName) $(CombinedFrameworkSdkHostMSIInstallerFile) -o $(CombinedFrameworkSdkHostMSIInstallerFile)" />
     </Target>-->
 </Project>
diff --git a/src/redist/targets/GeneratePKG.targets b/src/redist/targets/GeneratePKG.targets
index 9eae8730d..3234b935a 100644
--- a/src/redist/targets/GeneratePKG.targets
+++ b/src/redist/targets/GeneratePKG.targets
@@ -1,34 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PkgIntermediateDirectory>$(IntermediateDirectory)/pkgs/$(SdkVersion)</PkgIntermediateDirectory>
+<Project>
+  <Target Name="SetupPKGProps" DependsOnTargets="SetSdkVersionInfo;GetCurrentRuntimeInformation;SetupFileExtensions">
+    <PropertyGroup>
+      <PkgIntermediateDirectory>$(IntermediateOutputPath)pkgs/$(SdkVersion)</PkgIntermediateDirectory>
 
-    <!-- Properties for pkg build -->
-    <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>
-    <SdkComponentId>com.microsoft.dotnet.dev.$(SdkVersion).component.osx.x64</SdkComponentId>
-    <SdkProductArchiveId>com.microsoft.dotnet.dev.$(SdkVersion).osx.x64</SdkProductArchiveId>
+      <!-- Properties for pkg build -->
+      <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>
+      <SdkComponentId>com.microsoft.dotnet.dev.$(SdkVersion).component.osx.x64</SdkComponentId>
+      <SdkProductArchiveId>com.microsoft.dotnet.dev.$(SdkVersion).osx.x64</SdkProductArchiveId>
 
-    <PkgInstallDirectory>/usr/local/share/dotnet</PkgInstallDirectory>
+      <PkgInstallDirectory>/usr/local/share/dotnet</PkgInstallDirectory>
 
-    <SdkPkgSourcesRootDirectory>$(RepoRoot)/packaging/osx/clisdk</SdkPkgSourcesRootDirectory>
-    <SdkPkgScriptsDirectory>$(SdkPkgSourcesRootDirectory)/scripts</SdkPkgScriptsDirectory>
-    <SdkPkgScriptTemplateFile>$(SdkPkgScriptsDirectory)/postinstall</SdkPkgScriptTemplateFile>
-    <SdkPkgDestinationScriptsDirectory>$(PkgIntermediateDirectory)/scripts</SdkPkgDestinationScriptsDirectory>
-    <SdkPkgScriptFile>$(SdkPkgDestinationScriptsDirectory)/postinstall</SdkPkgScriptFile>
-    <SdkProductArchiveResourcesDirectory>$(PkgIntermediateDirectory)/resources</SdkProductArchiveResourcesDirectory>
+      <SdkPkgSourcesRootDirectory>$(MSBuildThisFileDirectory)packaging/osx/clisdk</SdkPkgSourcesRootDirectory>
+      <SdkPkgScriptsDirectory>$(SdkPkgSourcesRootDirectory)/scripts</SdkPkgScriptsDirectory>
+      <SdkPkgScriptTemplateFile>$(SdkPkgScriptsDirectory)/postinstall</SdkPkgScriptTemplateFile>
+      <SdkPkgDestinationScriptsDirectory>$(PkgIntermediateDirectory)/scripts</SdkPkgDestinationScriptsDirectory>
+      <SdkPkgScriptFile>$(SdkPkgDestinationScriptsDirectory)/postinstall</SdkPkgScriptFile>
+      <SdkProductArchiveResourcesDirectory>$(PkgIntermediateDirectory)/resources</SdkProductArchiveResourcesDirectory>
 
-    <SdkProductArchiveDistributionTemplateFile>$(SdkPkgSourcesRootDirectory)/Distribution-Template</SdkProductArchiveDistributionTemplateFile>
-    <SdkProductArchiveDistributionFile>$(PkgIntermediateDirectory)/CLI-SDK-Formatted-Distribution-Template.xml</SdkProductArchiveDistributionFile>
+      <SdkProductArchiveDistributionTemplateFile>$(SdkPkgSourcesRootDirectory)/Distribution-Template</SdkProductArchiveDistributionTemplateFile>
+      <SdkProductArchiveDistributionFile>$(PkgIntermediateDirectory)/CLI-SDK-Formatted-Distribution-Template.xml</SdkProductArchiveDistributionFile>
 
-    <SdkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SdkComponentId).pkg</SdkPkgIntermediatePath>
-    <SharedFrameworkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedFrameworkComponentId).pkg</SharedFrameworkPkgIntermediatePath>
-    <SharedHostPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedHostComponentId).pkg</SharedHostPkgIntermediatePath>
-    <HostFxrPkgIntermediatePath>$(PkgIntermediateDirectory)/$(HostFxrComponentId).pkg</HostFxrPkgIntermediatePath>
-  </PropertyGroup>
+      <SdkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SdkComponentId).pkg</SdkPkgIntermediatePath>
+      <SharedFrameworkPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedFrameworkComponentId).pkg</SharedFrameworkPkgIntermediatePath>
+      <SharedHostPkgIntermediatePath>$(PkgIntermediateDirectory)/$(SharedHostComponentId).pkg</SharedHostPkgIntermediatePath>
+      <HostFxrPkgIntermediatePath>$(PkgIntermediateDirectory)/$(HostFxrComponentId).pkg</HostFxrPkgIntermediatePath>
+
+      <SdkPKGInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkPKGInstallerFile>
+      <CombinedFrameworkSdkHostPKGInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostPKGInstallerFile>
+    </PropertyGroup>
+  </Target>
   
-    <Target Name="SetupPkgInputsOutputs">
+    <Target Name="SetupPkgInputsOutputs" DependsOnTargets="SetupPKGProps;SetSdkBrandingInfo">
       <ItemGroup>
         <DistributionTemplateReplacement Include="{SharedFxComponentId}">
           <ReplacementString>$(SharedFrameworkComponentId)</ReplacementString>
@@ -75,16 +79,16 @@
       
       <!-- Consumed By Publish -->
       <ItemGroup>
-        <GeneratedInstallers Include="$(SdkInstallerFile);$(CombinedFrameworkSdkHostInstallerFile)" />
+        <GeneratedInstallers Include="$(SdkPKGInstallerFile);$(CombinedFrameworkSdkHostPKGInstallerFile)" />
       </ItemGroup>
 
       <ItemGroup>
         <SdkProductArchiveResourcesTemplateFiles Include="$(SdkPkgSourcesRootDirectory)/resources/**/*" />
 
-        <GenerateSdkPkgInputs Include="$(SdkLayoutOutputDirectory)/**/*" />
+        <GenerateSdkPkgInputs Include="$(SdkInternalLayoutPath)/**/*" />
         <GenerateSdkPkgInputs Include="$(SdkPkgScriptsDirectory)/**/*" />
 
-        <GenerateSdkProductArchiveInputs Include="$(SdkInstallerFile)" />
+        <GenerateSdkProductArchiveInputs Include="$(SdkPKGInstallerFile)" />
         <GenerateSdkProductArchiveInputs Include="$(DownloadedSharedFrameworkInstallerFile)" />
         <GenerateSdkProductArchiveInputs Include="$(DownloadedHostFxrInstallerFile)" />
         <GenerateSdkProductArchiveInputs Include="$(DownloadedSharedHostInstallerFile)" />
@@ -95,12 +99,13 @@
 
     <Target Name="GenerateSdkPkg"
             Inputs="@(GenerateSdkPkgInputs)"
-            Outputs="$(SdkInstallerFile)"
-            DependsOnTargets="Init;Layout;SetupPkgInputsOutputs"
+            Outputs="$(SdkPKGInstallerFile)"
+            DependsOnTargets="GenerateLayout;SetupPkgInputsOutputs"
             Condition=" '$(OSName)' == 'osx' ">
-
-      <Copy SourceFiles="@(AspNetRuntimeFilesInput)"
-            DestinationFiles="@(AspNetRuntimeFilesInput->'$(SdkLayoutOutputDirectory)/%(RecursiveDir)%(FileName)%(Extension)')" />
+      
+      <!-- Copy ASP.NET runtime to internal layout, as we don't currently chain that in with a pkg dependency -->
+      <ExtractArchiveToDirectory SourceArchive="$(DownloadsFolder)$(AspNetCoreSharedFxArchiveFileName)"
+                                 DestinationDirectory="$(SdkInternalLayoutPath)" />
 
       <ReplaceFileContents
         InputFiles="$(SdkPkgScriptTemplateFile)"
@@ -118,25 +123,25 @@
         Glob="$(SdkPkgScriptFile)"
         Mode="ugo+x" />
 
-      <Exec Command="pkgbuild
-                     --root '$(SdkLayoutOutputDirectory)'
-                     --identifier '$(SdkComponentId)'
-                     --version '$(SdkVersion)'
-                     --install-location '$(PkgInstallDirectory)'
-                     --scripts '$(SdkPkgDestinationScriptsDirectory)'
-                     '$(SdkInstallerFile)'" />
+      <Exec Command="pkgbuild \
+                     --root '$(SdkInternalLayoutPath)' \
+                     --identifier '$(SdkComponentId)' \
+                     --version '$(SdkVersion)' \
+                     --install-location '$(PkgInstallDirectory)' \
+                     --scripts '$(SdkPkgDestinationScriptsDirectory)' \
+                     '$(SdkPKGInstallerFile)'" />
     </Target>
 
     <Target Name="GenerateSdkProductArchive"
             Inputs="@(GenerateSdkProductArchiveInputs)"
-            Outputs="$(CombinedFrameworkSdkHostInstallerFile)"
+            Outputs="$(CombinedFrameworkSdkHostPKGInstallerFile)"
             DependsOnTargets="GenerateSdkPkg"
             Condition=" '$(OSName)' == 'osx' ">
       <ItemGroup>
-        <PkgComponentsSourceFiles Include="$(SdkInstallerFile);
-                                $(DownloadedSharedFrameworkInstallerFile);
-                                $(DownloadedHostFxrInstallerFile);
-                                $(DownloadedSharedHostInstallerFile)" />
+        <PkgComponentsSourceFiles Include="$(SdkPKGInstallerFile);
+                                $(DownloadsFolder)$(DownloadedSharedFrameworkInstallerFileName);
+                                $(DownloadsFolder)$(DownloadedHostFxrInstallerFileName);
+                                $(DownloadsFolder)$(DownloadedSharedHostInstallerFileName)" />
         <PkgComponentsDestinationFiles Include="$(SdkPkgIntermediatePath);
                                                 $(SharedFrameworkPkgIntermediatePath);
                                                 $(HostFxrPkgIntermediatePath);
@@ -153,21 +158,18 @@
         ReplacementPatterns="@(DistributionTemplateReplacement -> '%(Identity)')"
         ReplacementStrings="@(DistributionTemplateReplacement -> '%(ReplacementString)')" />
 
-      <Exec Command="productbuild
-                     --version '$(SdkVersion)'
-                     --identifier '$(SdkProductArchiveId)'
-                     --package-path '$(PkgIntermediateDirectory)'
-                     --resources '$(SdkProductArchiveResourcesDirectory)'
-                     --distribution '$(SdkProductArchiveDistributionFile)'
-                     '$(CombinedFrameworkSdkHostInstallerFile)'" />
+      <Exec Command="productbuild \
+                     --version '$(SdkVersion)' \
+                     --identifier '$(SdkProductArchiveId)' \
+                     --package-path '$(PkgIntermediateDirectory)' \
+                     --resources '$(SdkProductArchiveResourcesDirectory)' \
+                     --distribution '$(SdkProductArchiveDistributionFile)' \
+                     '$(CombinedFrameworkSdkHostPKGInstallerFile)'" />
     </Target>
 
     <Target Name="GeneratePkgs"
-            DependsOnTargets="Init;
-                              Layout;
-                              SetupPkgInputsOutputs;
+            DependsOnTargets="GetCurrentRuntimeInformation;
                               GenerateSdkPkg;
-                              GenerateSdkProductArchive"
-            Condition=" '$(OSName)' == 'osx' " />
+                              GenerateSdkProductArchive"/>
 
 </Project>
diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets
index 0bd23052b..30608fb9a 100644
--- a/src/redist/targets/GenerateRPMs.targets
+++ b/src/redist/targets/GenerateRPMs.targets
@@ -105,7 +105,7 @@
       <TestSdkRpmTaskEnvironmentVariables Include="PreviousStageProps=$(NextStagePropsPath)" />-->
 
       <!-- Consumed By Publish -->
-      <!--<GeneratedInstallers Include="$(SdkInstallerFile)" />-->
+      <!--<GeneratedInstallers Include="$(SdkRPMInstallerFile)" />-->
     </ItemGroup>
 
     <ReplaceFileContents InputFiles="$(AfterInstallHostScriptTemplateFile)"
@@ -157,8 +157,8 @@
       <RuntimeDepsPackageFileName>dotnet-runtime-deps-$(RuntimeDepsPackageVersion)</RuntimeDepsPackageFileName>
       <RpmPackageVersion>$(SdkVersion)</RpmPackageVersion>
       <InputRoot>$(RedistLayoutPath)sdk/</InputRoot>
-      <SdkInstallerFile>$(ArtifactsShippingPackagesDir)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</SdkInstallerFile>
-      <RpmFile>$(SdkInstallerFile)</RpmFile>
+      <SdkRPMInstallerFile>$(ArtifactsShippingPackagesDir)$(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(InstallerExtension)</SdkRPMInstallerFile>
+      <RpmFile>$(SdkRPMInstallerFile)</RpmFile>
       <!-- Need to acquire manpage files from CLI repo: https://github.com/dotnet/cli/issues/10266 -->
       <ManPagesDir>$(RepoRoot)/Documentation/manpages</ManPagesDir>
       <ConfigJsonFile>$(MSBuildThisFileDirectory)packaging/rpm/dotnet-config.json</ConfigJsonFile>
@@ -239,7 +239,7 @@
     <!-- Ignore dependencies, which may have an incoherent dependency on dotnet-runtime -->
     <Exec Command="sudo rpm --install --nodeps $(DownloadedAspNetCoreSharedFxInstallerFile)" />
 
-    <Exec Command="sudo yum -y install $(SdkInstallerFile)" />
+    <Exec Command="sudo yum -y install $(SdkRPMInstallerFile)" />
 
     <!-- Run Tests -->
     <DotNetRestore ProjectPath="$(EndToEndTestProject)"
diff --git a/old/packaging/osx/clisdk/Distribution-Template b/src/redist/targets/packaging/osx/clisdk/Distribution-Template
similarity index 100%
rename from old/packaging/osx/clisdk/Distribution-Template
rename to src/redist/targets/packaging/osx/clisdk/Distribution-Template
diff --git a/old/packaging/osx/clisdk/resources/cs.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/cs.lproj/conclusion.html
rename to src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/conclusion.html
diff --git a/old/packaging/osx/clisdk/resources/cs.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/welcome.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/cs.lproj/welcome.html
rename to src/redist/targets/packaging/osx/clisdk/resources/cs.lproj/welcome.html
diff --git a/old/packaging/osx/clisdk/resources/de.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/de.lproj/conclusion.html
rename to src/redist/targets/packaging/osx/clisdk/resources/de.lproj/conclusion.html
diff --git a/old/packaging/osx/clisdk/resources/de.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/de.lproj/welcome.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/de.lproj/welcome.html
rename to src/redist/targets/packaging/osx/clisdk/resources/de.lproj/welcome.html
diff --git a/old/packaging/osx/clisdk/resources/en.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/en.lproj/conclusion.html
rename to src/redist/targets/packaging/osx/clisdk/resources/en.lproj/conclusion.html
diff --git a/old/packaging/osx/clisdk/resources/en.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/en.lproj/welcome.html
rename to src/redist/targets/packaging/osx/clisdk/resources/en.lproj/welcome.html
diff --git a/old/packaging/osx/clisdk/resources/es.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/es.lproj/conclusion.html
rename to src/redist/targets/packaging/osx/clisdk/resources/es.lproj/conclusion.html
diff --git a/old/packaging/osx/clisdk/resources/es.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/es.lproj/welcome.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/es.lproj/welcome.html
rename to src/redist/targets/packaging/osx/clisdk/resources/es.lproj/welcome.html
diff --git a/old/packaging/osx/clisdk/resources/fr.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/fr.lproj/conclusion.html
rename to src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/conclusion.html
diff --git a/old/packaging/osx/clisdk/resources/fr.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/welcome.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/fr.lproj/welcome.html
rename to src/redist/targets/packaging/osx/clisdk/resources/fr.lproj/welcome.html
diff --git a/old/packaging/osx/clisdk/resources/it.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/it.lproj/conclusion.html
rename to src/redist/targets/packaging/osx/clisdk/resources/it.lproj/conclusion.html
diff --git a/old/packaging/osx/clisdk/resources/it.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/it.lproj/welcome.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/it.lproj/welcome.html
rename to src/redist/targets/packaging/osx/clisdk/resources/it.lproj/welcome.html
diff --git a/old/packaging/osx/clisdk/resources/ja.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/ja.lproj/conclusion.html
rename to src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/conclusion.html
diff --git a/old/packaging/osx/clisdk/resources/ja.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/welcome.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/ja.lproj/welcome.html
rename to src/redist/targets/packaging/osx/clisdk/resources/ja.lproj/welcome.html
diff --git a/old/packaging/osx/clisdk/resources/ko.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/ko.lproj/conclusion.html
rename to src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/conclusion.html
diff --git a/old/packaging/osx/clisdk/resources/ko.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/welcome.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/ko.lproj/welcome.html
rename to src/redist/targets/packaging/osx/clisdk/resources/ko.lproj/welcome.html
diff --git a/old/packaging/osx/clisdk/resources/pl.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/pl.lproj/conclusion.html
rename to src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/conclusion.html
diff --git a/old/packaging/osx/clisdk/resources/pl.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/welcome.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/pl.lproj/welcome.html
rename to src/redist/targets/packaging/osx/clisdk/resources/pl.lproj/welcome.html
diff --git a/old/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
rename to src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/conclusion.html
diff --git a/old/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html
rename to src/redist/targets/packaging/osx/clisdk/resources/pt-br.lproj/welcome.html
diff --git a/old/packaging/osx/clisdk/resources/ru.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/ru.lproj/conclusion.html
rename to src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/conclusion.html
diff --git a/old/packaging/osx/clisdk/resources/ru.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/welcome.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/ru.lproj/welcome.html
rename to src/redist/targets/packaging/osx/clisdk/resources/ru.lproj/welcome.html
diff --git a/old/packaging/osx/clisdk/resources/tr.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/tr.lproj/conclusion.html
rename to src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/conclusion.html
diff --git a/old/packaging/osx/clisdk/resources/tr.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/welcome.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/tr.lproj/welcome.html
rename to src/redist/targets/packaging/osx/clisdk/resources/tr.lproj/welcome.html
diff --git a/old/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
rename to src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/conclusion.html
diff --git a/old/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html
rename to src/redist/targets/packaging/osx/clisdk/resources/zh-hans.lproj/welcome.html
diff --git a/old/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
rename to src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/conclusion.html
diff --git a/old/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html b/src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html
similarity index 100%
rename from old/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html
rename to src/redist/targets/packaging/osx/clisdk/resources/zh-hant.lproj/welcome.html
diff --git a/old/packaging/osx/clisdk/scripts/postinstall b/src/redist/targets/packaging/osx/clisdk/scripts/postinstall
similarity index 100%
rename from old/packaging/osx/clisdk/scripts/postinstall
rename to src/redist/targets/packaging/osx/clisdk/scripts/postinstall