From 8d3ac352ae16fe1846010ec5559aa835fce1ee23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Saulius=20Menkevi=C4=8Dius?= Date: Fri, 24 Oct 2025 09:32:08 +0300 Subject: [PATCH 1/6] use .net 10 to build csharp-ls --- .github/workflows/build.yaml | 2 +- .github/workflows/test.yaml | 2 +- global.json | 2 +- src/CSharpLanguageServer/CSharpLanguageServer.fsproj | 2 +- .../CSharpLanguageServer.Tests.fsproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 0174ac20..078f8b7e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: [ubuntu-24.04] - dotnet: [9.0.x] + dotnet: [10.0.x] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 621569e8..d966cd62 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -11,7 +11,7 @@ jobs: strategy: matrix: os: [windows-latest, ubuntu-24.04] - dotnet: [9.0.x] + dotnet: [10.0.x] fail-fast: false runs-on: ${{ matrix.os }} diff --git a/global.json b/global.json index 883d5bef..53991d8a 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0", + "version": "10.0", "rollForward": "minor" } } diff --git a/src/CSharpLanguageServer/CSharpLanguageServer.fsproj b/src/CSharpLanguageServer/CSharpLanguageServer.fsproj index 8b44f951..676f2846 100644 --- a/src/CSharpLanguageServer/CSharpLanguageServer.fsproj +++ b/src/CSharpLanguageServer/CSharpLanguageServer.fsproj @@ -3,7 +3,7 @@ Exe - net9.0 + net10.0 C# LSP language server true csharp-ls diff --git a/tests/CSharpLanguageServer.Tests/CSharpLanguageServer.Tests.fsproj b/tests/CSharpLanguageServer.Tests/CSharpLanguageServer.Tests.fsproj index faa73635..f090a7ca 100644 --- a/tests/CSharpLanguageServer.Tests/CSharpLanguageServer.Tests.fsproj +++ b/tests/CSharpLanguageServer.Tests/CSharpLanguageServer.Tests.fsproj @@ -1,6 +1,6 @@ - net9.0 + net10.0 false false FS0988 From 8c4640ed8482d77159aec64bae98329bfac79f7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Saulius=20Menkevi=C4=8Dius?= Date: Fri, 24 Oct 2025 09:35:40 +0300 Subject: [PATCH 2/6] fix TimeSpan.FromMilliseconds --- src/CSharpLanguageServer/Handlers/Initialization.fs | 2 +- src/CSharpLanguageServer/State/ServerState.fs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CSharpLanguageServer/Handlers/Initialization.fs b/src/CSharpLanguageServer/Handlers/Initialization.fs index e2979fa6..badf17bb 100644 --- a/src/CSharpLanguageServer/Handlers/Initialization.fs +++ b/src/CSharpLanguageServer/Handlers/Initialization.fs @@ -179,7 +179,7 @@ module Initialization = // // start loading workspace // - stateActor.Post(WorkspaceReloadRequested(TimeSpan.FromMilliseconds(100))) + stateActor.Post(WorkspaceReloadRequested(TimeSpan.FromMilliseconds(int64 100))) logger.LogDebug("handleInitialized: Ok") diff --git a/src/CSharpLanguageServer/State/ServerState.fs b/src/CSharpLanguageServer/State/ServerState.fs index 33398fd1..a67f320a 100644 --- a/src/CSharpLanguageServer/State/ServerState.fs +++ b/src/CSharpLanguageServer/State/ServerState.fs @@ -235,7 +235,7 @@ let processServerEvent (logger: ILogger) state postSelf msg : Async not (state.Settings.SolutionPath = newState.Settings.SolutionPath) if solutionChanged then - postSelf (WorkspaceReloadRequested(TimeSpan.FromMilliseconds(250))) + postSelf (WorkspaceReloadRequested(TimeSpan.FromMilliseconds(int64 250))) return newState From ae33c1cd18c62933a207eac97613cbe1fa582139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Saulius=20Menkevi=C4=8Dius?= Date: Fri, 24 Oct 2025 09:38:17 +0300 Subject: [PATCH 3/6] check this --- src/CSharpLanguageServer/Handlers/Completion.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CSharpLanguageServer/Handlers/Completion.fs b/src/CSharpLanguageServer/Handlers/Completion.fs index 899a374e..64a53a9f 100644 --- a/src/CSharpLanguageServer/Handlers/Completion.fs +++ b/src/CSharpLanguageServer/Handlers/Completion.fs @@ -80,7 +80,7 @@ module Completion = let defaultCo: obj = coType.GetField("Default") |> nonNull "Microsoft.CodeAnalysis.Completion.CompletionOptions.Default" - |> _.GetValue() + |> _.GetValue(null) { Object = defaultCo CompletionOptionsType = coType } From 0704261a0ab5f5686a1251d4be32e1200e4f7fa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Saulius=20Menkevi=C4=8Dius?= Date: Thu, 6 Nov 2025 08:33:42 +0200 Subject: [PATCH 4/6] and this --- Directory.Packages.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Packages.props b/Directory.Packages.props index 575df2a6..b58f9844 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,6 +8,7 @@ 17.14.28 4.14.0 1.9.1 + $(NoWarn);NU1902;NU1903 From ba83144b9483504ff2c5cd8dd5927269fde291fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Saulius=20Menkevi=C4=8Dius?= Date: Thu, 6 Nov 2025 08:34:05 +0200 Subject: [PATCH 5/6] now --- src/CSharpLanguageServer/CSharpLanguageServer.fsproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CSharpLanguageServer/CSharpLanguageServer.fsproj b/src/CSharpLanguageServer/CSharpLanguageServer.fsproj index 676f2846..7f66add8 100644 --- a/src/CSharpLanguageServer/CSharpLanguageServer.fsproj +++ b/src/CSharpLanguageServer/CSharpLanguageServer.fsproj @@ -18,6 +18,7 @@ CHANGELOG.md enable true + $(NoWarn);NU1902;NU1903 From 95433738e11e0b0e34c7ef6a75c804dd98f9ace2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Saulius=20Menkevi=C4=8Dius?= Date: Sat, 15 Nov 2025 14:46:53 +0200 Subject: [PATCH 6/6] bump msbuild to 18.0.2 --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index b58f9844..22fbe837 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ true - 17.14.28 + 18.0.2 4.14.0 1.9.1 $(NoWarn);NU1902;NU1903 @@ -40,4 +40,4 @@ - \ No newline at end of file +