Skip to content

Commit

Permalink
using a pre-release .net sdk to work around dotnet/fsharp#4822
Browse files Browse the repository at this point in the history
  • Loading branch information
aaronpowell committed Feb 28, 2019
1 parent 443f69f commit 334e20d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
16 changes: 12 additions & 4 deletions build.fsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ let chauffeurRunnerDescription = chauffeurRunnerSummary
let chauffeurTestingToolsSummary = "Chauffeur Testing Tools is a series of helpers for using Chauffeur to setup Umbraco for integration testing with Umbraco's API"
let chauffeurTestingToolsDescription = chauffeurRunnerSummary

let install = lazy DotNet.install DotNet.Versions.FromGlobalJson

let inline withWorkDir wd =
DotNet.Options.lift install.Value
>> DotNet.Options.withWorkingDirectory wd

let inline dotnetSimple arg = DotNet.Options.lift install.Value arg

let releaseNotes =
File.read "ReleaseNotes.md"
|> ReleaseNotes.parse
Expand All @@ -66,15 +74,15 @@ Target.create "Clean" (fun _ ->
!! "src/**/bin"
++ "src/**/obj"
-- "src/Chauffeur.Demo"
|> Shell.cleanDirs
|> Shell.cleanDirs
)

Target.create "Build" (fun _ ->
DotNet.build (fun p -> { p with Configuration = buildMode }) "src/Chauffeur.sln"
DotNet.build (fun p -> { p with Configuration = buildMode } |> dotnetSimple) "src/Chauffeur.sln"
)

Target.create "DotNetRestore" (fun _ ->
DotNet.restore id "src/Chauffeur.sln"
DotNet.restore (fun args -> args |> dotnetSimple) "src/Chauffeur.sln"
)

Target.create "Package Chauffeur" (fun _ ->
Expand All @@ -87,7 +95,7 @@ Target.create "Package Chauffeur" (fun _ ->
with Properties =
[("Author", authors |> String.concat(","))
("PackageVersion", nugetVersion)] }
}) (chauffeurDir + "../Chauffeur.fsproj")
} |> dotnetSimple) (chauffeurDir + "../Chauffeur.fsproj")
)

Target.create "Default" ignore
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{ "sdk": { "version": "2.1.402" } }
{ "sdk": { "version": "2.1.600-preview-009497" } }

0 comments on commit 334e20d

Please sign in to comment.