Merge pull request #1972 from kblohm/netcore2.1

.Net Core 2.1
fsprojects · Jun 2, 2018 · 85ccbfd · 85ccbfd
2 parents 1e46b5d + 17fe2d5
commit 85ccbfd
Show file tree

Hide file tree

Showing 12 changed files with 838 additions and 850 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -10,4 +10,6 @@ root = true
 [*]
 insert_final_newline = true
 indent_style = space
-indent_size = 4
+indent_size = 4
+[*.fsproj]
+indent_size = 2
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,8 +9,13 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "dotnet:build:fake.sln",
-            "program": "${workspaceRoot}/src/app/Fake.netcore/bin/Debug/netcoreapp2.0/fake.dll",
-            "args": ["run", "build.fsx", "--fsiargs", "--debug:portable --optimize-"],
+            "program": "${workspaceRoot}/src/app/Fake.netcore/bin/Debug/netcoreapp2.1/fake.dll",
+            "args": [
+                "run",
+                "build.fsx",
+                "--fsiargs",
+                "--debug:portable --optimize-"
+            ],
             "cwd": "${workspaceRoot}",
             "stopAtEntry": false,
             "console": "internalConsole"
@@ -20,7 +25,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "dotnet:build:fake.sln",
-            "program": "${workspaceRoot}/src/test/Fake.Core.UnitTests/bin/Debug/netcoreapp2.0/Fake.Core.UnitTests.dll",
+            "program": "${workspaceRoot}/src/test/Fake.Core.UnitTests/bin/Debug/netcoreapp2.1/Fake.Core.UnitTests.dll",
             "args": [],
             "cwd": "${workspaceRoot}",
             "console": "internalConsole",

diff --git a/build.fsx b/build.fsx
@@ -247,7 +247,7 @@ Trace.setBuildNumber nugetVersion
 //    CoreTracing.setTraceListeners (CoreTracing.defaultConsoleTraceListener :: current)
 
 
-let dotnetSdk = lazy DotNet.install DotNet.Release_2_1_300_RC1
+let dotnetSdk = lazy DotNet.install DotNet.Release_2_1_300
 let inline dtntWorkDir wd =
     DotNet.Options.lift dotnetSdk.Value
     >> DotNet.Options.withWorkingDirectory wd
@@ -723,7 +723,7 @@ Target.create "DotNetCoreIntegrationTests" (fun _ ->
     cleanForTests()
 
     let processResult =
-        DotNet.exec (dtntWorkDir root) "src/test/Fake.Core.IntegrationTests/bin/Release/netcoreapp2.0/Fake.Core.IntegrationTests.dll" "--summary"
+        DotNet.exec (dtntWorkDir root) "src/test/Fake.Core.IntegrationTests/bin/Release/netcoreapp2.1/Fake.Core.IntegrationTests.dll" "--summary"
 
     if processResult.ExitCode <> 0 then failwithf "DotNet Core Integration tests failed."
 )
@@ -732,13 +732,13 @@ Target.create "DotNetCoreIntegrationTests" (fun _ ->
 Target.create "DotNetCoreUnitTests" (fun _ ->
     // dotnet run -p src/test/Fake.Core.UnitTests/Fake.Core.UnitTests.fsproj
     let processResult =
-        DotNet.exec (dtntWorkDir root) "src/test/Fake.Core.UnitTests/bin/Release/netcoreapp2.0/Fake.Core.UnitTests.dll" "--summary"
+        DotNet.exec (dtntWorkDir root) "src/test/Fake.Core.UnitTests/bin/Release/netcoreapp2.1/Fake.Core.UnitTests.dll" "--summary"
 
     if processResult.ExitCode <> 0 then failwithf "Unit-Tests failed."
 
     // dotnet run --project src/test/Fake.Core.CommandLine.UnitTests/Fake.Core.CommandLine.UnitTests.fsproj
     let processResult =
-        DotNet.exec (dtntWorkDir root) "src/test/Fake.Core.CommandLine.UnitTests/bin/Release/netcoreapp2.0/Fake.Core.CommandLine.UnitTests.dll" "--summary"
+        DotNet.exec (dtntWorkDir root) "src/test/Fake.Core.CommandLine.UnitTests/bin/Release/netcoreapp2.1/Fake.Core.CommandLine.UnitTests.dll" "--summary"
 
     if processResult.ExitCode <> 0 then failwithf "Unit-Tests for Fake.Core.CommandLine failed."
 )
@@ -1059,7 +1059,7 @@ Target.create "_DotNetPublish_portable" (fun _ ->
     let outDir = nugetDir @@ "Fake.netcore" @@ "portable"
     DotNet.publish (fun c ->
         { c with
-            Framework = Some "netcoreapp2.0"
+            Framework = Some "netcoreapp2.1"
             OutputPath = Some outDir
         } |> dtntSmpl) netcoreFsproj
 )
@@ -1099,7 +1099,7 @@ Target.create "_DotNetPackage" (fun _ ->
     // TODO: Check if we run the test in the current build!
     Directory.ensure "temp"
     let testZip = "temp/tests.zip"
-    !! "src/test/*/bin/Release/netcoreapp2.0/**"
+    !! "src/test/*/bin/Release/netcoreapp2.1/**"
     |> Zip.zip "src/test" testZip
     publish testZip
 )

diff --git a/help/markdown/fake-dotnetcore.md b/help/markdown/fake-dotnetcore.md
@@ -30,7 +30,7 @@ Just install the corresponding package for your system:
 
 - Windows (dotnet sdk global tool)
 
-  - Install the .NET sdk (at least `2.1.300-RC1`)
+  - Install the .NET sdk (at least `2.1.300`)
   - Install FAKE
 
     <pre>

diff --git a/paket.dependencies b/paket.dependencies
@@ -140,7 +140,7 @@ group netcore
     //source https://ci.appveyor.com/nuget/paket
     source https://api.nuget.org/v3/index.json
     storage: none
-    framework: net46, net462, netstandard1.6, netstandard2.0, netcoreapp2.0
+    framework: net46, net462, netstandard1.6, netstandard2.0, netcoreapp2.0, netcoreapp2.1
 
     nuget Microsoft.NETCore.App framework: netstandard1.6, netstandard2.0, netcoreapp1.1
     nuget FSharp.Compiler.Service storage: packages, content: none