Merge main to runtime async branch

.github/CODEOWNERS

@@ -9,8 +9,6 @@ docs/compilers @dotnet/roslyn-compiler
 docs/ide @dotnet/roslyn-ide
 
 eng/ @dotnet/roslyn-infrastructure
-/eng/DotNetBuild.props @dotnet/product-construction
-/eng/SourceBuild* @dotnet/source-build
 scripts/ @dotnet/roslyn-infrastructure
 
 src/Analyzers/ @dotnet/roslyn-ide

.github/policies/resourceManagement.yml

@@ -55,6 +55,8 @@ configuration:
             branch: main
         - targetsBranch:
             branch: main-vs-deps
+        - targetsBranch:
+            branch: community
       - and:
         - isAction:
             action: Closed

.github/workflows/main-merge.yml

@@ -21,6 +21,6 @@ jobs:
     if: github.repository == 'dotnet/roslyn'
     uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main
     with:
-      configuration_file_path: 'eng/config/main-to-main-vs-deps-branch-merge.jsonc'
+      configuration_file_path: 'eng/config/community-to-main-branch-merge.jsonc'
       configuration_file_branch: ${{ inputs.configuration_file_branch || 'main' }}
 

azure-pipelines-integration-dartlab.yml

@@ -22,7 +22,7 @@ resources:
     name: internal/dotnet-roslyn
     ref: $(Build.SourceBranch)
     trigger:
-    - main-vs-deps
+    - main
 
 parameters:
   - name: prNumber

azure-pipelines-integration-lsp.yml

@@ -6,6 +6,7 @@ trigger:
     include:
     - main
     - main-vs-deps
+    - community
     - release/*
     - features/*
     - demos/*
@@ -24,6 +25,7 @@ pr:
     include:
     - main
     - main-vs-deps
+    - community
     - release/*
     - features/*
     - demos/*

azure-pipelines-integration-scouting.yml

@@ -10,6 +10,7 @@ schedules:
     include:
     - main
     - main-vs-deps
+    - community
 
 variables:
 - name: Codeql.Enabled

azure-pipelines-integration.yml

@@ -4,6 +4,7 @@ trigger:
     include:
     - main
     - main-vs-deps
+    - community
     - release/*
     - features/*
     - demos/*
@@ -20,6 +21,7 @@ pr:
     include:
     - main
     - main-vs-deps
+    - community
     - release/*
     - features/*
     - demos/*

azure-pipelines-official.yml

@@ -3,6 +3,7 @@ trigger:
     include:
     - main
     - main-vs-deps
+    - community
     - release/dev16.*-vs-deps
     - release/dev17.*
     - release/dev18.*
@@ -111,6 +112,7 @@ extends:
   parameters:
     featureFlags:
       autoBaseline: true
+      incrementalSDLBinaryAnalysis: false
     sdl:
       sourceAnalysisPool:
         name: NetCore1ESPool-Svc-Internal
@@ -127,7 +129,7 @@ extends:
         configFile: '$(Build.SourcesDirectory)/eng/TSAConfig.gdntsa'
     pool:
       name: NetCore1ESPool-Svc-Internal
-      image: windows.vs2022preview.amd64
+      image: windows.vs2022preview.scout.amd64
       os: windows
     customBuildTags:
     - ES365AIMigrationTooling
@@ -137,11 +139,11 @@ extends:
       displayName: Build and Test
 
       jobs:
-      - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.13') }}:
+      - ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/release/dev17.14') }}:
         - template: /eng/common/templates-official/job/onelocbuild.yml@self
           parameters:
             MirrorRepo: roslyn
-            MirrorBranch: release/dev17.13
+            MirrorBranch: release/dev17.14
             LclSource: lclFilesfromPackage
             LclPackageId: 'LCL-JUNO-PROD-ROSLYN'
 

azure-pipelines.yml

@@ -2,6 +2,7 @@
 trigger:
 - main
 - main-vs-deps
+- community
 - release/*
 - features/*
 - demos/*
@@ -12,6 +13,7 @@ pr:
     include:
     - main
     - main-vs-deps
+    - community
     - release/*
     - features/*
     - demos/*
@@ -55,10 +57,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

@@ -3,11 +3,11 @@
     <!-- Versions used by several individual references below -->
     <RoslynDiagnosticsNugetPackageVersion>3.11.0-beta1.24081.1</RoslynDiagnosticsNugetPackageVersion>
     <MicrosoftCodeAnalysisTestingVersion>1.1.3-beta1.24319.1</MicrosoftCodeAnalysisTestingVersion>
-    <MicrosoftVisualStudioExtensibilityTestingVersion>0.1.796-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
+    <MicrosoftVisualStudioExtensibilityTestingVersion>0.1.800-beta</MicrosoftVisualStudioExtensibilityTestingVersion>
     <_BasicReferenceAssembliesVersion>1.8.3</_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.332-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>
@@ -45,10 +45,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-25353-11" />
+    <PackageVersion Include="Microsoft.Build.Framework" Version="17.15.0-preview-25353-11" />
+    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="17.15.0-preview-25353-11" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.15.0-preview-25353-11" />
   </ItemGroup>
 
   <ItemGroup>
@@ -57,12 +57,12 @@
     <!--
       Visual Studio
     -->
-    <PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.13.40008" />
-    <PackageVersion Include="Microsoft.Internal.VisualStudio.Shell.Framework" Version="17.12.40391" />
-    <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.VisualStudio.SDK" Version="18.0.2101-preview.1" />
+    <PackageVersion Include="Microsoft.Internal.VisualStudio.Shell.Framework" Version="18.0.1211-preview.1" />
+    <PackageVersion Include="Microsoft.ServiceHub.Client" Version="4.6.3200" />
+    <PackageVersion Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="18.0.52-preview1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Extensibility" Version="18.0.52-preview1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Extensibility.JsonGenerators.Sdk" Version="18.0.52-preview1" />
     <PackageVersion Include="Microsoft.VSSDK.Debugger.VSDConfigTool" Version="17.13.1100801-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.ProjectSystem" Version="17.0.77-pre-g62a6cb5699" />
     <PackageVersion Include="Microsoft.VisualStudio.CallHierarchy.Package.Definitions" Version="15.8.27812-alpha" />
@@ -74,7 +74,7 @@
     <PackageVersion Include="Microsoft.VisualStudio.LiveShare.WebEditors" Version="3.0.8" />
     <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.Search" Version="17.14.39337" />
     <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="Microsoft.VisualStudio.Copilot.Roslyn.SemanticSearch" Version="18.0.533-alpha" />
@@ -90,29 +90,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.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.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.11-beta" />
+    <PackageVersion Include="Microsoft.VisualStudio.Composition" Version="17.13.50" />
+    <PackageVersion Include="Microsoft.VisualStudio.Composition.Analyzers" Version="17.13.50" />
+    <PackageVersion Include="Microsoft.VisualStudio.CoreUtility" Version="18.0.332-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Editor" Version="18.0.332-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.ImageCatalog" Version="18.0.2101-preview.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Imaging" Version="18.0.2101-preview.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="18.0.2077-preview.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Language" Version="18.0.332-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Language.NavigateTo.Interfaces" Version="18.0.332-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Language.StandardClassification" Version="18.0.332-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.LanguageServer.Client" Version="18.0.14-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.RemoteControl" Version="16.3.52" />
-    <PackageVersion Include="Microsoft.VisualStudio.RpcContracts" Version="17.13.7" />
-    <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.25-pre" />
+    <PackageVersion Include="Microsoft.VisualStudio.Shell.15.0" Version="18.0.2101-preview.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Telemetry" Version="18.0.22" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.Data" Version="18.0.332-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.Logic" Version="18.0.332-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.UI" Version="18.0.332-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Text.UI.Wpf" Version="18.0.332-preview" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.15.20-alpha" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.15.20-alpha" />
+    <PackageVersion Include="Microsoft.VisualStudio.Utilities" Version="18.0.2101-preview.1" />
     <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.39-alpha" />
 
     <!--
       VS Debugger
@@ -260,7 +264,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/Version.Details.props

@@ -10,7 +10,7 @@ This file should be imported by eng/Versions.props
     <MicrosoftCodeAnalysisPackageVersion>3.11.0</MicrosoftCodeAnalysisPackageVersion>
     <MicrosoftNetCompilersToolsetPackageVersion>4.10.0-1.24061.4</MicrosoftNetCompilersToolsetPackageVersion>
     <!-- dotnet/dotnet dependencies -->
-    <SystemCommandLinePackageVersion>2.0.0-rc.1.25406.102</SystemCommandLinePackageVersion>
+    <SystemCommandLinePackageVersion>2.0.0-rc.2.25416.109</SystemCommandLinePackageVersion>
     <!-- dotnet/runtime dependencies -->
     <MicrosoftBclAsyncInterfacesPackageVersion>9.0.0</MicrosoftBclAsyncInterfacesPackageVersion>
     <MicrosoftExtensionsConfigurationPackageVersion>9.0.0</MicrosoftExtensionsConfigurationPackageVersion>

eng/Version.Details.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="30bc8f92be07c2c8c3a6addb946877260e042f63" BarId="278224" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="roslyn" Sha="7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e" BarId="279809" />
   <ProductDependencies>
     <!-- RoslynAnalyzers reference older builds of Roslyn and this is necessary for SourceBuild. -->
     <Dependency Name="Microsoft.CodeAnalysis" Version="3.11.0">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>ae1fff344d46976624e68ae17164e0607ab68b10</Sha>
     </Dependency>
-    <Dependency Name="System.CommandLine" Version="2.0.0-rc.1.25406.102">
+    <Dependency Name="System.CommandLine" Version="2.0.0-rc.2.25416.109">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>30bc8f92be07c2c8c3a6addb946877260e042f63</Sha>
+      <Sha>7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e</Sha>
     </Dependency>
     <!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
     <Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="9.0.0">

eng/Versions.props

@@ -32,7 +32,7 @@
     <SystemValueTupleVersion>4.6.1</SystemValueTupleVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
-    <MicrosoftIORedistVersion>6.0.1</MicrosoftIORedistVersion>
+    <MicrosoftIORedistVersion>6.1.0</MicrosoftIORedistVersion>
     <SystemBuffersVersion>4.6.0</SystemBuffersVersion>
     <!--
     Microsoft.TeamFoundationServer.Client is referencing System.Data.SqlClient causing CG alert

eng/build.ps1

@@ -266,7 +266,6 @@ function BuildSolution() {
   $roslynUseHardLinks = if ($ci) { "/p:ROSLYNUSEHARDLINKS=true" } else { "" }
 
   try {
-    # TODO: Remove DotNetBuildRepo property when roslyn is on Arcade 10
     MSBuild $toolsetBuildProj `
       $bl `
       /p:Configuration=$configuration `
@@ -287,7 +286,6 @@ function BuildSolution() {
       /p:IbcOptimizationDataDir=$ibcDir `
       /p:VisualStudioIbcDrop=$ibcDropName `
       /p:VisualStudioDropAccessToken=$officialVisualStudioDropAccessToken `
-      /p:DotNetBuildRepo=$productBuild `
       /p:DotNetBuild=$productBuild `
       /p:DotNetBuildFromVMR=$fromVMR `
       $suppressExtensionDeployment `

eng/build.sh

@@ -297,7 +297,6 @@ function BuildSolution {
   # /p:TreatWarningsAsErrors=true so that compiler reported warnings, other than IDE0055 are treated as errors. 
   # Warnings reported from other msbuild tasks are not treated as errors for now.
 
-  # TODO: Remove DotNetBuildRepo property when roslyn is on Arcade 10
   MSBuild $toolset_build_proj \
     $bl \
     /p:Configuration=$configuration \
@@ -316,7 +315,6 @@ function BuildSolution {
     /p:TreatWarningsAsErrors=true \
     /p:TestRuntimeAdditionalArguments=$test_runtime_args \
     /p:DotNetBuildSourceOnly=$source_build \
-    /p:DotNetBuildRepo=$product_build \
     /p:DotNetBuild=$product_build \
     /p:DotNetBuildFromVMR=$from_vmr \
     $test_runtime \

eng/config/PublishData.json

@@ -94,6 +94,7 @@
       "Microsoft.CodeAnalysis.Remote.Razor.ServiceHub": "vs-impl",
       "Microsoft.CodeAnalysis.Remote.ServiceHub": "vs-impl",
       "Microsoft.CodeAnalysis.Remote.Workspaces": "vs-impl",
+      "Microsoft.CodeAnalysis.SemanticSearch.Extensions": "vs-impl",
       "Microsoft.CodeAnalysis.SemanticSearch.ReferenceAssemblies": "vs-impl",
       "Microsoft.VisualStudio.LanguageServices.LiveShare": "vs-impl",
       "Microsoft.VisualStudio.LanguageServices.Razor.RemoteClient": "vs-impl",
@@ -186,7 +187,7 @@
       "insertionTitlePrefix": "[Validation]",
       "insertionCreateDraftPR": true
     },
-    "main": {
+    "community": {
       "nugetKind": [
         "Shipping",
         "NonShipping"
@@ -195,7 +196,7 @@
       "insertionCreateDraftPR": true,
       "insertionTitlePrefix": "[Validation]"
     },
-    "main-vs-deps": {
+    "main": {
       "nugetKind": [
         "Shipping",
         "NonShipping"

eng/config/main-to-main-vs-deps-branch-merge.jsonc → eng/config/community-to-main-branch-merge.jsonc

@@ -1,9 +1,9 @@
 // Used by .github/workflows/main-merge.yml
 {
     "merge-flow-configurations": {
-        // Merge any main changes to main-vs-deps.
-        "main": {
-            "MergeToBranch": "main-vs-deps",
+        // Merge any community changes to main.
+        "community": {
+            "MergeToBranch": "main",
             "ExtraSwitches": "-QuietComments"
         }
     }