Merge pull request #616 from enricosada/fix_preview2

Cleanup for .NET Core SDK preview2

Author: dsyme

.gitignore

@@ -192,18 +192,9 @@ src/fsharp/FSharp.Compiler.Service/pppars.fsi
 *.vstman
 project.lock.json
 
-src/fsharp/FSharp.Compiler.Service.netcore/FSComp.fs
-src/fsharp/FSharp.Compiler.Service.netcore/FSComp.resx
-src/fsharp/FSharp.Compiler.Service.netcore/FSIstrings.fs
-src/fsharp/FSharp.Compiler.Service.netcore/FSIstrings.resx
-src/fsharp/FSharp.Compiler.Service.netcore/illex.fs
-src/fsharp/FSharp.Compiler.Service.netcore/ilpars.fs
-src/fsharp/FSharp.Compiler.Service.netcore/ilpars.fsi
-src/fsharp/FSharp.Compiler.Service.netcore/lex.fs
-src/fsharp/FSharp.Compiler.Service.netcore/pars.fs
-src/fsharp/FSharp.Compiler.Service.netcore/pars.fsi
-src/fsharp/FSharp.Compiler.Service.netcore/pplex.fs
-src/fsharp/FSharp.Compiler.Service.netcore/pppars.fs
-src/fsharp/FSharp.Compiler.Service.netcore/pppars.fsi
+src/fsharp/FSharp.Compiler.Service/FSComp.fs
+src/fsharp/FSharp.Compiler.Service/FSComp.resx
+src/fsharp/FSharp.Compiler.Service/FSIstrings.fs
+src/fsharp/FSharp.Compiler.Service/FSIstrings.resx
 Tools/
 Backup/

…vice.ProjectCracker.netcore/NuGet.Config NuGet.Configsrc/fsharp/FSharp.Compiler.Service.ProjectCracker.netcore/NuGet.Config renamed to NuGet.Config src/fsharp/FSharp.Compiler.Service.ProjectCracker.netcore/NuGet.Config renamed to NuGet.Config

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="fsharp-netcore-preview2" value="https://www.myget.org/F/fsharp-netcoresdk-preview2-betatest/api/v3/index.json" />
     <!-- MSBuild -->
     <add key="dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
   </packageSources>

appveyor.yml

@@ -5,12 +5,7 @@ init:
 
 environment:
   matrix:
-    - BUILD_TARGET: DotnetCliTests
-    - BUILD_TARGET: NuGet
-
-matrix:
-  allow_failures:
-    - BUILD_TARGET: DotnetCliTests
+    - BUILD_TARGET: CreatePackage
 
 build_script:
   - ps: dotnet --info

build.fsx

@@ -219,52 +219,64 @@ Target "GitHubRelease" (fun _ ->
 )
 
 // --------------------------------------------------------------------------------------
-// .NET CLI and .NET Core
+// .NET Core and .NET Core SDK
 
-let isDotnetCliInstalled = (try Shell.Exec("dotnet", "--info") = 0 with _ -> false)
+let isDotnetSDKInstalled = (try Shell.Exec("dotnet", "--info") = 0 with _ -> false)
 let assertExitCodeZero x = if x = 0 then () else failwithf "Command failed with exit code %i" x
-
-Target "DotnetCliCodeGen" (fun _ ->
-    let fsLex  = @"lib/bootstrap/4.0/fslex.exe"
-    let fsYacc = @"lib/bootstrap/4.0/fsyacc.exe"
-    let lexArgs = @" --lexlib Internal.Utilities.Text.Lexing"
-    let yaccArgs = @" --internal --parslib Internal.Utilities.Text.Parsing"
-    let module1 = @" --module Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser"
-    let module2 = @" --module Microsoft.FSharp.Compiler.Parser"
-    let module3 = @" --module Microsoft.FSharp.Compiler.PPParser"
-    let open1 = @" --open Microsoft.FSharp.Compiler.AbstractIL"
-    let open2 = @" --open Microsoft.FSharp.Compiler"
-    let open3 = @" --open Microsoft.FSharp.Compiler"
-
-    // restore tools
-    let workDir = @"src/fsharp/FSharp.Compiler.Service.netcore/"
-    Shell.Exec("dotnet", "restore -v Minimal", workDir) |> assertExitCodeZero
+let runCmdIn workDir exe = Printf.ksprintf (fun args -> Shell.Exec(exe, args, workDir) |> assertExitCodeZero)
+let run exe = runCmdIn "." exe
+
+Target "DotnetCoreCodeGen" (fun _ ->
+    let lexArgs = "--lexlib Internal.Utilities.Text.Lexing"
+    let yaccArgs = "--internal --parslib Internal.Utilities.Text.Parsing"
+    let module1 = "--module Microsoft.FSharp.Compiler.AbstractIL.Internal.AsciiParser"
+    let module2 = "--module Microsoft.FSharp.Compiler.Parser"
+    let module3 = "--module Microsoft.FSharp.Compiler.PPParser"
+    let open1 = "--open Microsoft.FSharp.Compiler.AbstractIL"
+    let open2 = "--open Microsoft.FSharp.Compiler"
+    let open3 = "--open Microsoft.FSharp.Compiler"
+
+    // dotnet restore
+    run "dotnet" "restore -v Information"
 
     // run tools
-    Shell.Exec("dotnet", "fssrgen ../FSComp.txt ./FSComp.fs ./FSComp.resx", workDir) |> assertExitCodeZero
-    Shell.Exec("dotnet", "fssrgen ../fsi/FSIstrings.txt ./FSIstrings.fs ./FSIstrings.resx", workDir) |> assertExitCodeZero
-    Shell.Exec(fsLex, @"../lex.fsl --unicode" + lexArgs + " -o lex.fs", workDir) |> assertExitCodeZero
-    Shell.Exec(fsLex, @"../pplex.fsl --unicode" + lexArgs + " -o pplex.fs", workDir) |> assertExitCodeZero
-    Shell.Exec(fsLex, @"../../absil/illex.fsl --unicode" + lexArgs + " -o illex.fs", workDir) |> assertExitCodeZero
-    Shell.Exec(fsYacc, @"../../absil/ilpars.fsy" + lexArgs + yaccArgs + module1 + open1 + " -o ilpars.fs", workDir) |> assertExitCodeZero
-    Shell.Exec(fsYacc, @"../pars.fsy" + lexArgs + yaccArgs + module2 + open2 + " -o pars.fs", workDir) |> assertExitCodeZero
-    Shell.Exec(fsYacc, @"../pppars.fsy" + lexArgs + yaccArgs + module3 + open3 + " -o pppars.fs", workDir) |> assertExitCodeZero
+    let runInDir exe = runCmdIn "src/fsharp/FSharp.Compiler.Service/" exe
+    let fsLex fslFilePath outFilePath = runInDir "lib/bootstrap/4.0/fslex.exe" @"%s --unicode %s -o %s" fslFilePath lexArgs outFilePath
+    let fsYacc = runInDir "lib/bootstrap/4.0/fsyacc.exe"
+
+    runInDir "dotnet" "fssrgen ../FSComp.txt ./FSComp.fs ./FSComp.resx"
+    runInDir "dotnet" "fssrgen ../fsi/FSIstrings.txt ./FSIstrings.fs ./FSIstrings.resx"
+    fsLex "../lex.fsl" "lex.fs"
+    fsLex "../pplex.fsl" "pplex.fs"
+    fsLex "../../absil/illex.fsl" "illex.fs"
+    fsYacc "../../absil/ilpars.fsy %s %s %s %s -o ilpars.fs" lexArgs yaccArgs module1 open1
+    fsYacc "../pars.fsy %s %s %s %s -o pars.fs" lexArgs yaccArgs module2 open2
+    fsYacc "../pppars.fsy %s %s %s %s -o pppars.fs" lexArgs yaccArgs module3 open3
 )
 
-Target "DotnetCliBuild" (fun _ ->
-    let workDir = @"src/fsharp/FSharp.Compiler.Service.netcore/"
-    Shell.Exec("dotnet", "restore -v Information", workDir) |> assertExitCodeZero
-    Shell.Exec("dotnet", "-v pack -c Release -o ../../../" + buildDir, workDir) |> assertExitCodeZero
-    
-    let workDir = @"src/fsharp/FSharp.Compiler.Service.ProjectCracker.netcore/"
-    Shell.Exec("dotnet", "restore -v Information", workDir) |> assertExitCodeZero
-    Shell.Exec("dotnet", "-v pack -c Release -o ../../../" + buildDir, workDir) |> assertExitCodeZero
+Target "Build.NetCore" (fun _ ->
+    [ "src/fsharp/FSharp.Compiler.Service/";
+      "src/fsharp/FSharp.Compiler.Service.ProjectCracker/";
+      "src/fsharp/FSharp.Compiler.Service.ProjectCrackerTool/" ]
+    |> List.iter (run "dotnet" "-v pack %s -c Release")
 )
 
-Target "DotnetCliTests" (fun _ ->
-    let workDir = @"tests/FSharp.Compiler.Service.Tests.netcore/"
-    Shell.Exec("dotnet", "restore -v Information", workDir) |> assertExitCodeZero
-    Shell.Exec("dotnet", "-v run -c Release", workDir) |> assertExitCodeZero
+Target "RunTests.NetCore" (fun _ ->
+    runCmdIn "tests/service/" "dotnet" "test -c Release --result:TestResults.NetCore.xml;format=nunit3"
+)
+
+
+//use dotnet-mergenupkg to merge the .netcore nuget package into the default one
+Target "Nuget.AddNetCore" (fun _ ->
+    do
+        let nupkg = sprintf "../../../%s/FSharp.Compiler.Service.%s.nupkg" buildDir (release.AssemblyVersion)
+        let netcoreNupkg = sprintf "bin/Release/FSharp.Compiler.Service.%s.nupkg" (release.AssemblyVersion)
+        runCmdIn "src/fsharp/FSharp.Compiler.Service" "dotnet" "mergenupkg --source %s --other %s --framework netstandard1.6" nupkg netcoreNupkg
+    
+    do
+        let nupkg = sprintf "../../../%s/FSharp.Compiler.Service.ProjectCracker.%s.nupkg" buildDir (release.AssemblyVersion)
+        let netcoreNupkg = sprintf "bin/Release/FSharp.Compiler.Service.ProjectCracker.%s.nupkg" (release.AssemblyVersion)
+        runCmdIn "src/fsharp/FSharp.Compiler.Service.ProjectCracker" "dotnet" "mergenupkg --source %s --other %s --framework netstandard1.6" nupkg netcoreNupkg
 )
 
 // --------------------------------------------------------------------------------------
@@ -274,26 +286,26 @@ Target "Prepare" DoNothing
 Target "PrepareRelease" DoNothing
 Target "All" DoNothing
 Target "Release" DoNothing
-Target "DotnetCli" DoNothing
-
-"DotnetCli"
-  =?> ("DotnetCliCodeGen", isDotnetCliInstalled)
-  =?> ("DotnetCliBuild", isDotnetCliInstalled)
-  =?> ("DotnetCliTests", isDotnetCliInstalled)
+Target "CreatePackage" DoNothing
 
 "Clean"
   =?> ("BuildVersion", isAppVeyorBuild)
   ==> "AssemblyInfo"
   ==> "GenerateFSIStrings"
   ==> "Prepare"
   ==> "Build"
+  =?> ("DotnetCoreCodeGen", isDotnetSDKInstalled)
+  =?> ("Build.NetCore", isDotnetSDKInstalled)
   ==> "RunTests"
+  =?> ("RunTests.NetCore", isDotnetSDKInstalled)
   ==> "All"
 
 "All"
   ==> "PrepareRelease" 
   ==> "SourceLink"
   ==> "NuGet"
+  =?> ("Nuget.AddNetCore", isDotnetSDKInstalled)
+  ==> "CreatePackage"
   ==> "GitHubRelease"
   ==> "PublishNuGet"
   ==> "Release"

global.json

@@ -1,3 +1,3 @@
 {
   "projects": [ "src/fsharp", "tests" ]
-}
+}

src/fsharp/FSharp.Build/project.json

@@ -15,6 +15,7 @@
     <Name>FSharp.Compiler.Service.ProjectCracker</Name>
     <OutputPath>..\..\..\bin\$(TargetFrameworkVersion)</OutputPath>
     <DocumentationFile>..\..\..\bin\$(TargetFrameworkVersion)\FSharp.Compiler.Service.ProjectCracker.xml</DocumentationFile>
+    <ResolveNuGetPackages>false</ResolveNuGetPackages>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>