Merge pull request #1033 from xamarin/wsu-20241101

Weekly Stable Updates 20241101
dotnet · Nov 6, 2024 · ec062c5 · ec062c5
2 parents 759fe88 + 5659d57
commit ec062c5
Show file tree

Hide file tree

Showing 13 changed files with 1,401 additions and 1,346 deletions.
diff --git a/cgmanifest.json b/cgmanifest.json
diff --git a/config.json b/config.json
diff --git a/docs/artifact-list-with-versions.md b/docs/artifact-list-with-versions.md
diff --git a/docs/artifact-list.md b/docs/artifact-list.md
diff --git a/published-namespaces.txt b/published-namespaces.txt
@@ -273,8 +273,9 @@ AndroidX.Camera.Core.Concurrent
 AndroidX.Camera.Core.ImageCaptures
 AndroidX.Camera.Core.Impl
 AndroidX.Camera.Core.Impl.Annotation
+AndroidX.Camera.Core.Impl.Capability
 AndroidX.Camera.Core.Impl.Compat
-AndroidX.Camera.Core.Impl.Quirk
+AndroidX.Camera.Core.Impl.Stabilization
 AndroidX.Camera.Core.Impl.Utils
 AndroidX.Camera.Core.Impl.Utils.Executors
 AndroidX.Camera.Core.Impl.Utils.Futures
@@ -283,6 +284,8 @@ AndroidX.Camera.Core.Internal.Compat.Quirk
 AndroidX.Camera.Core.Internal.Compat.Workaround
 AndroidX.Camera.Core.Internal.Utils
 AndroidX.Camera.Core.Processing
+AndroidX.Camera.Core.Processing.Concurrent
+AndroidX.Camera.Core.Processing.Util
 AndroidX.Camera.Core.ResolutionSelector
 AndroidX.Camera.Core.StreamSharing
 AndroidX.Camera.Extensions
@@ -301,6 +304,8 @@ AndroidX.Camera.Video.Internal.Encoder
 AndroidX.Camera.Video.Internal.Utils
 AndroidX.Camera.Video.Internal.Workaround
 AndroidX.Camera.View
+AndroidX.Camera.View.Impl
+AndroidX.Camera.View.Internal
 AndroidX.Camera.View.Internal.Compat.Quirk
 AndroidX.Camera.View.Transform
 AndroidX.Camera.View.Video
@@ -352,13 +357,15 @@ AndroidX.Compose.Material3.Tokens
 AndroidX.Compose.Material3.WindowSizeClass
 AndroidX.Concurrent.Futures
 AndroidX.ConstraintLayout.Core
+AndroidX.ConstraintLayout.Core.Dsl
 AndroidX.ConstraintLayout.Core.Motion
 AndroidX.ConstraintLayout.Core.Motion.Key
 AndroidX.ConstraintLayout.Core.Motion.Parse
 AndroidX.ConstraintLayout.Core.Motion.Utils
 AndroidX.ConstraintLayout.Core.Parser
 AndroidX.ConstraintLayout.Core.State
 AndroidX.ConstraintLayout.Core.State.Helpers
+AndroidX.ConstraintLayout.Core.Utils
 AndroidX.ConstraintLayout.Core.Widgets
 AndroidX.ConstraintLayout.Core.Widgets.Analyzer
 AndroidX.ConstraintLayout.Helper.Widget

diff --git a/source/androidx.camera/camera-core/Additions/ImageAnalysisBuilder.cs b/source/androidx.camera/camera-core/Additions/ImageAnalysisBuilder.cs
@@ -29,11 +29,6 @@ Java.Lang.Object ITargetConfigBuilder.SetTargetName (string name)
 			{
 				return SetTargetName (name);
 			}
-
-			Java.Lang.Object IUseCaseEventConfigBuilder.SetUseCaseEventCallback (IEventCallback p0)
-			{
-				return SetUseCaseEventCallback (p0);
-			}
 		}
 	}
 }
diff --git a/source/androidx.camera/camera-core/Additions/ImageCaptureBuilder.cs b/source/androidx.camera/camera-core/Additions/ImageCaptureBuilder.cs
@@ -29,11 +29,6 @@ Java.Lang.Object ITargetConfigBuilder.SetTargetName (string name)
 			{
 				return SetTargetName (name);
 			}
-
-			Java.Lang.Object IUseCaseEventConfigBuilder.SetUseCaseEventCallback (IEventCallback p0)
-			{
-				return SetUseCaseEventCallback (p0);
-			}
 		}
 	}
 }
diff --git a/source/androidx.camera/camera-core/Additions/PreviewBuilder.cs b/source/androidx.camera/camera-core/Additions/PreviewBuilder.cs
@@ -29,11 +29,6 @@ Java.Lang.Object ITargetConfigBuilder.SetTargetName (string name)
 			{
 				return SetTargetName (name);
 			}
-
-			Java.Lang.Object IUseCaseEventConfigBuilder.SetUseCaseEventCallback (IEventCallback p0)
-			{
-				return SetUseCaseEventCallback (p0);
-			}
 		}
 	}
 }
diff --git a/source/androidx.camera/camera-core/Transforms/Metadata.xml b/source/androidx.camera/camera-core/Transforms/Metadata.xml
@@ -122,4 +122,17 @@
         Java.Lang.Object
     </attr>
 
+    <attr
+        path="/api/package[@name='androidx.camera.core.impl']/class[@name='QuirkSettingsLoader']/method[@name='apply' and count(parameter)=1 and parameter[1][@type='android.content.Context']]/parameter[1]"
+        name="managedType"
+        >
+        Java.Lang.Object
+    </attr>
+    <attr
+        path="/api/package[@name='androidx.camera.core.impl']/class[@name='QuirkSettingsLoader']/method[@name='apply' and count(parameter)=1 and parameter[1][@type='android.content.Context']]"
+        name="managedReturn"
+        >
+        Java.Lang.Object
+    </attr>
+
 </metadata>
diff --git a/source/androidx.core/core/Transforms/Metadata.xml b/source/androidx.core/core/Transforms/Metadata.xml
@@ -104,6 +104,10 @@
         name="no-alternatives"
         >
         true
-    </attr>    
+    </attr>
+
+    <remove-node 
+        path="/api/package[@name='androidx.core.os']/class[@name='ProfilingRequestBuilder']/method[@name='getThis' and count(parameter)=0]"
+        />
 
 </metadata>
diff --git a/source/androidx.work/work-runtime/Transforms/Metadata.xml b/source/androidx.work/work-runtime/Transforms/Metadata.xml
@@ -200,4 +200,11 @@
         Java.Lang.Object
     </attr>
 
+    <attr 
+        path="/api/package[@name='androidx.work']/class[@name='DefaultWorkerFactory']/method[@name='createWorker' and count(parameter)=3 and parameter[1][@type='android.content.Context'] and parameter[2][@type='java.lang.String'] and parameter[3][@type='androidx.work.WorkerParameters']]"
+        name="managedReturn"
+        >
+        AndroidX.Work.ListenableWorker
+    </attr>
+
 </metadata>
diff --git a/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/BindingProjectConverter.cs b/util/Xamarin.AndroidBinderator/Xamarin.AndroidBinderator/BindingProjectConverter.cs
@@ -182,6 +182,14 @@ static void FixDependency (BindingConfig config, MavenArtifactConfig mavenArtifa
 
 		var version = dependency.Version;
 
+		// If <version> was empty, look for a matching <dependencyManagement> entry
+		if (string.IsNullOrWhiteSpace (version)) {
+			var dep_man_dep = project.DependencyManagement?.Dependencies?.FirstOrDefault (d => d.GroupAndArtifactId () == dependency.GroupAndArtifactId ());
+
+			if (dep_man_dep is not null)
+				version = dep_man_dep.Version;
+		}
+
 		if (string.IsNullOrWhiteSpace (version))
 			return;
 

diff --git a/utilities.cake b/utilities.cake
@@ -1093,25 +1093,24 @@ Task ("api-diff-markdown-info-pr")
                     idx_start = i;
                 }
 
-                if(line.Contains("dependencyOnly"))
+                if (line.StartsWith("-"))
                 {
-                    if (line.StartsWith("-"))
+                    string next_line = lines[i + 1];
+                    if (next_line.StartsWith("-"))
                     {
-                        continue;
+                        idx_stop = i;
                     }
-                    idx_stop = i;
                 }
 
                 if (idx_start != -1 && idx_stop != -1)
                 {
-                    changelog_block = lines.GetRange(idx_start, idx_stop - idx_start);
+                    changelog_block = lines.GetRange(idx_start, idx_stop - idx_start + 4);
                     changelog_blocks.Add(changelog_block);
                     idx_start = -1;
                     idx_stop = -1;
                 }
             }
 
-
             foreach (List<string> changelog_block_lines in changelog_blocks)
             {
                 string g = null;
@@ -1142,8 +1141,11 @@ Task ("api-diff-markdown-info-pr")
                             continue;
                         }
 
-                        v_artifact_old = ParseDiffLine(line, "version");
-                        continue;
+                        if (line.StartsWith("-"))
+                        {
+                            v_artifact_old = ParseDiffLine(line, "version");
+                            continue;
+                        }
                     }
 
                     if (line.Contains("nugetVersion"))
@@ -1169,7 +1171,7 @@ Task ("api-diff-markdown-info-pr")
                 }
 
                 string changelog_line = $"- `{g}:{a}` - {v_artifact_old} -> {v_artifact_new}";
-
+                Information(changelog_line);
                 changelog.Add(changelog_line);
             }
 
@@ -1231,18 +1233,25 @@ Task ("api-diff-analysis")
                 Information( $"Directory    = {d}");
                 Information( $"     nugetId    = {d.GetDirectoryName()}");
 
-                bool    dependencyOnly  = true;
+                bool?    dependencyOnly  = true;
                 string  groupId         = null;
                 string  artifactId      = null;
                 string  nugetId         = null;
                 string  nugetVersion    = null;
-                // no guarantees thta config.json is sorted, so linear "search"
+                // no guarantees that config.json is sorted, so linear "search"
                 // TODO: sort + (LINQ or binary serch)
                 foreach(JObject jo in binderator_json_array[0]["artifacts"])
                 {
-                    dependencyOnly  = (bool)    jo["dependencyOnly"];
+                    try
+                    {
+                        dependencyOnly  = (bool)    jo["dependencyOnly"];
+                    }
+                    catch
+                    {
+                        dependencyOnly  = null;
+                    }
 
-                    if ( dependencyOnly == true)
+                    if ( dependencyOnly == null || dependencyOnly == true)
                     {
                         continue;
                     }