diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6af7b1bc3eb..158d160bcc4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,33 +1,37 @@ - + https://github.com/dotnet/msbuild - c192adbb5252264481e8c046a8e0694f7fc7855b + 15d19b96cf826b99925c8e5fd75575f46c60dd4a - + https://github.com/dotnet/msbuild - c192adbb5252264481e8c046a8e0694f7fc7855b + 15d19b96cf826b99925c8e5fd75575f46c60dd4a - + https://github.com/dotnet/msbuild - c192adbb5252264481e8c046a8e0694f7fc7855b + 15d19b96cf826b99925c8e5fd75575f46c60dd4a - + https://github.com/dotnet/msbuild - c192adbb5252264481e8c046a8e0694f7fc7855b + 15d19b96cf826b99925c8e5fd75575f46c60dd4a - + https://github.com/dotnet/runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://github.com/dotnet/runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 - + https://github.com/dotnet/runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 + + + https://github.com/dotnet/runtime + 9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3 diff --git a/eng/Versions.props b/eng/Versions.props index da68a27d5c1..6d7504f8dd2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,14 +80,14 @@ 4.6.0 - 4.5.5 + 4.6.0 6.1.0 - 8.0.0 + 9.0.0 $(SystemPackageVersionVersion) $(SystemPackageVersionVersion) $(SystemPackageVersionVersion) @@ -97,12 +97,13 @@ $(SystemPackageVersionVersion) 1.6.0 - 4.11.0-2.24264.2 - 17.10.191 - 17.10.40152 - 17.10.526-pre-g1b474069f5 - 17.10.41 - 17.13.26 + 4.15.0-1.25171.14 + 17.14.188 + 17.14.40268 + 17.14.79 + 17.14.40254 + 17.14.15 + 17.15.0-preview-25276-10 $(RoslynVersion) $(RoslynVersion) @@ -117,7 +118,7 @@ $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) + $(VisualStudioShellProjectsPackages) $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) @@ -127,20 +128,20 @@ $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) + $(VisualStudioShellProjectsPackages) + $(VisualStudioShellProjectsPackages) $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) + 17.14.40270 $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) + 17.14.40270 10.0.30319 11.0.50727 15.0.25123-Dev15Preview - 17.13.26 - 17.13.26 - 17.13.26 + 17.15.0-preview-25276-10 + 17.15.0-preview-25276-10 + 17.15.0-preview-25276-10 $(VisualStudioEditorPackagesVersion) @@ -153,7 +154,7 @@ $(VisualStudioEditorPackagesVersion) $(VisualStudioEditorPackagesVersion) $(VisualStudioEditorPackagesVersion) - $(VisualStudioEditorPackagesVersion) + 17.14.106 5.6.0 0.1.169-beta $(MicrosoftVisualStudioExtensibilityTestingVersion) @@ -168,7 +169,7 @@ 17.10.2179 - 17.10.21 + 17.14.20 17.0.0 17.8.8 12.0.4 @@ -195,8 +196,8 @@ 17.11.1 13.0.3 1.0.0-beta2-dev3 - 2.18.48 - 2.10.69 + 2.22.11 + 2.12.87 2.9.0 2.8.2 3.1.17 diff --git a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs b/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs index 4eb399a39f3..4f6136b8db0 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs @@ -355,64 +355,65 @@ type internal FSharpPackage() as this = flushTelemetry () #endif - override this.InitializeAsync(cancellationToken: CancellationToken, progress: IProgress) : Tasks.Task = - // `base.` methods can't be called in the `async` builder, so we have to cache it - let baseInitializeAsync = base.InitializeAsync(cancellationToken, progress) + override this.RegisterInitializationWork(packageRegistrationTasks: PackageRegistrationTasks) : unit = + base.RegisterInitializationWork(packageRegistrationTasks: PackageRegistrationTasks) - foregroundCancellableTask { - do! baseInitializeAsync + packageRegistrationTasks.AddTask( + true, + (fun progress _tasks cancellationToken -> + foregroundCancellableTask { + let! commandService = this.GetServiceAsync(typeof) + let commandService = commandService :?> OleMenuCommandService - let! commandService = this.GetServiceAsync(typeof) - let commandService = commandService :?> OleMenuCommandService + // Switch to UI thread + do! this.JoinableTaskFactory.SwitchToMainThreadAsync() - // Switch to UI thread - do! this.JoinableTaskFactory.SwitchToMainThreadAsync() + // FSI-LINKAGE-POINT: sited init + FSharp.Interactive.Hooks.fsiConsoleWindowPackageInitializeSited (this :> Package) commandService - // FSI-LINKAGE-POINT: sited init - FSharp.Interactive.Hooks.fsiConsoleWindowPackageInitializeSited (this :> Package) commandService + // FSI-LINKAGE-POINT: private method GetDialogPage forces fsi options to be loaded + let _fsiPropertyPage = + this.GetDialogPage(typeof) - // FSI-LINKAGE-POINT: private method GetDialogPage forces fsi options to be loaded - let _fsiPropertyPage = - this.GetDialogPage(typeof) + let workspace = this.ComponentModel.GetService() - let workspace = this.ComponentModel.GetService() + let _ = + this.ComponentModel.DefaultExportProvider.GetExport() - let _ = - this.ComponentModel.DefaultExportProvider.GetExport() + let optionsManager = + workspace.Services.GetService().FSharpProjectOptionsManager - let optionsManager = - workspace.Services.GetService().FSharpProjectOptionsManager - - let metadataAsSource = - this.ComponentModel.DefaultExportProvider.GetExport().Value + let metadataAsSource = + this.ComponentModel.DefaultExportProvider.GetExport().Value - let! solution = this.GetServiceAsync(typeof) - let solution = solution :?> IVsSolution + let! solution = this.GetServiceAsync(typeof) + let solution = solution :?> IVsSolution - let solutionEvents = FSharpSolutionEvents(optionsManager, metadataAsSource) + let solutionEvents = FSharpSolutionEvents(optionsManager, metadataAsSource) - let! rdt = this.GetServiceAsync(typeof) - let rdt = rdt :?> IVsRunningDocumentTable + let! rdt = this.GetServiceAsync(typeof) + let rdt = rdt :?> IVsRunningDocumentTable - solutionEventsOpt <- Some(solutionEvents) - solution.AdviseSolutionEvents(solutionEvents) |> ignore + solutionEventsOpt <- Some(solutionEvents) + solution.AdviseSolutionEvents(solutionEvents) |> ignore - let projectContextFactory = - this.ComponentModel.GetService() + let projectContextFactory = + this.ComponentModel.GetService() - let miscFilesWorkspace = - this.ComponentModel.GetService() + let miscFilesWorkspace = + this.ComponentModel.GetService() - do - SingleFileWorkspaceMap(FSharpMiscellaneousFileService(workspace, miscFilesWorkspace, projectContextFactory), rdt) - |> ignore + do + SingleFileWorkspaceMap(FSharpMiscellaneousFileService(workspace, miscFilesWorkspace, projectContextFactory), rdt) + |> ignore - do - LegacyProjectWorkspaceMap(solution, optionsManager, projectContextFactory) - |> ignore + do + LegacyProjectWorkspaceMap(solution, optionsManager, projectContextFactory) + |> ignore - } - |> CancellableTask.startAsTask cancellationToken + } + |> CancellableTask.startAsTask cancellationToken) + ) override _.RoslynLanguageName = FSharpConstants.FSharpLanguageName (*override this.CreateWorkspace() = this.ComponentModel.GetService() *) diff --git a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj index 89ca891597a..fead6828567 100644 --- a/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj +++ b/vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj @@ -46,6 +46,7 @@ + diff --git a/vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj b/vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj index 43e8352845f..0171cdf9b26 100644 --- a/vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj +++ b/vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj @@ -57,6 +57,7 @@ + diff --git a/vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs b/vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs index 85ad11c6e2e..25509f14ace 100644 --- a/vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs +++ b/vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs @@ -171,7 +171,7 @@ type TestHostWorkspaceServices(hostServices: HostServices, workspace: Workspace) |> System.Collections.Concurrent.ConcurrentDictionary let langServices = - TestHostLanguageServices(this, LanguageNames.FSharp, exportProvider) + new TestHostLanguageServices(this, LanguageNames.FSharp, exportProvider) override _.Workspace = workspace @@ -199,7 +199,7 @@ type TestHostServices() = inherit HostServices() override this.CreateWorkspaceServices(workspace) = - TestHostWorkspaceServices(this, workspace) + new TestHostWorkspaceServices(this, workspace) [] type RoslynTestHelpers private () = diff --git a/vsintegration/tests/UnitTests/Tests.RoslynHelpers.fs b/vsintegration/tests/UnitTests/Tests.RoslynHelpers.fs index 25ba0ce68dc..ff00a933e26 100644 --- a/vsintegration/tests/UnitTests/Tests.RoslynHelpers.fs +++ b/vsintegration/tests/UnitTests/Tests.RoslynHelpers.fs @@ -160,7 +160,7 @@ type TestHostWorkspaceServices(hostServices: HostServices, workspace: Workspace) |> Seq.distinctBy (fun x -> x.Key) |> System.Collections.Concurrent.ConcurrentDictionary - let langServices = TestHostLanguageServices(this, LanguageNames.FSharp, exportProvider) + let langServices = new TestHostLanguageServices(this, LanguageNames.FSharp, exportProvider) override _.Workspace = workspace @@ -191,7 +191,7 @@ type TestHostServices() = inherit HostServices() override this.CreateWorkspaceServices(workspace) = - TestHostWorkspaceServices(this, workspace) :> HostWorkspaceServices + new TestHostWorkspaceServices(this, workspace) :> HostWorkspaceServices [] type RoslynTestHelpers private () =