Skip to content

Commit 74e9802

Browse files
authored
Reduce friction (ionide#1918)
* git: sync .fs eol with editorconfig * git: apply renormalization to fix old inconsistencies * build: remove `-r` from fantomas, arg was removed creates an empty dir now... ref: fsprojects/fantomas#2854 * dotnet global.json: enable rollForward latestFeature Also update MSBuild.StructuredLogger, since dotnet 7.0.4 (sdk 7.0.202) shipped with an a bump in the binlog version. Fake uses binlog as a response from the dotnet process and crashed after using a newer sdk. * CONTRIBUTING.md: update dotnet version and link * omnisharp: set solution name, doesnt select default anymore
1 parent 63a98d4 commit 74e9802

11 files changed

+774
-762
lines changed

.editorconfig

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ root = true
44
[*.fs]
55
indent_style = space
66
indent_size = 4
7+
# keep in sync with .gitattributes
78
end_of_line = crlf
89
charset = utf-8
910
trim_trailing_whitespace = true

.gitattributes

+4-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1-
* text=auto
1+
* text=auto
2+
3+
# keep in sync with .editorconfig
4+
*.fs text eol=crlf

.paket/Paket.Restore.targets

+557-557
Large diffs are not rendered by default.

.vscode/settings.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,6 @@
2929
},
3030
"yaml.schemas": {
3131
".github/workflows": "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/github-workflow.json"
32-
}
32+
},
33+
"dotnet.defaultSolution": "ionide-fsharp-vscode.sln"
3334
}

CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ First things first! In order to build & develop Ionide locally, you'll need to i
2020

2121
### Prerequisites
2222

23-
- [Visual Studio Code][vscode] 🙄
24-
- [.NET 6][dotnet]
23+
- [Visual Studio Code][vscode]
24+
- [.NET 7][dotnet]
2525
- [Node.js][nodejs]
2626
- [Yarn][yarn]
2727

@@ -232,7 +232,7 @@ to make a strong case to convince the community of the merits of this feature.
232232
Please provide as much detail and context as possible.
233233
234234
235-
[dotnet]: https://www.microsoft.com/net/download/core
235+
[dotnet]: https://dotnet.microsoft.com/en-us/download/dotnet/7.0
236236
[nodejs]: https://nodejs.org/en/download/
237237
[yarn]: https://yarnpkg.com/en/docs/install
238238
[vscode]: https://code.visualstudio.com/Download

build/Program.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ let initTargets () =
357357
Target.create "ReleaseGitHub" (fun _ -> releaseGithub release)
358358

359359
Target.create "Format" (fun _ ->
360-
DotNet.exec id "fantomas" "-r src build"
360+
DotNet.exec id "fantomas" "src build"
361361
|> fun r ->
362362
if r.OK then
363363
()

build/paket.references

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@ Fake.IO.Zip
1414
Fake.Api.GitHub
1515
Fake.Tools.Git
1616
Fake.JavaScript.Yarn
17-
Octokit
17+
Octokit
18+
19+
MSBuild.StructuredLogger

global.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"sdk": {
3-
"version": "7.0.200"
3+
"version": "7.0.200",
4+
"rollForward": "latestFeature"
45
}
56
}

paket.dependencies

+51-46
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,51 @@
1-
source https://api.nuget.org/v3/index.json
2-
storage: none
3-
framework: netstandard2.0
4-
5-
nuget Fable.Core
6-
nuget Fable.Promise
7-
nuget Fable.Node
8-
nuget Fable.Browser.Dom
9-
10-
nuget Fable.HtmlConverter
11-
12-
nuget Thoth.Json 7.0
13-
14-
git https://github.com/ionide/ionide-fsgrammar.git master
15-
16-
github ionide/ionide-vscode-helpers:8e81bc03f11f07b8e0811b3d4598eadc78f32f2f src/Fable.Import.VSCode.fs
17-
github ionide/ionide-vscode-helpers:8e81bc03f11f07b8e0811b3d4598eadc78f32f2f src/Helpers.fs
18-
github ionide/ionide-vscode-helpers:8e81bc03f11f07b8e0811b3d4598eadc78f32f2f src/Fable.Import.Showdown.fs
19-
github ionide/ionide-vscode-helpers:8e81bc03f11f07b8e0811b3d4598eadc78f32f2f src/Fable.Import.VSCode.LanguageServer.fs
20-
21-
group fsac
22-
source https://api.nuget.org/v3/index.json
23-
storage: packages
24-
framework: netstandard2.0
25-
nuget fsautocomplete
26-
27-
group build
28-
source https://api.nuget.org/v3/index.json
29-
storage: none
30-
framework: net7.0
31-
32-
nuget Fake.Core.Target
33-
nuget Fake.Core.Process
34-
nuget Fake.Core.ReleaseNotes
35-
nuget Fake.Core.Environment
36-
nuget Fake.Core.UserInput
37-
nuget Fake.DotNet.Cli
38-
nuget Fake.DotNet.AssemblyInfoFile
39-
nuget Fake.DotNet.Paket
40-
nuget Fake.DotNet.MsBuild
41-
nuget Fake.IO.FileSystem
42-
nuget Fake.IO.Zip
43-
nuget Fake.Api.GitHub
44-
nuget Fake.Tools.Git
45-
nuget Fake.JavaScript.Yarn
46-
nuget Octokit <= 0.49.0
1+
source https://api.nuget.org/v3/index.json
2+
storage: none
3+
framework: netstandard2.0
4+
5+
nuget Fable.Core
6+
nuget Fable.Promise
7+
nuget Fable.Node
8+
nuget Fable.Browser.Dom
9+
10+
nuget Fable.HtmlConverter
11+
12+
nuget Thoth.Json 7.0
13+
14+
git https://github.com/ionide/ionide-fsgrammar.git master
15+
16+
github ionide/ionide-vscode-helpers:8e81bc03f11f07b8e0811b3d4598eadc78f32f2f src/Fable.Import.VSCode.fs
17+
github ionide/ionide-vscode-helpers:8e81bc03f11f07b8e0811b3d4598eadc78f32f2f src/Helpers.fs
18+
github ionide/ionide-vscode-helpers:8e81bc03f11f07b8e0811b3d4598eadc78f32f2f src/Fable.Import.Showdown.fs
19+
github ionide/ionide-vscode-helpers:8e81bc03f11f07b8e0811b3d4598eadc78f32f2f src/Fable.Import.VSCode.LanguageServer.fs
20+
21+
group fsac
22+
source https://api.nuget.org/v3/index.json
23+
storage: packages
24+
framework: netstandard2.0
25+
nuget fsautocomplete
26+
27+
group build
28+
source https://api.nuget.org/v3/index.json
29+
storage: none
30+
framework: net7.0
31+
32+
nuget Fake.Core.Target
33+
nuget Fake.Core.Process
34+
nuget Fake.Core.ReleaseNotes
35+
nuget Fake.Core.Environment
36+
nuget Fake.Core.UserInput
37+
nuget Fake.DotNet.Cli
38+
nuget Fake.DotNet.AssemblyInfoFile
39+
nuget Fake.DotNet.Paket
40+
nuget Fake.DotNet.MsBuild
41+
nuget Fake.IO.FileSystem
42+
nuget Fake.IO.Zip
43+
nuget Fake.Api.GitHub
44+
nuget Fake.Tools.Git
45+
nuget Fake.JavaScript.Yarn
46+
nuget Octokit <= 0.49.0
47+
48+
// Enforce updated binlog parser until Fake gets an update, so we're not stuck
49+
// on an old sdk version.
50+
// ref: https://github.com/fsprojects/FAKE/issues/2744
51+
nuget MSBuild.StructuredLogger >= 2.1.784

paket.lock

+14-15
Original file line numberDiff line numberDiff line change
@@ -178,24 +178,25 @@ NUGET
178178
FSharp.Core (>= 4.7.2)
179179
System.Reactive (>= 5.0 < 6.0)
180180
FSharp.Core (7.0.200)
181-
Microsoft.Build.Framework (17.4)
182-
System.Security.Permissions (>= 6.0)
183-
Microsoft.Build.Utilities.Core (17.4)
184-
Microsoft.Build.Framework (>= 17.4)
185-
Microsoft.NET.StringTools (>= 17.4)
186-
System.Collections.Immutable (>= 6.0)
187-
System.Configuration.ConfigurationManager (>= 6.0)
188-
Microsoft.NET.StringTools (17.4)
189-
System.Memory (>= 4.5.5)
190-
System.Runtime.CompilerServices.Unsafe (>= 6.0)
181+
Microsoft.Build.Framework (17.7.2)
182+
System.Security.Permissions (>= 7.0)
183+
Microsoft.Build.Utilities.Core (17.7.2)
184+
Microsoft.Build.Framework (>= 17.7.2)
185+
Microsoft.NET.StringTools (>= 17.7.2)
186+
Microsoft.VisualStudio.Setup.Configuration.Interop (>= 3.2.2146)
187+
System.Collections.Immutable (>= 7.0)
188+
System.Configuration.ConfigurationManager (>= 7.0)
189+
System.Security.Permissions (>= 7.0)
190+
Microsoft.NET.StringTools (17.7.2)
191+
Microsoft.VisualStudio.Setup.Configuration.Interop (3.7.2175)
191192
Microsoft.Win32.Registry (5.0)
192193
System.Security.AccessControl (>= 5.0)
193194
System.Security.Principal.Windows (>= 5.0)
194195
Microsoft.Win32.SystemEvents (7.0)
195196
Mono.Posix.NETStandard (1.0)
196-
MSBuild.StructuredLogger (2.1.768)
197-
Microsoft.Build.Framework (>= 16.10)
198-
Microsoft.Build.Utilities.Core (>= 16.10)
197+
MSBuild.StructuredLogger (2.1.846)
198+
Microsoft.Build.Framework (>= 17.5)
199+
Microsoft.Build.Utilities.Core (>= 17.5)
199200
Newtonsoft.Json (13.0.2)
200201
NuGet.Common (6.4)
201202
NuGet.Frameworks (>= 6.4)
@@ -222,9 +223,7 @@ NUGET
222223
System.Drawing.Common (7.0)
223224
Microsoft.Win32.SystemEvents (>= 7.0)
224225
System.Formats.Asn1 (7.0)
225-
System.Memory (4.5.5)
226226
System.Reactive (5.0)
227-
System.Runtime.CompilerServices.Unsafe (6.0)
228227
System.Security.AccessControl (6.0)
229228
System.Security.Cryptography.Cng (5.0)
230229
System.Formats.Asn1 (>= 5.0)

0 commit comments

Comments
 (0)