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

FSharp.Compiler.Tools: set FSharpTargetsPath when using the old SDK

Author: dsyme

FSharp.Compiler.Tools.Nuget/FSharp.Compiler.Tools.nuspec

@@ -52,6 +52,11 @@
 	<!-- Microsoft.FSharp.targets : Used in the source tree as of 08/04/2016 (prior this was Microsoft.FSharp.Targets) -->
 
     <file src="..\Release\net40\bin\Microsoft.FSharp.Targets" target="tools\Microsoft.FSharp.Targets" />
+	
+	<!-- Microsoft.Portable.FSharp.targets: used in source tree -->
+	<!-- Microsoft.Portable.FSharp.Targets: imported by project templates -->
+    <file src="..\Release\net40\bin\Microsoft.Portable.FSharp.targets" target="tools\Microsoft.Portable.FSharp.Targets" />
+	
     <file src="..\Release\net40\bin\Microsoft.Build.dll" target="tools\Microsoft.Build.dll" />
     <file src="..\Release\net40\bin\Microsoft.Build.Engine.dll" target="tools\Microsoft.Build.Engine.dll" />
     <file src="..\Release\net40\bin\Microsoft.Build.Framework.dll" target="tools\Microsoft.Build.Framework.dll" />

FSharp.Compiler.Tools.Nuget/build/FSharp.Compiler.Tools.props

@@ -24,6 +24,15 @@ WARNING:  You CAN MODIFY this file, doesnt matter if you are not knowledgeable a
 
   </PropertyGroup>
 
+
+  <!-- ref https://github.com/dotnet/standard/blob/master/Microsoft.Packaging.Tools/tasks/targets/Microsoft.Packaging.Tools.targets#L12 -->
+  <!-- Condition here is a hack until https://github.com/dotnet/sdk/issues/534 is fixed -->
+  <PropertyGroup Condition="'$(TargetFramework)' == '' and '$(TargetFrameworks)' == ''">
+    <!-- when using the old SDK, override FSharpTargetsPath and PortableFSharpTargetsPath -->
+    <FSharpTargetsPath>$(MSBuildThisFileDirectory)../tools/Microsoft.FSharp.Targets</FSharpTargetsPath>
+    <PortableFSharpTargetsPath>$(MSBuildThisFileDirectory)../tools/Microsoft.Portable.FSharp.Targets</PortableFSharpTargetsPath>
+  </PropertyGroup>
+  
   <Choose>
     <When Condition="'$(MSBuildRuntimeType)' == 'Core'">
       <PropertyGroup>
@@ -43,4 +52,4 @@ WARNING:  You CAN MODIFY this file, doesnt matter if you are not knowledgeable a
     </Otherwise>
   </Choose>
 
-</Project>
+</Project>