From 68398a5e7e1a3b59dce33563e5ca17d36789eb31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Jul 2026 02:02:53 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/roslyn build 20260709.4 On relative base path root Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.Compilers , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.EditorFeatures , Microsoft.CodeAnalysis.EditorFeatures.Text , Microsoft.CodeAnalysis.ExternalAccess.FSharp , Microsoft.CodeAnalysis.Features , Microsoft.VisualStudio.LanguageServices From Version 5.10.0-1.26358.9 -> To Version 5.10.0-1.26359.4 --- eng/Version.Details.props | 16 ++++++++-------- eng/Version.Details.xml | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index b6eb37c7f68..feb34be7224 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -19,14 +19,14 @@ This file should be imported by eng/Versions.props 1.0.0-prerelease.26318.1 1.0.0-prerelease.26318.1 - 5.10.0-1.26358.9 - 5.10.0-1.26358.9 - 5.10.0-1.26358.9 - 5.10.0-1.26358.9 - 5.10.0-1.26358.9 - 5.10.0-1.26358.9 - 5.10.0-1.26358.9 - 5.10.0-1.26358.9 + 5.10.0-1.26359.4 + 5.10.0-1.26359.4 + 5.10.0-1.26359.4 + 5.10.0-1.26359.4 + 5.10.0-1.26359.4 + 5.10.0-1.26359.4 + 5.10.0-1.26359.4 + 5.10.0-1.26359.4 10.0.2 10.0.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d0852f8158..ab6f7f51c7c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,37 +18,37 @@ https://github.com/dotnet/msbuild 98935500d8efcb66c1f32927cb2976ea067172d2 - + https://github.com/dotnet/roslyn - 35967bab3447f7edd6162baee7048f801f18fffe + eb9b56c32a8c535140f19b9561fdb01ac4225254 - + https://github.com/dotnet/roslyn - 35967bab3447f7edd6162baee7048f801f18fffe + eb9b56c32a8c535140f19b9561fdb01ac4225254 - + https://github.com/dotnet/roslyn - 35967bab3447f7edd6162baee7048f801f18fffe + eb9b56c32a8c535140f19b9561fdb01ac4225254 - + https://github.com/dotnet/roslyn - 35967bab3447f7edd6162baee7048f801f18fffe + eb9b56c32a8c535140f19b9561fdb01ac4225254 - + https://github.com/dotnet/roslyn - 35967bab3447f7edd6162baee7048f801f18fffe + eb9b56c32a8c535140f19b9561fdb01ac4225254 - + https://github.com/dotnet/roslyn - 35967bab3447f7edd6162baee7048f801f18fffe + eb9b56c32a8c535140f19b9561fdb01ac4225254 - + https://github.com/dotnet/roslyn - 35967bab3447f7edd6162baee7048f801f18fffe + eb9b56c32a8c535140f19b9561fdb01ac4225254 - + https://github.com/dotnet/roslyn - 35967bab3447f7edd6162baee7048f801f18fffe + eb9b56c32a8c535140f19b9561fdb01ac4225254 From 4b1a3a41a7a42407db56460c030474d127da6cf4 Mon Sep 17 00:00:00 2001 From: Copilot Date: Fri, 10 Jul 2026 11:17:00 +0200 Subject: [PATCH 2/6] Fix NU1605 package downgrades from Roslyn 5.10.0-1.26359.4 bump The new Roslyn build adds a net472 dependency on Microsoft.VisualStudio.SDK 18.9.496-Preview and bumps its runtime deps to 10.0.8, causing package downgrade errors: - System.Collections.Immutable / System.Reflection.Metadata / System.Composition now required >= 10.0.8 (were pinned to 10.0.2) - VS interops (OLE/Shell/TextManager.Interop) required >= 18.9.438 - Microsoft.VisualStudio.Threading required >= 18.7.19 The three interop packages are decoupled from the shared shell package version since the VS SDK pins them newer than the other shell packages. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/Version.Details.props | 6 +++--- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 9 +++++---- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index feb34be7224..f966d971576 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -28,10 +28,10 @@ This file should be imported by eng/Versions.props 5.10.0-1.26359.4 5.10.0-1.26359.4 - 10.0.2 - 10.0.2 + 10.0.8 + 10.0.8 10.0.2 - 10.0.2 + 10.0.8 10.0.8 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab6f7f51c7c..aad66a859f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -51,13 +51,13 @@ eb9b56c32a8c535140f19b9561fdb01ac4225254 - + https://github.com/dotnet/runtime - + https://github.com/dotnet/runtime @@ -69,7 +69,7 @@ - + https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 60486fabcaa..3ad827108dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -103,16 +103,17 @@ 18.0.2188-preview.1 18.0.1237-pre 18.0.2077-preview.1 - 18.0.5 + 18.7.19 2.0.28 $(MicrosoftVisualStudioShellPackagesVersion) $(VisualStudioShellProjectsPackages) - $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) - $(MicrosoftVisualStudioShellPackagesVersion) + + 18.9.438 + 18.9.438 + 18.9.438 $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) $(MicrosoftVisualStudioShellPackagesVersion) From a3a6db83936ef14238926e3e7d20a9f917d88249 Mon Sep 17 00:00:00 2001 From: Copilot Date: Fri, 10 Jul 2026 12:53:36 +0200 Subject: [PATCH 3/6] Fix MSB3277 assembly conflicts from new Roslyn VS SDK 18.9 deps The new Roslyn Microsoft.CodeAnalysis.ExternalAccess.FSharp (net472) now depends on Microsoft.VisualStudio.SDK 18.9.496 and its coherent 18.9.x VS package set, pulling newer transitive assemblies than fsharp's 18.0.x Shell packages. This caused MSB3277 (assembly version conflicts) across the vsintegration projects for: - System.Diagnostics.DiagnosticSource (10.0.2 vs 10.0.8) - Microsoft.VisualStudio.Validation (17.13 vs 18.7.1) - StreamJsonRpc (2.23 vs 2.26.5) - Microsoft.ServiceHub.Framework (4.9 vs 4.10.128) - Microsoft.VisualStudio.RpcContracts (17.15.25 vs 18.9.453) Bump DiagnosticSource to 10.0.8 (coherent with the other runtime deps) and pin the four remaining transitive packages to the exact versions Roslyn pulls, so all vsintegration projects resolve them coherently. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 2 +- eng/Versions.props | 8 ++++++++ vsintegration/Directory.Build.targets | 5 +++++ 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 52f3b61d385..0c24e5430c6 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -30,7 +30,7 @@ This file should be imported by eng/Versions.props 10.0.8 10.0.8 - 10.0.2 + 10.0.8 10.0.8 10.0.8 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 158707bc3a5..327241a4319 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -63,7 +63,7 @@ - + https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3ad827108dc..513bb633cb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,6 +137,14 @@ $(MicrosoftVisualStudioThreadingPackagesVersion) + + 18.7.1 + 18.9.453 + 4.10.128 + 2.26.5 + $(VisualStudioProjectSystemPackagesVersion) 2.3.6152103 diff --git a/vsintegration/Directory.Build.targets b/vsintegration/Directory.Build.targets index 6d09285feca..16099d6637c 100644 --- a/vsintegration/Directory.Build.targets +++ b/vsintegration/Directory.Build.targets @@ -14,6 +14,11 @@ + + + + + From 73a93e75e87d595c95dcf006daf8f8be568dcd11 Mon Sep 17 00:00:00 2001 From: Copilot Date: Fri, 10 Jul 2026 14:41:24 +0200 Subject: [PATCH 4/6] Fix runtime VS assembly load failures in legacy VS unit tests The Roslyn 5.10.0-1.26359.4 bump pulls Microsoft.VisualStudio.SDK 18.9.496 which transitively upgrades the editor assemblies (Microsoft.VisualStudio.Text.*, .Editor) to 18.9.123 and Shell.15.0 to 18.9.x. Two runtime-only breaks remained after the earlier NU1605/MSB3277 build-time fixes, both surfacing as a ReflectionTypeLoadException in the VsMocks MEF catalog that failed all ~1959 legacy VS unit tests: 1. Microsoft.VisualStudio.Platform.VSEditor is not pulled transitively, so it stayed pinned at 18.0.404-preview and its implementation types no longer bind against the newer Text.Internal 18.9.123 interfaces. Pin VSEditor to 18.9.123 to match. 2. Shell.15.0 18.9.x references Microsoft.VisualStudio.SolutionPersistence at runtime without declaring it as a NuGet dependency; deploy it next to the VS unit-test host (scoped to test projects to keep it out of the VSIX). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- eng/Versions.props | 13 ++++++++++++- vsintegration/tests/Directory.Build.targets | 7 +++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 513bb633cb7..8f756067e4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -128,7 +128,12 @@ $(VisualStudioEditorPackagesVersion) $(VisualStudioEditorPackagesVersion) $(VisualStudioEditorPackagesVersion) - $(VisualStudioEditorPackagesVersion) + + 18.9.123 $(VisualStudioEditorPackagesVersion) 17.14.0 0.1.800-beta @@ -145,6 +150,12 @@ 4.10.128 2.26.5 + + 1.0.52 + $(VisualStudioProjectSystemPackagesVersion) 2.3.6152103 diff --git a/vsintegration/tests/Directory.Build.targets b/vsintegration/tests/Directory.Build.targets index 14437118703..2bbbb8d4d4c 100644 --- a/vsintegration/tests/Directory.Build.targets +++ b/vsintegration/tests/Directory.Build.targets @@ -1,3 +1,10 @@ + + + + + From 3aec278d2b3ea6f8f632af87a7620919e7629529 Mon Sep 17 00:00:00 2001 From: Copilot Date: Fri, 10 Jul 2026 16:11:13 +0200 Subject: [PATCH 5/6] Fix flaky AOT CI build: pass -ci to disable UpdateXlfOnBuild The Build_And_Test_AOT_Windows job runs '.\Build.cmd -pack' without -ci, so ContinuousIntegrationBuild is not set. Arcade then enables UpdateXlfOnBuild, which flakily fails with 'MSB4057: The target UpdateXlf does not exist' on FSharp.Core (the classic_metadata leg failed while the identical compressed_metadata leg passed). Every other CI job builds via CIBuildNoPublish.cmd/cibuild.sh, which pass -ci. Add -ci here for consistency so ContinuousIntegrationBuild=true and UpdateXlfOnBuild stays disabled. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- azure-pipelines-PR.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines-PR.yml b/azure-pipelines-PR.yml index 827b97f33ac..8647164d91a 100644 --- a/azure-pipelines-PR.yml +++ b/azure-pipelines-PR.yml @@ -774,7 +774,7 @@ stages: workingDirectory: $(Build.SourcesDirectory) installationPath: $(Build.SourcesDirectory)/.dotnet - script: .\eng\common\dotnet.cmd - - script: .\Build.cmd $(_kind) -pack -c $(_BuildConfig) + - script: .\Build.cmd $(_kind) -ci -pack -c $(_BuildConfig) env: NativeToolsOnMachine: true displayName: Initial build and prepare packages. From 8cefe1916c12592715c6d57323bd01aefc0735ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Jul 2026 02:03:30 +0000 Subject: [PATCH 6/6] Update dependencies from https://github.com/dotnet/roslyn build 20260709.5 On relative base path root Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.Compilers , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.EditorFeatures , Microsoft.CodeAnalysis.EditorFeatures.Text , Microsoft.CodeAnalysis.ExternalAccess.FSharp , Microsoft.CodeAnalysis.Features , Microsoft.VisualStudio.LanguageServices From Version 5.10.0-1.26358.9 -> To Version 5.10.0-1.26359.5 --- eng/Version.Details.props | 16 ++++++++-------- eng/Version.Details.xml | 32 ++++++++++++++++---------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 0c24e5430c6..d39d8b4f083 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -19,14 +19,14 @@ This file should be imported by eng/Versions.props 1.0.0-prerelease.26318.1 1.0.0-prerelease.26318.1 - 5.10.0-1.26359.4 - 5.10.0-1.26359.4 - 5.10.0-1.26359.4 - 5.10.0-1.26359.4 - 5.10.0-1.26359.4 - 5.10.0-1.26359.4 - 5.10.0-1.26359.4 - 5.10.0-1.26359.4 + 5.10.0-1.26359.5 + 5.10.0-1.26359.5 + 5.10.0-1.26359.5 + 5.10.0-1.26359.5 + 5.10.0-1.26359.5 + 5.10.0-1.26359.5 + 5.10.0-1.26359.5 + 5.10.0-1.26359.5 10.0.8 10.0.8 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 327241a4319..4147079d860 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -18,37 +18,37 @@ https://github.com/dotnet/msbuild ad7e074ca3a93f4af30405c4cd24db04151d7ce8 - + https://github.com/dotnet/roslyn - eb9b56c32a8c535140f19b9561fdb01ac4225254 + 4d24fd6cc1bd247579fc2cf42442b03004ecc7bd - + https://github.com/dotnet/roslyn - eb9b56c32a8c535140f19b9561fdb01ac4225254 + 4d24fd6cc1bd247579fc2cf42442b03004ecc7bd - + https://github.com/dotnet/roslyn - eb9b56c32a8c535140f19b9561fdb01ac4225254 + 4d24fd6cc1bd247579fc2cf42442b03004ecc7bd - + https://github.com/dotnet/roslyn - eb9b56c32a8c535140f19b9561fdb01ac4225254 + 4d24fd6cc1bd247579fc2cf42442b03004ecc7bd - + https://github.com/dotnet/roslyn - eb9b56c32a8c535140f19b9561fdb01ac4225254 + 4d24fd6cc1bd247579fc2cf42442b03004ecc7bd - + https://github.com/dotnet/roslyn - eb9b56c32a8c535140f19b9561fdb01ac4225254 + 4d24fd6cc1bd247579fc2cf42442b03004ecc7bd - + https://github.com/dotnet/roslyn - eb9b56c32a8c535140f19b9561fdb01ac4225254 + 4d24fd6cc1bd247579fc2cf42442b03004ecc7bd - + https://github.com/dotnet/roslyn - eb9b56c32a8c535140f19b9561fdb01ac4225254 + 4d24fd6cc1bd247579fc2cf42442b03004ecc7bd