From e75c661001abe8de7419e9ebf8133695a2814e8e Mon Sep 17 00:00:00 2001
From: Fred Silberberg <frsilb@microsoft.com>
Date: Thu, 20 Feb 2025 11:07:06 -0800
Subject: [PATCH] Update to release nuget packages (#77261)

* Update to release nuget packages

In order to publish 17.13 nuget packages, we need to update a few dependencies. I updated the minimum number of packages required from our public packages, then fixed up any restore issues. For each updated package, I then went and confirmed that the dll was actually present in 17.13.0, so we should be safe from dependency loading issues. This change does not need to be inserted into VS.

* Skip tests for https://github.com/microsoft/vs-solutionpersistence/issues/95

* Skip failing tests, see https://github.com/dotnet/roslyn/issues/77293.

(cherry picked from commit 33500363d0b80af7fe0171a4ebe16586a18d1e48)
---
 eng/Directory.Packages.props                  | 56 +++++++++----------
 .../CSharp/CSharpGoToImplementation.cs        |  4 +-
 .../CSharp/CSharpWinForms.cs                  |  8 +--
 .../Test/VisualStudioMSBuildWorkspaceTests.cs |  6 +-
 4 files changed, 38 insertions(+), 36 deletions(-)

diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props
index 4fcb5b88ff93a..464d35d10f954 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.13.226</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>
@@ -44,10 +44,10 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(TargetFramework)' == 'net472'">
-    <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" />
+    <PackageVersion Include="Microsoft.Build" Version="17.13.9" />
+    <PackageVersion Include="Microsoft.Build.Framework" Version="17.13.9" />
+    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.13.9" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.13.9" />
   </ItemGroup>
 
   <ItemGroup>
@@ -56,10 +56,10 @@
     <!--
       Visual Studio
     -->
-    <PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.12.39557-preview.2.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.13.40008" />
     <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.Sdk" Version="17.12.39557-preview.2.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.13.40008" />
     <PackageVersion Include="Microsoft.VisualStudio.Extensibility" Version="17.12.2037-preview3" />
     <PackageVersion Include="Microsoft.VisualStudio.Extensibility.JsonGenerators.Sdk" Version="17.12.2037-preview3" />
     <PackageVersion Include="Microsoft.VSSDK.Debugger.VSDConfigTool" Version="17.13.1100801-preview" />
@@ -91,31 +91,31 @@
       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.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" />
-    <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.ServiceHub.Framework" Version="4.8.3" />
+    <PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.12.20" />
+    <PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers" Version="17.12.20" />
+    <PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="17.13.226" />
+    <PackageVersion Include="Microsoft.VisualStudio.Editor" Version="17.13.226" />
+    <PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="17.13.40008" />
+    <PackageVersion Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="17.13.40008" />
+    <PackageVersion Include="Microsoft.VisualStudio.Language" Version="17.13.226" />
+    <PackageVersion Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="17.13.226" />
+    <PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="17.13.226" />
+    <PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client" Version="17.13.33" />
     <PackageVersion Include="Microsoft.VisualStudio.RemoteControl" Version="16.3.52" />
-    <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.RpcContracts" Version="17.13.7" />
+    <PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="17.13.40008" />
     <PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.14.2" />
-    <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.13-preview" />
-    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.12.13-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="17.13.226" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="17.13.226" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.UI" Version="17.13.226" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="17.13.226" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.13.2" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.2" />
     <PackageVersion Include="Microsoft.VisualStudio.Utilities.Internal" Version="16.3.90" />
     <PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="StreamJsonRpc" Version="2.20.8-beta" />
+    <PackageVersion Include="StreamJsonRpc" Version="2.21.10" />
     
     <!--
       VS Debugger
@@ -253,7 +253,7 @@
     <PackageVersion Include="Microsoft.VisualStudio.Extensibility.Testing.SourceGenerator" Version="$(MicrosoftVisualStudioExtensibilityTestingVersion)" />
     <PackageVersion Include="Microsoft.VisualStudio.Extensibility.Testing.Xunit" Version="$(MicrosoftVisualStudioExtensibilityTestingVersion)" />
     <PackageVersion Include="System.Management" Version="7.0.0" />
-    <PackageVersion Include="System.Drawing.Common" Version="8.0.0" />
+    <PackageVersion Include="System.Drawing.Common" Version="8.0.8" />
     <PackageVersion Include="NuGet.SolutionRestoreManager.Interop" Version="4.8.0" />
     <PackageVersion Include="Moq" Version="4.10.1" />
     <PackageVersion Include="System.CodeDom" Version="7.0.0" />
diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpGoToImplementation.cs b/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpGoToImplementation.cs
index b28bee4e12d44..ec9bc8da159ac 100644
--- a/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpGoToImplementation.cs
+++ b/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpGoToImplementation.cs
@@ -111,7 +111,9 @@ await TestServices.Editor.SetTextAsync(
     }
 
     [IdeTheory]
-    [CombinatorialData]
+    //[CombinatorialData]
+    [InlineData(false, Skip = "https://github.com/dotnet/roslyn/issues/77293")]
+    [InlineData(true)]
     public async Task GoToImplementationFromMetadataAsSource(bool asyncNavigation)
     {
         await TestServices.Editor.ConfigureAsyncNavigation(asyncNavigation ? AsyncNavigationKind.Asynchronous : AsyncNavigationKind.Synchronous, HangMitigatingCancellationToken);
diff --git a/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpWinForms.cs b/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpWinForms.cs
index d165adb26ceb4..f4aa270674050 100644
--- a/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpWinForms.cs
+++ b/src/VisualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpWinForms.cs
@@ -109,7 +109,7 @@ private void ExecuteWhenButtonClicked(object sender, EventArgs e)
     }", codeFileActualText);
     }
 
-    [IdeFact]
+    [IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/77293")]
     public async Task RenameControl()
     {
         var project = ProjectName;
@@ -146,7 +146,7 @@ await TestServices.Workspace.WaitForAllAsyncOperationsAsync(
         Assert.DoesNotContain(@"private System.Windows.Forms.Button SomeButton;", actualText);
     }
 
-    [IdeFact]
+    [IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/77293")]
     public async Task RemoveEventHandler()
     {
         var project = ProjectName;
@@ -176,7 +176,7 @@ await TestServices.Workspace.WaitForAllAsyncOperationsAsync(
         Assert.DoesNotContain(@"VisualStudio.Editor.SomeButton.Click += new System.EventHandler(VisualStudio.Editor.GooHandler);", actualText);
     }
 
-    [IdeFact]
+    [IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/77293")]
     public async Task ChangeAccessibility()
     {
         var project = ProjectName;
@@ -205,7 +205,7 @@ await TestServices.Workspace.WaitForAllAsyncOperationsAsync(
         var actualText = await TestServices.Editor.GetTextAsync(HangMitigatingCancellationToken);
         Assert.Contains(@"public System.Windows.Forms.Button SomeButton;", actualText);
     }
-    [IdeFact]
+    [IdeFact(Skip = "https://github.com/dotnet/roslyn/issues/77293")]
     public async Task DeleteControl()
     {
         if (ExecutionConditionUtil.IsBitness64)
diff --git a/src/Workspaces/MSBuild/Test/VisualStudioMSBuildWorkspaceTests.cs b/src/Workspaces/MSBuild/Test/VisualStudioMSBuildWorkspaceTests.cs
index a266d2f7995c8..1a13e707c5e97 100644
--- a/src/Workspaces/MSBuild/Test/VisualStudioMSBuildWorkspaceTests.cs
+++ b/src/Workspaces/MSBuild/Test/VisualStudioMSBuildWorkspaceTests.cs
@@ -199,7 +199,7 @@ private static MetadataReference GetMetadataReferenceByAlias(Project project, st
         private static Metadata GetMetadata(MetadataReference metadataReference)
             => ((PortableExecutableReference)metadataReference).GetMetadata();
 
-        [ConditionalFact(typeof(VisualStudioMSBuildInstalled))]
+        [ConditionalFact(typeof(VisualStudioMSBuildInstalled), AlwaysSkip = "https://github.com/microsoft/vs-solutionpersistence/issues/95")]
         [WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/552981")]
         public async Task TestOpenSolution_DuplicateProjectGuids()
         {
@@ -2713,7 +2713,7 @@ public async Task TestOpenSolution_SolutionFileHasMissingEndProject()
             }
         }
 
-        [ConditionalFact(typeof(VisualStudioMSBuildInstalled))]
+        [ConditionalFact(typeof(VisualStudioMSBuildInstalled), AlwaysSkip = "https://github.com/microsoft/vs-solutionpersistence/issues/95")]
         [WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/792912")]
         public async Task TestOpenSolution_WithDuplicatedGuidsBecomeSelfReferential()
         {
@@ -2739,7 +2739,7 @@ public async Task TestOpenSolution_WithDuplicatedGuidsBecomeSelfReferential()
             Assert.Empty(libraryProject.AllProjectReferences);
         }
 
-        [ConditionalFact(typeof(VisualStudioMSBuildInstalled))]
+        [ConditionalFact(typeof(VisualStudioMSBuildInstalled), AlwaysSkip = "https://github.com/microsoft/vs-solutionpersistence/issues/95")]
         [WorkItem("http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/792912")]
         public async Task TestOpenSolution_WithDuplicatedGuidsBecomeCircularReferential()
         {