Manual updates 20230329 androidx.media.players

Directory.Build.props

@@ -11,10 +11,10 @@
     <!-- Use an updated 'generator' -->
     <!-- It's ok to use "Windows" here because we only use managed code from this package -->
     <_BindingsToolsLocation>$(MSBuildThisFileDirectory)/tools/Microsoft.Android.Sdk.Windows.34.0.95/tools/</_BindingsToolsLocation>
-    
+
     <!-- Enable DIM/SIM for Classic (defaults to true on .NET) -->
     <AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>true</AndroidBoundInterfacesContainStaticAndDefaultInterfaceMethods>
-    
+
     <!-- Opt out of C#8 features to maintain compatibility with legacy -->
     <AndroidBoundInterfacesContainConstants>false</AndroidBoundInterfacesContainConstants>
     <AndroidBoundInterfacesContainTypes>false</AndroidBoundInterfacesContainTypes>
@@ -45,7 +45,7 @@
     <!-- Exclude TF-specific transform files by default -->
     <DefaultTransformExcludes>**/*.MonoAndroid*.0.xml;**/*.net*.0-android.xml</DefaultTransformExcludes>
   </PropertyGroup>
-  
+
   <!-- Folders that .targets files need to go into -->
   <ItemGroup>
     <AndroidXNuGetTargetFolders Include="build\monoandroid12.0" />
@@ -207,14 +207,24 @@
     <AndroidNamespaceReplacement Include='protolayout' Replacement='ProtoLayout' />
     <AndroidNamespaceReplacement Include='quicksettings' Replacement='QuickSettings' />
     <AndroidNamespaceReplacement Include='contentcapture' Replacement='ContentCapture' />
+    <AndroidNamespaceReplacement Include='datasource' Replacement='DataSource' />
+    <AndroidNamespaceReplacement Include='cronet' Replacement='CroNet' />
     <AndroidNamespaceReplacement Include='resolutionselector' Replacement='ResolutionSelector' />
     <AndroidNamespaceReplacement Include='streamsharing' Replacement='StreamSharing' />
-    <AndroidNamespaceReplacement Include='domerrors' Replacement='DomErrors' />    
-    <AndroidNamespaceReplacement Include='publickeycredential' Replacement='PublicKeyCredential' />    
-    <AndroidNamespaceReplacement Include='playservices' Replacement='PlayServices' />    
-    <AndroidNamespaceReplacement Include='webauthn' Replacement='WebAuthn' />    
-    <AndroidNamespaceReplacement Include='reflectionguard' Replacement='ReflectionGuard' />    
-    <AndroidNamespaceReplacement Include='Pulltorefresh' Replacement='PullToRefresh' />    
-
+    <AndroidNamespaceReplacement Include='domerrors' Replacement='DomErrors' />
+    <AndroidNamespaceReplacement Include='publickeycredential' Replacement='PublicKeyCredential' />
+    <AndroidNamespaceReplacement Include='playservices' Replacement='PlayServices' />
+    <AndroidNamespaceReplacement Include='webauthn' Replacement='WebAuthn' />
+    <AndroidNamespaceReplacement Include='reflectionguard' Replacement='ReflectionGuard' />
+    <AndroidNamespaceReplacement Include='Pulltorefresh' Replacement='PullToRefresh' />
+    <AndroidNamespaceReplacement Include='Mediacodec' Replacement='MediaCodec' />
+    <AndroidNamespaceReplacement Include='Smoothstreaming' Replacement='SmoothStreaming' />
+    <AndroidNamespaceReplacement Include='Trackselection' Replacement='TrackSelection' />
+    <AndroidNamespaceReplacement Include='Mediaparser' Replacement='MediaParser' />
+    <AndroidNamespaceReplacement Include='Workmanager' Replacement='WorkManager' />
+    <AndroidNamespaceReplacement Include='Interactivemedia' Replacement='InteractiveMedia' />
+    <AndroidNamespaceReplacement Include='Antmedia' Replacement='AntMedia' />
+    <AndroidNamespaceReplacement Include='RTMP' Replacement='Rtmp' />
   </ItemGroup>
+
 </Project>

build.cake

@@ -630,31 +630,26 @@ Task("libs")
     .IsDependentOn("libs-native")
     .Does(() =>
 {
-    DotNetMSBuildSettings settings = new DotNetMSBuildSettings()
-        .SetConfiguration(CONFIGURATION)
-        .SetMaxCpuCount(0)
-        .EnableBinaryLogger($"./output/libs.{CONFIGURATION}.binlog")
-        .WithProperty("MigrationPackageVersion", MIGRATION_PACKAGE_VERSION)
-        .WithProperty("Verbosity", VERBOSITY.ToString())
-        .WithProperty("DesignTimeBuild", "false")
-        .WithProperty("AndroidSdkBuildToolsVersion", $"{AndroidSdkBuildTools}");
+    DotNetBuildSettings settings = new DotNetBuildSettings()
+    {
+        Configuration = CONFIGURATION,
+        MSBuildSettings = new DotNetMSBuildSettings()
+                                .SetMaxCpuCount(0)
+                                .EnableBinaryLogger($"./output/libs.{CONFIGURATION}.binlog")
+                                .WithProperty("MigrationPackageVersion", MIGRATION_PACKAGE_VERSION)
+                                .WithProperty("DesignTimeBuild", "false")
+                                .WithProperty("AndroidSdkBuildToolsVersion", $"{AndroidSdkBuildTools}")            
+    };
 
     if (!string.IsNullOrEmpty(ANDROID_HOME))
-        settings.WithProperty("AndroidSdkDirectory", $"{ANDROID_HOME}");
+        settings.MSBuildSettings.WithProperty("AndroidSdkDirectory", $"{ANDROID_HOME}");
 
     DotNetRestore("./generated/AndroidX.sln", new DotNetRestoreSettings
     {
-        MSBuildSettings = settings.EnableBinaryLogger("./output/restore.binlog")
+        MSBuildSettings = settings.MSBuildSettings.EnableBinaryLogger("./output/restore.binlog")
     });
 
-    DotNetBuild
-        (
-            "./generated/AndroidX.sln", 
-            new DotNetBuildSettings
-            {
-                MSBuildSettings = settings
-            }
-        );
+    DotNetBuild("./generated/AndroidX.sln", settings);
 });
 
 Task("libs-native")
@@ -676,27 +671,23 @@ Task("nuget")
     .IsDependentOn("libs")
     .Does(() =>
 {
-    var settings = new DotNetMSBuildSettings()
-        .SetConfiguration(CONFIGURATION)
-        .SetMaxCpuCount(0)
-        .EnableBinaryLogger($"./output/nuget.{CONFIGURATION}.binlog")
-        .WithProperty("MigrationPackageVersion", MIGRATION_PACKAGE_VERSION)
-        .WithProperty("NoBuild", "true")
-        .WithProperty("PackageRequireLicenseAcceptance", "true")
-        .WithProperty("PackageOutputPath", MakeAbsolute ((DirectoryPath)"./output/").FullPath)
-        .WithTarget("Pack");
+    DotNetBuildSettings settings = new DotNetBuildSettings()
+    {
+        Configuration = CONFIGURATION,
+        MSBuildSettings = new DotNetMSBuildSettings()
+                                        .SetMaxCpuCount(0)
+                                        .EnableBinaryLogger($"./output/nuget.{CONFIGURATION}.binlog")
+                                        .WithProperty("MigrationPackageVersion", MIGRATION_PACKAGE_VERSION)
+                                        .WithProperty("NoBuild", "true")
+                                        .WithProperty("PackageRequireLicenseAcceptance", "true")
+                                        .WithProperty("PackageOutputPath", MakeAbsolute ((DirectoryPath)"./output/").FullPath)
+                                        .WithTarget("Pack")
+    };
 
     if (!string.IsNullOrEmpty(ANDROID_HOME))
-        settings.WithProperty("AndroidSdkDirectory", $"{ANDROID_HOME}");
+        settings.MSBuildSettings.WithProperty("AndroidSdkDirectory", $"{ANDROID_HOME}");
 
-    DotNetBuild
-        (
-            "./generated/AndroidX.sln", 
-            new DotNetBuildSettings
-            {
-                MSBuildSettings = settings
-            }
-        );
+    DotNetBuild("./generated/AndroidX.sln", settings);
 });
 
 Task("samples-generate-all-targets")
@@ -812,14 +803,16 @@ Task("samples-only-dotnet")
     EnsureDirectoryExists(packagesPath);
     CleanDirectories(packagesPath);
 
-    var settings = new DotNetMSBuildSettings()
-        .SetConfiguration("Debug") // We don't need to run linking
-        .WithProperty("Verbosity", VERBOSITY.ToString())
-        .WithProperty("RestorePackagesPath", packagesPath)
-        .WithProperty("AndroidSdkBuildToolsVersion", $"{AndroidSdkBuildTools}");
-
+    DotNetBuildSettings settings = new DotNetBuildSettings()
+    {
+        Configuration = "Debug",
+        MSBuildSettings = new DotNetMSBuildSettings()
+                                    .WithProperty("RestorePackagesPath", packagesPath)
+                                    .WithProperty("AndroidSdkBuildToolsVersion", $"{AndroidSdkBuildTools}")
+    };
+
     if (!string.IsNullOrEmpty(ANDROID_HOME))
-        settings.WithProperty("AndroidSdkDirectory", $"{ANDROID_HOME}");
+        settings.MSBuildSettings.WithProperty("AndroidSdkDirectory", $"{ANDROID_HOME}");
 
     string[] solutions = new string[]
     {
@@ -833,10 +826,10 @@ Task("samples-only-dotnet")
         FilePath fp_solution = new FilePath(solution);
         string filename = fp_solution.GetFilenameWithoutExtension().ToString();
         Information($"=====================================================================================================");
-        Information($"DotNetBuild           {solution} / {filename}");    
+        Information($"DotNetBuild        {solution} / {filename}");    
         DotNetBuild(solution, new DotNetBuildSettings
         {
-            MSBuildSettings = settings.EnableBinaryLogger($"./output/samples-dotnet-dotnet-msbuild-{filename}.binlog")
+            MSBuildSettings = settings.MSBuildSettings.EnableBinaryLogger($"./output/samples-dotnet-dotnet-msbuild-{filename}.binlog")
         });
     }
 });