[automated] Merge branch 'main' => 'feature/net11-scouting'#20069
Open
github-actions[bot] wants to merge 7 commits into
Open
[automated] Merge branch 'main' => 'feature/net11-scouting'#20069github-actions[bot] wants to merge 7 commits into
github-actions[bot] wants to merge 7 commits into
Conversation
* Update dependencies from https://github.com/dotnet/msbuild build 20260710.4 On relative base path root Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core From Version 18.10.0-1.26359.10 -> To Version 18.10.0-1.26360.4 * Update dependencies from https://github.com/dotnet/msbuild build 20260713.4 On relative base path root Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core From Version 18.10.0-1.26359.10 -> To Version 18.10.0-1.26363.4 * Update dependencies from https://github.com/dotnet/msbuild build 20260714.11 On relative base path root Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core From Version 18.10.0-1.26359.10 -> To Version 18.10.0-1.26364.11 * Update dependencies from https://github.com/dotnet/msbuild build 20260715.6 On relative base path root Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core From Version 18.10.0-1.26359.10 -> To Version 18.10.0-1.26365.6 * Update dependencies from https://github.com/dotnet/msbuild build 20260716.8 On relative base path root Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core From Version 18.10.0-1.26359.10 -> To Version 18.10.0-1.26366.8 * Update dependencies from https://github.com/dotnet/msbuild build 20260717.5 On relative base path root Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core From Version 18.10.0-1.26359.10 -> To Version 18.10.0-1.26367.5 * Update dependencies from https://github.com/dotnet/msbuild build 20260719.1 On relative base path root Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core From Version 18.10.0-1.26359.10 -> To Version 18.10.0-1.26369.1 * Update dependencies from https://github.com/dotnet/msbuild build 20260720.18 On relative base path root Microsoft.Build , Microsoft.Build.Framework , Microsoft.Build.Tasks.Core , Microsoft.Build.Utilities.Core From Version 18.10.0-1.26359.10 -> To Version 18.10.0-1.26370.18 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* 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 * 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> * 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> * 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> * 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> * 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 * Update dependencies from https://github.com/dotnet/roslyn build 20260713.9 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.26363.9 * Update dependencies from https://github.com/dotnet/roslyn build 20260714.9 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.26364.9 * Update dependencies from https://github.com/dotnet/roslyn build 20260715.2 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.26365.2 * Update dependencies from https://github.com/dotnet/roslyn build 20260715.3 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.26365.3 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Copilot <copilot@github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
… Build ID 3013177 (#20023) Co-authored-by: Copilot <copilot@github.com>
Reset patterns: - global.json - eng/Version.Details.xml - eng/Version.Details.props - eng/Versions.props - eng/common/** - eng/TargetFrameworks.props
github-actions
Bot
added
the
AI-Tooling-Check-Bypassed
* Update dependencies from https://github.com/dotnet/arcade build 20260708.3 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26324.4 -> To Version 10.0.0-beta.26358.3 * Update dependencies from https://github.com/dotnet/arcade build 20260716.3 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26324.4 -> To Version 10.0.0-beta.26366.3 * Update dependencies from https://github.com/dotnet/arcade build 20260717.6 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26324.4 -> To Version 10.0.0-beta.26367.6 * Re-run CI (flaky infrastructure failures unrelated to Arcade bump) The two failing jobs on this darc dependency PR were flaky/infra failures, not caused by the Arcade SDK version bump: - WindowsCompressedMetadata transparent_compiler_release: FSharp.Compiler.Service.Tests host hang hitting the 5m hangdump timeout (createdump MiniDumpWriteDump failure). - IcedTasks_Test_Debug Regression Test: net9.0-only 'Entry point was not found' in the third-party FSharp.Control.TaskSeq DisposeAsync path (passed on net8.0/net10.0). Both signatures recur on unrelated PRs (e.g. IcedTasks on #19941). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Update dependencies from https://github.com/dotnet/arcade build 20260721.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.26324.4 -> To Version 10.0.0-beta.26371.2 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: T-Gro <15220165+T-Gro@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
The automated 'Reset files' commit reset eng/Versions.props,
eng/Version.Details.{props,xml}, global.json and eng/common/** to a stale
snapshot of feature/net11-scouting, dropping the branch's dependency fixes.
This caused restore to fail with NU1015 (missing MicrosoftVisualStudioValidation/
RpcContracts/ServiceHubFramework/StreamJsonRpc versions) and would then hit
NU1605 (System.Composition 10.0.2 vs RpcContracts requiring >= 10.0.8).
Re-run the reset against the current feature/net11-scouting so these
target-branch-owned files match, restoring the coherent Arcade/MSBuild/System
package set. FSharp.slnx now restores cleanly.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…/net11-scouting # Conflicts: # eng/Version.Details.props # eng/Version.Details.xml # eng/common/core-templates/job/publish-build-assets.yml # eng/common/core-templates/post-build/post-build.yml # eng/common/tools.ps1 # eng/common/tools.sh # global.json
github-actions
Bot
added
⚠️ Affects-Build-Infra
Contributor
Author
|
🔍 Tooling Safety Check — Affects-Build-Infra, Affects-Restore
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
I detected changes in the main branch which have not been merged yet to feature/net11-scouting. I'm a robot and am configured to help you automatically keep feature/net11-scouting up to date, so I've opened this PR.
This PR merges commits made on main by the following committers:
Instructions for merging from UI
This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.
If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.
Instructions for merging via command line
Run these commands to merge this pull request from the command line.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
Instructions for updating this pull request
Contributors to this repo have permission update this pull request by pushing to the branch 'merge/main-to-feature/net11-scouting'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.
or if you are using SSH
Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.