From effb755d428b66bb12fb965de1836ea5d8ecba73 Mon Sep 17 00:00:00 2001
From: tmat <tomas.matousek@microsoft.com>
Date: Fri, 1 Mar 2024 10:05:28 -0800
Subject: [PATCH] 17.10

---
 eng/Directory.Packages.props    | 62 ++++++++++++++++-----------------
 eng/generate-vssdk-versions.csx | 25 ++++++++++---
 2 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index 007be63e2f975..2d74de079840d 100644
--- a/eng/Directory.Packages.props
+++ b/eng/Directory.Packages.props
@@ -21,7 +21,7 @@
     <MicrosoftWindowsDesktopAppRuntimePackagesVersion>8.0.0</MicrosoftWindowsDesktopAppRuntimePackagesVersion>
     <xunitVersion>2.4.1</xunitVersion>
     <SqliteVersion>2.1.0</SqliteVersion>
-    <MicrosoftVisualStudioExtensibilityVersion>17.9.43-preview-1</MicrosoftVisualStudioExtensibilityVersion>
+    <MicrosoftVisualStudioExtensibilityVersion>17.10.22-preview-1</MicrosoftVisualStudioExtensibilityVersion>
   </PropertyGroup>
 
   <!--
@@ -43,9 +43,9 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotnetBuildFromSource)' != 'true' and '$(TargetFramework)' == 'net472'">
-    <PackageVersion Include="Microsoft.Build" Version="17.9.0-preview-23551-05" />
-    <PackageVersion Include="Microsoft.Build.Framework" Version="17.9.0-preview-23551-05" />
-    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.9.0-preview-23551-05" />
+    <PackageVersion Include="Microsoft.Build" Version="17.10.0-preview-24066-01" />
+    <PackageVersion Include="Microsoft.Build.Framework" Version="17.10.0-preview-24066-01" />
+    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.10.0-preview-24066-01" />
   </ItemGroup>
 
   <ItemGroup>
@@ -54,7 +54,7 @@
     <!--
       Visual Studio
     -->
-    <PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.9.35796-preview.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.10.234-preview.1" />
     <PackageVersion Include="Microsoft.Internal.VisualStudio.Shell.Framework" Version="17.9.35796-preview.1" />
     <PackageVersion Include="Microsoft.ServiceHub.Client" Version="4.2.1017" />
     <PackageVersion Include="Microsoft.VisualStudio.Extensibility" Version="$(MicrosoftVisualStudioExtensibilityVersion)" />
@@ -88,33 +88,31 @@
     <!--
       Subset of Microsoft.VisualStudio.Sdk meta-package (run `csi generate-vssdk-versions.csx` to update based on VSSDK meta-package).
     -->
-    <PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.7.29" />
-    <PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.9.80-preview" />
-    <PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.9.80-preview" />
-    <PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.9.35796-preview.1" />
-    <PackageVersion Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="17.9.35796-preview.1" />
-    <PackageVersion Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="17.9.80-preview" />
-    <PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client" Version="17.9.25-preview" />
-    <PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.9.80-preview" />
-    <PackageVersion Include="Microsoft.VisualStudio.Language" Version="17.9.80-preview" />
+    <PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.4.22" />
+    <PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.10.8-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers" Version="17.10.8-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.10.13-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.10.13-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.10.234-preview.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="17.10.157-preview.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Language" Version="17.10.13-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="17.10.13-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.10.13-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client" Version="17.10.11-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.RemoteControl" Version="16.3.52" />
-    <PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.9.5-alpha" />
-    <PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.9.35796-preview.1" />
-    <PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.9.13" />
-    <PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="17.9.80-preview" />
-    <PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="17.9.80-preview" />
-    <PackageVersion Include="Microsoft.VisualStudio.Text.UI" Version="17.9.80-preview" />
-    <PackageVersion Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="17.9.80-preview" />
-    <PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.9.3-alpha" />
+    <PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.10.3-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.10.234-preview.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.9.102" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="17.10.13-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="17.10.13-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.UI" Version="17.10.13-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="17.10.13-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.10.12-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.10.12-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.Utilities.Internal" Version="16.3.56" />
     <PackageVersion Include="Nerdbank.Streams" Version="2.10.69" />
     <PackageVersion Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
-    <PackageVersion Include="StreamJsonRpc" Version="2.17.9" />
-
-    <!-- TODO: workaround for https://github.com/dotnet/roslyn/issues/71377 -->
-    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.10.12-preview" />
-    <PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers" Version="17.7.40" />
-    <PackageVersion Include="Microsoft.ServiceHub.Framework" Version="4.4.22"/>
+    <PackageVersion Include="StreamJsonRpc" Version="2.18.6-preview" />
 
     <!--
       VS Debugger
@@ -188,7 +186,7 @@
     <PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
     <PackageVersion Include="System.Composition" Version="$(SystemCompositionVersion)" />
-    <PackageVersion Include="System.ComponentModel.Composition" Version="7.0.0" />
+    <PackageVersion Include="System.ComponentModel.Composition" Version="8.0.0" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
     <PackageVersion Include="System.Diagnostics.EventLog" Version="$(SystemDiagnosticsEventLogVersion)" />
     <PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
@@ -197,13 +195,13 @@
     <PackageVersion Include="System.Memory" Version="4.5.5" />
     <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
     <PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
-    <PackageVersion Include="System.Resources.Extensions" Version="7.0.0" />
+    <PackageVersion Include="System.Resources.Extensions" Version="8.0.0" />
     <PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="$(SystemSecurityCryptographyProtectedDataVersion)" />
     <PackageVersion Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" />
     <PackageVersion Include="System.Security.Principal" Version="4.3.0" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="7.0.0" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
     <PackageVersion Include="System.Text.Encoding.Extensions" Version="4.3.0" />
-    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="7.0.0" />
+    <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.0" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     <PackageVersion Include="System.Windows.Extensions" Version="$(SystemWindowsExtensionsVersion)" />
 
diff --git a/eng/generate-vssdk-versions.csx b/eng/generate-vssdk-versions.csx
index ceacfcaa4fd8f..00418d83313e0 100644
--- a/eng/generate-vssdk-versions.csx
+++ b/eng/generate-vssdk-versions.csx
@@ -30,7 +30,7 @@ if (!File.Exists(vssdkPackageSpecPath))
 
 var vssdkPackageSpec = XDocument.Parse(File.ReadAllText(vssdkPackageSpecPath));
 
-var properties = new List<string>();
+var properties = new List<(string packageId, string version)>();
 
 foreach (var node in vssdkPackageSpec.Descendants())
 {
@@ -44,6 +44,7 @@ foreach (var node in vssdkPackageSpec.Descendants())
 
         if (!id.StartsWith("Microsoft.VisualStudio") &&
             !id.StartsWith("Microsoft.ServiceHub") &&
+            !id.StartsWith("Microsoft.Build") &&
             id != "Newtonsoft.Json" &&
             id != "StreamJsonRpc" &&
             id != "Nerdbank.Streams")
@@ -56,15 +57,31 @@ foreach (var node in vssdkPackageSpec.Descendants())
             continue;
         }
 
-        properties.Add($"<PackageVersion Include=\"{id}\" Version=\"{version}\" />");
+        properties.Add((id, version));
     }
 }
 
 properties.Sort();
 
-foreach (var property in properties)
+var seenMsbuild = false;
+foreach (var (id, version) in properties)
 {
-    Console.WriteLine(property);
+    if (!id.StartsWith("Microsoft.Build"))
+    {
+        Console.WriteLine($"<PackageVersion Include=\"{id}\" Version=\"{version}\" />");
+    }
+    else if (!seenMsbuild)
+    {
+        Console.WriteLine($$"""
+            <ItemGroup Condition="'$(DotnetBuildFromSource)' != 'true' and '$(TargetFramework)' == 'net472'">
+              <PackageVersion Include="Microsoft.Build" Version="{{version}}" />
+              <PackageVersion Include="Microsoft.Build.Framework" Version="{{version}}" />
+              <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="{{version}}" />
+            </ItemGroup>
+            """);
+
+        seenMsbuild = true;
+    }
 }
 
 return 0;