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

[net10.0] Update dependencies from dotnet/android #27040

Merged
merged 7 commits into from
Jan 13, 2025

Conversation

dotnet-maestro[bot]
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Jan 9, 2025

This pull request updates the following dependencies

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

  • Subscription: ffb91a18-df31-48c2-acad-d3687a0ba6e6
  • Build: main-ff80c42817c2051daae46fcfaa579e6c19206a9a-1
  • Date Produced: January 10, 2025 11:38:31 PM UTC
  • Commit: ff80c42817c2051daae46fcfaa579e6c19206a9a
  • Branch: refs/heads/main

…-c4a6a9a6d130dfb7aef4217e89cb8d9342a7684e-1

Microsoft.Android.Sdk.Windows
 From Version 35.99.0-ci.main.90 -> To Version 35.99.0-ci.main.91
@dotnet-maestro dotnet-maestro bot requested a review from a team as a code owner January 9, 2025 19:01
@dotnet-maestro dotnet-maestro bot requested review from jfversluis and jsuarezruiz and removed request for a team January 9, 2025 19:02
@dotnet-policy-service dotnet-policy-service bot added area/infrastructure 🏗️ area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions labels Jan 9, 2025
…30-ci.main.25060.1+azdo.10809905

Microsoft.Android.Sdk.Windows
 From Version 35.99.0-ci.main.90 -> To Version 35.99.0-ci.main.93
jonpryor pushed a commit to dotnet/android that referenced this pull request Jan 10, 2025
Changes: dotnet/sdk@5b9d9d4...a93a592

	% git diff --shortstat 5b9d9d4677...a93a592ce9
	 2336 files changed, 57809 insertions(+), 28665 deletions(-)

Changes: dotnet/runtime@226c034...4b02c51

	% git diff --shortstat 226c0347b9...4b02c51f71
	 6343 files changed, 214693 insertions(+), 177501 deletions(-)

Changes: dotnet/emsdk@8e660ff...953fd74

	% git diff --shortstat 8e660ff41e...953fd74cd2
	 44 files changed, 844 insertions(+), 521 deletions(-)

Changes: dotnet/cecil@9c94433...9e8bd52

	% git diff --shortstat 9c9443396f8...9e8bd520939
	 20 files changed, 317 insertions(+), 205 deletions(-)

Changes: a8cd27e...4b20432

	% git diff --shortstat a8cd27e...4b20432
	 1522 files changed, 302553 insertions(+), 40811 deletions(-)

Context: dotnet/msbuild#11237
Context: dotnet/roslyn-analyzers#7525
Context: dotnet/maui#27040

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'

until we get dotnet/maui on .NET 10 (see e.g. dotnet/maui#27040).

Regressions discovered:

  * MSBuild: dotnet/msbuild#11237
  * Roslyn analyzers: dotnet/roslyn-analyzers#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 "previous"
    .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: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <[email protected]>
Co-authored-by: Jonathan Pobst <[email protected]>
jonathanpeppers added a commit to dotnet/android that referenced this pull request Jan 10, 2025
Context: https://github.com/dotnet/maui/tree/net10.0
Context: dotnet/maui#27040

dotnet/maui is using the `net10.0` branch for .NET 10.
…30-ci.main.25060.1+azdo.10810243

Microsoft.Android.Sdk.Windows
 From Version 35.99.0-ci.main.90 -> To Version 35.99.0-ci.main.94
…30-ci.main.25060.1+azdo.10810290

Microsoft.Android.Sdk.Windows
 From Version 35.99.0-ci.main.90 -> To Version 35.99.0-ci.main.95
…-6754e0524437edb231f8a98c399ff2a870ca3747-1

Microsoft.Android.Sdk.Windows
 From Version 35.99.0-ci.main.90 -> To Version 35.99.0-ci.main.97
…-37014d1029bae887ed12b8969c2327d60fd27e7c-1

Microsoft.Android.Sdk.Windows
 From Version 35.99.0-ci.main.90 -> To Version 35.99.0-ci.main.96
…-ff80c42817c2051daae46fcfaa579e6c19206a9a-1

Microsoft.Android.Sdk.Windows
 From Version 35.99.0-ci.main.90 -> To Version 35.99.0-ci.main.98
@rmarinho rmarinho merged commit 8bdd583 into net10.0 Jan 13, 2025
1 of 2 checks passed
@rmarinho rmarinho deleted the darc-net10.0-564d5329-c0d2-449e-a869-f3399167c1da branch January 13, 2025 13:05
jonathanpeppers added a commit to dotnet/android that referenced this pull request Jan 23, 2025
Context: https://github.com/dotnet/maui/tree/net10.0
Context: dotnet/maui#27040

dotnet/maui is using the `net10.0` branch for .NET 10.
jonathanpeppers added a commit to dotnet/android that referenced this pull request Jan 23, 2025
Context: https://github.com/dotnet/maui/tree/net10.0
Context: dotnet/maui#27040

dotnet/maui is using the `net10.0` branch for .NET 10.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/infrastructure 🏗️ area-infrastructure CI, Maestro / Coherency, upstream dependencies/versions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant