From 8e7cd5c550165b4727f74dd97f1f61b4f25e8f4c Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Tue, 25 Apr 2017 20:38:41 -0700
Subject: [PATCH] Add a hostfxr container version, because even a 1.1.2 hostfxr
 is being binplaced in a 1.1.0 container.

---
 build.proj                                 | 1 +
 build/Microsoft.DotNet.Cli.Prepare.targets | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.proj b/build.proj
index 0b065edbf..37dadf33d 100644
--- a/build.proj
+++ b/build.proj
@@ -21,6 +21,7 @@
     <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
     <SharedFrameworkVersion>1.1.2</SharedFrameworkVersion>
     <SharedHostVersion>1.1.0</SharedHostVersion>
+    <HostFxrContainerVersion>1.1.0</HostFxrContainerVersion>
     <HostFxrVersion Condition=" '$(OS)' != 'Windows_NT' ">1.1.0</HostFxrVersion>
     <HostFxrVersion Condition=" '$(OS)' == 'Windows_NT' ">1.1.2</HostFxrVersion>
 
diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
index 302b7e6c6..0a47f2622 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -146,6 +146,7 @@
       <AdditionalCoreSetupChannel>preview</AdditionalCoreSetupChannel>
       <AdditionalSharedFrameworkVersion>1.0.5</AdditionalSharedFrameworkVersion>
       <AdditionalSharedHostVersion>1.0.1</AdditionalSharedHostVersion>
+      <AdditionalHostFxrContainerVersion>1.0.1</AdditionalHostFxrContainerVersion>
       <AdditionalHostFxrVersion Condition=" '$(OSName)' != 'win' ">1.0.1</AdditionalHostFxrVersion>
       <AdditionalHostFxrVersion Condition=" '$(OSName)' == 'win' ">1.0.5</AdditionalHostFxrVersion>
 
@@ -201,7 +202,7 @@
 
       <_DownloadAndExtractItem Include="DownloadedHostFxrInstallerFile"
                                Condition="!Exists('$(DownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''">
-        <Url>$(CoreSetupInstallerBlobRootUrl)/$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url>
+        <Url>$(CoreSetupInstallerBlobRootUrl)/$(HostFxrContainerVersion)/$(DownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url>
         <DownloadFileName>$(DownloadedHostFxrInstallerFile)</DownloadFileName>
         <ExtractDestintation></ExtractDestintation>
       </_DownloadAndExtractItem>
@@ -242,7 +243,7 @@
 
       <_DownloadAndExtractItem Include="AdditionalDownloadedHostFxrInstallerFile"
                                Condition="!Exists('$(AdditionalDownloadedHostFxrInstallerFile)') And '$(InstallerExtension)' != ''">
-        <Url>$(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrVersion)/$(AdditionalDownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url>
+        <Url>$(AdditionalCoreSetupInstallerBlobRootUrl)/$(AdditionalHostFxrContainerVersion)/$(AdditionalDownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam)</Url>
         <DownloadFileName>$(AdditionalDownloadedHostFxrInstallerFile)</DownloadFileName>
         <ExtractDestintation></ExtractDestintation>
       </_DownloadAndExtractItem>