Skip to content

[dev] Source code updates from dotnet/dotnet - #6802

Merged
dotnet-maestro[bot] merged 4 commits into
devfrom
darc-dev-c1e108ce-448b-44c9-92d7-16337e6e60c8
Oct 2, 2025
Merged

dotnet-maestro[bot] merged 4 commits into
devfrom
darc-dev-c1e108ce-448b-44c9-92d7-16337e6e60c8

Conversation

@dotnet-maestro
dotnet-maestro Bot requested a review from a team as a code owner September 24, 2025 11:30

@nkolev92 nkolev92 left a comment

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.

I know it's easier to make some of the changes in the VMR directly, but for infra stuff, it'd be good to at either get a review from someone on the client team or maybe even create the PR here so it doesn't end up affecting things arcade flow.

Comment thread build/common.targets
Comment thread build/common.targets Outdated
Comment thread eng/Version.Details.props
@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Important

The source repository has received code changes from an opposite flow. Any additional codeflows into this PR may potentially result in lost changes.
Please continue with one of the following options:

  1. Close or merge this PR and let the codeflow continue normally
  2. Close or merge this PR and receive the new codeflow immediately by triggering the subscription:
    darc trigger-subscriptions --id 5ba36ed4-9948-4cfe-8753-1c3463a6cf09
  3. Force-flow new changes into this PR at your own risk (some PR commits might be reverted):
    darc trigger-subscriptions --force --id 5ba36ed4-9948-4cfe-8753-1c3463a6cf09

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

@ViktorHofer

ViktorHofer commented Sep 29, 2025 •

Copy link
Copy Markdown
Contributor

@nkolev92 @zivkan are the test failures related? I assume not.

@nkolev92

Copy link
Copy Markdown
Member

Shouldn't be, but not sure what's going on.
I kicked off a re-run.

dotnet-maestro Bot and others added 4 commits October 2, 2025 13:33
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XliffTasks (Version 10.0.0-beta.25420.109 -> 10.0.0-beta.25468.104)
@nkolev92
nkolev92 force-pushed the darc-dev-c1e108ce-448b-44c9-92d7-16337e6e60c8 branch from 485d000 to 5d9f5e4 Compare October 2, 2025 20:33
@nkolev92

nkolev92 commented Oct 2, 2025

Copy link
Copy Markdown
Member

The test seem to persist, so I have rebased just in case, but that means my approval is reset.

@dotnet-maestro
dotnet-maestro Bot merged commit 72770c7 into dev Oct 2, 2025
23 checks passed
@dotnet-maestro
dotnet-maestro Bot deleted the darc-dev-c1e108ce-448b-44c9-92d7-16337e6e60c8 branch October 2, 2025 21:19
@Nigusu-Allehu

Nigusu-Allehu commented Oct 2, 2025 •

Copy link
Copy Markdown
Member

It looks like the bot merged it. Nice

@nkolev92

nkolev92 commented Oct 2, 2025

Copy link
Copy Markdown
Member

it merged when all the policies passed, so your approval + green ci + the fact that I had resolver the conversation.

nkolev92 pushed a commit that referenced this pull request Oct 10, 2025
[dev] Source code updates from dotnet/dotnet

 - Update build/common.targets

 - Update common.project.props
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.

6 participants