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.

Sign up for GitHub

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
Merged

[main] Update dependencies from dotnet/dotnet #10073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4722433
Update dependencies from https://github.com/dotnet/dotnet build 20250…
dotnet-maestro[bot] Apr 24, 2025
61d94d6
Remove CoherentParentDependency, it's no longer needed
akoeplinger Apr 24, 2025
ed257eb
Update Versions.props
akoeplinger Apr 24, 2025
c10a39e
Add back Microsoft.DotNet.ApiCompat
akoeplinger Apr 24, 2025
f321a77
Fix versions
akoeplinger Apr 24, 2025
3b60c22
Fix versions
akoeplinger Apr 24, 2025
031e5d9
dotnet/runtime 8.0.16 feeds
jonathanpeppers Apr 24, 2025
d3bac29
dotnet/runtime 9.0.5 feeds
jonathanpeppers Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@
<!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
<!-- Android binary, to support delta APK install -->
<add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 8.0.11 -->
<add key="darc-pub-dotnet-emsdk-91b783e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-91b783ed/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-ef07c4f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ef07c4f2/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 9.0.5 -->
<add key="darc-pub-dotnet-emsdk-3cddc1f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3cddc1fe/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-207cda3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-207cda34/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 8.0.16 -->
<add key="darc-pub-dotnet-runtime-6cd8ef8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-6cd8ef87/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources />
</configuration>
36 changes: 18 additions & 18 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.4.25220.1">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>f4de547215d995985f21f195b29909d8569bcf46</Sha>
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-preview.5.25223.119">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-preview.4.25217.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e1702c393a1ef71b211f51d00beedec0151c9f25</Sha>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-preview.4.25223.119">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.4.25217.10" CoherentParentDependency="Microsoft.NET.Sdk">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>e1702c393a1ef71b211f51d00beedec0151c9f25</Sha>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.4.25223.119">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25125.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>f7a78a77069262841fe3c3c6b89ff243fc43cefc</Sha>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25223.119">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>721dc7a2a59416b21fc49447d264009d708d6000</Sha>
</Dependency>
<!-- Previous .NET Android version(s) -->
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-9.0.100" Version="35.0.61">
Expand All @@ -31,13 +31,13 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>70831f0d126fe88b81d7dc8de11358e17a5ce364</Sha>
</Dependency>
<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>
Comment on lines -34 to +40
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 •
edited
Loading

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:

android/eng/Version.Details.xml

Lines 27 to 31 in 1d79963

<!-- 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 •
edited
Loading

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

</Dependency>
</ToolsetDependencies>
</Dependencies>
12 changes: 6 additions & 6 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftNETSdkPackageVersion>10.0.100-preview.4.25220.1</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-preview.5.25223.119</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.4.25217.10</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.4.25217.10</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-preview.4.25223.119</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-preview.4.25223.119</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.24476.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25223.119</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadMonoToolChainPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETWorkloadMonoToolChainPackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>9.0.201</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25125.1</MicrosoftDotNetCecilPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100-preview.5.25223.119</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25223.119</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>9.0.4</SystemIOHashingPackageVersion>
<!-- Previous .NET Android version -->
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.61</MicrosoftNETSdkAndroidManifest90100PackageVersion>
Expand Down