Merge pull request #842 from ctaggart/sourcelink

pack source linked pdb files

Author: dsyme

appveyor.yml

@@ -1,24 +1,13 @@
 os: Visual Studio 2017
 
-environment:
-  CLI_VERSION: 2.0.0
-
-install:
-  - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
-  - ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
-  - ps: Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
-  - ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version $env:CLI_VERSION -InstallDir $env:DOTNET_INSTALL_DIR'
-  - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
-
 init:
   - git config --global core.autocrlf input
 
 build_script:
-  - cmd: dotnet --info
   - cmd: fcs\build.cmd TestAndNuGet
 
 test: off
 version: '{build}'
 artifacts:
   - path: release\*.nupkg
-    type: NuGetPackage
+    type: NuGetPackage

fcs/Directory.Build.props

@@ -0,0 +1,5 @@
+<Project>
+  <ItemGroup>
+    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.7.4" PrivateAssets="All" />
+  </ItemGroup>
+</Project>

fcs/FSharp.Compiler.Service.netstandard/FSharp.Compiler.Service.netstandard.fsproj

@@ -665,4 +665,14 @@
   <Import Project="$(FSharpSourcesRoot)\scripts\fssrgen.targets" />
   <Import Project="$(FSharpSourcesRoot)\..\packages\FsLexYacc.7.0.6\build\FsLexYacc.targets" />
 	<Target Name="GenerateCode" AfterTargets="Restore" BeforeTargets="BeforeBuild"       DependsOnTargets="CallFsLex;CallFsYacc;ProcessFsSrGen"></Target>
+  <ItemGroup>
+    <EmbeddedFiles Include="$(IntermediateOutputPath)FSComp.fs" />
+    <EmbeddedFiles Include="$(IntermediateOutputPath)FSIStrings.fs" />
+    <EmbeddedFiles Include="lex.fs" />
+    <EmbeddedFiles Include="pplex.fs" />
+    <EmbeddedFiles Include="pars.fs" />
+    <EmbeddedFiles Include="pppars.fs" />
+    <EmbeddedFiles Include="illex.fs" />
+    <EmbeddedFiles Include="ilpars.fs" />
+  </ItemGroup>
 </Project>

fcs/build.fsx

@@ -18,7 +18,7 @@ CleanDir (__SOURCE_DIRECTORY__ + "/../tests/TestResults")
 File.WriteAllText(__SOURCE_DIRECTORY__ + "/../tests/TestResults/notestsyet.txt","No tests yet")
 #endif
 
-let dotnetExePath = DotNetCli.InstallDotNetSDK "2.0.2"
+let dotnetExePath = DotNetCli.InstallDotNetSDK "2.1.3"
 
 let runDotnet workingDir args =
     let result =
@@ -109,7 +109,7 @@ Target "BuildVersion" (fun _ ->
 
 Target "Build.NetFx" (fun _ ->
     !! "FSharp.Compiler.Service.sln"
-    |> MSBuild "" "Build" ["Configuration","Release" ]
+    |> MSBuild "" "Build" ["Configuration","Release"; "SourceLinkCreate","true"]
     |> Log (".NETFxBuild-Output: ")
 )
 

fcs/paket.dependencies

@@ -9,4 +9,9 @@ nuget Microsoft.Build.Utilities.Core 14.3.0
 nuget Microsoft.Build.Framework 14.3.0
 nuget Microsoft.Build.Engine 14.3.0
 nuget Microsoft.Build 14.3.0
-nuget System.Threading.Tasks.Dataflow 4.5.24.0
+nuget System.Threading.Tasks.Dataflow 4.5.24.0
+
+group SourceLink
+  storage: none
+  source https://www.nuget.org/api/v2/
+  nuget SourceLink.Create.CommandLine 2.7.4

fcs/paket.lock

@@ -22,3 +22,9 @@ NUGET
     System.Runtime (4.3) - restriction: || (&& (== net45) (>= netstandard1.3)) (== net46)
     System.Runtime.InteropServices (4.3) - restriction: || (&& (== net45) (>= netstandard1.3)) (== net46)
     System.Threading.Tasks.Dataflow (4.5.24)
+
+GROUP SourceLink
+STORAGE: NONE
+NUGET
+  remote: https://www.nuget.org/api/v2
+    SourceLink.Create.CommandLine (2.7.4)