diff --git a/Dockerfile b/Dockerfile index 744e0c499..5ec9f5058 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/build.cmd b/build.cmd index 5e8204ecf..cbab3589f 100644 --- a/build.cmd +++ b/build.cmd @@ -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 %* diff --git a/build.fsx b/build.fsx index f9f7203c9..0c29f390e 100644 --- a/build.fsx +++ b/build.fsx @@ -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 _ -> @@ -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 _ -> diff --git a/build.sh b/build.sh index 4b2cc7529..da2227ce4 100644 --- a/build.sh +++ b/build.sh @@ -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 $@ diff --git a/global.json b/global.json index 6d848ed1f..31dfab8d2 100644 --- a/global.json +++ b/global.json @@ -1,3 +1,6 @@ { - "projects": [ "src", "test" ] -} + "projects": [ "src", "test" ], + "sdk": { + "version": "1.0.0-preview2-003131" + } +} \ No newline at end of file