Second attempt at updating versions

azure-pipelines-integration.yml

@@ -68,7 +68,7 @@ parameters:
 - name: queueName
   displayName: Queue Name
   type: string
-  default: windows.vs2022preview.amd64.open
+  default: windows.vs2022preview.scout.amd64.open
   values:
   - windows.vs2022.amd64.open
   - windows.vs2022.scout.amd64.open

azure-pipelines.yml

@@ -55,10 +55,12 @@ variables:
       value: NetCore1ESPool-Internal
 
   - name: Vs2022PreviewQueueName
+    # As of 2025-06-12, the non-scouting queue does not have a new enough of an MSBuild to build Roslyn; use the scouting
+    # queue which is on 17.14. This likely can be removed by 2025-06-18 when the upgrade to 17.14 Preview 4 is scheduled to complete.
     ${{ if eq(variables['System.TeamProject'], 'public') }}:
-      value: windows.vs2022preview.amd64.open
+      value: windows.vs2022preview.scout.amd64.open
     ${{ else }}:
-      value: windows.vs2022preview.amd64
+      value: windows.vs2022preview.scout.amd64
 
   - name: Vs2022RegularQueueName
     ${{ if eq(variables['System.TeamProject'], 'public') }}:

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.13.226</VisualStudioEditorPackagesVersion>
+    <VisualStudioEditorPackagesVersion>18.0.231-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>
@@ -46,10 +46,10 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true' and '$(TargetFramework)' == 'net472'">
-    <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" />
+    <PackageVersion Include="Microsoft.Build" Version="17.15.0-preview-25279-04" />
+    <PackageVersion Include="Microsoft.Build.Framework" Version="17.15.0-preview-25279-04" />
+    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.15.0-preview-25279-04" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25279-04" />
   </ItemGroup>
 
   <ItemGroup>
@@ -58,13 +58,14 @@
     <!--
       Visual Studio
     -->
-    <PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.13.40008" />
-    <PackageVersion Include="Microsoft.Internal.VisualStudio.Shell.Framework" Version="17.9.36524" />
+    <PackageVersion Include="Microsoft.VisualStudio.SDK" Version="18.0.1306-preview.1" />
+    <PackageVersion Include="Microsoft.Internal.VisualStudio.Shell.Framework" Version="18.0.1211-preview.1" />
     <PackageVersion Include="Microsoft.ServiceHub.Client" Version="4.2.1017" />
     <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" />
+    <PackageVersion Include="Microsoft.VisualStudio.Imaging" Version="18.0.1306-preview.1" />
     <PackageVersion Include="Microsoft.VisualStudio.ProjectSystem" Version="17.0.77-pre-g62a6cb5699" />
     <PackageVersion Include="Microsoft.VisualStudio.Progression.CodeSchema" Version="15.8.27812-alpha" />
     <PackageVersion Include="Microsoft.VisualStudio.Progression.Common" Version="15.8.27812-alpha" />
@@ -79,6 +80,7 @@
     <PackageVersion Include="Microsoft.VisualStudio.InteractiveWindow" Version="4.0.0" />
     <PackageVersion Include="Microsoft.VisualStudio.VsInteractiveWindow" Version="4.0.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Search" Version="17.10.961-preview.2" />
+    <PackageVersion Include="Microsoft.VisualStudio.Utilities" Version="18.0.1306-preview.1" />
     <PackageVersion Include="Microsoft.VisualStudio.WinForms.Interfaces" Version="17.0.0-previews-4-31709-430" />
     <PackageVersion Include="Microsoft.VisualStudio.Workspace.VSIntegration" Version="17.9.29-preview-0001" />
     <PackageVersion Include="VsWebSite.Interop" Version="8.0.50727" />
@@ -93,31 +95,32 @@
       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.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.ServiceHub.Framework" Version="4.9.7-beta" />
+    <PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.13.44" />
+    <PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers" Version="17.13.44" />
+    <PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="18.0.231-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Editor" Version="18.0.231-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="18.0.1306-preview.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="18.0.1299-preview.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Language" Version="18.0.231-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Language.Intellisense" Version="18.0.231-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="18.0.231-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="18.0.231-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client" Version="18.0.12-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.RemoteControl" Version="16.3.52" />
-    <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.8" />
-    <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.RpcContracts" Version="17.15.10-pre" />
+    <PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="18.0.1306-preview.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="17.14.18" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="18.0.231-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="18.0.231-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.UI" Version="18.0.231-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="18.0.231-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.15.3-alpha" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.15.3-alpha" />
     <PackageVersion Include="Microsoft.VisualStudio.Utilities.Internal" Version="16.3.90" />
-    <PackageVersion Include="Nerdbank.Streams" Version="2.11.79" />
+    <PackageVersion Include="Nerdbank.Streams" Version="2.12.87" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="StreamJsonRpc" Version="2.21.10" />
+    <PackageVersion Include="StreamJsonRpc" Version="2.23.8-alpha" />
 
     <!--
       VS Debugger
@@ -265,7 +268,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.8" />
+    <PackageVersion Include="System.Drawing.Common" Version="9.0.0" />
     <PackageVersion Include="NuGet.SolutionRestoreManager.Interop" Version="4.8.0" />
     <PackageVersion Include="Moq" Version="4.10.1" />
     <PackageVersion Include="System.CodeDom" Version="8.0.0" />

eng/Versions.props

@@ -31,17 +31,17 @@
     <SystemValueTupleVersion>4.6.1</SystemValueTupleVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
-    <MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
-    <SystemBuffersVersion>4.5.1</SystemBuffersVersion>
+    <MicrosoftIORedistVersion>6.1.0</MicrosoftIORedistVersion>
+    <SystemBuffersVersion>4.6.0</SystemBuffersVersion>
     <!--
     Microsoft.TeamFoundationServer.Client is referencing System.Data.SqlClient causing CG alert
     When it updates its referenced System.Data.SqlClient version this should be removed
     -->
     <SystemDataSqlClientVersion>4.8.6</SystemDataSqlClientVersion>
-    <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
-    <SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>
-    <SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
-    <SystemThreadingTasksExtensionsVersion>4.5.4</SystemThreadingTasksExtensionsVersion>
+    <SystemMemoryVersion>4.6.0</SystemMemoryVersion>
+    <SystemNumericsVectorsVersion>4.6.0</SystemNumericsVectorsVersion>
+    <SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
+    <SystemThreadingTasksExtensionsVersion>4.6.0</SystemThreadingTasksExtensionsVersion>
     <SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
   </PropertyGroup>
   <!--

src/EditorFeatures/Test/Formatting/InferredIndentationTests.cs

@@ -18,7 +18,7 @@ namespace Microsoft.CodeAnalysis.Editor.UnitTests.Formatting;
 [UseExportProvider]
 public sealed class InferredIndentationTests
 {
-    [Fact]
+    [WpfFact]
     public async Task BlankFileMatchesWorkspaceSettings()
     {
         using var testWorkspace = CreateWithLines(
@@ -28,7 +28,7 @@ public async Task BlankFileMatchesWorkspaceSettings()
         Assert.Equal(FormattingOptions.UseTabs.DefaultValue, options.UseTabs);
     }
 
-    [Fact, WorkItem("https://github.com/dotnet/roslyn/issues/61109")]
+    [WpfFact, WorkItem("https://github.com/dotnet/roslyn/issues/61109")]
     public async Task SingleLineWithTab()
     {
         using var testWorkspace = CreateWithLines(
@@ -42,7 +42,7 @@ public async Task SingleLineWithTab()
         Assert.False(options.UseTabs);
     }
 
-    [Fact]
+    [WpfFact]
     public async Task SingleLineWithFourSpaces()
     {
         using var testWorkspace = CreateWithLines(

src/EditorFeatures/TestUtilities/Workspaces/TestWorkspaceFixture.cs

@@ -116,7 +116,7 @@ private void CloseTextView()
         // Brushes are DispatcherObjects, they are tied to the thread they are created on. Since we're going
         // to be run on a different thread, clear out their collection.
         var textFormattingRunPropertiesType = typeof(VisualStudio.Text.Formatting.TextFormattingRunProperties);
-        var existingPropertiesField = textFormattingRunPropertiesType.GetField("ExistingProperties", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static);
+        var existingPropertiesField = textFormattingRunPropertiesType.GetField("s_existingProperties", System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static);
         var existingProperties = (List<VisualStudio.Text.Formatting.TextFormattingRunProperties>)existingPropertiesField.GetValue(null);
         existingProperties.Clear();
     }

src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.csproj

@@ -100,6 +100,7 @@
       <_Dependency Remove="@(_Dependency)" Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').StartsWith('Microsoft.ServiceHub.'))"/>
       <_Dependency Remove="@(_Dependency)" Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').StartsWith('System.Composition.'))"/>
       <_Dependency Remove="@(_Dependency)" Condition="$([MSBuild]::ValueOrDefault('%(Identity)', '').StartsWith('Microsoft.Internal.VisualStudio.'))"/>
+      <_Dependency Remove="Azure.Core"/>
       <_Dependency Remove="EnvDTE"/>
       <_Dependency Remove="EnvDTE80"/>
       <_Dependency Remove="EnvDTE90"/>
@@ -128,6 +129,7 @@
       <_Dependency Remove="stdole"/>
       <_Dependency Remove="StreamJsonRpc"/>
       <_Dependency Remove="System.Buffers" />
+      <_Dependency Remove="System.ClientModel"/>
       <_Dependency Remove="System.Collections.Immutable"/>
       <_Dependency Remove="System.Configuration.ConfigurationManager"/>
       <_Dependency Remove="System.Diagnostics.DiagnosticSource"/>
@@ -136,6 +138,7 @@
       <_Dependency Remove="System.IO.Packaging"/>
       <_Dependency Remove="System.IO.Pipelines"/>
       <_Dependency Remove="System.Memory"/>
+      <_Dependency Remove="System.Memory.Data"/>
       <_Dependency Remove="System.Numerics.Vectors"/>
       <_Dependency Remove="System.Reflection.Metadata"/>
       <_Dependency Remove="System.Reflection.MetadataLoadContext"/>

src/Tools/BuildActionTelemetryTable/BuildActionTelemetryTable.csproj

@@ -18,10 +18,6 @@
     <ProjectReference Include="..\..\Workspaces\VisualBasic\Portable\Microsoft.CodeAnalysis.VisualBasic.Workspaces.vbproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.LanguageServer.Client" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Include="..\..\Compilers\Core\Portable\InternalUtilities\Hash.cs" Link="Utilities\Hash.cs" />
     <Compile Include="..\..\Workspaces\Core\Portable\Shared\Extensions\TelemetryExtensions.cs" Link="Utilities\TelemetryExtensions.cs" />

src/VisualStudio/CSharp/Test/CallHierarchy/CSharpCallHierarchyTests.cs

@@ -217,7 +217,7 @@ void Baz()
         testState.VerifyResult(root, string.Format(EditorFeaturesResources.Calls_To_Base_Member_0, "N.C.Goo()"), ["N.D.Bar()"]);
     }
 
-    [WpfFact]
+    [WpfFact(Skip = "https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2506733")]
     public async Task FieldInitializers()
     {
         var text = """

src/VisualStudio/Core/Def/CallHierarchy/CallHierarchyProvider.cs

@@ -2,12 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.ComponentModel.Composition;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -33,15 +32,28 @@ internal sealed partial class CallHierarchyProvider
     private readonly Lazy<IStreamingFindUsagesPresenter> _streamingPresenter;
 
     public IThreadingContext ThreadingContext { get; }
-    public IGlyphService GlyphService { get; }
+
+    [AllowNull]
+    public IGlyphService GlyphService
+    {
+        get
+        {
+            // Work around https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2506733; we don't expect to need this in unit tests
+            // so we'll keep the property non-nullable. Once the editor bug is fixed, we can revert this to an autoprop again.
+            Contract.ThrowIfNull(field, "We must be in unit tests and didn't get a IGlyphService, but a test still needs it.");
+
+            return field;
+        }
+        set { field = value!; }
+    }
 
     [ImportingConstructor]
     [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
     public CallHierarchyProvider(
         IThreadingContext threadingContext,
         IUIThreadOperationExecutor threadOperationExecutor,
         IAsynchronousOperationListenerProvider listenerProvider,
-        IGlyphService glyphService,
+        [Import(AllowDefault = true)] IGlyphService? glyphService, // AllowDefault = true to work around https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2506733
         Lazy<IStreamingFindUsagesPresenter> streamingPresenter)
     {
         AsyncListener = listenerProvider.GetListener(FeatureAttribute.CallHierarchy);
@@ -51,7 +63,7 @@ public CallHierarchyProvider(
         _streamingPresenter = streamingPresenter;
     }
 
-    public async Task<CallHierarchyItem> CreateItemAsync(
+    public async Task<CallHierarchyItem?> CreateItemAsync(
         ISymbol symbol, Project project, ImmutableArray<Location> callsites, CancellationToken cancellationToken)
     {
         if (symbol.Kind is SymbolKind.Method or
@@ -119,9 +131,9 @@ SymbolKind.Event or
                 finders.Add(new CallToOverrideFinder(symbol, project.Id, AsyncListener, this));
             }
 
-            if (symbol.GetOverriddenMember() != null)
+            if (symbol.GetOverriddenMember() is ISymbol overridenMember)
             {
-                finders.Add(new BaseMemberFinder(symbol.GetOverriddenMember(), project.Id, AsyncListener, this));
+                finders.Add(new BaseMemberFinder(overridenMember, project.Id, AsyncListener, this));
             }
 
             var implementedInterfaceMembers = await SymbolFinder.FindImplementedInterfaceMembersAsync(symbol, project.Solution, cancellationToken: cancellationToken).ConfigureAwait(false);

src/VisualStudio/Setup.Dependencies/Roslyn.VisualStudio.Setup.Dependencies.csproj

@@ -32,7 +32,6 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Console" ForceIncludeInVsix="true" PkgDefEntry="BindingRedirect" />
     <PackageReference Include="Microsoft.Extensions.Options" ForceIncludeInVsix="true" PkgDefEntry="BindingRedirect" />
     <PackageReference Include="Microsoft.Extensions.Primitives" ForceIncludeInVsix="true" PkgDefEntry="BindingRedirect" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading" ForceIncludeInVsix="true" PkgDefEntry="BindingRedirect" />
     <PackageReference Include="System.Buffers" ForceIncludeInVsix="true" PkgDefEntry="BindingRedirect" />
     <PackageReference Include="System.CodeDom" ForceIncludeInVsix="true" PkgDefEntry="BindingRedirect" />
     <PackageReference Include="System.Collections.Immutable" ForceIncludeInVsix="true" PkgDefEntry="BindingRedirect" />
@@ -49,7 +48,6 @@
     <PackageReference Include="System.Composition.Runtime" ForceIncludeInVsix="true" PkgDefEntry="BindingRedirect" VersionOverride="$(SystemCompositionVersion)" />
     <PackageReference Include="System.Composition.TypedParts" ForceIncludeInVsix="true" PkgDefEntry="BindingRedirect" VersionOverride="$(SystemCompositionVersion)" />
 
-    <PackageReference Include="System.Drawing.Common" ForceIncludeInVsix="true" PkgDefEntry="BindingRedirect" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" ForceIncludeInVsix="true" PkgDefEntry="BindingRedirect" />
     <PackageReference Include="System.Diagnostics.EventLog" ForceIncludeInVsix="true" PkgDefEntry="BindingRedirect" />
     <PackageReference Include="System.IO.Hashing" ForceIncludeInVsix="true" PkgDefEntry="BindingRedirect" />