From 6d9e938bcb92d2c010d9f08f959a51a24a5256ff Mon Sep 17 00:00:00 2001 From: Adam Boniecki <20281641+abonie@users.noreply.github.com> Date: Tue, 10 Jun 2025 08:27:27 +0200 Subject: [PATCH 1/4] Update copilot-setup-steps.yml with dotnet tool restore (#18675) Make copilot run dotnet tool restore during setup so it can use fantomas --- .github/workflows/copilot-setup-steps.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml index abef568c5c5..2025949999f 100644 --- a/.github/workflows/copilot-setup-steps.yml +++ b/.github/workflows/copilot-setup-steps.yml @@ -22,3 +22,7 @@ jobs: env: CI: false run: dotnet build ./FSharp.Compiler.Service.sln --verbosity quiet + - name: Restore dotnet tools + env: + CI: false + run: dotnet tool restore From 6331c8480e2ed08040399e2e5bbc958cfb7c2834 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 10 Jun 2025 08:27:54 +0200 Subject: [PATCH 2/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-optimization build 20250609.1 (#18676) optimization.linux-arm64.MIBC.Runtime , optimization.linux-x64.MIBC.Runtime , optimization.windows_nt-arm64.MIBC.Runtime , optimization.windows_nt-x64.MIBC.Runtime , optimization.windows_nt-x86.MIBC.Runtime From Version 1.0.0-prerelease.25304.1 -> To Version 1.0.0-prerelease.25309.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4966e4fd4c6..2744e70e9bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -39,25 +39,25 @@ https://github.com/dotnet/arcade 12d3a9f5d6138e22270694574e73e4c58a815795 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 3209c82631372c33b3df04636ab2a6fd255b0681 + b1f3f5c40f86362217f1b98952d5c6562d609619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 3209c82631372c33b3df04636ab2a6fd255b0681 + b1f3f5c40f86362217f1b98952d5c6562d609619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 3209c82631372c33b3df04636ab2a6fd255b0681 + b1f3f5c40f86362217f1b98952d5c6562d609619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 3209c82631372c33b3df04636ab2a6fd255b0681 + b1f3f5c40f86362217f1b98952d5c6562d609619 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 3209c82631372c33b3df04636ab2a6fd255b0681 + b1f3f5c40f86362217f1b98952d5c6562d609619 diff --git a/eng/Versions.props b/eng/Versions.props index 0f857133f50..fd3fc543421 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -204,10 +204,10 @@ 2.2.0 - 1.0.0-prerelease.25304.1 - 1.0.0-prerelease.25304.1 - 1.0.0-prerelease.25304.1 - 1.0.0-prerelease.25304.1 - 1.0.0-prerelease.25304.1 + 1.0.0-prerelease.25309.1 + 1.0.0-prerelease.25309.1 + 1.0.0-prerelease.25309.1 + 1.0.0-prerelease.25309.1 + 1.0.0-prerelease.25309.1 From b4f372814276ae2b55feb46a65570b61230ed855 Mon Sep 17 00:00:00 2001 From: Adam Boniecki <20281641+abonie@users.noreply.github.com> Date: Tue, 10 Jun 2025 10:02:24 +0200 Subject: [PATCH 3/4] Restore language server sln in copilot-setup-steps.yml (#18677) Add a build step in copilot setup --- .github/workflows/copilot-setup-steps.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml index 2025949999f..5091aec9f0d 100644 --- a/.github/workflows/copilot-setup-steps.yml +++ b/.github/workflows/copilot-setup-steps.yml @@ -18,10 +18,14 @@ jobs: - uses: actions/setup-dotnet@v4 with: global-json-file: global.json - - name: Restore solution + - name: Restore the compiler service solution env: CI: false run: dotnet build ./FSharp.Compiler.Service.sln --verbosity quiet + - name: Restore the language server solution + env: + CI: false + run: dotnet build ./VSFSharpExtension.sln --verbosity quiet - name: Restore dotnet tools env: CI: false From 47bdb71b5e52c6620cee83aa6b52f5a3d82b212c Mon Sep 17 00:00:00 2001 From: Tomas Grosup Date: Tue, 10 Jun 2025 11:50:23 +0200 Subject: [PATCH 4/4] Fix roslyn versions to resolve NGEN issues (#18678) --- eng/Versions.props | 5 +++-- vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj | 4 +++- .../src/FSharp.Editor/LanguageService/LanguageService.fs | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index fd3fc543421..504cb60a4cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -97,7 +97,7 @@ $(SystemPackageVersionVersion) 1.6.0 - 4.15.0-1.25171.14 + 5.0.0-1.25276.102 17.14.188 17.14.40268 17.14.79 @@ -105,9 +105,10 @@ 17.14.15 17.15.0-preview-25278-01 + $(RoslynVersion) $(RoslynVersion) $(RoslynVersion) - $(RoslynVersion) + 5.0.0-1.25275.2 $(RoslynVersion) $(RoslynVersion) $(RoslynVersion) diff --git a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj index fbafe3bd839..8ccba61a5af 100644 --- a/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj +++ b/vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj @@ -6,6 +6,7 @@ Library $(NoWarn);75 $(NoWarn);44 + $(NoWarn);NU1608 true $(OtherFlags) --subsystemversion:6.00 false @@ -172,10 +173,11 @@ + - + diff --git a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs b/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs index 4f6136b8db0..b7e34648aed 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs @@ -355,12 +355,12 @@ type internal FSharpPackage() as this = flushTelemetry () #endif - override this.RegisterInitializationWork(packageRegistrationTasks: PackageRegistrationTasks) : unit = - base.RegisterInitializationWork(packageRegistrationTasks: PackageRegistrationTasks) + override this.RegisterInitializeAsyncWork(packageRegistrationTasks: PackageLoadTasks) : unit = + base.RegisterInitializeAsyncWork(packageRegistrationTasks) packageRegistrationTasks.AddTask( true, - (fun progress _tasks cancellationToken -> + (fun _tasks cancellationToken -> foregroundCancellableTask { let! commandService = this.GetServiceAsync(typeof) let commandService = commandService :?> OleMenuCommandService