Skip to content

[main] Update dependencies from dotnet/dotnet #10073

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 8 commits into from
Apr 25, 2025

Conversation

dotnet-maestro[bot]
Copy link
Contributor

This pull request updates the following dependencies

From https://github.com/dotnet/dotnet

…423.19

Microsoft.DotNet.Build.Tasks.Feed , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Authoring.Tasks
 From Version 9.0.0-beta.24408.2 -> To Version 10.0.0-beta.25223.119
Comment on lines -34 to +40
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24408.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60ae233c3d77f11c5fdb53e570b64d503b13ba59</Sha>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25223.119">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="9.0.201">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>006b799c44481a0870d4cbe754e6aae9d1236708</Sha>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100-preview.5.25223.119">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
Copy link
Member

Choose a reason for hiding this comment

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

@pjcollins is there any concern updating these? Or do some of our yaml templates use a different dotnet/arcade version anyway?

Copy link
Member

@dkurepa dkurepa Apr 25, 2025

Choose a reason for hiding this comment

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

We can add this and the arcade dependency above to the excluded asset list, if you don't want them to get updated from the VMR, let us know please

Copy link
Member

Choose a reason for hiding this comment

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

@dkurepa do you know if there a way to ignore certain dependencies in a subscription? This would help us update the downlevel .NET 8/9 packs on main more effectively.

For example, I was trying to track Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-8.0.100 here from dotnet/runtime/release/8.0:

<!-- Previous .NET version -->
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-8.0.100" Version="8.0.16">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>6cd8ef87e1e5b8e89ae28d3f6e61ce77d469d9ea</Sha>
</Dependency>

But I bet it will update on the next dotnet/runtime/release/9.0 update.

I think this PR is probably fine as-is, I just wanted to check about the two dependencies before merging.

Copy link
Member

Choose a reason for hiding this comment

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

yes! The --excluded-assets flag should help you with this. So you can just run darc update-subscription --id 58e8279d-a615-4b62-adba-499b6c5c9d3e --excluded-assets <list of assets separated by ;>. Note that this command will always update the whole list of excluded assets, so always list all of them

Copy link
Member

Choose a reason for hiding this comment

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

For the subscription:

https://github.com/dotnet/runtime (.NET 9) ==> 'https://github.com/dotnet/android' ('release/9.0.1xx')
  - Id: 5321cb53-127e-4a94-91ac-29929edb8b1c

I tried:

> darc update-subscription --id 5321cb53-127e-4a94-91ac-29929edb8b1c --excluded-assets Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-8.0.100
Asset exclusion only works for source-enabled subscriptions

Copy link
Member

Choose a reason for hiding this comment

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

@pjcollins is there any concern updating these? Or do some of our yaml templates use a different dotnet/arcade version anyway?

I don't think this will be an issue for us, and it's probably for the best for these to be updated more regularly. Our MSI generation tasks still are pinned on a specific arcade version in a separate repo.

Copy link
Member

@akoeplinger akoeplinger Apr 28, 2025

Choose a reason for hiding this comment

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

@jonathanpeppers tracking Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-8.0.100 makes no sense in this case since that is produced in a completely different channel.

Let's talk about the use case you have for this separately, you can ping me on Teams

@jonathanpeppers jonathanpeppers merged commit f2eea99 into main Apr 25, 2025
59 checks passed
@jonathanpeppers jonathanpeppers deleted the darc-main-3eee70c5-7f9a-41a5-8224-e3c14aae17e6 branch April 25, 2025 18:48
@github-actions github-actions bot locked and limited conversation to collaborators May 29, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants