Skip to content

Commit

Permalink
convert FCS MSBuild references to a NuGet package (#6439)
Browse files Browse the repository at this point in the history
  • Loading branch information
brettfo authored and KevinRansom committed Apr 8, 2019
1 parent 1e79be6 commit e2ce51e
Show file tree
Hide file tree
Showing 12 changed files with 43 additions and 40 deletions.
1 change: 1 addition & 0 deletions fcs/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<RestoreSources>
$(RestoreSources);
https://api.nuget.org/v3/index.json;
https://dotnet.myget.org/F/fsharp/api/v3/index.json;
</RestoreSources>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,8 @@
<PackageReference Include="FSharp.Core" Version="4.5.2" />
<PackageReference Include="FSharp.Core" Version="4.1.19" />
<PackageReference Include="FSharp.Core" Version="4.1.18" />
<PackageReference Include="FSharp.Compiler.Service.MSBuild.v12.0" Version="1.0.0" />
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Engine.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="Microsoft.Build.Utilities.v12.0">
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Utilities.v12.0.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="Microsoft.Build.Tasks.v12.0">
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Tasks.v12.0.dll</HintPath>
<Private>false</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,6 @@
<Reference Include="System.Runtime" />
<Reference Include="System.IO" />
<PackageReference Include="FSharp.Core" Version="4.6.2" />
<Reference Include="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="Microsoft.Build.Engine, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Engine.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="Microsoft.Build, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="Microsoft.Build.Utilities.v12.0">
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Utilities.v12.0.dll</HintPath>
<Private>false</Private>
</Reference>
<Reference Include="Microsoft.Build.Tasks.v12.0">
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Tasks.v12.0.dll</HintPath>
<Private>false</Private>
</Reference>
<PackageReference Include="FSharp.Compiler.Service.MSBuild.v12.0" Version="1.0.0" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions fcs/dependencies/MSBuild.v12.0/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.dll
10 changes: 10 additions & 0 deletions fcs/dependencies/MSBuild.v12.0/MSBuild.v12.0.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">

<PropertyGroup>
<TargetFramework>net45</TargetFramework>
<NuspecFile>MSBuild.v12.0.nuspec</NuspecFile>
</PropertyGroup>

<Target Name="Build" />

</Project>
20 changes: 20 additions & 0 deletions fcs/dependencies/MSBuild.v12.0/MSBuild.v12.0.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0"?>
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
<metadata>
<id>FSharp.Compiler.Service.MSBuild.v12.0</id>
<version>1.0</version>
<authors>Microsoft and F# Software Foundation</authors>
<description>MSBuild.v12.0 dependencies for fcs.</description>
<dependencies>
<group targetFramework="net45">
</group>
</dependencies>
</metadata>
<files>
<file src="Microsoft.Build.dll" target="lib\net45" />
<file src="Microsoft.Build.Engine.dll" target="lib\net45" />
<file src="Microsoft.Build.Framework.dll" target="lib\net45" />
<file src="Microsoft.Build.Tasks.v12.0.dll" target="lib\net45" />
<file src="Microsoft.Build.Utilities.v12.0.dll" target="lib\net45" />
</files>
</package>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed fcs/dependencies/MSBuild.v12.0/Microsoft.Build.dll
Binary file not shown.
9 changes: 9 additions & 0 deletions fcs/dependencies/MSBuild.v12.0/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
The MSBuild.12.0 dependencies have been converted to a NuGet package.

To create an updated version of the package:

1. Copy the appropriate `Microsoft.Build.*.dll` files to this directory.
2. Update the `<version>` element of `MSBuild.v12.0.nuspec`.
3. Run `msbuild MSBuild.v12.0.csproj /t:Pack`
4. Upload `<repo-root>\artifacts\bin\fcs\FSharp.Compiler.Service.MSBuild.v12.0.*.nupkg` to the MyGet feed at
`https://dotnet.myget.org/F/fsharp/api/v3/index.json`

0 comments on commit e2ce51e

Please sign in to comment.