diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml index abef568c5c5..5091aec9f0d 100644 --- a/.github/workflows/copilot-setup-steps.yml +++ b/.github/workflows/copilot-setup-steps.yml @@ -18,7 +18,15 @@ 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 + run: dotnet tool restore diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7b17d64c652..5e098d1702b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -40,25 +40,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 27383527757..34e62fdd415 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) @@ -204,10 +205,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 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