From 84e2b49e3ef396a68ef83623fdd982521e34e313 Mon Sep 17 00:00:00 2001
From: tmat <tomas.matousek@microsoft.com>
Date: Tue, 22 Oct 2024 19:48:29 -0700
Subject: [PATCH 1/3] Update VSSDK and Gladstone versions

---
 eng/Directory.Packages.props | 63 ++++++++++++++++++------------------
 eng/Versions.props           |  2 +-
 2 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index d75a411948dc8..04b6244650e96 100644
--- a/eng/Directory.Packages.props
+++ b/eng/Directory.Packages.props
@@ -8,7 +8,7 @@
     <_BasicReferenceAssembliesVersion>1.7.9</_BasicReferenceAssembliesVersion>
     <!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->
     <CodeStyleAnalyzerVersion>4.8.0-3.final</CodeStyleAnalyzerVersion>
-    <VisualStudioEditorPackagesVersion>17.10.191</VisualStudioEditorPackagesVersion>
+    <VisualStudioEditorPackagesVersion>17.12.145-preview</VisualStudioEditorPackagesVersion>
     <ILAsmPackageVersion>9.0.0-rc.2.24462.10</ILAsmPackageVersion>
     <ILDAsmPackageVersion>6.0.0-rtm.21518.12</ILDAsmPackageVersion>
     <MicrosoftILVerificationVersion>7.0.0-alpha.1.22060.1</MicrosoftILVerificationVersion>
@@ -22,7 +22,7 @@
     <MicrosoftWindowsDesktopAppRuntimePackagesVersion>8.0.10</MicrosoftWindowsDesktopAppRuntimePackagesVersion>
     <_xunitVersion>2.6.6</_xunitVersion>
     <SqliteVersion>2.1.0</SqliteVersion>
-    <MicrosoftVisualStudioExtensibilityVersion>17.10.2079</MicrosoftVisualStudioExtensibilityVersion>
+    <MicrosoftVisualStudioExtensibilityVersion>17.13.2-preview1</MicrosoftVisualStudioExtensibilityVersion>
   </PropertyGroup>
 
   <!--
@@ -46,10 +46,10 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(TargetFramework)' == 'net472'">
-    <PackageVersion Include="Microsoft.Build" Version="17.10.4" />
-    <PackageVersion Include="Microsoft.Build.Framework" Version="17.10.4" />
-    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.10.4" />
-    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.10.4" />
+    <PackageVersion Include="Microsoft.Build" Version="17.12.0-preview-24426-07" />
+    <PackageVersion Include="Microsoft.Build.Framework" Version="17.12.0-preview-24426-07" />
+    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.12.0-preview-24426-07" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.0-preview-24426-07" />
   </ItemGroup>
 
   <ItemGroup>
@@ -58,7 +58,7 @@
     <!--
       Visual Studio
     -->
-    <PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.10.234-preview.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.12.39557-preview.2.1" />
     <PackageVersion Include="Microsoft.Internal.VisualStudio.Shell.Framework" Version="17.9.36524" />
     <PackageVersion Include="Microsoft.ServiceHub.Client" Version="4.2.1017" />
     <PackageVersion Include="Microsoft.VisualStudio.Extensibility" Version="$(MicrosoftVisualStudioExtensibilityVersion)" />
@@ -91,32 +91,33 @@
 
     <!--
       Subset of Microsoft.VisualStudio.Sdk meta-package (run `csi generate-vssdk-versions.csx` to update based on VSSDK meta-package).
+      See https://github.com/dotnet/arcade/blob/main/Documentation/MirroringPackages.md if any of these packages fail to restore.
     -->
-    <PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.5.31" />
-    <PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.10.37" />
-    <PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers" Version="17.10.37" />
-    <PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.10.191" />
-    <PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.10.191" />
-    <PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.10.40170" />
-    <PackageVersion Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="17.10.40152" />
-    <PackageVersion Include="Microsoft.VisualStudio.Language" Version="17.10.191" />
-    <PackageVersion Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="17.10.191" />
-    <PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.10.191" />
-    <PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client" Version="17.10.124" />
+    <PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.7.36" />
+    <PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.12.18" />
+    <PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers" Version="17.12.18" />
+    <PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.12.145-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.12.145-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.12.39557-preview.2.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="17.12.39557-preview.2.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Language" Version="17.12.145-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="17.12.145-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.12.145-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client" Version="17.12.39-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.RemoteControl" Version="16.3.52" />
-    <PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.10.21" />
-    <PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.10.40170" />
-    <PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.13.14" />
-    <PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="17.10.191" />
-    <PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="17.10.191" />
-    <PackageVersion Include="Microsoft.VisualStudio.Text.UI" Version="17.10.191" />
-    <PackageVersion Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="17.10.191" />
-    <PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.11.20" />
-    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.11.20" />
-    <PackageVersion Include="Microsoft.VisualStudio.Utilities.Internal" Version="16.3.90" />
-    <PackageVersion Include="Nerdbank.Streams" Version="2.10.69" />
-    <PackageVersion Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
-    <PackageVersion Include="StreamJsonRpc" Version="2.18.48" />
+    <PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.12.12" />
+    <PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.12.39557-preview.2.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.12.36" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="17.12.145-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="17.12.145-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.UI" Version="17.12.145-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="17.12.145-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.12.14" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.14" />
+    <PackageVersion Include="Microsoft.VisualStudio.Utilities.Internal" Version="16.3.73" />
+    <PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="StreamJsonRpc" Version="2.20.11" />
 
     <!--
       VS Debugger
diff --git a/eng/Versions.props b/eng/Versions.props
index e4dc164395e31..5ce59ad87b5fb 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -26,7 +26,7 @@
     <SystemDiagnosticsEventLogVersion>8.0.0</SystemDiagnosticsEventLogVersion>
     <SystemCollectionsImmutableVersion>8.0.0</SystemCollectionsImmutableVersion>
     <SystemComponentModelCompositionVersion>8.0.0</SystemComponentModelCompositionVersion>
-    <SystemDiagnosticsDiagnosticSourceVersion>8.0.0</SystemDiagnosticsDiagnosticSourceVersion>
+    <SystemDiagnosticsDiagnosticSourceVersion>8.0.1</SystemDiagnosticsDiagnosticSourceVersion>
     <SystemIOHashingVersion>8.0.0</SystemIOHashingVersion>
     <SystemIOPipelinesVersion>8.0.0</SystemIOPipelinesVersion>
     <SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>

From d1f0374118536c02decd5f4b7f45aa3c20fd2dee Mon Sep 17 00:00:00 2001
From: Tomas Matousek <tomat@microsoft.com>
Date: Mon, 28 Oct 2024 13:29:50 -0700
Subject: [PATCH 2/3] Update VS SDK to 17.12.39557-preview.2.1

---
 eng/Directory.Packages.props                  | 20 +++++++++----------
 .../TestUtilities/StubSettingsManagerHost.cs  |  2 +-
 .../Def/LanguageService/AbstractPackage.cs    |  2 +-
 src/VisualStudio/Core/Def/RoslynPackage.cs    |  3 ++-
 .../TestUtilities2/MockComponentModel.vb      |  4 ++--
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index 04b6244650e96..3747129f5afef 100644
--- a/eng/Directory.Packages.props
+++ b/eng/Directory.Packages.props
@@ -8,7 +8,7 @@
     <_BasicReferenceAssembliesVersion>1.7.9</_BasicReferenceAssembliesVersion>
     <!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->
     <CodeStyleAnalyzerVersion>4.8.0-3.final</CodeStyleAnalyzerVersion>
-    <VisualStudioEditorPackagesVersion>17.12.145-preview</VisualStudioEditorPackagesVersion>
+    <VisualStudioEditorPackagesVersion>17.10.191</VisualStudioEditorPackagesVersion>
     <ILAsmPackageVersion>9.0.0-rc.2.24462.10</ILAsmPackageVersion>
     <ILDAsmPackageVersion>6.0.0-rtm.21518.12</ILDAsmPackageVersion>
     <MicrosoftILVerificationVersion>7.0.0-alpha.1.22060.1</MicrosoftILVerificationVersion>
@@ -22,7 +22,7 @@
     <MicrosoftWindowsDesktopAppRuntimePackagesVersion>8.0.10</MicrosoftWindowsDesktopAppRuntimePackagesVersion>
     <_xunitVersion>2.6.6</_xunitVersion>
     <SqliteVersion>2.1.0</SqliteVersion>
-    <MicrosoftVisualStudioExtensibilityVersion>17.13.2-preview1</MicrosoftVisualStudioExtensibilityVersion>
+    <MicrosoftVisualStudioExtensibilityVersion>17.10.2079</MicrosoftVisualStudioExtensibilityVersion>
   </PropertyGroup>
 
   <!--
@@ -93,9 +93,9 @@
       Subset of Microsoft.VisualStudio.Sdk meta-package (run `csi generate-vssdk-versions.csx` to update based on VSSDK meta-package).
       See https://github.com/dotnet/arcade/blob/main/Documentation/MirroringPackages.md if any of these packages fail to restore.
     -->
-    <PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.7.36" />
-    <PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.12.18" />
-    <PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers" Version="17.12.18" />
+    <PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.7.32-beta" />
+    <PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.12.17-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers" Version="17.12.17-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.12.145-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.12.145-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.12.39557-preview.2.1" />
@@ -105,19 +105,19 @@
     <PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.12.145-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client" Version="17.12.39-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.RemoteControl" Version="16.3.52" />
-    <PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.12.12" />
+    <PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.12.11-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.12.39557-preview.2.1" />
-    <PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.12.36" />
+    <PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.12.32" />
     <PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="17.12.145-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="17.12.145-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.Text.UI" Version="17.12.145-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="17.12.145-preview" />
-    <PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.12.14" />
-    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.14" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.12.13-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.13-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.Utilities.Internal" Version="16.3.73" />
     <PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="StreamJsonRpc" Version="2.20.11" />
+    <PackageVersion Include="StreamJsonRpc" Version="2.20.8-beta" />
 
     <!--
       VS Debugger
diff --git a/src/EditorFeatures/TestUtilities/StubSettingsManagerHost.cs b/src/EditorFeatures/TestUtilities/StubSettingsManagerHost.cs
index d14ce4996f855..3b49070da8dcc 100644
--- a/src/EditorFeatures/TestUtilities/StubSettingsManagerHost.cs
+++ b/src/EditorFeatures/TestUtilities/StubSettingsManagerHost.cs
@@ -78,7 +78,7 @@ Task<string> ISettingsManagerHost2.GetTelemetrySettingsAsync()
         throw new NotImplementedException();
     }
 
-    Task<Stream> ISettingsManagerHost5.GetServiceStreamAsync(string serviceMoniker, CancellationToken cancellationToken)
+    Task<Stream> ISettingsManagerHost5.GetServiceStreamAsync(CancellationToken cancellationToken)
     {
         throw new NotImplementedException();
     }
diff --git a/src/VisualStudio/Core/Def/LanguageService/AbstractPackage.cs b/src/VisualStudio/Core/Def/LanguageService/AbstractPackage.cs
index ffabfa991b393..e6babc4236130 100644
--- a/src/VisualStudio/Core/Def/LanguageService/AbstractPackage.cs
+++ b/src/VisualStudio/Core/Def/LanguageService/AbstractPackage.cs
@@ -31,7 +31,7 @@ protected override async Task InitializeAsync(CancellationToken cancellationToke
 
         await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
 
-        _componentModel_doNotAccessDirectly = (IComponentModel)await GetServiceAsync(typeof(SComponentModel)).ConfigureAwait(true);
+        _componentModel_doNotAccessDirectly = (IComponentModel?)await GetServiceAsync(typeof(SComponentModel)).ConfigureAwait(true);
         Assumes.Present(_componentModel_doNotAccessDirectly);
     }
 
diff --git a/src/VisualStudio/Core/Def/RoslynPackage.cs b/src/VisualStudio/Core/Def/RoslynPackage.cs
index 1ec2bec5601c6..d0980fe34b761 100644
--- a/src/VisualStudio/Core/Def/RoslynPackage.cs
+++ b/src/VisualStudio/Core/Def/RoslynPackage.cs
@@ -276,7 +276,8 @@ private async Task LoadStackTraceExplorerMenusAsync(CancellationToken cancellati
         // Obtain services and QueryInterface from the main thread
         await JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
 
-        var menuCommandService = (OleMenuCommandService)await GetServiceAsync(typeof(IMenuCommandService)).ConfigureAwait(true);
+        var menuCommandService = (OleMenuCommandService?)await GetServiceAsync(typeof(IMenuCommandService)).ConfigureAwait(true);
+        Assumes.Present(menuCommandService);
         StackTraceExplorerCommandHandler.Initialize(menuCommandService, this);
     }
 
diff --git a/src/VisualStudio/TestUtilities2/MockComponentModel.vb b/src/VisualStudio/TestUtilities2/MockComponentModel.vb
index 5ba9c94a9d75c..81e015d26e91d 100644
--- a/src/VisualStudio/TestUtilities2/MockComponentModel.vb
+++ b/src/VisualStudio/TestUtilities2/MockComponentModel.vb
@@ -18,13 +18,12 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests
             _exportProvider = exportProvider
         End Sub
 
-#Disable Warning BC40000 ' Type or member is obsolete
+        <Obsolete>
         Public ReadOnly Property DefaultCatalog As ComposablePartCatalog Implements IComponentModel.DefaultCatalog
             Get
                 Throw New NotImplementedException
             End Get
         End Property
-#Enable Warning BC40000 ' Type or member is obsolete
 
         Public ReadOnly Property DefaultCompositionService As ICompositionService Implements IComponentModel.DefaultCompositionService
             Get
@@ -38,6 +37,7 @@ Namespace Microsoft.VisualStudio.LanguageServices.UnitTests
             End Get
         End Property
 
+        <Obsolete>
         Public Function GetCatalog(catalogName As String) As ComposablePartCatalog Implements IComponentModel.GetCatalog
             Throw New NotImplementedException
         End Function

From f155e6b9f34dee85a316e7cdf73490ddfeb6a16f Mon Sep 17 00:00:00 2001
From: Tomas Matousek <tomat@microsoft.com>
Date: Mon, 28 Oct 2024 15:32:04 -0700
Subject: [PATCH 3/3] Editor

---
 eng/Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index 3747129f5afef..4b1707551e3af 100644
--- a/eng/Directory.Packages.props
+++ b/eng/Directory.Packages.props
@@ -8,7 +8,7 @@
     <_BasicReferenceAssembliesVersion>1.7.9</_BasicReferenceAssembliesVersion>
     <!-- CodeStyleAnalyzerVersion should we updated together with version of dotnet-format in dotnet-tools.json -->
     <CodeStyleAnalyzerVersion>4.8.0-3.final</CodeStyleAnalyzerVersion>
-    <VisualStudioEditorPackagesVersion>17.10.191</VisualStudioEditorPackagesVersion>
+    <VisualStudioEditorPackagesVersion>17.12.145-preview</VisualStudioEditorPackagesVersion>
     <ILAsmPackageVersion>9.0.0-rc.2.24462.10</ILAsmPackageVersion>
     <ILDAsmPackageVersion>6.0.0-rtm.21518.12</ILDAsmPackageVersion>
     <MicrosoftILVerificationVersion>7.0.0-alpha.1.22060.1</MicrosoftILVerificationVersion>