Remove Classic support.

Directory.Build.props

@@ -4,7 +4,7 @@
     <RepositoryType>git</RepositoryType>
 
     <!-- Default TFM's we build for -->
-    <_DefaultTargetFrameworks>MonoAndroid12.0;net6.0-android;net7.0-android</_DefaultTargetFrameworks>
+    <_DefaultTargetFrameworks>net7.0-android</_DefaultTargetFrameworks>
 
     <!-- Use an updated 'generator' -->
     <!-- It's ok to use "Windows" here because we only use managed code from this package -->

azure-pipelines.yaml

@@ -39,7 +39,7 @@ resources:
       type: github
       name: xamarin/androidx
       endpoint: xamarin
-      ref: refs/heads/main
+      ref: refs/heads/no-classic
 
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines

build.cake

@@ -817,105 +817,6 @@ Task("samples-directory-build-targets")
 		}
 	);
 
-Task("samples")
-	.IsDependentOn("libs")
-	.IsDependentOn("samples-directory-build-targets")
-	.IsDependentOn("samples-only")
-    .IsDependentOn("samples-only-dotnet")
-	;
-
-Task("samples-only")
-	.IsDependentOn("samples-directory-build-targets")
-	.IsDependentOn("mergetargets")
-	.IsDependentOn("allbindingprojectrefs")
-	.Does
-(
-	() =>
-	{
-		Configs = new string[] { "Debug", "Release" };
-
-		DeleteDirectories(GetDirectories("./samples/**/bin/"), new DeleteDirectorySettings() { Force = true, Recursive = true });
-		DeleteDirectories(GetDirectories("./samples/**/obj/"), new DeleteDirectorySettings() { Force = true, Recursive = true });
-
-		EnsureDirectoryExists($@"./output/failed/");
-
-		var sampleSlns = GetFiles("./samples/all/**/*.sln")
-							.Concat(GetFiles("./samples/com.google.android.gms/**/*.sln"))
-							.Concat(GetFiles("./samples/com.google.firebase/**/*.sln"))
-							;
-
-		foreach(string config in Configs)
-		{
-			foreach (var sampleSln in sampleSlns)
-			{
-				string filename_sln = sampleSln.GetFilenameWithoutExtension().ToString();
-
-				if ( ! filename_sln.Contains("BuildAll") )
-				{
-					NuGetRestore(sampleSln, new NuGetRestoreSettings { }); // R8 errors
-				}
-				if
-				(
-					sampleSln.ToString().Contains("com.google.android.gms/play-services-location/LocationSample.sln")
-					||
-					sampleSln.ToString().Contains("com.google.android.gms/play-services-cast/CastingCall.sln")
-					||
-					sampleSln.ToString().Contains("com.google.android.gms/play-services-games/BeGenerous.sln")
-					||
-					sampleSln.ToString().Contains("com.google.android.gms/play-services-wallet/AndroidPayQuickstart.sln")
-					||
-					sampleSln.ToString().Contains("com.google.firebase/firebase-analytics/FirebaseAnalyticsQuickstart.sln")
-					||
-					sampleSln.ToString().Contains("com.google.firebase/firebase-storage/FirebaseStorageQuickstart.sln")
-				)
-				{
-					// skip problematic samples for now
-					continue;
-				}
-				Information($"Solution: {filename_sln}");
-				string bl = MakeAbsolute(new FilePath($"./output/{filename_sln}{config}.sample.binlog")).FullPath;
-				try
-				{
-					MSBuild
-						(
-							sampleSln,
-							c =>
-							{
-								c.Configuration = config;
-								c.Properties.Add("DesignTimeBuild", new [] { "false" });
-								c.BinaryLogger = new MSBuildBinaryLogSettings
-														{
-															Enabled = true,
-															FileName = bl
-														};
-								if (! string.IsNullOrEmpty(ANDROID_HOME))
-								{
-									c.Properties.Add("AndroidSdkDirectory", new [] { $"{ANDROID_HOME}" } );
-								}
-							}
-						);
-				}
-				catch (Exception exc)
-				{
-					Error($"Error: 	{exc}");
-					Error($"   bl:	{bl}");
-					Error($"   bl:	{bl.Replace($@"output", $@"output/failed")}");
-					if ( FileExists(bl) )
-					{
-						DeleteFile(bl);
-					}
-					MoveFile(bl, bl.Replace($@"output", $@"output/failed"));
-				}
-			}
-		}
-
-		DeleteFiles(".output/system.*/nupkg");
-		DeleteFiles(".output/microsoft.*/nupkg");
-		DeleteFiles(".output/xamarin.android.support.*/nupkg");
-		DeleteFiles(".output/xamarin.android.arch.*/nupkg");
-		DeleteFiles(".output/xamarin.build.download.*/nupkg");
-});
-
 Task("samples-dotnet")
     .IsDependentOn("nuget")
     .IsDependentOn("samples-only-dotnet")
@@ -936,7 +837,6 @@ Task("samples-only-dotnet")
     {
         "./samples/dotnet/BuildAllDotNet.sln",
         "./samples/dotnet/BuildAllMauiApp.sln",
-        "./samples/dotnet/BuildAllXamarinForms.sln",
         "./samples/dotnet/BuildAllPlayDotNet.sln",
     };
 
@@ -1183,7 +1083,6 @@ Task ("ci-build")
 	;
 
 Task ("ci-samples")
-	.IsDependentOn ("samples-only")
 	.IsDependentOn ("samples-only-dotnet")
   	;
 

published-namespaces.txt

@@ -525,7 +525,6 @@ Square.Retrofit2.Converter.Gson
 Square.Retrofit2.Converter.Scalars
 Square.Retrofit2.Http
 System.Runtime.CompilerServices
-System.Runtime.Versioning
 Volley
 Volley.CroNet
 Volley.Toolbox

samples/Directory.Build.props

@@ -2,7 +2,7 @@
 
   <!-- Default TFM's we build for -->
   <PropertyGroup>
-    <_DefaultDotNetSampleTargetFrameworks>net6.0-android</_DefaultDotNetSampleTargetFrameworks>
+    <_DefaultDotNetSampleTargetFrameworks>net7.0-android</_DefaultDotNetSampleTargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

samples/dotnet/BuildAllMauiApp/BuildAllMauiApp.csproj

@@ -83,5 +83,12 @@
 		>
 		<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]" />
+
+		<!-- Should match version of the referenced 'Xamarin.AndroidX.Collection' package -->
+		<PackageReference Include="Xamarin.AndroidX.Collection.Jvm" Version="1.3.0.2" />
+		<PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.3.0.2" />
+
+		<!-- Should match version of the referenced 'Xamarin.AndroidX.Activity' package -->
+		<PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.8.1.1" />
 	</ItemGroup>
 </Project>

source/GooglePlayServicesProject.cshtml

@@ -6,7 +6,7 @@
   var targetFrameworkMoniker = "MonoAndroid12.0";
 }
 
-<Project Sdk="Xamarin.Legacy.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>$(_DefaultTargetFrameworks)</TargetFrameworks>
     <IsBindingProject>true</IsBindingProject>