Skip to content

[darc] track previous .NET Android manifests #9981

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 1 commit into from
Mar 27, 2025
Merged

[darc] track previous .NET Android manifests #9981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,15 @@
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>f7a78a77069262841fe3c3c6b89ff243fc43cefc</Sha>
</Dependency>
<!-- Previous .NET Android version -->
<Dependency Name="Microsoft.Android.Sdk.Windows" Version="35.0.61">
<!-- Previous .NET Android version(s) -->
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-9.0.100" Version="35.0.61">
<Uri>https://github.com/dotnet/android</Uri>
<Sha>e7876a4f92d894b40c191a24c2b74f06d4bf4573</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-8.0.100" Version="34.0.154">
Copy link
Member

@pjcollins pjcollins Mar 27, 2025

Choose a reason for hiding this comment

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

Do we have an idea of how many .NET 10 previews we plan to support .NET 8 targeting for? This is easy enough to revert whenever we drop that support either way, and should hopefully make dependency updating easier in general

Copy link
Member Author

@jonathanpeppers jonathanpeppers Mar 27, 2025

Choose a reason for hiding this comment

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

We will probably remove this entry around May, and remove this from the workload manifest at the same time:

android/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.json

Lines 24 to 33 in e347cd3

"android-net8": {
"description": ".NET SDK Workload for building .NET 8 Android applications.",
"packs": [ "Microsoft.Android.Sdk.net8" ],
"platforms": [ "win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-x64", "osx-arm64" ],
"extends" : [
"android",
"microsoft-net-runtime-android-net8",
"microsoft-net-runtime-android-aot-net8"
]
}

<Uri>https://github.com/dotnet/android</Uri>
<Sha>82d8938cf80f6d5fa6c28529ddfbdb753d805ab4</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="7.0.0-beta.22103.1">
Expand Down
7 changes: 4 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25125.1</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>$(MicrosoftNETCoreAppRefPackageVersion)</SystemIOHashingPackageVersion>
<!-- Previous .NET Android version -->
<MicrosoftAndroidSdkWindowsPackageVersion>35.0.61</MicrosoftAndroidSdkWindowsPackageVersion>
<AndroidNetPreviousVersion>$(MicrosoftAndroidSdkWindowsPackageVersion)</AndroidNetPreviousVersion>
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.61</MicrosoftNETSdkAndroidManifest90100PackageVersion>
<AndroidNetPreviousVersion>$(MicrosoftNETSdkAndroidManifest90100PackageVersion)</AndroidNetPreviousVersion>
<!-- To be removed before .NET 10 GA -->
<AndroidNet8PreviousVersion>34.0.154</AndroidNet8PreviousVersion>
<MicrosoftNETSdkAndroidManifest80100PackageVersion>34.0.154</MicrosoftNETSdkAndroidManifest80100PackageVersion>
<AndroidNet8PreviousVersion>$(MicrosoftNETSdkAndroidManifest80100PackageVersion)</AndroidNet8PreviousVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Match the first three version numbers and append 00 -->
Expand Down
Loading