Skip to content

Commit

Permalink
merge main to nightly (#1273)
Browse files Browse the repository at this point in the history
* merge main to nightly

* Update .github/workflows/build.yml

* Ensure new test list can be added. (#5)

* Ensure new test list can be added.

* Use ParsedInput.tryPick

* Just make all LSP tests sequenced.

* fix "replacing unicode paragraph by newline"

---------

Co-authored-by: Florian Verdonck <[email protected]>
Co-authored-by: Jimmy Byrd <[email protected]>
  • Loading branch information
3 people authored Apr 27, 2024
1 parent c5a5812 commit 1b9343b
Show file tree
Hide file tree
Showing 58 changed files with 1,696 additions and 1,405 deletions.
6 changes: 3 additions & 3 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"paket": {
"version": "8.0.0-alpha002",
"version": "8.0.3",
"commands": [
"paket"
]
Expand All @@ -15,13 +15,13 @@
]
},
"fantomas": {
"version": "6.2.3",
"version": "6.3.1",
"commands": [
"fantomas"
]
},
"fsharp-analyzers": {
"version": "0.23.0",
"version": "0.25.0",
"commands": [
"fsharp-analyzers"
]
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
#-------------------------------------------------------------------------------------------------------------

ARG DOTNETCORE_VERSION=7.0.201
ARG DOTNETCORE_VERSION=7.0.400
FROM mcr.microsoft.com/dotnet/sdk:${DOTNETCORE_VERSION}

# Avoid warnings by switching to noninteractive
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,11 +96,15 @@ jobs:
run: dotnet tool restore

- name: Check format
run: dotnet fantomas --check src
run: dotnet fantomas --check build.fsx src
env:
DOTNET_ROLL_FORWARD: LatestMajor
DOTNET_ROLL_FORWARD_TO_PRERELEASE: 1

# Ensure the scaffolding code can still add items to the existing code.
# - name: EnsureCanScaffoldCodeFix
# run: dotnet fsi build.fsx -- -p EnsureCanScaffoldCodeFix

- name: Run Build
run: dotnet build -c Release
env:
Expand Down
997 changes: 500 additions & 497 deletions .paket/Paket.Restore.targets

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions FsAutoComplete.sln
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "OptionAnalyzer", "test\Opti
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FsAutoComplete.DependencyManager.Dummy", "test\FsAutoComplete.DependencyManager.Dummy\FsAutoComplete.DependencyManager.Dummy.fsproj", "{C58701B0-D8E3-4B68-A7DE-8524C95F86C0}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "build", "build\build.fsproj", "{400D56D0-28C9-4210-AA30-BD688122E298}"
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "benchmarks", "benchmarks\benchmarks.fsproj", "{0CD029D8-B39E-4CBE-A190-C84A7A811180}"
EndProject
Global
Expand Down Expand Up @@ -63,10 +61,6 @@ Global
{C58701B0-D8E3-4B68-A7DE-8524C95F86C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C58701B0-D8E3-4B68-A7DE-8524C95F86C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C58701B0-D8E3-4B68-A7DE-8524C95F86C0}.Release|Any CPU.Build.0 = Release|Any CPU
{400D56D0-28C9-4210-AA30-BD688122E298}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{400D56D0-28C9-4210-AA30-BD688122E298}.Debug|Any CPU.Build.0 = Debug|Any CPU
{400D56D0-28C9-4210-AA30-BD688122E298}.Release|Any CPU.ActiveCfg = Release|Any CPU
{400D56D0-28C9-4210-AA30-BD688122E298}.Release|Any CPU.Build.0 = Release|Any CPU
{0CD029D8-B39E-4CBE-A190-C84A7A811180}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0CD029D8-B39E-4CBE-A190-C84A7A811180}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0CD029D8-B39E-4CBE-A190-C84A7A811180}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
2 changes: 0 additions & 2 deletions build.cmd

This file was deleted.

Loading

0 comments on commit 1b9343b

Please sign in to comment.