Target .NET 10 only and refresh public API baselines

.github/ISSUE_TEMPLATE/01-use-package.yml

@@ -13,7 +13,6 @@ body:
       description: In what target framework(s) of Android application(s) do you see this issue?
       multiple: true
       options:
-      - net9.0-android
       - net10.0-android
       - net11.0-android (Preview)
       - Other
@@ -24,7 +23,7 @@ body:
     attributes:
       label: Affected platform version
       description: Please provide the version number of the platform you see this issue on.
-      placeholder: E.g. VS 2022 17.14.0, .NET 9.0.100, etc.
+      placeholder: E.g. .NET SDK 10.0.100, etc.
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/04-other.yml

@@ -12,7 +12,6 @@ body:
       description: In what target framework(s) of Android application(s) do you see this issue?
       multiple: true
       options:
-      - net9.0-android
       - net10.0-android
       - net11.0-android (Preview)
       - Other
@@ -23,7 +22,7 @@ body:
     attributes:
       label: Affected platform version
       description: Please provide the version number of the platform you see this issue on.
-      placeholder: E.g. VS 2022 17.14.0, .NET 9.0.100, etc.
+      placeholder: E.g. .NET SDK 10.0.100, etc.
     validations:
       required: true
   - type: textarea

.github/copilot-instructions.md

@@ -14,7 +14,7 @@ Creates .NET for Android bindings for Google's Java/Kotlin libraries (AndroidX,
 - **`source/AssemblyInfo.cs`**: **DO NOT EDIT** - contains placeholder tokens
 
 ## Target Frameworks
-- `net9.0-android` (API 35) and `net10.0-android` (API 36)
+- `net10.0-android` (API 36)
 - Legacy Xamarin.Android support ended May 1, 2024
 
 ## Common Build Commands

BUILDING.md

@@ -4,7 +4,7 @@
 
 Before building the libraries and samples in this repository, you will need to install:
 
-  * [.NET 9.0](https://dotnet.microsoft.com/download) (.NET SDK 9.0 is currently required)
+  * [.NET 10.0](https://dotnet.microsoft.com/download) (.NET SDK 10.0 or newer with the .NET 10 Android workload is required)
 
   * [Cake .NET Tool](http://cakebuild.net):
 

Directory.Build.props

@@ -6,18 +6,12 @@
     <RepositoryCommit>$(BUILD_SOURCEVERSION)</RepositoryCommit>
 
     <!-- Default TFM's we build for -->
-    <_DefaultNetTargetFramework>net9.0</_DefaultNetTargetFramework>
+    <_DefaultNetTargetFramework>net10.0</_DefaultNetTargetFramework>
     <!-- base -->
-    <_DefaultPlatformVersionBase>35</_DefaultPlatformVersionBase>
-    <_DefaultTargetFrameworkVersionBase>9.0</_DefaultTargetFrameworkVersionBase>
+    <_DefaultPlatformVersionBase>36</_DefaultPlatformVersionBase>
+    <_DefaultTargetFrameworkVersionBase>10.0</_DefaultTargetFrameworkVersionBase>
     <_DefaultTargetFrameworkBase>net$(_DefaultTargetFrameworkVersionBase)-android$(_DefaultPlatformVersionBase).0</_DefaultTargetFrameworkBase>
-    <!-- next -->
-    <_DefaultPlatformVersionNext>36</_DefaultPlatformVersionNext>
-    <_DefaultTargetFrameworkVersionNext>10.0</_DefaultTargetFrameworkVersionNext>
-    <_DefaultTargetFrameworkNext>net$(_DefaultTargetFrameworkVersionNext)-android$(_DefaultPlatformVersionNext).0</_DefaultTargetFrameworkNext>
-    <!-- combined -->
-    <_DefaultTargetFrameworks Condition=" '$(GITHUB_ACTIONS)' != 'true' ">$(_DefaultTargetFrameworkBase);$(_DefaultTargetFrameworkNext)</_DefaultTargetFrameworks>
-    <_DefaultTargetFrameworks Condition=" '$(GITHUB_ACTIONS)' == 'true' ">$(_DefaultTargetFrameworkBase)</_DefaultTargetFrameworks>
+    <_DefaultTargetFrameworks>$(_DefaultTargetFrameworkBase)</_DefaultTargetFrameworks>
 
     <CheckEolWorkloads>false</CheckEolWorkloads>
 
@@ -97,14 +91,11 @@
   <ItemGroup>
     <AndroidXNuGetTargetFolders Include="build\$(_DefaultTargetFrameworkBase)" />
     <AndroidXNuGetTargetFolders Include="buildTransitive\$(_DefaultTargetFrameworkBase)" />
-    <AndroidXNuGetTargetFolders Include="build\$(_DefaultTargetFrameworkNext)" />
-    <AndroidXNuGetTargetFolders Include="buildTransitive\$(_DefaultTargetFrameworkNext)" />
   </ItemGroup>
 
   <!-- Folders that _._ files need to go into for packages without managed libraries -->
   <ItemGroup>
     <AndroidXNuGetLibFolders Include="lib\$(_DefaultTargetFrameworkBase)" />
-    <AndroidXNuGetLibFolders Include="lib\$(_DefaultTargetFrameworkNext)" />
   </ItemGroup>
 
   <ItemGroup>

build/ci/variables.yml

@@ -27,7 +27,7 @@ variables:
 
   # Tool variables
   dotnetVersion: '10.x'                                                                 # .NET version to install on agent
-  dotnetFrameworkVersion: 9                                                             # The number to use for TF (eg: netX.0-android)
+  dotnetFrameworkVersion: 10                                                            # The number to use for TF (eg: netX.0-android)
 
   # Standard test variables
   standardTestProject: tests/allpackages/AllPackagesTests.csproj                                                      # Standard tests project file

build/scripts/provision-android/provision-android.csproj

@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Build with the latest -->
-    <TargetFramework>$(_DefaultTargetFrameworkNext)</TargetFramework>
+    <TargetFramework>$(_DefaultTargetFrameworkBase)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <!-- Used by gradle projects -->
     <AndroidDependency Include="build-tools/35.0.0" />
     <AndroidDependency Include="platforms/android-34" />
-    <!-- But also install the base -->
+    <!-- Install the target platform -->
     <AndroidDependency Include="platforms/android-$(_DefaultPlatformVersionBase)" />
   </ItemGroup>
 </Project>

docs/buildtoolsinventory.csv

@@ -1,8 +1,8 @@
 BuildToolName,BuildToolVersion
-dotnet sdk, 9.0.301
-dotnet sdk, latestMajor
+dotnet sdk, 11.0.100-preview.7.26381.103
 msbuild-sdks Microsoft.Build.Traversal, 4.1.0
 msbuild-sdks Microsoft.Build.NoTargets, 3.7.56
+msbuild-sdks Microsoft.DotNet.Arcade.Sdk, 11.0.0-beta.26381.103
 Mono JIT compiler, 6.12.0.188 (2020-02/ca8abcb6bc4 Thu Oct 13 14:26:22 EDT 2022)
 nuget, 6.3.1.1
 api-tools,1.4.1

docs/buildtoolsinventory.md

@@ -4,16 +4,14 @@
 
 ```
 {
-    "sdk": {
-        "version": "9.0.301",
-        "rollForward": "latestMajor",
-        "allowPrerelease": true
+    "tools": {
+        "dotnet": "11.0.100-preview.7.26381.103"
     },
     "msbuild-sdks": {
         "Microsoft.Build.Traversal": "4.1.0",
-        "Microsoft.Build.NoTargets": "3.7.56"
+        "Microsoft.Build.NoTargets": "3.7.56",
+        "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26381.103"
     }
 }
 ```
-version9.0.301
-rollForwardlatestMajor
+dotnet11.0.100-preview.7.26381.103

source/androidx.compose.material3/material3-window-size-class-android/PublicAPI/PublicAPI.Unshipped.txt

@@ -33,5 +33,6 @@ override AndroidX.Compose.Material3.WindowSizeClass.WindowSizeClass.Companion.Jn
 override AndroidX.Compose.Material3.WindowSizeClass.WindowSizeClass.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
 override AndroidX.Compose.Material3.WindowSizeClass.WindowWidthSizeClass.Companion.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
 override AndroidX.Compose.Material3.WindowSizeClass.WindowWidthSizeClass.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
+static AndroidX.Compose.Material3.WindowSizeClass.AndroidWindowSizeClass_androidKt.CalculateWindowSizeClass(Android.App.Activity! activity, AndroidX.Compose.Runtime.IComposer? _composer, int _changed) -> AndroidX.Compose.Material3.WindowSizeClass.WindowSizeClass!
 static AndroidX.Compose.Material3.WindowSizeClass.WindowHeightSizeClass.CompareTo(int arg0, int other) -> int
 static AndroidX.Compose.Material3.WindowSizeClass.WindowWidthSizeClass.CompareTo(int arg0, int other) -> int

source/androidx.lifecycle/lifecycle-viewmodel-compose-android/PublicAPI/PublicAPI.Unshipped.txt

@@ -1,14 +1,30 @@
 #nullable enable
+AndroidX.Lifecycle.ViewModels.Compose.CanonicalName_jvmAndAndroidKt
 AndroidX.Lifecycle.ViewModels.Compose.ISavedStateHandleSaveableApi
 AndroidX.Lifecycle.ViewModels.Compose.LocalViewModelStoreOwner
+AndroidX.Lifecycle.ViewModels.Compose.LocalViewModelStoreOwner.GetCurrent(AndroidX.Compose.Runtime.IComposer? _composer, int _changed) -> AndroidX.Lifecycle.IViewModelStoreOwner?
+AndroidX.Lifecycle.ViewModels.Compose.LocalViewModelStoreOwner.Provides(AndroidX.Lifecycle.IViewModelStoreOwner! viewModelStoreOwner) -> AndroidX.Compose.Runtime.ProvidedValue!
 AndroidX.Lifecycle.ViewModels.Compose.LocalViewModelStoreOwner_androidKt
+AndroidX.Lifecycle.ViewModels.Compose.RememberViewModelStoreOwnerKt
+AndroidX.Lifecycle.ViewModels.Compose.RememberViewModelStoreProviderKt
 AndroidX.Lifecycle.ViewModels.Compose.SavedStateHandleSaveableApiAttribute
 AndroidX.Lifecycle.ViewModels.Compose.SavedStateHandleSaveableApiAttribute.SavedStateHandleSaveableApiAttribute() -> void
 AndroidX.Lifecycle.ViewModels.Compose.SavedStateHandleSaverKt
 AndroidX.Lifecycle.ViewModels.Compose.ViewModelKt
+override AndroidX.Lifecycle.ViewModels.Compose.CanonicalName_jvmAndAndroidKt.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
 override AndroidX.Lifecycle.ViewModels.Compose.LocalViewModelStoreOwner.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
 override AndroidX.Lifecycle.ViewModels.Compose.LocalViewModelStoreOwner_androidKt.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
+override AndroidX.Lifecycle.ViewModels.Compose.RememberViewModelStoreOwnerKt.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
+override AndroidX.Lifecycle.ViewModels.Compose.RememberViewModelStoreProviderKt.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
 override AndroidX.Lifecycle.ViewModels.Compose.SavedStateHandleSaverKt.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
 override AndroidX.Lifecycle.ViewModels.Compose.ViewModelKt.JniPeerMembers.get -> Java.Interop.JniPeerMembers!
+static AndroidX.Lifecycle.ViewModels.Compose.CanonicalName_jvmAndAndroidKt.GetCanonicalName(Kotlin.Reflect.IKClass? obj) -> string?
 static AndroidX.Lifecycle.ViewModels.Compose.LocalViewModelStoreOwner.Instance.get -> AndroidX.Lifecycle.ViewModels.Compose.LocalViewModelStoreOwner!
-static AndroidX.Lifecycle.ViewModels.Compose.ViewModelKt.Get(AndroidX.Lifecycle.IViewModelStoreOwner! _this_get, Kotlin.Reflect.IKClass! modelClass, string? key, AndroidX.Lifecycle.ViewModelProvider.IFactory? factory, AndroidX.Lifecycle.ViewModels.CreationExtras! extras) -> Java.Lang.Object!
+static AndroidX.Lifecycle.ViewModels.Compose.LocalViewModelStoreOwner_androidKt.ViewModelStoreOwnerHostDefaultKey.get -> AndroidX.Compose.Runtime.IHostDefaultKey!
+static AndroidX.Lifecycle.ViewModels.Compose.RememberViewModelStoreOwnerKt.RememberViewModelStoreOwner(AndroidX.Lifecycle.IViewModelStoreOwner? parent, AndroidX.SavedState.ISavedStateRegistryOwner? savedStateRegistryOwner, Android.OS.Bundle? defaultArgs, AndroidX.Lifecycle.ViewModels.CreationExtras? defaultCreationExtras, AndroidX.Lifecycle.ViewModelProvider.IFactory? defaultFactory, AndroidX.Compose.Runtime.IComposer? _composer, int p6, int _changed) -> AndroidX.Lifecycle.IViewModelStoreOwner!
+static AndroidX.Lifecycle.ViewModels.Compose.RememberViewModelStoreOwnerKt.RememberViewModelStoreOwner(AndroidX.Lifecycle.ViewModels.ViewModelStoreProvider! provider, AndroidX.SavedState.ISavedStateRegistryOwner? savedStateRegistryOwner, AndroidX.Compose.Runtime.IComposer? _composer, int p3, int _changed) -> AndroidX.Lifecycle.IViewModelStoreOwner!
+static AndroidX.Lifecycle.ViewModels.Compose.RememberViewModelStoreOwnerKt.RememberViewModelStoreOwner(Java.Lang.Object? key, AndroidX.Lifecycle.ViewModels.ViewModelStoreProvider! provider, AndroidX.SavedState.ISavedStateRegistryOwner? savedStateRegistryOwner, AndroidX.Compose.Runtime.IComposer? _composer, int p4, int _changed) -> AndroidX.Lifecycle.IViewModelStoreOwner!
+static AndroidX.Lifecycle.ViewModels.Compose.RememberViewModelStoreProviderKt.RememberViewModelStoreProvider(AndroidX.Lifecycle.IViewModelStoreOwner? parent, Android.OS.Bundle? defaultArgs, AndroidX.Lifecycle.ViewModels.CreationExtras? defaultCreationExtras, AndroidX.Lifecycle.ViewModelProvider.IFactory? defaultFactory, AndroidX.Compose.Runtime.IComposer? _composer, int p5, int _changed) -> AndroidX.Lifecycle.ViewModels.ViewModelStoreProvider!
+static AndroidX.Lifecycle.ViewModels.Compose.RememberViewModelStoreProviderKt.RememberViewModelStoreProvider(Java.Lang.Object? key, AndroidX.Lifecycle.IViewModelStoreOwner? parent, Android.OS.Bundle? defaultArgs, AndroidX.Lifecycle.ViewModels.CreationExtras? defaultCreationExtras, AndroidX.Lifecycle.ViewModelProvider.IFactory? defaultFactory, AndroidX.Compose.Runtime.IComposer? _composer, int p6, int _changed) -> AndroidX.Lifecycle.ViewModels.ViewModelStoreProvider!
+static AndroidX.Lifecycle.ViewModels.Compose.ViewModelKt.ViewModel(Java.Lang.Class! modelClass, AndroidX.Lifecycle.IViewModelStoreOwner? viewModelStoreOwner, string? key, AndroidX.Lifecycle.ViewModelProvider.IFactory? factory, AndroidX.Lifecycle.ViewModels.CreationExtras? extras, AndroidX.Compose.Runtime.IComposer? _composer, int p6, int _changed) -> Java.Lang.Object!
+static AndroidX.Lifecycle.ViewModels.Compose.ViewModelKt.ViewModel(Kotlin.Reflect.IKClass! modelClass, AndroidX.Lifecycle.IViewModelStoreOwner? viewModelStoreOwner, string? key, AndroidX.Lifecycle.ViewModelProvider.IFactory? factory, AndroidX.Lifecycle.ViewModels.CreationExtras? extras, AndroidX.Compose.Runtime.IComposer? _composer, int p6, int _changed) -> Java.Lang.Object!

source/androidx.media3/media3-common/PublicAPI/PublicAPI.Unshipped.txt

@@ -2360,6 +2360,8 @@ AndroidX.Media3.Common.Util.IHandlerWrapperMessage.SendToTarget() -> void
 AndroidX.Media3.Common.Util.IHandlerWrapperMessage.Target.get -> AndroidX.Media3.Common.Util.IHandlerWrapper?
 AndroidX.Media3.Common.Util.INonNullApi
 AndroidX.Media3.Common.Util.INullableType
+AndroidX.Media3.Common.Util.IThrowingRunnable
+AndroidX.Media3.Common.Util.IThrowingRunnable.Run() -> void
 AndroidX.Media3.Common.Util.ITimestampConsumer
 AndroidX.Media3.Common.Util.ITimestampConsumer.OnTimestamp(long p0) -> void
 AndroidX.Media3.Common.Util.ITimestampIterator
@@ -3333,9 +3335,9 @@ const AndroidX.Media3.Common.MediaItem.DefaultMediaId = "" -> string!
 const AndroidX.Media3.Common.MediaLibraryInfo.InterfaceVersion = 10 -> int
 const AndroidX.Media3.Common.MediaLibraryInfo.Tag = "AndroidXMedia3" -> string!
 const AndroidX.Media3.Common.MediaLibraryInfo.TraceEnabled = true -> bool
-const AndroidX.Media3.Common.MediaLibraryInfo.Version = "1.11.0" -> string!
-const AndroidX.Media3.Common.MediaLibraryInfo.VersionInt = 1011000300 -> int
-const AndroidX.Media3.Common.MediaLibraryInfo.VersionSlashy = "AndroidXMedia3/1.11.0" -> string!
+const AndroidX.Media3.Common.MediaLibraryInfo.Version = "1.11.1" -> string!
+const AndroidX.Media3.Common.MediaLibraryInfo.VersionInt = 1011001300 -> int
+const AndroidX.Media3.Common.MediaLibraryInfo.VersionSlashy = "AndroidXMedia3/1.11.1" -> string!
 const AndroidX.Media3.Common.MediaMetadata.FolderTypeAlbums = 2 -> int
 const AndroidX.Media3.Common.MediaMetadata.FolderTypeArtists = 3 -> int
 const AndroidX.Media3.Common.MediaMetadata.FolderTypeGenres = 4 -> int
@@ -4170,6 +4172,9 @@ static AndroidX.Media3.Common.Util.CodecSpecificDataUtil.GetVideoResolutionFromM
 static AndroidX.Media3.Common.Util.CodecSpecificDataUtil.GetVorbisInitializationData(AndroidX.Media3.Common.Format? format) -> Java.Nio.ByteBuffer?
 static AndroidX.Media3.Common.Util.CodecSpecificDataUtil.H263ConstToLevelNumber(int levelConst) -> int
 static AndroidX.Media3.Common.Util.CodecSpecificDataUtil.H263ConstToProfileNumber(int profileConst) -> int
+static AndroidX.Media3.Common.Util.CodecSpecificDataUtil.IsHagcMetadata(Java.Nio.ByteBuffer? buffer) -> bool
+static AndroidX.Media3.Common.Util.CodecSpecificDataUtil.IsHagcMetadata(byte[]? data, int length) -> bool
+static AndroidX.Media3.Common.Util.CodecSpecificDataUtil.IsHagcTrack(AndroidX.Media3.Common.Format? format) -> bool
 static AndroidX.Media3.Common.Util.CodecSpecificDataUtil.MediaCodecProfileAndLevel.Unsupportable.get -> AndroidX.Media3.Common.Util.CodecSpecificDataUtil.MediaCodecProfileAndLevel?
 static AndroidX.Media3.Common.Util.CodecSpecificDataUtil.ParseAlacAudioSpecificConfig(byte[]? audioSpecificConfig) -> int[]?
 static AndroidX.Media3.Common.Util.CodecSpecificDataUtil.ParseCea708InitializationData(System.Collections.Generic.IList<byte[]!>? initializationData) -> bool
@@ -4470,6 +4475,7 @@ static AndroidX.Media3.Common.Util.Util.Sum(params long[]? summands) -> long
 static AndroidX.Media3.Common.Util.Util.TableExists(Android.Database.Sqlite.SQLiteDatabase? database, string? tableName) -> bool
 static AndroidX.Media3.Common.Util.Util.ToByteArray(System.IO.Stream? inputStream) -> byte[]?
 static AndroidX.Media3.Common.Util.Util.ToByteArray(float value) -> byte[]?
+static AndroidX.Media3.Common.Util.Util.ToByteArray(int value) -> byte[]?
 static AndroidX.Media3.Common.Util.Util.ToByteArray(params int[]? values) -> byte[]?
 static AndroidX.Media3.Common.Util.Util.ToFourccString(int fourcc) -> string?
 static AndroidX.Media3.Common.Util.Util.ToHexString(byte[]? bytes) -> string?