Skip to content

Commit a04cbcc

Browse files
committed
Prep for net8
1 parent 26b77ef commit a04cbcc

File tree

8 files changed

+549
-1071
lines changed

8 files changed

+549
-1071
lines changed

.config/dotnet-tools.json

+1-7
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,10 @@
33
"isRoot": true,
44
"tools": {
55
"paket": {
6-
"version": "7.1.5",
6+
"version": "8.0.3",
77
"commands": [
88
"paket"
99
]
10-
},
11-
"fake-cli": {
12-
"version": "5.20.4",
13-
"commands": [
14-
"fake"
15-
]
1610
}
1711
}
1812
}

.paket/Paket.Restore.targets

+500-497
Large diffs are not rendered by default.

build.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ dotnet tool restore
66
dotnet paket update -g wsbuild --no-install
77
if errorlevel 1 exit /b %errorlevel%
88

9-
call paket-files\wsbuild\github.com\dotnet-websharper\build-script\build.cmd %*
9+
dotnet fsi ./build.fsx -t %*

build.fsx

+5-21
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,19 @@
1-
#if INTERACTIVE
21
#r "nuget: FAKE.Core"
32
#r "nuget: Fake.Core.Target"
43
#r "nuget: Fake.IO.FileSystem"
54
#r "nuget: Fake.Tools.Git"
65
#r "nuget: Fake.DotNet.Cli"
76
#r "nuget: Fake.DotNet.AssemblyInfoFile"
87
#r "nuget: Fake.DotNet.Paket"
9-
#r "nuget: Paket.Core"
10-
#else
11-
#r "paket:
12-
nuget FSharp.Core 5.0.0
13-
nuget FAKE.Core
14-
nuget Fake.Core.Target
15-
nuget Fake.IO.FileSystem
16-
nuget Fake.Tools.Git
17-
nuget Fake.DotNet.Cli
18-
nuget Fake.DotNet.AssemblyInfoFile
19-
nuget Fake.DotNet.Paket
20-
nuget Paket.Core prerelease //"
21-
#endif
8+
#r "nuget: Paket.Core, 8.1.0-alpha004"
9+
10+
open Fake.Core
11+
let execContext = Context.FakeExecutionContext.Create false "build.fsx" []
12+
Context.setExecutionContext (Context.RuntimeContext.Fake execContext)
2213

2314
#load "paket-files/wsbuild/github.com/dotnet-websharper/build-script/WebSharper.Fake.fsx"
2415
#r "System.Xml.Linq"
2516

26-
// Only reference these packages from editors/non fake-cli tools
27-
#if !FAKE
28-
// To have proper language service in the editor
29-
#r "netstandard"
30-
// To help FAKE related IntelliSense in editor
31-
#load "./.fake/build.fsx/intellisense_lazy.fsx"
32-
#endif
3317

3418
open WebSharper.Fake
3519
open Fake.DotNet

0 commit comments

Comments
 (0)