Skip to content

Comments

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

Merged
dotnet-maestro[bot] merged 3 commits intodevfrom
darc-dev-ddda095a-6839-4593-bbf1-3335392c25af
Oct 6, 2025
Merged

[dev] Source code updates from dotnet/dotnet#6835
dotnet-maestro[bot] merged 3 commits intodevfrom
darc-dev-ddda095a-6839-4593-bbf1-3335392c25af

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Oct 6, 2025

Auto-resolved conflicts:
- build/common.targets
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XliffTasks (Version 10.0.0-beta.25468.104 -> 10.0.0-beta.25479.115)
@dotnet-maestro
Copy link
Contributor Author

dotnet-maestro bot commented Oct 6, 2025

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="e72b5bbe719d747036ce9c36582a205df9f1c361" BarId="285185" />

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 6, 2025 05:01
@dotnet-policy-service
Copy link
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.

@dotnet-maestro dotnet-maestro bot merged commit b8d39a9 into dev Oct 6, 2025
23 checks passed
@dotnet-maestro dotnet-maestro bot deleted the darc-dev-ddda095a-6839-4593-bbf1-3335392c25af branch October 6, 2025 17:14
nkolev92 pushed a commit that referenced this pull request Oct 10, 2025
[dev] Source code updates from dotnet/dotnet
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.

1 participant