Skip to content
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

[main] Update dependencies from dotnet/sdk #9395

Merged
merged 63 commits into from
Jan 10, 2025

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Oct 14, 2024

Coherency update: Failed to perform coherency update for one or more dependencies. Please review the GitHub checks or run darc update-dependencies --coherency-only locally against darc-main-714b3296-586d-442c-9958-cb73c20d69cb for more information.

Coherency Updates

The following updates ensure that dependencies with a CoherentParentDependency
attribute were produced in a build used as input to the parent dependency's build.
See Dependency Description Format

  • Coherency Updates:
    • Microsoft.NETCore.App.Ref: from 9.0.0-rtm.24510.3 to 10.0.0-alpha.1.24619.8 (parent: Microsoft.NET.Sdk)
    • Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport: from 10.0.0-alpha.1.24575.2 to 10.0.0-alpha.1.24613.1 (parent: Microsoft.NETCore.App.Ref)
    • Microsoft.NET.ILLink.Tasks: from 9.0.0-rtm.24510.3 to 10.0.0-alpha.1.24619.8 (parent: Microsoft.NET.Sdk)

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

  • Subscription: 72348f96-04eb-450b-86c3-d2a4f68e3279
  • Build: 20241220.2
  • Date Produced: December 20, 2024 11:35:50 AM UTC
  • Commit: bf452b9e2c47b6cb09c54ff0f44bc90d2a24636b
  • Branch: refs/heads/main

Microsoft.NET.Sdk
 From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24510.13
Copy link
Member

@jonathanpeppers jonathanpeppers left a comment

Choose a reason for hiding this comment

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

This is WIP for testing .NET 10 builds. We shouldn't merge until we've branched for .NET 9 GA.

@jonathanpeppers jonathanpeppers added the do-not-merge PR should not be merged. label Oct 14, 2024
@jonathanpeppers jonathanpeppers marked this pull request as draft October 14, 2024 17:43
dotnet-maestro bot and others added 14 commits October 16, 2024 19:47
Microsoft.NET.Sdk
 From Version 10.0.100-alpha.1.24510.13 -> To Version 10.0.100-alpha.1.24524.9

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport,Microsoft.NET.ILLink.Tasks,Microsoft.DotNet.Cecil
 From Version 10.0.0-alpha.1.24507.22 -> To Version 10.0.0-alpha.1.24523.5 (parent: Microsoft.NET.Sdk
Looking up build with BAR id 243767
Updating 'Microsoft.Android.Sdk.Windows': '34.0.145' => '35.0.7' (from build '9.0.1xx-278e101698269c9bc8840aa94d72e7f24066a96d-1' of 'https://github.com/dotnet/android')
Checking for coherency updates...
Local dependencies updated based on build with BAR id 243767 (9.0.1xx-278e101698269c9bc8840aa94d72e7f24066a96d-1 from https://github.com/dotnet/android@release/9.0.1xx)
Fixes the error:

    error NETSDK1045: The current .NET SDK does not support targeting .NET 9.0.
Microsoft.NET.Sdk
 From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24553.6

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport,Microsoft.NET.ILLink.Tasks
 From Version 9.0.0-rtm.24510.3 -> To Version 10.0.0-alpha.1.24552.2 (parent: Microsoft.NET.Sdk
jonathanpeppers and others added 8 commits November 8, 2024 14:20
Microsoft.NET.Sdk
 From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24560.6

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NET.ILLink.Tasks
 From Version 9.0.0-rtm.24510.3 -> To Version 10.0.0-alpha.1.24557.1 (parent: Microsoft.NET.Sdk
Microsoft.NET.Sdk
 From Version 9.0.100-rtm.24512.1 -> To Version 10.0.100-alpha.1.24568.3

Dependency coherency updates

Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport,Microsoft.NET.ILLink.Tasks
 From Version 9.0.0-rtm.24510.3 -> To Version 10.0.0-alpha.1.24565.3 (parent: Microsoft.NET.Sdk
Hopefully, avoids the error on `MAUI Integration` lane:

    error NU1102: Unable to find package Microsoft.NETCore.App.Ref with version (= 9.0.1)
@jonathanpeppers

This comment was marked as outdated.

This comment was marked as outdated.

Fixes:

    [BT : 1.17.0] error : The app doesn't support ABI architectures of the device. Device ABIs: [x86, armeabi-v7a, armeabi], app ABIs: [arm64-v8a, x86_64]. [/Users/runner/work/1/a/TestRelease/01-09_16.47.28/temp/DotNetInstallAndRunPreviousSdkTrue/UnnamedProject.csproj]
@jonathanpeppers

This comment was marked as outdated.

This comment was marked as outdated.

Otherwise it gets deleted
@jonathanpeppers
Copy link
Member

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@jonathanpeppers jonathanpeppers marked this pull request as ready for review January 10, 2025 16:00
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-android</TargetFramework>
<TargetFramework>net10.0-android</TargetFramework>
Copy link
Contributor

Choose a reason for hiding this comment

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

At some point we should auto generate these files so that we don't have to keep updating them.

Copy link
Member

Choose a reason for hiding this comment

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

I did this for AutoImport.props, but yeah each year we should do a couple. This year had a lot of blockers, though...

@jonathanpeppers
Copy link
Member

Note that this one will be a failure until MAUI is on .NET 10:

image

But I heard they are really close once we have an Android build on 10.

@akoeplinger
Copy link
Member

Hmm it fails with

Workload installation failed: Could not find workload 'microsoft-net-runtime-android-net9' extended by workload 'android' in manifest 'microsoft.net.sdk.android' [D:\a_work\1\s\maui.dotnet\sdk-manifests\9.0.100\microsoft.net.sdk.android\WorkloadManifest.json]

shouldn't that workload come from this repo?

@jonathanpeppers
Copy link
Member

jonathanpeppers commented Jan 10, 2025

Commit message:

Bump to .NET 10 alpha SDK

Changes: https://github.com/dotnet/sdk/compare/5b9d9d4677...a93a592ce9
Changes: https://github.com/dotnet/runtime/compare/226c0347b9...4b02c51f71
Changes: https://github.com/dotnet/emsdk/compare/8e660ff41e...953fd74cd2
Changes: https://github.com/dotnet/cecil/compare/9c9443396f8...9e8bd520939
Changes: https://github.com/dotnet/android/compare/a8cd27e430...4b20432d95

Bump to:

* .NET SDK 10.0.100-alpha.1.25056.1
* .NET Runtime 10.0.0-alpha.1.25056.1
* .NET Android 35.0.24

Note that the `Xamarin.Android-PR (MAUI Tests MAUI Integration)` lane will fail with:

    Workload installation failed: Could not find workload 'microsoft-net-runtime-android-net9' extended by workload 'android' in manifest 'microsoft.net.sdk.android' [D:\a_work\1\s\maui.dotnet\sdk-manifests\9.0.100\microsoft.net.sdk.android\WorkloadManifest.json]

Until we get dotnet/maui on .NET 10 (shortly).

Regressions discovered:

* MSBuild: https://github.com/dotnet/msbuild/issues/11237
* Roslyn analyzers: https://github.com/dotnet/roslyn-analyzers/issues/7525

I temporarily disabled tests that hit these issues, with a code comment
to restore them in the future.

Other changes:

* Add the `dotnet10` NuGet feeds.

* `$(DotNetTargetFramework)` is `net10.0`

* Update project templates to say `net10.0-android`.

* Update `WorkloadManifest.json` to support .NET 10 and able to build
  `net9.0-android` projects.

* Replace the contents of `AutoImports.props`, so we shouldn't need to
  modify this file each year.

* Various tests should target `net9.0-android` for the "previus" .NET
  Android version and `net10.0-android` for the current.

* `workload-dependencies.csproj` needs `$(RollForward)=Major` to allow
  it to run on a .NET 10 runtime.

Co-authored-by: Jonathan Peppers <[email protected]>

@jonathanpeppers
Copy link
Member

Hmm it fails with

Workload installation failed: Could not find workload 'microsoft-net-runtime-android-net9' extended by workload 'android' in manifest 'microsoft.net.sdk.android' [D:\a_work\1\s\maui.dotnet\sdk-manifests\9.0.100\microsoft.net.sdk.android\WorkloadManifest.json]

shouldn't that workload come from this repo?

The .NET 9 SDK listed in the error won't have microsoft-net-runtime-android-net9 from runtime:

https://github.com/dotnet/runtime/blob/5abf58221b725acc12df0b0c4e225e4d3c3c3b45/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.net9.Manifest/WorkloadManifest.json.in#L46

It just has "current".

When MAUI is on the .NET 10 SDK, I think everything will work.

@akoeplinger
Copy link
Member

Ahh ok, yeah that makes sense

@jonpryor jonpryor merged commit 37014d1 into main Jan 10, 2025
58 of 60 checks passed
@jonpryor jonpryor deleted the darc-main-714b3296-586d-442c-9958-cb73c20d69cb branch January 10, 2025 17:51
grendello added a commit that referenced this pull request Jan 10, 2025
* main:
  Bump to dotnet/sdk@2d6bc4f67d 10.0.100-alpha.1.25060.8 (#9669)
  [templates] Default `$(SupportedOSPlatformVersion)=24`. (#9656)
  Bump to dotnet/sdk@a93a592ce9 10.0.100-alpha.1.25056.1 (#9395)
  LEGO: Pull request (#9667)
  [tests] use the 'TestName' property (#9664)
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.

4 participants