Bring Host FXR MSI

build_projects/dotnet-cli-build/CliDependencyVersions.cs

@@ -12,5 +12,6 @@ namespace Microsoft.DotNet.Cli.Build
 
         public static readonly string SharedFrameworkChannel = "preview";
         public static readonly string SharedHostChannel = "preview";
+        public static readonly string HostFxrChannel = "preview";
     }
-}
+}

build_projects/dotnet-cli-build/MsiTargets.cs

@@ -29,6 +29,8 @@ namespace Microsoft.DotNet.Cli.Build
 
         private static string SdkBundle { get; set; }
 
+        private static string HostFxrMsi { get; set; }
+
         private static string SharedHostMsi { get; set; }
 
         private static string SharedFrameworkMsi { get; set; }
@@ -82,6 +84,7 @@ namespace Microsoft.DotNet.Cli.Build
             SdkEngine = GetEngineName(SdkBundle);
 
             SharedFrameworkMsi = Path.ChangeExtension(c.BuildContext.Get<string>("SharedFrameworkInstallerFile"), "msi");
+            HostFxrMsi = Path.ChangeExtension(c.BuildContext.Get<string>("HostFxrInstallerFile"), "msi");
             SharedHostMsi = Path.ChangeExtension(c.BuildContext.Get<string>("SharedHostInstallerFile"), "msi");
 
             var buildVersion = c.BuildContext.Get<BuildVersion>("BuildVersion");
@@ -134,7 +137,7 @@ namespace Microsoft.DotNet.Cli.Build
 
             Cmd("powershell", "-NoProfile", "-NoLogo",
                 Path.Combine(Dirs.RepoRoot, "packaging", "windows", "clisdk", "generatebundle.ps1"),
-                SdkMsi, SharedFrameworkMsi, SharedHostMsi, SdkBundle, WixRoot, cliSdkBrandName, MsiVersion, CliDisplayVersion, CliNugetVersion, upgradeCode, Arch)
+                SdkMsi, SharedFrameworkMsi, HostFxrMsi, SharedHostMsi, SdkBundle, WixRoot, cliSdkBrandName, MsiVersion, CliDisplayVersion, CliNugetVersion, upgradeCode, Arch)
                     .EnvironmentVariable("Stage2Dir", Dirs.Stage2)
                     .Execute()
                     .EnsureSuccessful();

build_projects/dotnet-cli-build/PrepareTargets.cs

@@ -141,6 +141,7 @@ namespace Microsoft.DotNet.Cli.Build
             var cliVersion = c.BuildContext.Get<BuildVersion>("BuildVersion").NuGetVersion;
             var sharedFrameworkVersion = CliDependencyVersions.SharedFrameworkVersion;
             var hostVersion = CliDependencyVersions.SharedHostVersion;
+            var hostFxrVersion = CliDependencyVersions.HostFxrVersion;
 
             // Generated Installers + Archives
             AddInstallerArtifactToContext(c, "dotnet-sdk", "Sdk", cliVersion);
@@ -150,6 +151,7 @@ namespace Microsoft.DotNet.Cli.Build
 
             //Downloaded Installers + Archives
             AddInstallerArtifactToContext(c, "dotnet-host", "SharedHost", hostVersion);
+            AddInstallerArtifactToContext(c, "dotnet-hostfxr", "HostFxr", hostFxrVersion);
             AddInstallerArtifactToContext(c, "dotnet-sharedframework", "SharedFramework", sharedFrameworkVersion);
             AddInstallerArtifactToContext(c, "dotnet", "CombinedFrameworkHost", sharedFrameworkVersion);
 
@@ -214,15 +216,19 @@ namespace Microsoft.DotNet.Cli.Build
 
             var sharedFrameworkVersion = CliDependencyVersions.SharedFrameworkVersion;
             var hostVersion = CliDependencyVersions.SharedHostVersion;
+            var hostFxrVersion = CliDependencyVersions.HostFxrVersion;
 
             var sharedFrameworkChannel = CliDependencyVersions.SharedFrameworkChannel;
             var sharedHostChannel = CliDependencyVersions.SharedHostChannel;
+            var hostFxrChannel = CliDependencyVersions.HostFxrChannel;
 
             var sharedFrameworkInstallerDownloadFile = Path.Combine(CliDirs.CoreSetupDownload, "sharedFrameworkInstaller");
             var sharedHostInstallerDownloadFile = Path.Combine(CliDirs.CoreSetupDownload, "sharedHostInstaller");
+            var hostFxrInstallerDownloadFile = Path.Combine(CliDirs.CoreSetupDownload, "hostFxrInstaller");
 
             Mkdirp(Path.GetDirectoryName(sharedFrameworkInstallerDownloadFile));
             Mkdirp(Path.GetDirectoryName(sharedHostInstallerDownloadFile));
+            Mkdirp(Path.GetDirectoryName(hostFxrInstallerDownloadFile));
 
             if ( ! File.Exists(sharedFrameworkInstallerDownloadFile))
             {
@@ -254,6 +260,21 @@ namespace Microsoft.DotNet.Cli.Build
                 File.Copy(sharedHostInstallerDownloadFile, sharedHostInstallerDestinationFile, true);
             }
 
+            if ( ! File.Exists(hostFxrInstallerDownloadFile))
+            {
+                var hostFxrInstallerDestinationFile = c.BuildContext.Get<string>("HostFxrInstallerFile");
+                Mkdirp(Path.GetDirectoryName(hostFxrInstallerDestinationFile));
+
+                AzurePublisher.DownloadFile(
+                   AzurePublisher.CalculateInstallerBlob(
+                       hostFxrInstallerDestinationFile,
+                       hostFxrChannel,
+                       hostFxrVersion),
+                   hostFxrInstallerDownloadFile).Wait();
+
+                File.Copy(hostFxrInstallerDownloadFile, hostFxrInstallerDestinationFile, true);
+            }
+
             return c.Success();
         }
 

packaging/windows/clisdk/bundle.wxs

@@ -49,6 +49,9 @@
       <MsiPackage SourceFile="$(var.SharedFXMsiSourcePath)">
         <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
       </MsiPackage>
+      <MsiPackage SourceFile="$(var.HostFXRMsiSourcePath)">
+        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
+      </MsiPackage>
       <MsiPackage SourceFile="$(var.SharedHostMsiSourcePath)">
         <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
       </MsiPackage>

packaging/windows/clisdk/generatebundle.ps1

@@ -4,6 +4,7 @@
 param(
     [Parameter(Mandatory=$true)][string]$CLISDKMSIFile,
     [Parameter(Mandatory=$true)][string]$SharedFxMSIFile,
+    [Parameter(Mandatory=$true)][string]$HostFxrMSIFile,
     [Parameter(Mandatory=$true)][string]$SharedHostMSIFile,
     [Parameter(Mandatory=$true)][string]$DotnetBundleOutput,
     [Parameter(Mandatory=$true)][string]$WixRoot,
@@ -36,6 +37,7 @@ function RunCandleForBundle
         -dCLISDKMsiSourcePath="$CLISDKMSIFile" `
         -dUpgradeCode="$UpgradeCode" `
         -dSharedFXMsiSourcePath="$SharedFxMSIFile" `
+        -dHostFXRMsiSourcePath="$HostFxrMSIFile" `
         -dSharedHostMsiSourcePath="$SharedHostMSIFile" `
         -arch "$Architecture" `
         -ext WixBalExtension.dll `