Skip to content

[main] Source code updates from dotnet/dotnet#129836

Closed
dotnet-maestro[bot] wants to merge 5 commits into
mainfrom
darc-main-8ea728cf-c553-450d-bb4a-9fbb14760072
Closed

[main] Source code updates from dotnet/dotnet#129836
dotnet-maestro[bot] wants to merge 5 commits into
mainfrom
darc-main-8ea728cf-c553-450d-bb4a-9fbb14760072

Conversation

@dotnet-maestro

@dotnet-maestro dotnet-maestro Bot commented Jun 25, 2026

Copy link
Copy Markdown
Contributor

Note

This is a codeflow update. It may contain both source code changes from
the VMR
as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/dotnet

Updated Dependencies

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:7c528f6e19c5245206de3dc561eb8a110bf9f746..https://github.com/dotnet/runtime:darc-main-8ea728cf-c553-450d-bb4a-9fbb14760072

Updated Dependencies:
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.BannedApiAnalyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.9.0-1.26322.110 -> 5.9.0-1.26324.102)
Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100.Transport (Version 11.0.100-preview.6.26322.110 -> 11.0.100-preview.6.26324.102)
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.26322.110 -> 11.0.0-beta.26324.102)
Microsoft.DotNet.Cecil (Version 0.11.5-preview.26322.110 -> 0.11.5-preview.26324.102)
Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.26322.110 -> 2.9.3-beta.26324.102)
Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 11.0.0-preview.6.26322.110 -> 11.0.0-preview.6.26324.102)
NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.9.0-rc.32310 -> 7.9.0-rc.32502)
System.CommandLine (Version 3.0.0-preview.6.26322.110 -> 3.0.0-preview.6.26324.102)
[[ commit created by automation ]]
@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

VMR PRs included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

dotnet-maestro Bot added 2 commits June 25, 2026 14:07
Updated Dependencies:
Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.BannedApiAnalyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.9.0-1.26324.102 -> 5.9.0-1.26325.102)
Microsoft.CodeAnalysis.NetAnalyzers, Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100.Transport (Version 11.0.100-preview.6.26324.102 -> 11.0.100-preview.7.26325.102)
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 11.0.0-beta.26324.102 -> 11.0.0-beta.26325.102)
Microsoft.DotNet.Cecil (Version 0.11.5-preview.26324.102 -> 0.11.5-preview.26325.102)
Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.26324.102 -> 2.9.3-beta.26325.102)
Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 11.0.0-preview.6.26324.102 -> 11.0.0-preview.7.26325.102)
NuGet.Frameworks, NuGet.Packaging, NuGet.ProjectModel, NuGet.Versioning (Version 7.9.0-rc.32502 -> 7.9.0-rc.32602)
System.CommandLine (Version 3.0.0-preview.6.26324.102 -> 3.0.0-preview.7.26325.102)
[[ commit created by automation ]]
@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

VMR PRs included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

Comment thread eng/Version.Details.xml
<Sha>d94093d6935a845e9a508e023ae1a94102a801b6</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="23.1.0-alpha.1.26314.2">
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools" Version="19.1.0-alpha.1.26256.1">

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

downgrade shouldn't happen

- Bump Microsoft.Diagnostics.NETCore.Client and Microsoft.Diagnostics.Runtime
  to match versions required transitively by Microsoft.DotNet.RemoteExecutor,
  resolving an NU1605 downgrade in System.Diagnostics.Tracing.Tests.
- Suppress NU1703 on the RemoteExecutor PackageReference to work around the
  deprecated MonoAndroid asset in System.Security.Cryptography.ProtectedData
  4.5.0 (pulled in transitively via Azure.Identity ->
  Microsoft.Identity.Client.Extensions.Msal).

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running:
    darc trigger-subscriptions --id f7901f87-9f24-40d6-9bc1-564863937237
    
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted.
    darc trigger-subscriptions --id f7901f87-9f24-40d6-9bc1-564863937237 --force
    

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

1 similar comment
@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running:
    darc trigger-subscriptions --id f7901f87-9f24-40d6-9bc1-564863937237
    
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted.
    darc trigger-subscriptions --id f7901f87-9f24-40d6-9bc1-564863937237 --force
    

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@akoeplinger

akoeplinger commented Jun 29, 2026

Copy link
Copy Markdown
Member

still has NU1703 warnings. needs to wait for NuGet/NuGet.Client#7511, or we need to disable NU1703 differently. I'll go for the latter

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Caution

🛑 Codeflow Paused — Conflict detected

A conflict was detected when trying to update this PR with changes from build 320578 of https://github.com/dotnet/dotnet/tree/7c528f6e19c5245206de3dc561eb8a110bf9f746.

💡 You can either merge the PR without getting these new updates or manually flow them in and resolve the conflicts so that automated codeflow can resume for this PR.

The conflicts in the following files need to be manually resolved:

ℹ️ To resolve the conflicts, please follow these steps:

  1. Clone the current repository

    git clone https://github.com/dotnet/runtime
    cd runtime
  2. Make sure your darc is up-to-date
    (version 1.1.0-beta.26329.1 or higher)

    # Linux / MacOS
    ./eng/common/darc-init.sh
    # or on Windows
    .\eng\common\darc-init.ps1
  3. Run from repo's git clone and follow the instructions provided by the command to stage the conflict locally

    darc vmr resolve-conflict --subscription f7901f87-9f24-40d6-9bc1-564863937237 

    This should apply the build 320578 with sources from 7c528f6

  4. Resolve the conflicts, commit & push the changes

  5. Once pushed, the Codeflow verification check will turn green.
    If not, a new build might have flown into the PR and you might need to run the command above again.

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

@akoeplinger akoeplinger deleted the darc-main-8ea728cf-c553-450d-bb4a-9fbb14760072 branch June 29, 2026 14:23
@akoeplinger

Copy link
Copy Markdown
Member

new PR: #129982

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area-codeflow for labeling automated codeflow

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant