Skip to content

Commit 633754d

Browse files
committed
Embed MSBUILD dependencies in the package
1 parent 9a3fc66 commit 633754d

File tree

2 files changed

+31
-12
lines changed

2 files changed

+31
-12
lines changed

nuget/FSharp.Compiler.Service.nuspec

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,24 @@
1616
<tags>@tags@</tags>
1717
</metadata>
1818
<files>
19+
<!-- .NET 4.0 assemblies -->
1920
<file src="..\bin\v4.0\FSharp.Compiler.Service.dll" target="lib/net40" />
2021
<file src="..\bin\v4.0\FSharp.Compiler.Service.xml" target="lib/net40" />
2122
<file src="..\bin\v4.0\FSharp.Compiler.Service.pdb" target="lib/net40" />
23+
<file src="..\bin\v4.0\Microsoft.Build.dll" target="lib/net40" />
24+
<file src="..\bin\v4.0\Microsoft.Build.Engine.dll" target="lib/net40" />
25+
<file src="..\bin\v4.0\Microsoft.Build.Framework.dll" target="lib/net40" />
26+
<file src="..\bin\v4.0\Microsoft.Build.Tasks.v12.0.dll" target="lib/net40" />
27+
<file src="..\bin\v4.0\Microsoft.Build.Utilities.v12.0.dll" target="lib/net40" />
28+
29+
<!-- .NET 4.5 assemblies -->
2230
<file src="..\bin\v4.5\FSharp.Compiler.Service.dll" target="lib/net45" />
2331
<file src="..\bin\v4.5\FSharp.Compiler.Service.xml" target="lib/net45" />
2432
<file src="..\bin\v4.5\FSharp.Compiler.Service.pdb" target="lib/net45" />
25-
</files>
33+
<file src="..\bin\v4.5\Microsoft.Build.dll" target="lib/net45" />
34+
<file src="..\bin\v4.5\Microsoft.Build.Engine.dll" target="lib/net45" />
35+
<file src="..\bin\v4.5\Microsoft.Build.Framework.dll" target="lib/net45" />
36+
<file src="..\bin\v4.5\Microsoft.Build.Tasks.v12.0.dll" target="lib/net45" />
37+
<file src="..\bin\v4.5\Microsoft.Build.Utilities.v12.0.dll" target="lib/net45" />
38+
</files>
2639
</package>

src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
# Copyright (c) 2002-2011 Microsoft Corporation.
44
#
@@ -597,18 +597,24 @@
597597
<Reference Include="Microsoft.Build" Condition=" '$(TargetFrameworkVersion)' == 'v4.0'" />
598598
<Reference Include="Microsoft.Build.Utilities.v4.0" Condition=" '$(TargetFrameworkVersion)' == 'v4.0'" />
599599
<Reference Include="Microsoft.Build.Tasks.v4.0" Condition=" '$(TargetFrameworkVersion)' == 'v4.0'" />
600-
601-
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'" >
602-
<SpecificVersion>True</SpecificVersion>
600+
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'">
601+
<SpecificVersion>True</SpecificVersion>
602+
<Private>True</Private>
603603
</Reference>
604-
<Reference Include="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'" >
605-
<SpecificVersion>True</SpecificVersion>
604+
<Reference Include="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'">
605+
<SpecificVersion>True</SpecificVersion>
606+
<Private>True</Private>
606607
</Reference>
607-
<Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'" >
608-
<SpecificVersion>True</SpecificVersion>
608+
<Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'">
609+
<SpecificVersion>True</SpecificVersion>
610+
<Private>True</Private>
611+
</Reference>
612+
<Reference Include="Microsoft.Build.Utilities.v12.0" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'">
613+
<Private>True</Private>
614+
</Reference>
615+
<Reference Include="Microsoft.Build.Tasks.v12.0" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'">
616+
<Private>True</Private>
609617
</Reference>
610-
<Reference Include="Microsoft.Build.Utilities.v12.0" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'" />
611-
<Reference Include="Microsoft.Build.Tasks.v12.0" Condition=" '$(TargetFrameworkVersion)' == 'v4.5'" />
612618
<Reference Include="FSharp.Core, Version=$(TargetFSharpCoreVersion), Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
613619
<Private>False</Private>
614620
</Reference>
@@ -623,4 +629,4 @@
623629
<Import Project="$(LkgPath)\FSharp.SRGen.targets" />
624630
<Import Project="$(LkgPath)\FsLexYacc.targets" />
625631
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
626-
</Project>
632+
</Project>

0 commit comments

Comments
 (0)