[DO NOT MERGE] TFM net9.0

.gitignore

@@ -1,3 +1,4 @@
+**/.idea/
 tools/**
 !tools/packages.config
 bin/

Directory.Build.props

@@ -4,8 +4,8 @@
     <RepositoryType>git</RepositoryType>
 
     <!-- Default TFM's we build for -->
-    <_DefaultTargetFrameworks>net8.0-android</_DefaultTargetFrameworks>
-
+    <_DefaultTargetFrameworks>net9.0-android</_DefaultTargetFrameworks>
+            
     <!-- Enable DIM/SIM for Classic (defaults to true on .NET) -->
     <AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>true</AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>
 
@@ -38,4 +38,5 @@
   <ItemGroup>
     <_TargetFrameworkNugetAarFolders Include="aar\net8.0-android34.0" />
   </ItemGroup>
+
 </Project>

azure-pipelines.yaml

@@ -35,7 +35,7 @@ resources:
       type: github
       name: xamarin/androidx
       endpoint: xamarin
-      ref: refs/heads/main
+      ref: refs/heads/mu-20240220-tfm-net90
 
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines

build.cake

@@ -627,36 +627,80 @@ Task("samples-directory-build-targets")
 	       	XmlElement element_ig = doc_all.CreateElement( string.Empty, "ItemGroup", string.Empty );
         	element_p.AppendChild(element_ig);
 
+
 			foreach(JObject jo in binderator_json_array[0]["artifacts"])
 			{
+				bool? dependency_only = (bool?) jo["dependencyOnly"];
+				if ( dependency_only == true)
+				{
+					continue;
+				}
+
+				string nuget_id		 = (string) jo["nugetId"];
+				/* 
+				errors
+
+					error XA4215: The Java type `X` is generated by more than one managed type.
+
+					ACW 
+
+						java error JAVA0000: Type X is defined multiple times:
+				*/
+				if 
+					(
+						nuget_id == "Xamarin.GooglePlayServices.Games" 
+						|| 
+						nuget_id.Contains("Xamarin.GooglePlayServices.Ads")
+						|| 
+						nuget_id == "Xamarin.GooglePlayServices.Measurement"
+						||
+						nuget_id == "Xamarin.Firebase.ML.Vision.Internal.Vkp"
+						|| 
+						nuget_id == "Xamarin.Google.MLKit.Vision.Internal.Vkp"
+						|| 
+						nuget_id == "Xamarin.Google.MLKit.ImageLabeling"
+						|| 
+						nuget_id == "Xamarin.Google.MLKit.ImageLabeling.Custom"
+						|| 
+						nuget_id == "Xamarin.Google.MLKit.ObjectDetection"
+						|| 
+						nuget_id == "Xamarin.Google.MLKit.ObjectDetection.Custom"
+						|| 
+						nuget_id == "Xamarin.Protobuf.Lite" 
+					)
+				{
+					continue;
+				}
+
+
 				string version       = (string) jo["version"];
 				string nuget_version = (string) jo["nugetVersion"];
 				Information($"groupId       = {jo["groupId"]}");
 				Information($"artifactId    = {jo["artifactId"]}");
 				Information($"version       = {version}");
 				Information($"nuget_version = {nuget_version}");
-				Information($"nugetId       = {jo["nugetId"]}");
+				Information($"nugetId       = {nuget_id}");
 
-				XmlElement element_pr = doc_all.CreateElement( string.Empty, "PackageReference", string.Empty );
+				XmlElement element_pr = doc_all.CreateElement( string.Empty, "PackageVersion", string.Empty );
 	        	element_ig.AppendChild(element_pr);
-				XmlAttribute attr_update = doc_all.CreateAttribute("Update");
-				attr_update.Value = (string) jo["nugetId"];
+				XmlAttribute attr_update = doc_all.CreateAttribute("Include");
+				attr_update.Value = nuget_id;
 				element_pr.Attributes.Append(attr_update);
 				XmlAttribute attr_version = doc_all.CreateAttribute("Version");
 				attr_version.Value = nuget_version;
 				element_pr.Attributes.Append(attr_version);
 			}
 
-			XmlElement xbd_pr = doc_all.CreateElement( string.Empty, "PackageReference", string.Empty );
+			XmlElement xbd_pr = doc_all.CreateElement( string.Empty, "PackageVersion", string.Empty );
 			element_ig.AppendChild(xbd_pr);
-			XmlAttribute xbd_attr_update = doc_all.CreateAttribute("Update");
+			XmlAttribute xbd_attr_update = doc_all.CreateAttribute("Include");
 			xbd_attr_update.Value = "Xamarin.Build.Download";
 			xbd_pr.Attributes.Append(xbd_attr_update);
 			XmlAttribute xbd_attr_version = doc_all.CreateAttribute("Version");
 			xbd_attr_version.Value = "0.11.4";
 			xbd_pr.Attributes.Append(xbd_attr_version);
 
-			doc_all.Save( System.IO.Path.Combine("samples", "Directory.Build.targets" ));
+			//doc_all.Save( System.IO.Path.Combine("samples", "Directory.Build.targets" ));
 			doc_all.Save( System.IO.Path.Combine("output", "Directory.Build.targets" ));
 
 			string[] lines = System.IO.File.ReadAllLines("./output/Directory.Build.targets");
@@ -677,11 +721,23 @@ Task("samples-directory-build-targets")
 										lines_gps.Add(line);
 									}
 
-									if
-										( 
-											line.Contains("Xamarin.GooglePlayServices.")
-										)
+									if (line.Contains("Xamarin.GooglePlayServices.") )
 									{
+										if 
+										(
+											line.Contains("Xamarin.GooglePlayServices.Games")
+											||
+											line.Contains("Xamarin.GooglePlayServices.Measurement")
+											||
+											line.Contains("Xamarin.GooglePlayServices.Ads")
+										)
+										{
+											Information($"{new string('-', 120)}");
+											Information($"Skipping {line}");
+
+											continue;											
+										}
+
 										lines_gps.Add(line);
 									}
 									else
@@ -703,11 +759,16 @@ Task("samples-directory-build-targets")
 										lines_fb.Add(line);
 									}
 
-									if
-										( 
-											line.Contains("Xamarin.Firebase.")
-										)
+									if ( line.Contains("Xamarin.Firebase.") )
 									{
+										if 
+										(
+											line.Contains("Xamarin.Firebase.ML.Vision.Internal.Vkp")
+										)
+										{
+											continue;											
+										}
+
 										lines_fb.Add(line);
 									}
 									else
@@ -729,11 +790,24 @@ Task("samples-directory-build-targets")
 										lines_mlkit.Add(line);
 									}
 
-									if
-										( 
-											line.Contains("Xamarin.Google.MLKit.")
-										)
+									if ( line.Contains("Xamarin.Google.MLKit.") )
 									{
+										if 
+										(
+											line.Contains("Xamarin.Google.MLKit.Vision.Internal.Vkp")
+											|| 
+											line.Contains("Xamarin.Google.MLKit.ImageLabeling")
+											|| 
+											line.Contains("Xamarin.Google.MLKit.ImageLabeling.Custom")
+											|| 
+											line.Contains("Xamarin.Google.MLKit.ObjectDetection")
+											|| 
+											line.Contains("Xamarin.Google.MLKit.ObjectDetection.Custom")
+										)
+										{
+											continue;											
+										}
+
 										lines_mlkit.Add(line);
 									}
 									else
@@ -755,10 +829,7 @@ Task("samples-directory-build-targets")
 										lines_gp.Add(line);
 									}
 
-									if
-										( 
-											line.Contains("Xamarin.Google.Android.Play.")
-										)
+									if ( line.Contains("Xamarin.Google.Android.Play.") )
 									{
 										lines_gp.Add(line);
 									}
@@ -795,9 +866,22 @@ Task("samples-directory-build-targets")
 											||
 											line.Contains("Xamarin.CodeHaus.")
 											||
+											line.Contains("Xamarin.Protobuf.")
+											||
 											line.Contains("Xamarin.TensorFlow.")
 										)
 									{
+										if 
+											(
+												line == "Xamarin.Protobuf.Lite"
+											)
+										{
+											Information($"{new string('-', 120)}");
+											Information($"Skipping {line}");
+
+											continue;	
+										}
+
 										lines_diverse.Add(line);
 									}
 									else
@@ -834,9 +918,44 @@ Task("samples-only-dotnet")
 
     string[] solutions = new string[]
     {
-        "./samples/dotnet/BuildAllDotNet.sln",
-        "./samples/dotnet/BuildAllMauiApp.sln",
-        "./samples/dotnet/BuildAllPlayDotNet.sln",
+		// "./samples/all/BuildAll.sln",
+        // "./samples/dotnet/BuildAllDotNet.sln",
+        //"./samples/dotnet/BuildAllMauiApp.sln",
+        //"./samples/dotnet/BuildAllPlayDotNet.sln",
+
+		"./samples/com.google.android.gms/play-services-nearby/NearbySample.sln",
+		"./samples/com.google.android.gms/play-services-vision/VisionSample.sln",
+		// System.Json ???
+		//"./samples/com.google.android.gms/play-services-safetynet/SafetyNetSample.sln",
+		"./samples/com.google.android.gms/play-services-gcm/GCMSample.sln",
+		"./samples/com.google.android.gms/play-services-places/PlacesAsync.sln",
+		"./samples/com.google.android.gms/play-services-plus/PlusSample.sln",
+		"./samples/com.google.android.gms/play-services-ads/AdMobSample.sln",
+		"./samples/com.google.android.gms/play-services-ads-lite/AdsLiteSample.sln",
+		"./samples/com.google.android.gms/play-services-panorama/PanoramaSample.sln",
+		"./samples/com.google.android.gms/play-services-analytics/AnalyticsSample.sln",
+		"./samples/com.google.android.gms/play-services-fitness/BasicSensorsApi.sln",
+		"./samples/com.google.android.gms/play-services-location/LocationSample.sln",
+		//"./samples/com.google.android.gms/play-services-games/BeGenerous.sln",
+		"./samples/com.google.android.gms/play-services-appinvite/AppInviteSample.sln",
+		"./samples/com.google.android.gms/play-services-drive/DriveSample.sln",
+		"./samples/com.google.android.gms/play-services-maps/MapsSample.sln",
+		"./samples/com.google.android.gms/play-services-wallet/AndroidPayQuickstart.sln",
+		"./samples/com.google.android.gms/play-services-cast/CastingCall.sln",
+
+		"./samples/com.google.firebase/firebase-invites/FirebaseInvitesQuickstart.sln",
+		"./samples/com.google.firebase/firebase-messaging/FirebaseMessagingQuickstart.sln",
+		//"./samples/com.google.firebase/firebase-analytics/FirebaseAnalyticsQuickstart.sln",
+		"./samples/com.google.firebase/firebase-auth/FirebaseAuthQuickstart.sln",
+		"./samples/com.google.firebase/firebase-config/FirebaseConfigQuickstart.sln",
+		"./samples/com.google.firebase/firebase-storage/FirebaseStorageQuickstart.sln",
+		"./samples/com.google.firebase/firebase-crash/FirebaseCrashReportingQuickstart.sln",
+		"./samples/com.google.firebase/firebase-appindexing/AppIndexingSample.sln",
+		"./samples/com.google.firebase/firebase-ads/FirebaseAdmobQuickstart.sln",
+
+		// Release mode
+		// error XAGJS7001: System.NullReferenceException: Object reference not set to an instance of an object.
+		//"./samples/com.google.android.play/play-services-assetpack/AssetPackSample.sln",
     };
 
     DotNetMSBuildSettings settings = null;
@@ -890,23 +1009,72 @@ Task("allbindingprojectrefs")
 {
 	Action<string,string> generateTargets = (string pattern, string file) => {
 		var xmlns = (XNamespace)"http://schemas.microsoft.com/developer/msbuild/2003";
-		var itemGroup = new XElement(xmlns + "ItemGroup");
+		var itemGroup1 = new XElement(xmlns + "ItemGroup");
+		var itemGroup2 = new XElement(xmlns + "ItemGroup");
 		foreach (var nupkg in GetFiles(pattern)) {
 			var filename = nupkg.GetFilenameWithoutExtension();
 		var match = Regex.Match(filename.ToString(), @"(.+?)\.(\d+[\.0-9\-a-zA-Z]+)");
-		itemGroup.Add(new XElement(xmlns + "PackageReference",
-			new XAttribute("Include", match.Groups[1]),
+
+		string nuget_id = match.Groups[1].Value;
+		/* 
+		ACW errors
+		*/
+		if (
+				nuget_id == "Xamarin.GooglePlayServices.Games" 
+				|| 
+				nuget_id == "Xamarin.Protobuf.Lite" 
+				|| 
+				nuget_id == "Xamarin.GooglePlayServices.Measurement"
+			)
+		{
+			continue;
+		}
+
+		itemGroup1.Add(new XElement(xmlns + "PackageVersion",
+			new XAttribute("Include", nuget_id),
 			new XAttribute("Version", match.Groups[2])));
+
+		itemGroup2.Add(new XElement(xmlns + "PackageReference",
+			new XAttribute("Include", nuget_id)));
 		}
-		var xdoc = new XDocument(new XElement(xmlns + "Project", itemGroup));
-		xdoc.Save(file);
+		var xdoc1 = new XDocument(new XElement(xmlns + "Project", itemGroup1));
+		var xdoc2 = new XDocument(new XElement(xmlns + "Project", itemGroup2));
+
+		string file1 = file.Replace("./output/", "./output/Directory.").Replace(".targets", ".packages.props");
+		string file2 = file.Replace("./output/", "./output/Directory.").Replace(".targets", ".packages.targets");
+		xdoc1.Save(file1);
+		xdoc2.Save(file2);
 
 	};
 
-	generateTargets("./output/Xamarin.Firebase.*.nupkg", "./output/FirebasePackages.targets");
-	generateTargets("./output/Xamarin.GooglePlayServices.*.nupkg", "./output/PlayServicesPackages.targets");
-	generateTargets("./output/Xamarin.Google.MLKit.*.nupkg", "./output/Google.MLKit.targets");
-	generateTargets("./output/Xamarin.Google.Android.Play.*.nupkg", "./output/Google.Play.targets");
+	generateTargets("./output/Xamarin.GooglePlayServices.*.nupkg", "./output/GPS.targets");
+	generateTargets("./output/Xamarin.Firebase.*.nupkg", "./output/FB.targets");
+	generateTargets("./output/Xamarin.Google.MLKit.*.nupkg", "./output/MLKit.targets");
+	generateTargets("./output/Xamarin.Google.Android.Play.*.nupkg", "./output/GooglePlay.targets");
+	generateTargets("./output/Square.*.nupkg", "./output/Square.targets");
+	generateTargets("./output/Xamarin.AndroidGlide.*.nupkg", "./output/Glide.targets");
+	generateTargets("./output/Xamarin.Android.Google.BillingClient.*.nupkg", "./output/BillingClient.targets");
+	generateTargets("./output/Xamarin.Android.Volley.*.nupkg", "./output/Volley.targets");
+	generateTargets("./output/Xamarin.AopAlliance.*.nupkg", "./output/AopAlliance.targets");
+	generateTargets("./output/Xamarin.Brotli.*.nupkg", "./output/Brotli.targets");
+	generateTargets("./output/Xamarin.Chromium.*.nupkg", "./output/Chromium.targets");
+	generateTargets("./output/Xamarin.CodeHaus.*.nupkg", "./output/CodeHaus.targets");
+	generateTargets("./output/Xamarin.Google.Code.FindBugs.*.nupkg", "./output/FindBugs.targets");
+	generateTargets("./output/Xamarin.Google.Dagger.*.nupkg", "./output/Dagger.targets");
+	generateTargets("./output/Xamarin.Google.ErrorProne.*.nupkg", "./output/ErrorProne.targets");
+	generateTargets("./output/Xamarin.Google.FlatBuffers.*.nupkg", "./output/FlatBuffers.targets");
+	generateTargets("./output/Xamarin.Google.Inject.Guice.*.nupkg", "./output/Inject.Guice.targets");
+	generateTargets("./output/Xamarin.Google.UserMessagingPlatform.*.nupkg", "./output/UserMessagingPlatform.targets");
+	generateTargets("./output/Xamarin.Google.ZXing.*.nupkg", "./output/ZXing.targets");
+	generateTargets("./output/Xamarin.GoogleAndroid.Annotations.*.nupkg", "./output/GoogleAndroid.Annotations.targets");
+	generateTargets("./output/Xamarin.GoogleAndroid.Libraries.Identity.GoogleId.*.nupkg", "./output/Identity.GoogleId.targets");
+	generateTargets("./output/Xamarin.Grpc.*.nupkg", "./output/Grpc.targets");
+	generateTargets("./output/Xamarin.Io.OpenCensus.*.nupkg", "./output/OpenCensus.targets");
+	generateTargets("./output/Xamarin.Io.PerfMark.*.nupkg", "./output/PerfMark.targets");
+	generateTargets("./output/Xamarin.JavaX.Inject.*.nupkg", "./output/JavaX.Inject.targets");
+	generateTargets("./output/Xamarin.OW2.ASM.*.nupkg", "./output/OW2.ASM.targets");
+	generateTargets("./output/Xamarin.Protobuf.*.nupkg", "./output/Protobuf.targets");
+	generateTargets("./output/Xamarin.TensorFlow.*.nupkg", "./output/TensorFlow.targets");
 });
 
 

cgmanifest.json

@@ -3560,6 +3560,19 @@
       },
       "license": "The Apache Software License, Version 2.0"
     },
+    {
+      "component": {
+        "type": "maven",
+        "maven": {
+          "artifactId": "tensorflow-lite-select-tf-ops",
+          "groupId": "org.tensorflow",
+          "version": "2.15.0",
+          "nuGetId": "Xamarin.TensorFlow.Lite.Select.TF.Ops",
+          "nuGetVersion": "2.15.0.1"
+        }
+      },
+      "license": "The Apache Software License, Version 2.0"
+    },
     {
       "component": {
         "type": "maven",