From 527cc26b062c32a81b3ed7582711c73f01ad09a1 Mon Sep 17 00:00:00 2001 From: lapponiandevil Date: Tue, 11 Feb 2025 16:38:37 +0100 Subject: [PATCH 1/3] net 9 compiles --- global.json | 2 +- src/CSharpLanguageServer/CSharpLanguageServer.fsproj | 2 +- src/CSharpLanguageServer/Handlers/Workspace.fs | 4 ++-- .../CSharpLanguageServer.Tests.fsproj | 2 +- .../testCodeActionOnMethodNameWorks/Project/Project.csproj | 2 +- .../TestData/testDefinitionWorks/Project/Project.csproj | 2 +- .../testDefinitionWorksInAspNetProject/Project/Project.csproj | 4 ++-- .../testEditorConfigFormatting/Project/Project.csproj | 2 +- .../TestData/testHoverWorks/Project/Project.csproj | 2 +- .../TestData/testPullDiagnosticsWork/Project/Project.csproj | 2 +- .../TestData/testPushDiagnosticsWork/Project/Project.csproj | 2 +- .../TestData/testReferenceWorks/Project/Project.csproj | 2 +- .../Project/Project.csproj | 4 ++-- .../Project/Project.csproj | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/global.json b/global.json index 50b81737..b306932f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.400", + "version": "9.0.1", "rollForward": "minor" } } diff --git a/src/CSharpLanguageServer/CSharpLanguageServer.fsproj b/src/CSharpLanguageServer/CSharpLanguageServer.fsproj index c863cba3..3a2a15a3 100644 --- a/src/CSharpLanguageServer/CSharpLanguageServer.fsproj +++ b/src/CSharpLanguageServer/CSharpLanguageServer.fsproj @@ -3,7 +3,7 @@ Exe - net8.0 + net9.0 C# LSP language server true csharp-ls diff --git a/src/CSharpLanguageServer/Handlers/Workspace.fs b/src/CSharpLanguageServer/Handlers/Workspace.fs index 90c84c34..1ccb2e32 100644 --- a/src/CSharpLanguageServer/Handlers/Workspace.fs +++ b/src/CSharpLanguageServer/Handlers/Workspace.fs @@ -81,11 +81,11 @@ module Workspace = match Path.GetExtension(change.Uri) with | ".csproj" -> do! context.WindowShowMessage "change to .csproj detected, will reload solution" - context.Emit(SolutionReloadRequest (TimeSpan.FromSeconds(5))) + context.Emit(SolutionReloadRequest (TimeSpan.FromSeconds(5:int64))) | ".sln" -> do! context.WindowShowMessage "change to .sln detected, will reload solution" - context.Emit(SolutionReloadRequest (TimeSpan.FromSeconds(5))) + context.Emit(SolutionReloadRequest (TimeSpan.FromSeconds(5:int64))) | ".cs" -> match change.Type with diff --git a/tests/CSharpLanguageServer.Tests/CSharpLanguageServer.Tests.fsproj b/tests/CSharpLanguageServer.Tests/CSharpLanguageServer.Tests.fsproj index eeacf45b..da7bd783 100644 --- a/tests/CSharpLanguageServer.Tests/CSharpLanguageServer.Tests.fsproj +++ b/tests/CSharpLanguageServer.Tests/CSharpLanguageServer.Tests.fsproj @@ -1,6 +1,6 @@ - net8.0 + net9.0 false false diff --git a/tests/CSharpLanguageServer.Tests/TestData/testCodeActionOnMethodNameWorks/Project/Project.csproj b/tests/CSharpLanguageServer.Tests/TestData/testCodeActionOnMethodNameWorks/Project/Project.csproj index dcb96604..29aeae9e 100644 --- a/tests/CSharpLanguageServer.Tests/TestData/testCodeActionOnMethodNameWorks/Project/Project.csproj +++ b/tests/CSharpLanguageServer.Tests/TestData/testCodeActionOnMethodNameWorks/Project/Project.csproj @@ -1,6 +1,6 @@ Exe - net8.0 + net9.0 diff --git a/tests/CSharpLanguageServer.Tests/TestData/testDefinitionWorks/Project/Project.csproj b/tests/CSharpLanguageServer.Tests/TestData/testDefinitionWorks/Project/Project.csproj index dcb96604..29aeae9e 100644 --- a/tests/CSharpLanguageServer.Tests/TestData/testDefinitionWorks/Project/Project.csproj +++ b/tests/CSharpLanguageServer.Tests/TestData/testDefinitionWorks/Project/Project.csproj @@ -1,6 +1,6 @@ Exe - net8.0 + net9.0 diff --git a/tests/CSharpLanguageServer.Tests/TestData/testDefinitionWorksInAspNetProject/Project/Project.csproj b/tests/CSharpLanguageServer.Tests/TestData/testDefinitionWorksInAspNetProject/Project/Project.csproj index ee06ba63..9d715580 100644 --- a/tests/CSharpLanguageServer.Tests/TestData/testDefinitionWorksInAspNetProject/Project/Project.csproj +++ b/tests/CSharpLanguageServer.Tests/TestData/testDefinitionWorksInAspNetProject/Project/Project.csproj @@ -1,10 +1,10 @@ - net8.0 + net9.0 enable - + diff --git a/tests/CSharpLanguageServer.Tests/TestData/testEditorConfigFormatting/Project/Project.csproj b/tests/CSharpLanguageServer.Tests/TestData/testEditorConfigFormatting/Project/Project.csproj index dcb96604..29aeae9e 100644 --- a/tests/CSharpLanguageServer.Tests/TestData/testEditorConfigFormatting/Project/Project.csproj +++ b/tests/CSharpLanguageServer.Tests/TestData/testEditorConfigFormatting/Project/Project.csproj @@ -1,6 +1,6 @@ Exe - net8.0 + net9.0 diff --git a/tests/CSharpLanguageServer.Tests/TestData/testHoverWorks/Project/Project.csproj b/tests/CSharpLanguageServer.Tests/TestData/testHoverWorks/Project/Project.csproj index dcb96604..29aeae9e 100644 --- a/tests/CSharpLanguageServer.Tests/TestData/testHoverWorks/Project/Project.csproj +++ b/tests/CSharpLanguageServer.Tests/TestData/testHoverWorks/Project/Project.csproj @@ -1,6 +1,6 @@ Exe - net8.0 + net9.0 diff --git a/tests/CSharpLanguageServer.Tests/TestData/testPullDiagnosticsWork/Project/Project.csproj b/tests/CSharpLanguageServer.Tests/TestData/testPullDiagnosticsWork/Project/Project.csproj index dcb96604..29aeae9e 100644 --- a/tests/CSharpLanguageServer.Tests/TestData/testPullDiagnosticsWork/Project/Project.csproj +++ b/tests/CSharpLanguageServer.Tests/TestData/testPullDiagnosticsWork/Project/Project.csproj @@ -1,6 +1,6 @@ Exe - net8.0 + net9.0 diff --git a/tests/CSharpLanguageServer.Tests/TestData/testPushDiagnosticsWork/Project/Project.csproj b/tests/CSharpLanguageServer.Tests/TestData/testPushDiagnosticsWork/Project/Project.csproj index dcb96604..29aeae9e 100644 --- a/tests/CSharpLanguageServer.Tests/TestData/testPushDiagnosticsWork/Project/Project.csproj +++ b/tests/CSharpLanguageServer.Tests/TestData/testPushDiagnosticsWork/Project/Project.csproj @@ -1,6 +1,6 @@ Exe - net8.0 + net9.0 diff --git a/tests/CSharpLanguageServer.Tests/TestData/testReferenceWorks/Project/Project.csproj b/tests/CSharpLanguageServer.Tests/TestData/testReferenceWorks/Project/Project.csproj index dcb96604..29aeae9e 100644 --- a/tests/CSharpLanguageServer.Tests/TestData/testReferenceWorks/Project/Project.csproj +++ b/tests/CSharpLanguageServer.Tests/TestData/testReferenceWorks/Project/Project.csproj @@ -1,6 +1,6 @@ Exe - net8.0 + net9.0 diff --git a/tests/CSharpLanguageServer.Tests/TestData/testReferenceWorksToAspNetRazorPageReferencedValue/Project/Project.csproj b/tests/CSharpLanguageServer.Tests/TestData/testReferenceWorksToAspNetRazorPageReferencedValue/Project/Project.csproj index ee06ba63..9d715580 100644 --- a/tests/CSharpLanguageServer.Tests/TestData/testReferenceWorksToAspNetRazorPageReferencedValue/Project/Project.csproj +++ b/tests/CSharpLanguageServer.Tests/TestData/testReferenceWorksToAspNetRazorPageReferencedValue/Project/Project.csproj @@ -1,10 +1,10 @@ - net8.0 + net9.0 enable - + diff --git a/tests/CSharpLanguageServer.Tests/TestData/testServerRegistersCapabilitiesWithTheClient/Project/Project.csproj b/tests/CSharpLanguageServer.Tests/TestData/testServerRegistersCapabilitiesWithTheClient/Project/Project.csproj index dcb96604..29aeae9e 100644 --- a/tests/CSharpLanguageServer.Tests/TestData/testServerRegistersCapabilitiesWithTheClient/Project/Project.csproj +++ b/tests/CSharpLanguageServer.Tests/TestData/testServerRegistersCapabilitiesWithTheClient/Project/Project.csproj @@ -1,6 +1,6 @@ Exe - net8.0 + net9.0 From 5ae825682df2c824fe6a560f4b5eaa7c05cc200d Mon Sep 17 00:00:00 2001 From: lapponiandevil Date: Thu, 3 Apr 2025 09:29:49 +0200 Subject: [PATCH 2/3] build and test pipelines use dotnet 9 --- .github/workflows/build.yaml | 2 +- .github/workflows/test.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 956e3208..8b362392 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: [ubuntu-24.04] - dotnet: [8.0.404] + dotnet: [9.0.202] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index fb1a2540..4837dc83 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -10,7 +10,7 @@ jobs: strategy: matrix: os: [windows-latest, ubuntu-24.04] - dotnet: [8.0.404] + dotnet: [9.0.202] fail-fast: false runs-on: ${{ matrix.os }} From 913891c3d9c452cf69189746d56224de1f611cbb Mon Sep 17 00:00:00 2001 From: lapponiandevil Date: Fri, 4 Apr 2025 07:20:17 +0200 Subject: [PATCH 3/3] dotnet 9.0.x for build and test workflows --- .github/workflows/build.yaml | 2 +- .github/workflows/test.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8b362392..0174ac20 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.202] + dotnet: [9.0.x] runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4837dc83..f1ef20cf 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -10,7 +10,7 @@ jobs: strategy: matrix: os: [windows-latest, ubuntu-24.04] - dotnet: [9.0.202] + dotnet: [9.0.x] fail-fast: false runs-on: ${{ matrix.os }}