Skip to content

Commit

Permalink
upgrade FAKE, try to pin preview-2 of .NET Core SDK
Browse files Browse the repository at this point in the history
  • Loading branch information
lahma committed Nov 27, 2016
1 parent e893736 commit 0d7bfbe
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ WORKDIR app
RUN chmod a+x ./build.sh

# run default units tests only
ENTRYPOINT ./build.sh Test
RUN ./build.sh Test
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@echo off
cls

"tools\NuGet\NuGet.exe" "Install" "FAKE" "-Version" "4.39" "-OutputDirectory" "packages" "-ExcludeVersion"
"tools\NuGet\NuGet.exe" "Install" "FAKE" "-Version" "4.45.0" "-OutputDirectory" "packages" "-ExcludeVersion"
"packages\FAKE\tools\Fake.exe" build.fsx %*
46 changes: 28 additions & 18 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,16 @@ Target "Build" (fun _ ->
{ p with
AdditionalArgs = [f] })

let build f = DotNetCli.Build (fun p ->
{ p with
Configuration = configuration
Project = f })

projectJsonFiles
|> Seq.iter restore

projectJsonFiles
|> DotNetCli.Build
(fun p ->
{ p with
Configuration = configuration })
|> Seq.iter build
)

Target "BuildSolutions" (fun _ ->
Expand All @@ -68,43 +70,51 @@ Target "BuildSolutions" (fun _ ->
)

Target "Pack" (fun _ ->
!! "src/Quartz/project.json" ++ "src/Quartz.Serialization.Json/project.json"
|> DotNetCli.Pack
(fun p ->

let pack f = DotNetCli.Pack (fun p ->
{ p with
Configuration = "Release"
Project = f
})

!! "src/Quartz/project.json" ++ "src/Quartz.Serialization.Json/project.json"
|> Seq.iter pack

!! "src/*/bin/**/*.nupkg"
|> Copy "artifacts"
)

Target "Test" (fun _ ->
!! "src/Quartz.Tests.Unit/project.json"
|> DotNetCli.Test
DotNetCli.Test
(fun p ->
{ p with
Configuration = configuration
AdditionalArgs = ["--where \"cat != database && cat != fragile\""] })
{ p with
Project = "src/Quartz.Tests.Unit/project.json"
Configuration = configuration
AdditionalArgs = ["--where \"cat != database && cat != fragile\""] })
)

Target "TestFull" (fun _ ->
testProjectJsonFiles
|> DotNetCli.Test
(fun p ->

let test f = DotNetCli.Test (fun p ->
{ p with
Project = f
Configuration = configuration
AdditionalArgs = ["--where \"cat != fragile\""] })

testProjectJsonFiles
|> Seq.iter test
)


Target "TestLinux" (fun _ ->
testProjectJsonFiles
|> DotNetCli.Test
(fun p ->
let test f = DotNetCli.Test (fun p ->
{ p with
Project = f
Configuration = configuration
AdditionalArgs = ["--where \"cat != fragile && cat != sqlserver && cat != windowstimezoneid\""] })

testProjectJsonFiles
|> Seq.iter test
)

Target "ApiDoc" (fun _ ->
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

FAKE_VERSION="4.39"
FAKE_VERSION="4.45.0"

mono tools/NuGet/NuGet.exe install FAKE -Version $FAKE_VERSION -OutputDirectory packages -ExcludeVersion
mono packages/FAKE/tools/FAKE.exe build.fsx $@
7 changes: 5 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{
"projects": [ "src", "test" ]
}
"projects": [ "src", "test" ],
"sdk": {
"version": "1.0.0-preview2-003131"
}
}

0 comments on commit 0d7bfbe

Please sign in to comment.