Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce friction #1918

Merged
merged 6 commits into from
Sep 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ root = true
[*.fs]
indent_style = space
indent_size = 4
# keep in sync with .gitattributes
end_of_line = crlf
charset = utf-8
trim_trailing_whitespace = true
Expand Down
5 changes: 4 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
* text=auto
* text=auto

# keep in sync with .editorconfig
*.fs text eol=crlf
1,114 changes: 557 additions & 557 deletions .paket/Paket.Restore.targets

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,6 @@
},
"yaml.schemas": {
".github/workflows": "https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/github-workflow.json"
}
},
"dotnet.defaultSolution": "ionide-fsharp-vscode.sln"
}
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ First things first! In order to build & develop Ionide locally, you'll need to i

### Prerequisites

- [Visual Studio Code][vscode] 🙄
- [.NET 6][dotnet]
- [Visual Studio Code][vscode]
- [.NET 7][dotnet]
- [Node.js][nodejs]
- [Yarn][yarn]

Expand Down Expand Up @@ -232,7 +232,7 @@ to make a strong case to convince the community of the merits of this feature.
Please provide as much detail and context as possible.


[dotnet]: https://www.microsoft.com/net/download/core
[dotnet]: https://dotnet.microsoft.com/en-us/download/dotnet/7.0
[nodejs]: https://nodejs.org/en/download/
[yarn]: https://yarnpkg.com/en/docs/install
[vscode]: https://code.visualstudio.com/Download
2 changes: 1 addition & 1 deletion build/Program.fs
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ let initTargets () =
Target.create "ReleaseGitHub" (fun _ -> releaseGithub release)

Target.create "Format" (fun _ ->
DotNet.exec id "fantomas" "-r src build"
DotNet.exec id "fantomas" "src build"
|> fun r ->
if r.OK then
()
Expand Down
4 changes: 3 additions & 1 deletion build/paket.references
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,6 @@ Fake.IO.Zip
Fake.Api.GitHub
Fake.Tools.Git
Fake.JavaScript.Yarn
Octokit
Octokit

MSBuild.StructuredLogger
3 changes: 2 additions & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"sdk": {
"version": "7.0.200"
"version": "7.0.200",
"rollForward": "latestFeature"
}
}
97 changes: 51 additions & 46 deletions paket.dependencies
Original file line number Diff line number Diff line change
@@ -1,46 +1,51 @@
source https://api.nuget.org/v3/index.json
storage: none
framework: netstandard2.0

nuget Fable.Core
nuget Fable.Promise
nuget Fable.Node
nuget Fable.Browser.Dom

nuget Fable.HtmlConverter

nuget Thoth.Json 7.0

git https://github.com/ionide/ionide-fsgrammar.git master

github ionide/ionide-vscode-helpers:8e81bc03f11f07b8e0811b3d4598eadc78f32f2f src/Fable.Import.VSCode.fs
github ionide/ionide-vscode-helpers:8e81bc03f11f07b8e0811b3d4598eadc78f32f2f src/Helpers.fs
github ionide/ionide-vscode-helpers:8e81bc03f11f07b8e0811b3d4598eadc78f32f2f src/Fable.Import.Showdown.fs
github ionide/ionide-vscode-helpers:8e81bc03f11f07b8e0811b3d4598eadc78f32f2f src/Fable.Import.VSCode.LanguageServer.fs

group fsac
source https://api.nuget.org/v3/index.json
storage: packages
framework: netstandard2.0
nuget fsautocomplete

group build
source https://api.nuget.org/v3/index.json
storage: none
framework: net7.0

nuget Fake.Core.Target
nuget Fake.Core.Process
nuget Fake.Core.ReleaseNotes
nuget Fake.Core.Environment
nuget Fake.Core.UserInput
nuget Fake.DotNet.Cli
nuget Fake.DotNet.AssemblyInfoFile
nuget Fake.DotNet.Paket
nuget Fake.DotNet.MsBuild
nuget Fake.IO.FileSystem
nuget Fake.IO.Zip
nuget Fake.Api.GitHub
nuget Fake.Tools.Git
nuget Fake.JavaScript.Yarn
nuget Octokit <= 0.49.0
source https://api.nuget.org/v3/index.json
storage: none
framework: netstandard2.0

nuget Fable.Core
nuget Fable.Promise
nuget Fable.Node
nuget Fable.Browser.Dom

nuget Fable.HtmlConverter

nuget Thoth.Json 7.0

git https://github.com/ionide/ionide-fsgrammar.git master

github ionide/ionide-vscode-helpers:8e81bc03f11f07b8e0811b3d4598eadc78f32f2f src/Fable.Import.VSCode.fs
github ionide/ionide-vscode-helpers:8e81bc03f11f07b8e0811b3d4598eadc78f32f2f src/Helpers.fs
github ionide/ionide-vscode-helpers:8e81bc03f11f07b8e0811b3d4598eadc78f32f2f src/Fable.Import.Showdown.fs
github ionide/ionide-vscode-helpers:8e81bc03f11f07b8e0811b3d4598eadc78f32f2f src/Fable.Import.VSCode.LanguageServer.fs

group fsac
source https://api.nuget.org/v3/index.json
storage: packages
framework: netstandard2.0
nuget fsautocomplete

group build
source https://api.nuget.org/v3/index.json
storage: none
framework: net7.0

nuget Fake.Core.Target
nuget Fake.Core.Process
nuget Fake.Core.ReleaseNotes
nuget Fake.Core.Environment
nuget Fake.Core.UserInput
nuget Fake.DotNet.Cli
nuget Fake.DotNet.AssemblyInfoFile
nuget Fake.DotNet.Paket
nuget Fake.DotNet.MsBuild
nuget Fake.IO.FileSystem
nuget Fake.IO.Zip
nuget Fake.Api.GitHub
nuget Fake.Tools.Git
nuget Fake.JavaScript.Yarn
nuget Octokit <= 0.49.0

// Enforce updated binlog parser until Fake gets an update, so we're not stuck
// on an old sdk version.
// ref: https://github.com/fsprojects/FAKE/issues/2744
nuget MSBuild.StructuredLogger >= 2.1.784
29 changes: 14 additions & 15 deletions paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -178,24 +178,25 @@ NUGET
FSharp.Core (>= 4.7.2)
System.Reactive (>= 5.0 < 6.0)
FSharp.Core (7.0.200)
Microsoft.Build.Framework (17.4)
System.Security.Permissions (>= 6.0)
Microsoft.Build.Utilities.Core (17.4)
Microsoft.Build.Framework (>= 17.4)
Microsoft.NET.StringTools (>= 17.4)
System.Collections.Immutable (>= 6.0)
System.Configuration.ConfigurationManager (>= 6.0)
Microsoft.NET.StringTools (17.4)
System.Memory (>= 4.5.5)
System.Runtime.CompilerServices.Unsafe (>= 6.0)
Microsoft.Build.Framework (17.7.2)
System.Security.Permissions (>= 7.0)
Microsoft.Build.Utilities.Core (17.7.2)
Microsoft.Build.Framework (>= 17.7.2)
Microsoft.NET.StringTools (>= 17.7.2)
Microsoft.VisualStudio.Setup.Configuration.Interop (>= 3.2.2146)
System.Collections.Immutable (>= 7.0)
System.Configuration.ConfigurationManager (>= 7.0)
System.Security.Permissions (>= 7.0)
Microsoft.NET.StringTools (17.7.2)
Microsoft.VisualStudio.Setup.Configuration.Interop (3.7.2175)
Microsoft.Win32.Registry (5.0)
System.Security.AccessControl (>= 5.0)
System.Security.Principal.Windows (>= 5.0)
Microsoft.Win32.SystemEvents (7.0)
Mono.Posix.NETStandard (1.0)
MSBuild.StructuredLogger (2.1.768)
Microsoft.Build.Framework (>= 16.10)
Microsoft.Build.Utilities.Core (>= 16.10)
MSBuild.StructuredLogger (2.1.846)
Microsoft.Build.Framework (>= 17.5)
Microsoft.Build.Utilities.Core (>= 17.5)
Newtonsoft.Json (13.0.2)
NuGet.Common (6.4)
NuGet.Frameworks (>= 6.4)
Expand All @@ -222,9 +223,7 @@ NUGET
System.Drawing.Common (7.0)
Microsoft.Win32.SystemEvents (>= 7.0)
System.Formats.Asn1 (7.0)
System.Memory (4.5.5)
System.Reactive (5.0)
System.Runtime.CompilerServices.Unsafe (6.0)
System.Security.AccessControl (6.0)
System.Security.Cryptography.Cng (5.0)
System.Formats.Asn1 (>= 5.0)
Expand Down
Loading