Embed MSBUILD dependencies in the package

fsharp · Apr 29, 2015 · 633754d · 633754d
1 parent 9a3fc66
commit 633754d
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 12 deletions.
diff --git a/nuget/FSharp.Compiler.Service.nuspec b/nuget/FSharp.Compiler.Service.nuspec
@@ -16,11 +16,24 @@
       <tags>@tags@</tags>
     </metadata>
     <files>
+      <!-- .NET 4.0 assemblies -->
       <file src="..\bin\v4.0\FSharp.Compiler.Service.dll" target="lib/net40" />
       <file src="..\bin\v4.0\FSharp.Compiler.Service.xml" target="lib/net40" />
       <file src="..\bin\v4.0\FSharp.Compiler.Service.pdb" target="lib/net40" />
+      <file src="..\bin\v4.0\Microsoft.Build.dll" target="lib/net40" />
+      <file src="..\bin\v4.0\Microsoft.Build.Engine.dll" target="lib/net40" />
+      <file src="..\bin\v4.0\Microsoft.Build.Framework.dll" target="lib/net40" />
+      <file src="..\bin\v4.0\Microsoft.Build.Tasks.v12.0.dll" target="lib/net40" />
+      <file src="..\bin\v4.0\Microsoft.Build.Utilities.v12.0.dll" target="lib/net40" />
+
+      <!-- .NET 4.5 assemblies -->
       <file src="..\bin\v4.5\FSharp.Compiler.Service.dll" target="lib/net45" />
       <file src="..\bin\v4.5\FSharp.Compiler.Service.xml" target="lib/net45" />
       <file src="..\bin\v4.5\FSharp.Compiler.Service.pdb" target="lib/net45" />
-   </files>
+      <file src="..\bin\v4.5\Microsoft.Build.dll" target="lib/net45" />
+      <file src="..\bin\v4.5\Microsoft.Build.Engine.dll" target="lib/net45" />
+      <file src="..\bin\v4.5\Microsoft.Build.Framework.dll" target="lib/net45" />
+      <file src="..\bin\v4.5\Microsoft.Build.Tasks.v12.0.dll" target="lib/net45" />
+      <file src="..\bin\v4.5\Microsoft.Build.Utilities.v12.0.dll" target="lib/net45" />
+    </files>
 </package>
diff --git a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 # Copyright (c) 2002-2011 Microsoft Corporation. 
 #
@@ -597,18 +597,24 @@
     <Reference Include="Microsoft.Build" Condition=" '$(TargetFrameworkVersion)' == 'v4.0'" />
     <Reference Include="Microsoft.Build.Utilities.v4.0" Condition=" '$(TargetFrameworkVersion)' == 'v4.0'" />
     <Reference Include="Microsoft.Build.Tasks.v4.0" Condition=" '$(TargetFrameworkVersion)' == 'v4.0'" />
-
-    <Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'" >
-        <SpecificVersion>True</SpecificVersion>
+    <Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'">
+      <SpecificVersion>True</SpecificVersion>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'" >
-        <SpecificVersion>True</SpecificVersion>
+    <Reference Include="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'">
+      <SpecificVersion>True</SpecificVersion>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'" >
-        <SpecificVersion>True</SpecificVersion>
+    <Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'">
+      <SpecificVersion>True</SpecificVersion>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Build.Utilities.v12.0" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'">
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.Build.Tasks.v12.0" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'">
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Build.Utilities.v12.0" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'" />
-    <Reference Include="Microsoft.Build.Tasks.v12.0" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'" />
     <Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <Private>False</Private>
     </Reference>
@@ -623,4 +629,4 @@
   <Import Project="$(LkgPath)\FSharp.SRGen.targets" />
   <Import Project="$(LkgPath)\FsLexYacc.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-</Project>
+</Project>