diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 31c0ad52ed2..f763104b991 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -12,9 +12,13 @@ - - - + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce2fa382478..305c68faac5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,26 +7,26 @@ - + https://github.com/dotnet/msbuild - 2cbc8b6aef648cf21c6a68a0dab7fe09a614e475 + 2d02daa886f279e2ee749cad03db4b1b75bb9adb - + https://github.com/dotnet/msbuild - 2cbc8b6aef648cf21c6a68a0dab7fe09a614e475 + 2d02daa886f279e2ee749cad03db4b1b75bb9adb - + https://github.com/dotnet/msbuild - 2cbc8b6aef648cf21c6a68a0dab7fe09a614e475 + 2d02daa886f279e2ee749cad03db4b1b75bb9adb - + https://github.com/dotnet/msbuild - 2cbc8b6aef648cf21c6a68a0dab7fe09a614e475 + 2d02daa886f279e2ee749cad03db4b1b75bb9adb - + https://github.com/dotnet/msbuild - 2cbc8b6aef648cf21c6a68a0dab7fe09a614e475 + 2d02daa886f279e2ee749cad03db4b1b75bb9adb diff --git a/eng/Versions.props b/eng/Versions.props index 6146affd95a..af37edf2450 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,22 +78,28 @@ + 8.0.0 4.5.1 - 7.0.0 - 1.6.0 - 7.0.2 + $(SystemPackageVersionVersion) + $(SystemPackageVersionVersion) + $(SystemPackageVersionVersion) + $(SystemPackageVersionVersion) 4.5.5 4.7.0 - 7.0.0 - 7.0.0 + $(SystemPackageVersionVersion) 6.0.0 + $(SystemPackageVersionVersion) 4.5.0 + 1.6.0 + - 4.6.0-3.23329.3 - 17.7.25-preview - 17.7.35338-preview.1 - 17.7.58-pre - 17.7.5-preview + 4.11.0-2.24264.2 + 17.10.191 + 17.10.40152 + 17.10.526-pre-g1b474069f5 + 17.10.41 + 17.11.0-preview-24178-03 + $(RoslynVersion) $(RoslynVersion) @@ -104,6 +110,7 @@ $(RoslynVersion) 2.0.28 $(RoslynVersion) + $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) @@ -115,6 +122,7 @@ $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) + $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) @@ -125,11 +133,12 @@ 10.0.30319 11.0.50727 15.0.25123-Dev15Preview + - 17.7.0-preview-23217-02 - 17.7.0-preview-23217-02 - 17.7.0-preview-23217-02 - 17.7.0-preview-23217-02 + $(MicrosoftBuildVersion) + $(MicrosoftBuildVersion) + $(MicrosoftBuildVersion) + $(VisualStudioEditorPackagesVersion) $(VisualStudioEditorPackagesVersion) @@ -146,33 +155,36 @@ 0.1.169-beta $(MicrosoftVisualStudioExtensibilityTestingVersion) $(MicrosoftVisualStudioExtensibilityTestingVersion) + $(MicrosoftVisualStudioThreadingPackagesVersion) + $(VisualStudioProjectSystemPackagesVersion) 2.3.6152103 + - 17.1.4054 - 17.7.3-preview + 17.10.1031-preview2 + 17.10.21 17.0.0 - 17.6.11 + 17.8.8 12.0.4 7.0.4 8.0.4 11.0.4 7.0.4 + 0.2.0 1.0.0 1.1.33 + 0.13.10 2.16.5 4.3.0.0 1.0.31 - 7.0.0 - 7.0.0 - 8.0.0 + $(SystemPackageVersionVersion) 4.3.0-1.22220.8 3.1.0 5.0.0-preview.7.20364.11 @@ -184,12 +196,13 @@ 3.11.0 2.1.80 1.0.0-beta2-dev3 - 2.16.8-preview - 2.9.112 + 2.18.48 + 2.10.69 2.4.1 2.4.2 5.10.3 2.2.0 + 1.0.0-prerelease.23614.4 1.0.0-prerelease.23614.4 diff --git a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs b/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs index b492cf1f35f..dfb65ee6742 100644 --- a/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs +++ b/vsintegration/src/FSharp.Editor/LanguageService/LanguageService.fs @@ -436,9 +436,7 @@ type internal FSharpPackage() as this = type internal FSharpLanguageService(package: FSharpPackage) = inherit AbstractLanguageService(package) - override _.Initialize() = - base.Initialize() - + member _.Initialize() = let exportProvider = package.ComponentModel.DefaultExportProvider let globalOptions = exportProvider.GetExport().Value diff --git a/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj b/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj index 58862ce6747..374b74b5ca1 100644 --- a/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj +++ b/vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj @@ -58,6 +58,7 @@ +