Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

.Net Core 2.1 #1972

Merged
merged 4 commits into from
Jun 2, 2018
Merged

.Net Core 2.1 #1972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7207fc8
Merge pull request #1955 from fsharp/release/rc
matthid May 27, 2018
534dd3f
* Add netcore 2.1.300 release to DotNet-Module and use it in build.fsx
kblohm May 30, 2018
300047d
Update fake.netcore, dotnet-fake and unit tests to .NET Core 2.1
kblohm May 30, 2018
17fe2d5
Revert dotnet-fake to netcore2.0 and update editorconfig for *.fsproj
kblohm May 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ root = true
[*]
insert_final_newline = true
indent_style = space
indent_size = 4
indent_size = 4
[*.fsproj]
indent_size = 2
11 changes: 8 additions & 3 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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."
)
Expand All @@ -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."
)
Expand Down Expand Up @@ -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
)
Expand Down Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion help/markdown/fake-dotnetcore.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading