download fxr installer file, use it in pkg targets

build_projects/dotnet-cli-build/PkgTargets.cs

@@ -20,6 +20,7 @@ namespace Microsoft.DotNet.Cli.Build
         public static string CLISdkComponentId { get; set; }
         public static string CLISdkPkgId { get; set; }
         public static string CLISdkNugetVersion { get; set; }
+        public static string HostFxrComponentId { get; set; }
 
         [Target]
         [BuildPlatforms(BuildPlatform.OSX)]
@@ -29,6 +30,7 @@ namespace Microsoft.DotNet.Cli.Build
             Directory.CreateDirectory(PkgsIntermediateDir);
 
             SharedHostComponentId = $"com.microsoft.dotnet.sharedhost.component.osx.x64";
+            HostFxrComponentId = $"com.microsoft.dotnet.hostfxr.component.osx.x64";
 
             string sharedFrameworkNugetName = Monikers.SharedFrameworkName;
             SharedFrameworkNugetVersion = CliDependencyVersions.SharedFrameworkVersion;
@@ -59,10 +61,12 @@ namespace Microsoft.DotNet.Cli.Build
             // Copy SharedFX and host installers in the correct place
             var sharedFrameworkPkgIntermediatePath = Path.Combine(PkgsIntermediateDir, $"{SharedFxComponentId}.pkg");
             var sharedHostPkgIntermediatePath = Path.Combine(PkgsIntermediateDir, $"{SharedHostComponentId}.pkg");
+            var hostFxrPkgIntermediatePath = Path.Combine(PkgsIntermediateDir, $"{HostFxrComponentId}.pkg");
+
 
             File.Copy(c.BuildContext.Get<string>("SharedFrameworkInstallerFile"), sharedFrameworkPkgIntermediatePath, true);
             File.Copy(c.BuildContext.Get<string>("SharedHostInstallerFile"), sharedHostPkgIntermediatePath, true);
-
+            File.Copy(c.BuildContext.Get<string>("HostFxrInstallerFile"), hostFxrPkgIntermediatePath, true);
 
             string inputDistTemplatePath = Path.Combine(
                 Dirs.RepoRoot,
@@ -75,11 +79,13 @@ namespace Microsoft.DotNet.Cli.Build
             string formattedDistContents =
                 distTemplate.Replace("{SharedFxComponentId}", SharedFxComponentId)
                 .Replace("{SharedHostComponentId}", SharedHostComponentId)
+                .Replace("{HostFxrComponentId}", HostFxrComponentId)
                 .Replace("{CLISdkComponentId}", CLISdkComponentId)
                 .Replace("{CLISdkNugetVersion}", CLISdkNugetVersion)
                 .Replace("{CLISdkBrandName}", Monikers.CLISdkBrandName)
                 .Replace("{SharedFxBrandName}", Monikers.SharedFxBrandName)
-                .Replace("{SharedHostBrandName}", Monikers.SharedHostBrandName);
+                .Replace("{SharedHostBrandName}", Monikers.SharedHostBrandName)
+                .Replace("{HostFxrBrandName}", Monikers.HostFxrBrandName);
             File.WriteAllText(distributionPath, formattedDistContents);
 
             Cmd("productbuild",

build_projects/shared-build-targets-utils/Utils/Monikers.cs

@@ -13,6 +13,7 @@ namespace Microsoft.DotNet.Cli.Build
         public const string CLISdkBrandName = "Microsoft .NET Core 1.0.0 - SDK Preview 2";
         public const string SharedFxBrandName = "Microsoft .NET Core 1.0.0 - Runtime";
         public const string SharedHostBrandName = "Microsoft .NET Core 1.0.0 - Host";
+        public const string HostFxrBrandName = "Microsoft .NET Core 1.0.0 - Host FX Resolver";
 
         public static string GetProductMoniker(BuildTargetContext c, string artifactPrefix, string version)
         {
@@ -45,29 +46,6 @@ namespace Microsoft.DotNet.Cli.Build
             return $"{CurrentPlatform.Current}_{CurrentArchitecture.Current}";
         }
 
-        public static string GetDebianPackageName(BuildTargetContext c)
-        {
-            var channel = c.BuildContext.Get<string>("Channel").ToLower();
-            var packageName = "";
-            switch (channel)
-            {
-                case "dev":
-                    packageName = "dotnet-nightly";
-                    break;
-                case "beta":
-                case "rc1":
-                case "rc2":
-                case "preview":
-                case "rtm":
-                    packageName = "dotnet";
-                    break;
-                default:
-                    throw new Exception($"Unknown channel - {channel}");
-            }
-
-            return packageName;
-        }
-
         public static string GetSdkDebianPackageName(BuildTargetContext c)
         {
             var channel = c.BuildContext.Get<string>("Channel").ToLower();
@@ -93,6 +71,11 @@ namespace Microsoft.DotNet.Cli.Build
             return $"{packagePrefix}-dev-{nugetVersion}";
         }
 
+        public static string GetDebianHostFxrPackageName(BuildTargetContext c)
+        {
+            return $"dotnet-hostfxr".ToLower();
+        }
+
         public static string GetDebianSharedFrameworkPackageName(string sharedFrameworkNugetVersion)
         {
             return $"dotnet-sharedframework-{SharedFrameworkName}-{sharedFrameworkNugetVersion}".ToLower();

packaging/osx/clisdk/Distribution-Template

@@ -15,12 +15,16 @@
     
     <choices-outline>
         <line choice="{SharedFxComponentId}.pkg" />
+        <line choice="{HostFxrComponentId}.pkg" />
         <line choice="{SharedHostComponentId}.pkg" />
         <line choice="{CLISdkComponentId}.pkg"/>
     </choices-outline>
     <choice id="{SharedFxComponentId}.pkg" visible="true" title="{SharedFxBrandName} (x64)" description="The .NET Core Shared Framework">
         <pkg-ref id="{SharedFxComponentId}.pkg" />
     </choice>
+    <choice id="{HostFxrComponentId}.pkg" visible="true" title="{HostFxrBrandName} (x64)" description="The .NET Core HostFxr">
+        <pkg-ref id="{HostFxrComponentId}.pkg" />
+    </choice>
     <choice id="{SharedHostComponentId}.pkg" visible="true" title="{SharedHostBrandName} (x64)" description="The .NET Core Shared Host." >
         <pkg-ref id="{SharedHostComponentId}.pkg" />
     </choice>
@@ -28,6 +32,7 @@
         <pkg-ref id="{CLISdkComponentId}.pkg"/>
     </choice>
     <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>
     <pkg-ref id="{CLISdkComponentId}.pkg">{CLISdkComponentId}.pkg</pkg-ref>
 </installer-gui-script>