Skip to content

[dev] Source code updates from dotnet/dotnet#6851

Closed
dotnet-maestro[bot] wants to merge 10 commits intodevfrom
darc-dev-cfe04b82-206c-49ce-b006-e415b2a021c1
Closed

[dev] Source code updates from dotnet/dotnet#6851
dotnet-maestro[bot] wants to merge 10 commits intodevfrom
darc-dev-cfe04b82-206c-49ce-b006-e415b2a021c1

Conversation

@dotnet-maestro
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

@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

Important

There are conflicts with the dev branch in this PR. Apart from conflicts in the source files, this means there are unresolved conflicts in the codeflow metadata file eng/Version.Details.xml.
When resolving these, please use the (incoming/ours) version from the PR branch. The correct content should be this:

<Source Uri="https://github.com/dotnet/dotnet" Mapping="nuget-client" Sha="0b60d265d30d96c827b73dbce74cb78f600d3c92" BarId="286686" />

In case of unclarities, consult the FAQ or tag @dotnet/product-construction for assistance.

@dotnet-maestro dotnet-maestro Bot requested a review from a team as a code owner October 13, 2025 05:01
@dotnet-policy-service
Copy link
Copy Markdown
Contributor

Since this PR is changing CI as it modifies YML files, please verify that you've addressed how this change should apply to release branches. Either:

  • Link to equivalent PRs or Issues for each currently supported branch.
    or
  • Explain in the PR description why this change doesn't apply to release branches.

Comment thread build/config.props
<ReleaseLabel Condition=" '$(ReleaseLabel)' == '' ">preview.1</ReleaseLabel>
<ReleaseLabel Condition=" '$(ReleaseLabel)' == '' ">rc</ReleaseLabel>

<IsEscrowMode Condition="'$(IsEscrowMode)' == ''">false</IsEscrowMode>
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.

Suggested change
<IsEscrowMode Condition="'$(IsEscrowMode)' == ''">false</IsEscrowMode>
<IsEscrowMode Condition="'$(IsEscrowMode)' == ''">false</IsEscrowMode>

Copy link
Copy Markdown
Member

@nkolev92 nkolev92 left a comment

Choose a reason for hiding this comment

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

Dev should only be ingesting from release/9.0.2xx or main at this point.

release/10.0.x is porting stuff from our release branches.

@jeffkl jeffkl closed this Oct 14, 2025
@dotnet-maestro dotnet-maestro Bot deleted the darc-dev-cfe04b82-206c-49ce-b006-e415b2a021c1 branch October 14, 2025 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants