Merge pull request fsharp#675 from 0x53A/0x53A-patch-1

fix fsharp#721
nosami · Mar 10, 2017 · 2658d33 · 2658d33
2 parents 6ce41a9 + 000daab
commit 2658d33
Showing 1 changed file with 25 additions and 12 deletions.
diff --git a/FSharp.Compiler.Tools.Nuget/build/FSharp.Compiler.Tools.props b/FSharp.Compiler.Tools.Nuget/build/FSharp.Compiler.Tools.props
@@ -14,20 +14,33 @@ WARNING:  You CAN MODIFY this file, doesnt matter if you are not knowledgeable a
 
   <PropertyGroup>
 
-    <!-- Default to netcoreapp fsc -->
-    <FscTaskAssemblyPath>$(MSBuildThisFileDirectory)netcoreapp1.0/FSharp.Build.dll</FscTaskAssemblyPath>
-    <FscToolPath>$(MSBuildThisFileDirectory)netcoreapp1.0</FscToolPath>
-    <FscToolExe>fsc.dll</FscToolExe>
-    <FscToolFullPath>$(MSBuildThisFileDirectory)netcoreapp1.0/fsc.dll</FscToolFullPath>
-
     <!-- specific netcoreapp1.0 fsc -->
-    <FscTaskAssemblyPath_netcoreapp1_0>$(MSBuildThisFileDirectory)netcoreapp1.0/FSharp.Build.dll</FscTaskAssemblyPath_netcoreapp1_0>
-    <FscToolFullPath_netcoreapp1_0>$(MSBuildThisFileDirectory)netcoreapp1.0/fsc.dll</FscToolFullPath_netcoreapp1_0>
+    <_FscTaskAssemblyPath_netcoreapp1_0>$(MSBuildThisFileDirectory)netcoreapp1.0/FSharp.Build.dll</_FscTaskAssemblyPath_netcoreapp1_0>
+    <_FscToolFullPath_netcoreapp1_0>$(MSBuildThisFileDirectory)netcoreapp1.0/fsc.dll</_FscToolFullPath_netcoreapp1_0>
 
     <!-- specific .NET Framework fsc -->
-    <FscTaskAssemblyPath_net>$(MSBuildThisFileDirectory)../tools/FSharp.Build.dll</FscTaskAssemblyPath_net>
-    <FscToolFullPath_net>$(MSBuildThisFileDirectory)../tools/fsc.exe</FscToolFullPath_net>
-    
+    <_FscTaskAssemblyPath_net>$(MSBuildThisFileDirectory)../tools/FSharp.Build.dll</_FscTaskAssemblyPath_net>
+    <_FscToolFullPath_net>$(MSBuildThisFileDirectory)../tools/fsc.exe</_FscToolFullPath_net>
+
   </PropertyGroup>
 
-</Project>
+  <Choose>
+    <When Condition="'$(MSBuildRuntimeType)' == 'Core'">
+      <PropertyGroup>
+        <FscTaskAssemblyPath>$(_FscTaskAssemblyPath_netcoreapp1_0)</FscTaskAssemblyPath>
+        <FscToolPath>$(MSBuildThisFileDirectory)netcoreapp1.0</FscToolPath>
+        <FscToolExe>fsc.dll</FscToolExe>
+        <FscToolFullPath>$(_FscToolFullPath_netcoreapp1_0)</FscToolFullPath>
+      </PropertyGroup>
+    </When>
+    <Otherwise>
+      <PropertyGroup>
+        <FscTaskAssemblyPath>$(_FscTaskAssemblyPath_net)</FscTaskAssemblyPath>
+        <FscToolPath>$(MSBuildThisFileDirectory)../tools</FscToolPath>
+        <FscToolExe>fsc.exe</FscToolExe>
+        <FscToolFullPath>$(_FscToolFullPath_net)</FscToolFullPath>
+      </PropertyGroup>
+    </Otherwise>
+  </Choose>
+
+</Project>