Skip to content

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

Merged
dotnet-maestro[bot] merged 31 commits intodevfrom
darc-dev-2b4a91bb-78ae-4725-b6a0-237be726ea18
Jul 29, 2025
Merged

[dev] Source code updates from dotnet/dotnet#6482
dotnet-maestro[bot] merged 31 commits intodevfrom
darc-dev-2b4a91bb-78ae-4725-b6a0-237be726ea18

Conversation

@dotnet-maestro
Copy link
Copy Markdown
Contributor

@dotnet-maestro dotnet-maestro bot commented May 28, 2025

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 bot added 2 commits May 28, 2025 10:18
[[ commit created by automation ]]
@dotnet-maestro dotnet-maestro bot requested a review from a team as a code owner May 28, 2025 10:18
@dotnet-maestro
Copy link
Copy Markdown
Contributor Author

Notification for subscribed users from https://github.com/dotnet/dotnet:

@dotnet/product-construction

Action requested: Please take a look at this failing automated dependency-flow pull request's checks; failures may be related to changes which originated in your repo.

  • This pull request contains changes from your source repo (https://github.com/dotnet/dotnet) and seems to have failed checks in this PR. Please take a peek at the failures and comment if they seem relevant to your changes.
  • If you're being tagged in this comment it is due to an entry in the related Maestro Subscription of the Build Asset Registry. If you feel this entry has added your GitHub login or your GitHub team in error, please update the subscription to reflect this.
  • For more details, please read the Arcade Darc documentation

ViktorHofer
ViktorHofer previously approved these changes May 28, 2025
@ViktorHofer
Copy link
Copy Markdown
Contributor

@NuGet/nuget-client there's a NuGet Audit vulnerability warning for Microsoft.Build.Tasks.Core/17.12.6. Should this version get upgraded to something newer?

I see the version hardcoded here:

<MicrosoftBuildVersion Condition="'$(DotNetBuildSourceOnly)' == 'true'">17.12.6</MicrosoftBuildVersion>

Unrelated but it looks like all versions referenced in that file are marked as vulnerable. Shouldn't all of them get updated?

@nkolev92
Copy link
Copy Markdown
Member

We build against 17.11 in non-source build scenarios.

We can probably use 17.12 in general.

We basically need to match whatever https://learn.microsoft.com/en-us/dotnet/core/porting/versioning-sdk-msbuild-vs#targeting-and-support-rules says the min version is.

We'd need to figure out what the min msbuild version of the next version of the SDK before updating.

dotnet-maestro bot added 2 commits June 2, 2025 05:01
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25277.113 -> 10.0.0-beta.25260.104)
@dotnet-maestro dotnet-maestro bot requested a review from a team as a code owner June 2, 2025 05:01
@ViktorHofer
Copy link
Copy Markdown
Contributor

Any idea why this isn't a problem in the main build? IOW why are those vulnerable dependencies not showing up anywhere?

jeffkl
jeffkl previously approved these changes Jun 2, 2025
@jeffkl
Copy link
Copy Markdown
Contributor

jeffkl commented Jun 3, 2025

@ViktorHofer we might have fixed this in #6488, can this PR be rebased?

dotnet-maestro bot added 3 commits June 9, 2025 05:02
[[ commit created by automation ]]
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25281.103 -> 10.0.0-beta.25304.106)
@jebriede
Copy link
Copy Markdown
Contributor

[PR Review] @jeffkl would you please work with @ViktorHofer in understanding how to review this and how to move it forward?

Comment thread global.json Outdated
@ViktorHofer
Copy link
Copy Markdown
Contributor

@premun we are still getting eng/common updates into NuGet backflow PRs. Is this intentional?

@premun
Copy link
Copy Markdown
Contributor

premun commented Jun 11, 2025

Yes, until we decide how to solve this (dotnet/dotnet#1054)

@ViktorHofer
Copy link
Copy Markdown
Contributor

I'm not sure what you mean by decide. Until nuget-client onboards to Arcade (which isn't funded), we need to exclude eng/common updates.

@premun
Copy link
Copy Markdown
Contributor

premun commented Jun 11, 2025

But we need to figure out the "how". The service always flows these things in a bundle and even if we wanted to hardcode this, it's not as simple as one if statement somewhere.

I still don't understand why we can't have the files checked in. There is already some eng/common in the repo.

@ViktorHofer
Copy link
Copy Markdown
Contributor

Submitted dotnet/arcade-services#4994 to be able to pin the .NET SDK to a specific version.

dotnet-maestro bot added 7 commits June 30, 2025 05:01
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25321.101 -> 10.0.0-beta.25327.102)
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25327.102 -> 10.0.0-beta.25351.106)
[[ commit created by automation ]]
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25351.106 -> 10.0.0-beta.25363.103)
dotnet-maestro bot added 2 commits July 21, 2025 05:01
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25363.103 -> 10.0.0-beta.25368.105)
@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="1c92f346e02a8363def6f7bdbcc526d3c579dd74" BarId="275898" />

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

@ViktorHofer
Copy link
Copy Markdown
Contributor

@jeffkl @nkolev92 can you help with the NuGet.Client-PrivateDev pipeline failure? Otherwise, this PR should now be ready. It contains:

  • "Recent" changes that were made in the VMR that backflow into this repository
  • The "/eng/common" layout which will be needed for onboarding to Arcade and partially needed for onboarding to OneLocBuild localization (related to @mmitche's work around using xlf localization).
  • The "tools.pinned" attribute in global.json which prevents Maestro (the service that opens these PRs) from updating the .NET SDK version as NuGet intentionally stays on 9.0.300.

@ViktorHofer
Copy link
Copy Markdown
Contributor

Gentle ping. We need to get this in so that the sync into and from the VMR is correctly working.

dotnet-maestro bot added 2 commits July 28, 2025 05:01
Updated Dependencies:
Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25368.105 -> 10.0.0-beta.25376.102)
Comment thread eng/common/templates/steps/publish-pipeline-artifacts.yml
@dotnet-maestro dotnet-maestro bot merged commit 4b55ffe into dev Jul 29, 2025
22 checks passed
@dotnet-maestro dotnet-maestro bot deleted the darc-dev-2b4a91bb-78ae-4725-b6a0-237be726ea18 branch July 29, 2025 02:01
@zivkan zivkan mentioned this pull request Jul 29, 2025
3 tasks
donnie-msft added a commit that referenced this pull request Jul 29, 2025
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