From 5be74db44056c79f0e4e972f489289fdb1bff69b Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Tue, 25 Apr 2017 15:10:39 -0700
Subject: [PATCH] Conditioning the version of hostfxr on the OS, because for
 Windows it actually has a different version.

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

diff --git a/build.proj b/build.proj
index fd7f7f235..0b065edbf 100644
--- a/build.proj
+++ b/build.proj
@@ -21,7 +21,8 @@
     <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
     <SharedFrameworkVersion>1.1.2</SharedFrameworkVersion>
     <SharedHostVersion>1.1.0</SharedHostVersion>
-    <HostFxrVersion>1.1.0</HostFxrVersion>
+    <HostFxrVersion Condition=" '$(OS)' != 'Windows_NT' ">1.1.0</HostFxrVersion>
+    <HostFxrVersion Condition=" '$(OS)' == 'Windows_NT' ">1.1.2</HostFxrVersion>
 
     <CoreCLRVersion>1.1.2</CoreCLRVersion>
     <JitVersion>1.1.2</JitVersion>
diff --git a/build/Microsoft.DotNet.Cli.Prepare.targets b/build/Microsoft.DotNet.Cli.Prepare.targets
index e15fc6e35..91acac4dd 100644
--- a/build/Microsoft.DotNet.Cli.Prepare.targets
+++ b/build/Microsoft.DotNet.Cli.Prepare.targets
@@ -146,7 +146,8 @@
       <AdditionalCoreSetupChannel>preview</AdditionalCoreSetupChannel>
       <AdditionalSharedFrameworkVersion>1.0.5</AdditionalSharedFrameworkVersion>
       <AdditionalSharedHostVersion>1.0.1</AdditionalSharedHostVersion>
-      <AdditionalHostFxrVersion>1.0.1</AdditionalHostFxrVersion>
+      <AdditionalHostFxrVersion Condition=" '$(OS)' != 'Windows_NT' ">1.0.1</AdditionalHostFxrVersion>
+      <AdditionalHostFxrVersion Condition=" '$(OS)' == 'Windows_NT' ">1.0.5</AdditionalHostFxrVersion>
 
       <!-- Additional Downloaded Installers + Archives -->
       <AdditionalDownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host-$(ProductMonikerRid).$(AdditionalSharedHostVersion)$(InstallerExtension)</AdditionalDownloadedSharedHostInstallerFileName>