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