Merge pull request #785 from dsyme/pu1

move MSBuild support to separate nuget package

Author: dsyme

RELEASE_NOTES.md

@@ -1,3 +1,6 @@
+#### 13.0.0
+  * Move FSharp.Compiler.Service.MSBuild.v12.dll to a separate nuget package
+  
 #### 12.0.8
   * Set bit on output executables correctly
 

build.fsx

@@ -4,15 +4,13 @@
 
 #I "packages/FAKE/tools"
 #r "packages/FAKE/tools/FakeLib.dll"
-#load "packages/SourceLink.Fake/tools/SourceLink.fsx"
 open System
 open Fake.AppVeyor
 open Fake
 open Fake.Git
 open Fake.ReleaseNotesHelper
 open Fake.UserInputHelper
 open Fake.AssemblyInfoFile
-open SourceLink
 
 #if MONO
 // prevent incorrect output encoding (e.g. https://github.com/fsharp/FAKE/issues/1196)
@@ -121,30 +119,6 @@ Target "Build.NetFx.Debug" (fun _ ->
     CleanDir buildDir
 )
 
-Target "SourceLink" (fun _ ->
-    #if MONO
-    ()
-    #else
-    netFrameworks
-    |> List.iter (fun framework ->
-        let outputPath = __SOURCE_DIRECTORY__ </> releaseDir </> framework
-        let proj = VsProj.Load "src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj"
-                        ["Configuration","Release"; "TargetFrameworkVersion",framework; "OutputPath",outputPath]
-        let sourceFiles =
-            SetBaseDir __SOURCE_DIRECTORY__ proj.Compiles
-            // generated and in fsproj as Compile, but in .gitignore, not source indexed
-            -- "src/fsharp/FSharp.Compiler.Service/illex.fs" // <FsLex Include="..\..\absil\illex.fsl">
-            -- "src/fsharp/FSharp.Compiler.Service/ilpars.fs"
-            -- "src/fsharp/FSharp.Compiler.Service/pplex.fs" // <FsLex Include="..\..\absil\illex.fsl">
-            -- "src/fsharp/FSharp.Compiler.Service/pppars.fs"
-            -- "src/fsharp/FSharp.Compiler.Service/lex.fs"
-            -- "src/fsharp/FSharp.Compiler.Service/pars.fs"
-        let url = sprintf "%s/%s/{0}/%%var2%%" gitRaw gitName
-        SourceLink.Index sourceFiles proj.OutputFilePdb __SOURCE_DIRECTORY__ url
-    )
-    #endif
-)
-
 // --------------------------------------------------------------------------------------
 // Run the unit tests using test runner
 
@@ -174,7 +148,13 @@ Target "NuGet.NetFx" (fun _ ->
             ReleaseNotes = toLines release.Notes })
     Paket.Pack (fun p ->
         { p with
-            TemplateFile = "nuget/projectcracker.template"
+            TemplateFile = "nuget/FSharp.Compiler.Service.ProjectCracker.template"
+            Version = nugetVersion
+            OutputPath = releaseDir
+            ReleaseNotes = toLines release.Notes })
+    Paket.Pack (fun p ->
+        { p with
+            TemplateFile = "nuget/FSharp.Compiler.Service.MSBuild.v12.template"
             Version = nugetVersion
             OutputPath = releaseDir
             ReleaseNotes = toLines release.Notes })
@@ -190,7 +170,13 @@ Target "NuGet.NetFx.Debug" (fun _ ->
             ReleaseNotes = toLines release.Notes })
     Paket.Pack (fun p ->
         { p with
-            TemplateFile = "nuget/projectcracker.template"
+            TemplateFile = "nuget/FSharp.Compiler.Service.ProjectCracker.template"
+            Version = nugetDebugVersion
+            OutputPath = debugDir
+            ReleaseNotes = toLines release.Notes })
+    Paket.Pack (fun p ->
+        { p with
+            TemplateFile = "nuget/FSharp.Compiler.Service.MSBuild.v12.template"
             Version = nugetDebugVersion
             OutputPath = debugDir
             ReleaseNotes = toLines release.Notes })
@@ -429,7 +415,6 @@ Target "All.NetFx" DoNothing
   ==> "NuGet"
 
 "All"
-  ==> "SourceLink"
   ==> "NuGet"
   ==> "CreatePackage"
   ==> "GitHubRelease"

nuget/FSharp.Compiler.Service.MSBuild.v12.template

@@ -0,0 +1,16 @@
+type file
+id FSharp.Compiler.Service.MSBuild.v12
+description
+    Adds legacy MSBuild 12.0 support to the F# compiler services package for
+    resolving references such as #r "System, Version=4.1.0.0,..."
+authors
+    Microsoft Corporation, Dave Thomas, Anh-Dung Phan, Tomas Petricek
+summary
+    Adds legacy MSBuild 12.0 support to the F# compiler services package
+licenseurl https://github.com/fsharp/FSharp.Compiler.Service/blob/master/LICENSE
+projecturl https://github.com/fsharp/FSharp.Compiler.Service
+iconurl https://raw.github.com/fsharp/FSharp.Compiler.Service/master/misc/logo.png
+tags
+    F#, fsharp, interactive, compiler, editor
+files
+    ../bin/v4.5/FSharp.Compiler.Service.MSBuild.v12.dll ==> lib/net45

nuget/projectcracker.template renamed to nuget/FSharp.Compiler.Service.ProjectCracker.template

@@ -19,7 +19,6 @@ files
     ../bin/v4.5/FSharp.Compiler.Service.xml ==> lib/net45
     ../bin/v4.5/FSharp.Compiler.Service.?db ==> lib/net45
     ../bin/v4.5/FSharp.Compiler.Service.dll.?db ==> lib/net45
-    ../bin/v4.5/FSharp.Compiler.Service.MSBuild.v12.dll ==> lib/net45
 dependencies
 	System.Collections.Immutable >= LOCKEDVERSION
 	System.Reflection.Metadata >= LOCKEDVERSION

nuget/FSharp.Compiler.Service.template

@@ -1,6 +1,6 @@
 <Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>12.0.8</VersionPrefix>
+    <VersionPrefix>13.0.0</VersionPrefix>
     <TargetFramework>netstandard1.6</TargetFramework>
     <OutputType>Library</OutputType>
     <DefineConstants>$(DefineConstants);DOTNETCORE;</DefineConstants>

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

@@ -1,6 +1,6 @@
 <Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>12.0.8</VersionPrefix>
+    <VersionPrefix>13.0.0</VersionPrefix>
     <TargetFramework>netstandard1.6</TargetFramework>
     <AssemblyName>FSharp.Compiler.Service</AssemblyName>
     <DefineConstants>$(DefineConstants);BUILDING_WITH_LKG</DefineConstants>

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

@@ -1,6 +1,7 @@
 
 #if INTERACTIVE
 #r "../../bin/v4.5/FSharp.Compiler.Service.dll"
+#r "../../bin/v4.5/FSharp.Compiler.Service.ProjectCracker.dll"
 #r "../../packages/NUnit/lib/nunit.framework.dll"
 #load "FsUnit.fs"
 #load "Common.fs"