[net9.0] Merge main into net9.0. (#21221)

.github/workflows/update-single-platform-branches.yml

@@ -28,7 +28,7 @@ jobs:
           set -ex
           git config user.email "github-actions-single-platform-branch-updater@xamarin.com"
           git config user.name "GitHub Actions Single Platform Branch Updater"
-          for platform in dotnet-iOS dotnet-tvOS dotnet-MacCatalyst dotnet-macOS dotnet legacy legacy-iOS legacy-macOS; do
+          for platform in dotnet-iOS dotnet-tvOS dotnet-MacCatalyst dotnet-macOS dotnet; do
             git checkout -b release-test/only-$platform origin/release-test/only-$platform
             git merge origin/main
             git push

docs/website/binding_types_reference_guide.md

@@ -2250,6 +2250,8 @@ Currently, these types are supported:
 
 * `nint`
 * `nuint`
+* `int`, `uint`
+* `long`, `ulong`
 * `NSNumber`
 * `NSString` (this is the default if none is specified)
 

eng/Versions.props

@@ -12,7 +12,7 @@
     <MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>9.0.0-alpha.1.23556.4</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.100-alpha.1.21601.1</MicrosoftTemplateEngineTasksVersion>
     <MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.24379.1</MicrosoftDotNetCecilPackageVersion>
-    <MicrosoftDotNetXHarnessiOSSharedPackageVersion>9.0.0-prerelease.24420.3</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
+    <MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.24459.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
     <!-- Manually updated versions -->
     <Emscriptennet7WorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</Emscriptennet7WorkloadVersion>
     <EmscriptenWorkloadVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</EmscriptenWorkloadVersion>

src/avfoundation.cs

@@ -11403,9 +11403,10 @@ interface AVCaptureDeviceDiscoverySession {
 
 	/// <summary>Enumerates the types of device that can capture audiovisual data.</summary>
 	[Introduced (PlatformName.MacCatalyst, 14, 0)]
-	[NoTV, NoWatch]
+	[TV (17, 0), NoWatch]
 	enum AVCaptureDeviceType {
 
+		[NoTV]
 		[Field ("AVCaptureDeviceTypeBuiltInMicrophone")]
 		BuiltInMicrophone,
 
@@ -11417,6 +11418,7 @@ enum AVCaptureDeviceType {
 		[Field ("AVCaptureDeviceTypeBuiltInTelephotoCamera")]
 		BuiltInTelephotoCamera,
 
+		[NoTV]
 		[NoMac]
 		[Deprecated (PlatformName.iOS, 10, 2, message: "Use 'BuiltInDualCamera' instead.")]
 		[MacCatalyst (13, 1)]
@@ -11453,9 +11455,14 @@ enum AVCaptureDeviceType {
 		[Field ("AVCaptureDeviceTypeExternalUnknown")]
 		ExternalUnknown,
 
-		[NoWatch, NoTV, NoMac, MacCatalyst (15, 4), iOS (15, 4)]
+		[NoWatch, TV (17, 0), NoMac, MacCatalyst (15, 4), iOS (15, 4)]
 		[Field ("AVCaptureDeviceTypeBuiltInLiDARDepthCamera")]
 		BuiltInLiDarDepthCamera,
+
+		[NoWatch]
+		[iOS (17, 0), MacCatalyst (17, 0), TV (17, 0), Mac (14, 0)]
+		[Field ("AVCaptureDeviceTypeExternal")]
+		External,
 	}
 
 	[NoTV, NoWatch] // matches API that uses it.

src/bgen/Caches/NamespaceCache.cs

@@ -17,6 +17,7 @@ public class NamespaceCache {
 	public ICollection<string> UINamespaces { get; private set; }
 	public ICollection<string> ImplicitNamespaces { get; private set; }
 	public ICollection<string> NamespacesThatConflictWithTypes { get; private set; }
+	public ICollection<string> TypesInMultipleNamespaces { get; private set; }
 
 	public NamespaceCache (PlatformName currentPlatform, string customObjCRuntimeNS, bool skipSystemDrawing)
 	{
@@ -154,6 +155,10 @@ public NamespaceCache (PlatformName currentPlatform, string customObjCRuntimeNS,
 			"AudioUnit",
 		};
 
+		TypesInMultipleNamespaces = new HashSet<string> {
+			"NWEndpoint", // Both in Network and NetworkExtension
+		};
+
 		if (!skipSystemDrawing)
 			ImplicitNamespaces.Add ("System.Drawing");
 	}

src/bgen/Enums.cs

@@ -94,7 +94,14 @@ void GenerateEnum (Type type)
 		var isBackingFieldValueType = backingFieldType.IsValueType;
 		var visibility = is_internal ? "internal" : "public";
 
-		if (backingFieldType != TypeCache.System_nint && backingFieldType != TypeCache.System_nuint && backingFieldType != TypeCache.NSString && backingFieldType != TypeCache.NSNumber) {
+		if (backingFieldType != TypeCache.System_nint &&
+			backingFieldType != TypeCache.System_nuint &&
+			backingFieldType != TypeCache.System_Int32 &&
+			backingFieldType != TypeCache.System_Int64 &&
+			backingFieldType != TypeCache.System_UInt32 &&
+			backingFieldType != TypeCache.System_UInt64 &&
+			backingFieldType != TypeCache.NSString &&
+			backingFieldType != TypeCache.NSNumber) {
 			exceptions.Add (ErrorHelper.CreateError (1088 /* The backing field type '{0}' is invalid. Valid backing field types are: "NSString", "NSNumber", "nint" and "nuint". */, backingFieldType.FullName));
 			backingFieldType = TypeCache.NSString;
 		}

src/bgen/Generator.cs

@@ -167,7 +167,22 @@ public bool IsNSObject (Type type)
 			return false;
 		}
 
-		return type.IsInterface;
+		// If any of the interfaces this type implements is an NSObject,
+		// then this type is also an NSObject
+		var ifaces = type.GetInterfaces ();
+		foreach (var iface in ifaces)
+			if (IsNSObject (iface))
+				return true;
+
+		if (type.IsInterface) {
+			var bta = ReflectionExtensions.GetBaseTypeAttribute (type, this);
+			if (bta?.BaseType is not null)
+				return IsNSObject (bta.BaseType);
+
+			return false;
+		}
+
+		return false;
 	}
 
 	public string PrimitiveType (Type t, bool formatted = false)
@@ -604,8 +619,10 @@ public TrampolineInfo MakeTrampoline (Type t)
 					invoke.AppendFormat (" Runtime.GetINativeObject<{1}> ({0}, false)!", safe_name, pi.ParameterType);
 				} else if (isForced) {
 					invoke.AppendFormat (" Runtime.GetINativeObject<{1}> ({0}, true, {2})!", safe_name, TypeManager.RenderType (pi.ParameterType), isForcedOwns);
-				} else {
+				} else if (IsNSObject (pi.ParameterType)) {
 					invoke.AppendFormat (" Runtime.GetNSObject<{1}> ({0})!", safe_name, TypeManager.RenderType (pi.ParameterType));
+				} else {
+					invoke.AppendFormat (" Runtime.GetINativeObject<{1}> ({0}, false)!", safe_name, TypeManager.RenderType (pi.ParameterType));
 				}
 				continue;
 			}
@@ -716,6 +733,11 @@ public TrampolineInfo MakeTrampoline (Type t)
 					invoke.AppendFormat ("CFArray.ArrayFromHandle<{0}> ({1})!", TypeManager.FormatType (null, et), safe_name);
 					continue;
 				}
+				if (TypeCache.INativeObject.IsAssignableFrom (et)) {
+					pars.Add (new TrampolineParameterInfo (NativeHandleType, safe_name));
+					invoke.AppendFormat ("NSArray.ArrayFromHandle<{0}> ({1})!", TypeManager.FormatType (t, et), safe_name);
+					continue;
+				}
 			}
 
 			if (pi.ParameterType.IsPointer && pi.ParameterType.GetElementType ().IsValueType) {
@@ -894,6 +916,9 @@ public string MarshalParameter (MethodInfo mi, ParameterInfo pi, bool null_allow
 			return safe_name + ".Handle";
 		}
 
+		if (TypeCache.INativeObject.IsAssignableFrom (pi.ParameterType))
+			return $"{safe_name}.GetHandle ()";
+
 		// This means you need to add a new MarshalType in the method "Go"
 		throw new BindingException (1002, true, pi.ParameterType.FullName, mi.DeclaringType.FullName, mi.Name.GetSafeParamName ());
 	}

src/bgen/TypeManager.cs

@@ -300,12 +300,17 @@ public string FormatTypeUsedIn (string? usedInNamespace, Type? type)
 
 		if (t.Namespace is not null) {
 			string ns = t.Namespace;
-			if (NamespaceCache.ImplicitNamespaces.Contains (ns) || t.IsGenericType) {
+			var isImplicitNamespace = NamespaceCache.ImplicitNamespaces.Contains (ns);
+			var isInMultipleNamespaces = IsInMultipleNamespaces (t);
+			var nonGlobalCandidate = isImplicitNamespace && !isInMultipleNamespaces;
+			if (nonGlobalCandidate || t.IsGenericType) {
 				var targs = t.GetGenericArguments ();
 				if (targs.Length == 0)
 					return t.Name + nullable;
 				return $"global::{t.Namespace}." + t.Name.RemoveArity () + "<" + string.Join (", ", targs.Select (l => FormatTypeUsedIn (null, l)).ToArray ()) + ">" + nullable;
 			}
+			if (isInMultipleNamespaces)
+				return "global::" + t.FullName + nullable;
 			if (NamespaceCache.NamespacesThatConflictWithTypes.Contains (ns))
 				return "global::" + t.FullName + nullable;
 			if (t.Name == t.Namespace)
@@ -317,6 +322,17 @@ public string FormatTypeUsedIn (string? usedInNamespace, Type? type)
 		return t.FullName + nullable;
 	}
 
+	bool IsInMultipleNamespaces (Type? type)
+	{
+		if (type is null)
+			return false;
+
+		if (NamespaceCache.TypesInMultipleNamespaces.Contains (type.Name))
+			return true;
+
+		return IsInMultipleNamespaces (type.GetElementType ());
+	}
+
 	// TODO: If we ever have an API with nested properties of the same name more than
 	// 2 deep, we'll need to have this return a list of PropertyInfo and comb through them all.
 	public PropertyInfo? GetParentTypeWithSameNamedProperty (BaseTypeAttribute bta, string propertyName)

system-dependencies.sh

@@ -316,8 +316,6 @@ function xcodebuild_download_selected_platforms ()
 	"$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadPlatform iOS
 	log "Executing '$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild -downloadPlatform tvOS' $1"
 	"$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadPlatform tvOS
-	log "Executing '$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild -downloadPlatform watchOS' $1"
-	"$XCODE_DEVELOPER_ROOT/usr/bin/xcodebuild" -downloadPlatform watchOS
 }
 
 function download_xcode_platforms ()

tests/bgen/bgen-tests.csproj

@@ -5,7 +5,7 @@
     <RootNamespace>bgen_tests</RootNamespace>
 
     <IsPackable>false</IsPackable>
-    <WarningsAsErrors>Nullable</WarningsAsErrors>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>

tests/cecil-tests/Documentation.KnownFailures.txt

@@ -5150,6 +5150,7 @@ F:AVFoundation.AVCaptureDeviceType.BuiltInTripleCamera
 F:AVFoundation.AVCaptureDeviceType.BuiltInTrueDepthCamera
 F:AVFoundation.AVCaptureDeviceType.BuiltInUltraWideCamera
 F:AVFoundation.AVCaptureDeviceType.BuiltInWideAngleCamera
+F:AVFoundation.AVCaptureDeviceType.External
 F:AVFoundation.AVCaptureDeviceType.ExternalUnknown
 F:AVFoundation.AVCaptureExposureMode.AutoExpose
 F:AVFoundation.AVCaptureExposureMode.ContinuousAutoExposure

tests/common/TestRuntime.cs

@@ -12,6 +12,7 @@
 using System.Runtime.InteropServices;
 using System.Reflection;
 using System.Reflection.Emit;
+using System.Runtime.Versioning;
 
 using AVFoundation;
 using CoreBluetooth;
@@ -116,6 +117,59 @@ public static Version OSXVersion {
 	}
 #endif
 
+	public static ApplePlatform CurrentPlatform {
+		get {
+#if __MACCATALYST__
+			return ApplePlatform.MacCatalyst;
+#elif __IOS__
+			return ApplePlatform.iOS;
+#elif __TVOS__
+			return ApplePlatform.TVOS;
+#elif __MACOS__
+			return ApplePlatform.MacOSX;
+#elif __WATCHOS__
+			return ApplePlatform.WatchOS;
+#else
+#error Unknown platform
+#endif
+		}
+	}
+
+	// This returns the string for the platform as used in the OSPlatformAttribute's PlatformName property.
+	public static string GetOSPlatformName (ApplePlatform platform)
+	{
+		switch (platform) {
+		case ApplePlatform.iOS:
+			return "ios";
+		case ApplePlatform.MacOSX:
+			return "macos";
+		case ApplePlatform.TVOS:
+			return "tvos";
+		case ApplePlatform.MacCatalyst:
+			return "maccatalyst";
+		default:
+			throw new Exception ($"Unknown platform: {platform}");
+		}
+	}
+
+	public static bool HasOSPlatformAttributeForCurrentPlatform<T> (ICustomAttributeProvider provider) where T : OSPlatformAttribute
+	{
+		return HasOSPlatformAttribute<T> (provider, CurrentPlatform);
+	}
+
+	public static bool HasOSPlatformAttribute<T> (ICustomAttributeProvider provider, ApplePlatform platform) where T : OSPlatformAttribute
+	{
+		var attribs = provider.GetCustomAttributes (false);
+		var platformName = GetOSPlatformName (platform);
+		foreach (var attrib in attribs) {
+			if (attrib is T platformAttribute) {
+				if (platformAttribute.PlatformName.StartsWith (platformName, StringComparison.OrdinalIgnoreCase))
+					return true;
+			}
+		}
+		return false;
+	}
+
 	public static Version GetSDKVersion ()
 	{
 		var v = dyld_get_program_sdk_version ();

tests/common/shared-dotnet.mk

@@ -78,9 +78,9 @@ endif
 
 ifeq ($(RID),)
 ifeq ($(PLATFORM),iOS)
-RID=ios-arm64
+RID=iossimulator-arm64
 else ifeq ($(PLATFORM),tvOS)
-RID=tvos-arm64
+RID=tvossimulator-arm64
 else ifeq ($(PLATFORM),MacCatalyst)
 ifeq ($(CONFIG),Release)
 RID=maccatalyst-x64;maccatalyst-arm64

tests/generator/BGenTests.cs

@@ -404,6 +404,20 @@ public void Bug35176 ()
 			Assert.AreEqual (expectedAttributes, renderedAttributes, "Introduced attributes");
 		}
 
+		[Test]
+		[TestCase (Profile.iOS)]
+		public void INativeObjectsInBlocks (Profile profile)
+		{
+			var bgen = new BGenTool ();
+			bgen.Profile = profile;
+			bgen.Defines = BGenTool.GetDefaultDefines (bgen.Profile);
+			bgen.AddTestApiDefinition ("tests/inativeobjects-in-blocks.cs");
+			bgen.AddExtraSourcesRelativeToGeneratorDirectory ("tests/inativeobjects-in-blocks-sources.cs");
+			bgen.CreateTemporaryBinding ();
+			bgen.AssertExecute ("build");
+			bgen.AssertNoWarnings ();
+		}
+
 		[Test]
 		public void Bug36457 ()
 		{
@@ -526,6 +540,13 @@ public void StackOverflow20696157 ()
 			BuildFile (Profile.iOS, "sof20696157.cs");
 		}
 
+		[Test]
+		[TestCase (Profile.iOS)]
+		public void TypesInMultipleNamespaces (Profile profile)
+		{
+			BuildFile (profile, "tests/types-in-multiple-namespaces.cs");
+		}
+
 		[Test]
 		public void HyphenInName ()
 		{
@@ -598,6 +619,14 @@ public void MultipleApiDefinitions2 ()
 			BuildFile (Profile.iOS, "multiple-api-definitions2-a.cs", "multiple-api-definitions2-b.cs");
 		}
 
+
+		[Test]
+		[TestCase (Profile.iOS)]
+		public void INativeObjectArraysInBlocks (Profile profile)
+		{
+			BuildFile (profile, "tests/inativeobject-arrays-in-blocks.cs");
+		}
+
 		[Test]
 		[TestCase (Profile.iOS)]
 		public void ClassNameCollision (Profile profile)
@@ -1669,6 +1698,10 @@ public void BackingFieldType (Profile profile)
 				new { BackingFieldType = "NSNumber", NullableType = "Foundation.NSNumber", RenderedBackingFieldType = "Foundation.NSNumber", SimplifiedNullableType = "Foundation.NSNumber" },
 				new { BackingFieldType = "NSInteger", NullableType = $"System.Nullable`1<{nintName}>", RenderedBackingFieldType = nintName, SimplifiedNullableType = "System.Nullable`1" },
 				new { BackingFieldType = "NSUInteger", NullableType = $"System.Nullable`1<{nuintName}>", RenderedBackingFieldType = nuintName, SimplifiedNullableType = "System.Nullable`1" },
+				new { BackingFieldType = "Int32", NullableType = $"System.Nullable`1<System.Int32>", RenderedBackingFieldType = "System.Int32", SimplifiedNullableType = "System.Nullable`1" },
+				new { BackingFieldType = "Int64", NullableType = $"System.Nullable`1<System.Int64>", RenderedBackingFieldType = "System.Int64", SimplifiedNullableType = "System.Nullable`1" },
+				new { BackingFieldType = "UInt32", NullableType = $"System.Nullable`1<System.UInt32>", RenderedBackingFieldType = "System.UInt32", SimplifiedNullableType = "System.Nullable`1" },
+				new { BackingFieldType = "UInt64", NullableType = $"System.Nullable`1<System.UInt64>", RenderedBackingFieldType = "System.UInt64", SimplifiedNullableType = "System.Nullable`1" },
 			};
 
 			foreach (var tc in testCases) {
@@ -1697,15 +1730,7 @@ public void BackingFieldType (Profile profile)
 		public void UnderlyingFieldType (Profile profile)
 		{
 			Configuration.IgnoreIfIgnoredPlatform (profile.AsPlatform ());
-			var bgen = BuildFile (profile, true, true, "tests/underlyingfieldtype.cs");
-
-#if NET
-			const string nintName = "System.IntPtr";
-			const string nuintName = "System.UIntPtr";
-#else
-			const string nintName = "System.nint";
-			const string nuintName = "System.nuint";
-#endif
+			BuildFile (profile, true, true, "tests/underlyingfieldtype.cs");
 		}
 
 		[Test]