From 9c2ec5b398d6d0d8737215d399595788180579a4 Mon Sep 17 00:00:00 2001
From: Kevin Ransom <codecutter.fsharp@hotmail.com>
Date: Mon, 22 Jan 2018 11:41:10 -0800
Subject: [PATCH 1/3] Enable pack for type providers

---
 .../Microsoft.FSharp.NetSdk.targets           | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets
index ceb5be04943..1be273bb0ce 100644
--- a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets
+++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets
@@ -73,4 +73,24 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
     <PackageReference Include="FSharp.Core" Version="$(FSharpCoreImplicitPackageVersion)"  Condition=" '$(DisableImplicitFSharpCoreReference)' != 'true' "></PackageReference>
   </ItemGroup>
 
+  <PropertyGroup> 
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackageFSharpDesignTimeTools</TargetsForTfmSpecificContentInPackage> 
+  </PropertyGroup> 
+
+  <Target Name="PackageFSharpDesignTimeTools">
+    <PropertyGroup>
+      <FSharpDesignTimeProtocol Condition = " '$(FSharpDesignTimeProtocol)' == '' ">fsharp41</FSharpDesignTimeProtocol>
+      <FSharpToolsDirectory Condition = " '$(FSharpToolsDirectory)' == '' ">tools</FSharpToolsDirectory>
+    </PropertyGroup>
+
+    <Error Text="'$(FSharpToolsDirectory)' is an invalid value for 'FSharpToolsDirectory' valid values are 'typeproviders' and 'tools'." Condition="'$(FSharpToolsDirectory)' != 'typeproviders' and '$(FSharpToolsDirectory)' != 'tools'" />
+    <Error Text="The 'FSharpDesignTimeProtocol'  property can be only 'fsharp41'" Condition="'$(FSharpDesignTimeProtocol)' != 'fsharp41'" />
+
+    <ItemGroup>
+      <TfmSpecificPackageFile Include="@(_ResolvedProjectReferencePaths)" Condition="'%(_ResolvedProjectReferencePaths.IsFSharpDesignTimeProvider)' == 'true'">
+        <PackagePath>$(FSharpToolsDirectory)/$(FSharpToolsProtocol)/%(_ResolvedProjectReferencePaths.NearestTargetFramework)/%(_ResolvedProjectReferencePaths.FileName)%(_ResolvedProjectReferencePaths.Extension)</PackagePath>
+      </TfmSpecificPackageFile>
+    </ItemGroup>
+  </Target>
+`
 </Project>

From 156085cb5501f8cc4d6e4374e4eecd52a95d6b1c Mon Sep 17 00:00:00 2001
From: Kevin Ransom <codecutter.fsharp@hotmail.com>
Date: Mon, 22 Jan 2018 13:11:27 -0800
Subject: [PATCH 2/3] Add support to msbuild simplify to pack for typeprovider
 packages

---
 src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets
index 1be273bb0ce..ec797c7dbfd 100644
--- a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets
+++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets
@@ -77,7 +77,7 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackageFSharpDesignTimeTools</TargetsForTfmSpecificContentInPackage> 
   </PropertyGroup> 
 
-  <Target Name="PackageFSharpDesignTimeTools">
+  <Target Name="PackageFSharpDesignTimeTools" DependsOnTargets="_GetFrameworkAssemblyReferences">
     <PropertyGroup>
       <FSharpDesignTimeProtocol Condition = " '$(FSharpDesignTimeProtocol)' == '' ">fsharp41</FSharpDesignTimeProtocol>
       <FSharpToolsDirectory Condition = " '$(FSharpToolsDirectory)' == '' ">tools</FSharpToolsDirectory>

From 704d8f5225b045d5db15fd9838bbc54e6168cbdf Mon Sep 17 00:00:00 2001
From: Kevin Ransom <codecutter.fsharp@hotmail.com>
Date: Mon, 22 Jan 2018 18:14:37 -0800
Subject: [PATCH 3/3] Add transitive dependencies

---
 .../FSharp.Build/Microsoft.FSharp.NetSdk.targets    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets
index ec797c7dbfd..c8f72b909a4 100644
--- a/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets
+++ b/src/fsharp/FSharp.Build/Microsoft.FSharp.NetSdk.targets
@@ -87,10 +87,17 @@ WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
     <Error Text="The 'FSharpDesignTimeProtocol'  property can be only 'fsharp41'" Condition="'$(FSharpDesignTimeProtocol)' != 'fsharp41'" />
 
     <ItemGroup>
-      <TfmSpecificPackageFile Include="@(_ResolvedProjectReferencePaths)" Condition="'%(_ResolvedProjectReferencePaths.IsFSharpDesignTimeProvider)' == 'true'">
-        <PackagePath>$(FSharpToolsDirectory)/$(FSharpToolsProtocol)/%(_ResolvedProjectReferencePaths.NearestTargetFramework)/%(_ResolvedProjectReferencePaths.FileName)%(_ResolvedProjectReferencePaths.Extension)</PackagePath>
+      <_ResolvedProjectOutputFiles
+          Include="%(_ResolvedProjectReferencePaths.RootDir)%(_ResolvedProjectReferencePaths.Directory)/**/*" 
+          Exclude="%(_ResolvedProjectReferencePaths.RootDir)%(_ResolvedProjectReferencePaths.Directory)/**/FSharp.Core.dll;%(_ResolvedProjectReferencePaths.RootDir)%(_ResolvedProjectReferencePaths.Directory)/**/System.ValueTuple.dll" 
+          Condition="'%(_ResolvedProjectReferencePaths.IsFSharpDesignTimeProvider)' == 'true'">
+        <NearestTargetFramework>%(_ResolvedProjectReferencePaths.NearestTargetFramework)</NearestTargetFramework>
+      </_ResolvedProjectOutputFiles>
+
+      <TfmSpecificPackageFile Include="@(_ResolvedProjectOutputFiles)">
+         <PackagePath>$(FSharpToolsDirectory)/$(FSharpDesignTimeProtocol)/%(_ResolvedProjectOutputFiles.NearestTargetFramework)/%(_ResolvedProjectOutputFiles.FileName)%(_ResolvedProjectOutputFiles.Extension)</PackagePath>
       </TfmSpecificPackageFile>
     </ItemGroup>
   </Target>
-`
+
 </Project>