[DO NOT MERGE] TFM net9.0

Directory.Build.props

@@ -6,9 +6,8 @@
     <RepositoryCommit>$(BUILD_SOURCEVERSION)</RepositoryCommit>
 
     <!-- Default TFM's we build for -->
-    <_DefaultTargetFrameworks>net8.0-android</_DefaultTargetFrameworks>
-    <_DefaultNetTargetFrameworks>net8.0</_DefaultNetTargetFrameworks>
-
+    <_DefaultTargetFrameworks>net9.0-android</_DefaultTargetFrameworks>
+    <_DefaultNetTargetFrameworks>net9.0</_DefaultNetTargetFrameworks>
     <!-- Enable DIM/SIM for Classic (defaults to true on .NET) -->
     <AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>true</AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>
 
@@ -83,13 +82,13 @@
 
   <!-- Folders that .targets files need to go into -->
   <ItemGroup>
-    <AndroidXNuGetTargetFolders Include="build\net8.0-android34.0" />
-    <AndroidXNuGetTargetFolders Include="buildTransitive\net8.0-android34.0" />
+    <AndroidXNuGetTargetFolders Include="build\net9.0-android34.0" />
+    <AndroidXNuGetTargetFolders Include="buildTransitive\net9.0-android34.0" />
   </ItemGroup>
 
   <!-- Folders that _._ files need to go into for packages without managed libraries -->
   <ItemGroup>
-    <AndroidXNuGetLibFolders Include="lib\net8.0-android34.0" />
+    <AndroidXNuGetLibFolders Include="lib\net9.0-android34.0" />
   </ItemGroup>
 
   <ItemGroup>

build/ci/setup-environment.yml

@@ -15,46 +15,15 @@ steps:
       includePreviewVersions: true
     condition: ne('$(dotnetVersion)', '')
 
-  - ${{ if eq(parameters.runDotnetNextTest, true) }}:
-    - task: UseDotNet@2
-      displayName: 'Use dotnet $(dotnetNextVersion)'
-      inputs:
-        version: $(dotnetNextVersion)
-        performMultiLevelLookup: true
-        includePreviewVersions: true
-
-  - ${{ each tool in parameters.dotnetTools }}:
-    - ${{ each pair in tool }}:
-      - pwsh: dotnet tool update -g ${{ pair.key }} --version ${{ pair.value }}
-        displayName: 'Install tool: ${{ pair.key }}'
-
-  - ${{ if eq(parameters.runDotnetNextTest, true) }}:
-    - pwsh: |
-        dotnet cake -t=dotnet-next `
-          --dotnet-version="$(dotnetNextVersion)" `
-          --framework-version="$(dotnetNextFrameworkVersion)" `
-          --api-level-version="$(dotnetNextApiLevel)"
-      displayName: Set up dotnet-next test changes
-
-  - ${{ if eq(parameters.runDotnetNextTest, false) }}:
-    - pwsh: |
-        dotnet workload install maui --verbosity diag --from-rollback-file $(dotnetWorkloadRollbackFile) --source $(dotnetWorkloadSource) --source $(dotnetNuGetOrgSource)
-        if ($LASTEXITCODE -ne 0) {
-            Write-Host "##vso[task.logissue type=error]Failed to install workloads."
-            Write-Host "##vso[task.complete result=Failed;]"
-            exit 0
-        }
-      displayName: Install .NET Workloads
-
-  - ${{ if eq(parameters.runDotnetNextTest, true) }}:
-    - pwsh: |
-        dotnet workload install maui --verbosity diag
-        if ($LASTEXITCODE -ne 0) {
-            Write-Host "##vso[task.logissue type=error]Failed to install workloads."
-            Write-Host "##vso[task.complete result=Failed;]"
-            exit 0
-        }
-      displayName: Install Preview .NET Workloads
+  - pwsh: |
+      dotnet workload install android --verbosity diag --from-rollback-file $(dotnetWorkloadRollbackFile) --source $(dotnetWorkloadSource) --source $(dotnetNuGetOrgSource)
+      dotnet workload install maui --verbosity diag --from-rollback-file $(dotnetWorkloadRollbackFile) --source $(dotnetWorkloadSource) --source $(dotnetNuGetOrgSource)
+      if ($LASTEXITCODE -ne 0) {
+          Write-Host "##vso[task.logissue type=error]Failed to install workloads."
+          Write-Host "##vso[task.complete result=Failed;]"
+          exit 0
+      }
+    displayName: Install .NET Workloads
 
   - bash: |
       if [[ "$(Agent.Name)" == *"Azure Pipelines"* ]]; then

build/ci/variables.yml

@@ -19,7 +19,7 @@ variables:
   macosAgentPoolName: VSEng-VSMac-Xamarin-Shared                                        # macOS VM pool name
 
   # Tool variables
-  dotnetVersion: '8.0.407'                                                              # .NET version to install on agent
+  dotnetVersion: '9.0.201'                                                              # .NET version to install on agent
   dotnetWorkloadRollbackFile: 'workloads.json'                                          # Rollback file specifying workload versions to install
   dotnetNuGetOrgSource: 'https://api.nuget.org/v3/index.json'                           # NuGet.org URL to find workloads
   dotnetWorkloadSource: 'https://aka.ms/dotnet6/nuget/index.json'                       # .NET engineering URL to find workloads

docs/buildtoolsinventory.csv

@@ -1,19 +0,0 @@
-BuildToolName,BuildToolVersion
-dotnet sdk, 8.0.400
-dotnet sdk, patch
-msbuild-sdks MSBuild.Sdk.Extras, 3.0.44
-msbuild-sdks Microsoft.Build.Traversal, 4.1.0
-msbuild-sdks Microsoft.Build.NoTargets, 3.7.56
-msbuild-sdks Xamarin.Legacy.Sdk, 0.2.0-alpha4
-Mono JIT compiler, 6.12.0.188 (2020-02/ca8abcb6bc4 Thu Oct 13 14:26:22 EDT 2022)
-nuget, 6.3.1.1
-private-api-tools,1.0.3
-xamarin.androidbinderator.tool,0.5.7
-Gradle, 8.10.2
-Kotlin, 1.9.24
-Groovy, 3.0.22
-Ant, Apache Ant(TM) version 1.10.14 compiled on August 16 2023
-JVM, Launcher   11.0.24 (Eclipse Adoptium 11.0.24+8)
-JVM, Daemon     /Users/runner/hostedtoolcache/Java_Temurin-Hotspot_jdk/11.0.24-8/x64/Contents/Home (no JDK specified, using current Java home)
-openjdk, 11.0.24 2024-07-16
-javac, 11.0.24

docs/buildtoolsinventory.md

@@ -1,23 +0,0 @@
-# Executive Order Build Tools Inventory
-
-./buildtoolsinventory.csv
-
-```
-{
-    "sdk": 
-    {
-        "version": "8.0.400",
-        "rollForward": "patch"
-    },
-    "msbuild-sdks": 
-    {
-        "MSBuild.Sdk.Extras": "3.0.44",
-        "Microsoft.Build.Traversal": "4.1.0",
-        "Microsoft.Build.NoTargets": "3.7.56",
-        "Xamarin.Legacy.Sdk": "0.2.0-alpha4"
-    }
-}
-
-```
-version8.0.400
-rollForwardpatch

global.json

@@ -1,7 +1,7 @@
 {
     "sdk": 
     {
-        "version": "8.0.407",
+        "version": "9.0.201",
         "rollForward": "patch"
     },
     "msbuild-sdks": 

samples/.mono/registry/CurrentUser/software/microsoft/csdevkit/v1/pids/39781_133595665255799770/values.xml

@@ -0,0 +1,3 @@
+<values>
+  <value name="StillAlive" type="qword">133595683463017070</value>
+</values>

samples/Directory.Packages.props

@@ -0,0 +1,3 @@
+<Project>
+    <Import Project="../output/Directory.packages.props" />
+</Project>

samples/dotnet/BuildAllDotNet/BuildAllDotNet.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
+
+    <!-- Some packages specify a minimum of 28 (eg: Xamarin.AndroidX.HeifWriter) -->
+    <SupportedOSPlatformVersion>28</SupportedOSPlatformVersion>
+    <OutputType>Exe</OutputType>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <ApplicationId>com.companyname.BuildAllDotNet</ApplicationId>
+    <ApplicationVersion>1</ApplicationVersion>
+    <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+
+    <!-- Override property from 'Directory.Build.props' -->
+    <AndroidGenerateResourceDesigner>true</AndroidGenerateResourceDesigner>
+
+    <!-- Prevent linking, since that would remove ~everything -->
+    <PublishTrimmed>False</PublishTrimmed>
+    <RunAOTCompilation>False</RunAOTCompilation>
+    <JavaMaximumHeapSize>4G</JavaMaximumHeapSize>
+  </PropertyGroup>
+
+  <Import Project="..\..\..\output\AllPackages.targets" />
+
+</Project>

samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj

@@ -0,0 +1,83 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
+		<OutputType>Exe</OutputType>
+		<RootNamespace>BuildAllMauiApp</RootNamespace>
+		<UseMaui>true</UseMaui>
+		<SingleProject>true</SingleProject>
+		<ImplicitUsings>enable</ImplicitUsings>
+
+		<!-- Display name -->
+		<ApplicationTitle>BuildAllMauiApp</ApplicationTitle>
+
+		<!-- App Identifier -->
+		<ApplicationId>com.companyname.buildallmauiapp</ApplicationId>
+		<ApplicationIdGuid>bf82dcee-2471-4ec8-856a-a3d17e578c8e</ApplicationIdGuid>
+
+		<!-- Versions -->
+		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+		<ApplicationVersion>1</ApplicationVersion>
+
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">28.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</SupportedOSPlatformVersion>
+		<TargetPlatformMinVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">10.0.17763.0</TargetPlatformMinVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen'">6.5</SupportedOSPlatformVersion>
+	</PropertyGroup>
+
+	<PropertyGroup
+		Condition="$(TargetFramework.EndsWith('-android')) == true"
+		>
+		<JavaMaximumHeapSize>4G</JavaMaximumHeapSize>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<!-- App Icon -->
+		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />
+
+		<!-- Splash Screen -->
+		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
+
+		<!-- Images -->
+		<MauiImage Include="Resources\Images\*" />
+		<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
+
+		<!-- Custom Fonts -->
+		<MauiFont Include="Resources\Fonts\*" />
+
+		<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
+		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
+	</ItemGroup>
+
+	<Import 
+		Condition="$(TargetFramework.StartsWith('net8.0-android')) == true"
+		Project="..\..\..\output\AllPackages.targets" 
+		/>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Maui.Controls" />
+		<PackageReference Include="Microsoft.Maui.Controls.Compatibility" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" />
+	</ItemGroup>
+
+		<!--
+	./samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj : 
+	error NU1605: Detected package downgrade: Xamarin.AndroidX.Security.SecurityCrypto from 1.1.0-alpha03 to 1.0.0.7. 
+	Reference the package directly from the project to select a different version.  
+	[./samples/dotnet/BuildAllMauiApp.sln]
+	./samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj : 
+	error NU1605:  BuildAllMauiApp -> Microsoft.Maui.Dependencies 6.0.312 -> Xamarin.AndroidX.Security.SecurityCrypto (>= 1.1.0-alpha03)  
+	[./samples/dotnet/BuildAllMauiApp.sln]
+	./samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj : 
+	error NU1605:  BuildAllMauiApp -> Xamarin.AndroidX.Security.SecurityCrypto (>= 1.0.0.7) 
+	[./samples/dotnet/BuildAllMauiApp.sln]
+	-->
+	<ItemGroup
+		Condition="$(TargetFramework.StartsWith('net8.0-android')) == true"
+		>
+		<PackageReference Update="Xamarin.AndroidX.Security.SecurityCrypto" Version="[1.1.0.1-alpha06]" />
+		<PackageReference Update="Xamarin.AndroidX.Security.SecurityCrypto.Ktx" Version="[1.1.0.1-alpha06]" />
+	</ItemGroup>
+</Project>

samples/dotnet/BuildAllMauiApp/Platforms/Android/___AndroidManifest.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.companyname.buildallmauiapp" android:versionCode="1" android:versionName="1.0">
+	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:supportsRtl="true" android:largeHeap="true" android:label="BuildAllMauiApp"></application>
+	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+	<uses-permission android:name="android.permission.INTERNET" />
+	<uses-sdk android:minSdkVersion="28" android:targetSdkVersion="34" />
+</manifest>

samples/dotnet/Directory.Packages.props

@@ -0,0 +1,15 @@
+<Project>
+    <Import Project="..\Directory.Packages.props"/>
+
+	<ItemGroup>
+		<PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
+		<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
+		<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0-preview.3.24172.9" />
+	</ItemGroup>
+  <ItemGroup>
+    <PackageVersion Include="Xamarin.Forms" Version="5.0.0.2612" />  
+    <PackageVersion Include="Xamarin.Essentials" Version="1.8.0" />
+    <PackageVersion Include="Xamarin.Google.Guava.ListenableFuture" Version="1.0.0.16" />
+    <PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.6.0.2" />            
+  </ItemGroup>
+</Project>

source/androidx.media3/media3-exoplayer/Additions/AndroidX.Media3.ExoPlayer.IExoPlayer.cs

@@ -10,32 +10,34 @@ namespace AndroidX.Media3.ExoPlayer;
 internal partial class IExoPlayerInvoker
 {
 	// These invokers are generated with IList<global::AndroidX.Media3.Common.MediaItem> instead of IList<MediaItem>
-	static Delegate? cb_addMediaItems_ILSystem_Collections_Generic_IList_1_;
+	static Delegate? cb_addMediaItems_AddMediaItems_ILSystem_Collections_Generic_IList_1__V;
 #pragma warning disable 0169
 	static Delegate GetAddMediaItems_ILSystem_Collections_Generic_IList_1_Handler ()
 	{
-		if (cb_addMediaItems_ILSystem_Collections_Generic_IList_1_ == null)
-			cb_addMediaItems_ILSystem_Collections_Generic_IList_1_ = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPIL_V (n_AddMediaItems_ILSystem_Collections_Generic_IList_1_));
-		return cb_addMediaItems_ILSystem_Collections_Generic_IList_1_;
+		if (cb_addMediaItems_AddMediaItems_ILSystem_Collections_Generic_IList_1__V == null)
+			cb_addMediaItems_AddMediaItems_ILSystem_Collections_Generic_IList_1__V = JNINativeWrapper.CreateDelegate (new _JniMarshal_PPIL_V (n_AddMediaItems_ILSystem_Collections_Generic_IList_1_));
+		return cb_addMediaItems_AddMediaItems_ILSystem_Collections_Generic_IList_1__V;
 	}
 
 	static void n_AddMediaItems_ILSystem_Collections_Generic_IList_1_ (IntPtr jnienv, IntPtr native__this, int p0, IntPtr native_p1)
 	{
 		var __this = global::Java.Lang.Object.GetObject<global::AndroidX.Media3.ExoPlayer.IExoPlayer> (jnienv, native__this, JniHandleOwnership.DoNotTransfer)!;
-		var p1 = (global::System.Collections.Generic.IList<global::AndroidX.Media3.Common.MediaItem> ?)global::Java.Lang.Object.GetObject <Java.Lang.Object> (native_p1, JniHandleOwnership.DoNotTransfer);
+		var p1 = (global::System.Collections.Generic.IList`1?)global::Java.Lang.Object.GetObject<global::System.Collections.Generic.IList`1> (native_p1, JniHandleOwnership.DoNotTransfer);
 		__this.AddMediaItems (p0, p1);
 	}
 #pragma warning restore 0169
 
-	IntPtr id_addMediaItems_ILSystem_Collections_Generic_IList_1_;
-	public unsafe void AddMediaItems (int p0, global::System.Collections.Generic.IList<global::AndroidX.Media3.Common.MediaItem>? p1)
+	public unsafe void AddMediaItems (int p0, global::System.Collections.Generic.IList`1? p1)
 	{
-		if (id_addMediaItems_ILSystem_Collections_Generic_IList_1_ == IntPtr.Zero)
-			id_addMediaItems_ILSystem_Collections_Generic_IList_1_ = JNIEnv.GetMethodID (class_ref, "addMediaItems", "(ILSystem/Collections/Generic/IList<global::AndroidX.Media3.Common.MediaItem>;)V");
-		JValue* __args = stackalloc JValue [2];
-		__args [0] = new JValue (p0);
-		__args [1] = new JValue ((p1 == null) ? IntPtr.Zero : ((global::Java.Lang.Object) p1).Handle);
-		JNIEnv.CallVoidMethod (((global::Java.Lang.Object) this).Handle, id_addMediaItems_ILSystem_Collections_Generic_IList_1_, __args);
+		const string __id = "addMediaItems.(ILSystem/Collections/Generic/IList`1;)V";
+		try {
+			JniArgumentValue* __args = stackalloc JniArgumentValue [2];
+			__args [0] = new JniArgumentValue (p0);
+			__args [1] = new JniArgumentValue ((p1 == null) ? IntPtr.Zero : ((global::Java.Lang.Object) p1).Handle);
+			_members_androidx_media3_common_Player.InstanceMethods.InvokeAbstractVoidMethod (__id, this, __args);
+		} finally {
+			global::System.GC.KeepAlive (p1);
+		}
 	}
 
 	static Delegate? cb_addMediaItems_LSystem_Collections_Generic_IList_1_;

source/androidx.media3/media3-exoplayer/Transforms/Metadata.xml

@@ -5,7 +5,9 @@
     name="skipInvokerMethods"
     >
     androidx/media3/common/Player.addMediaItems(ILSystem/Collections/Generic/IList`1;)V
+    <!--
     androidx/media3/common/Player.addMediaItems(LSystem/Collections/Generic/IList`1;)V
+    -->
     androidx/media3/common/Player.setMediaItems(LSystem/Collections/Generic/IList`1;)V
     androidx/media3/common/Player.setMediaItems(LSystem/Collections/Generic/IList`1;Z)V
     androidx/media3/common/Player.setMediaItems(LSystem/Collections/Generic/IList`1;IJ)V    

source/androidx.wear.protolayout/protolayout-expression/Transforms/Metadata.xml

@@ -18,6 +18,9 @@
         >
         Java.Lang.Object
     </attr>
+    <remove-node
+        path="/api/package[@name='androidx.wear.protolayout.expression']/interface[@name='DynamicBuilders.DynamicZonedDateTime']"
+        />
 
     <remove-node
         path="/api/package[@name='androidx.wear.protolayout.expression']/interface[@name='DynamicBuilders.DynamicZonedDateTime']"