Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Apr 29, 2025

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Apr 25, 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

@dotnet-maestro dotnet-maestro bot requested a review from a team as a code owner April 25, 2025 02:03
@MichaelSimons
Copy link
Member

SB leg failures are caused by an instance of dotnet/arcade-services#4739. This will be fixed once dotnet/dotnet#258 flows in.

@ViktorHofer ViktorHofer enabled auto-merge (squash) April 29, 2025 05:58
@ViktorHofer ViktorHofer merged commit 64b5915 into main Apr 29, 2025
8 of 9 checks passed
@ViktorHofer ViktorHofer deleted the darc-main-e6bcd835-cc2d-4b2b-941a-615420068a67 branch April 29, 2025 06:06
@@ -17,7 +17,7 @@
<MicrosoftNETCoreILAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.0-preview.6.21352.12</MicrosoftNETCoreILDAsmVersion>
Copy link
Member

Choose a reason for hiding this comment

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

@ViktorHofer this version is out of sync with the one in Version.Details.xml and looks manually updated, should we remove it there?

Copy link
Member

Choose a reason for hiding this comment

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

Isn't that version used by the repo build?

Copy link
Member

@ViktorHofer ViktorHofer Apr 29, 2025

Choose a reason for hiding this comment

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

Yes, we should make them the same

Copy link
Member

Choose a reason for hiding this comment

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

OK this was already the case before the backflow changes. @MichaelSimons should those version get updated to something newer? A version closer to what the product uses with the PSB? Also, should there be toolset sub for it?

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.

3 participants