Merge branch 'main' into Nullable-CoreText

Make.config

@@ -38,10 +38,10 @@ include $(TOP)/Make.versions
 
 APIDIFF_REFERENCES_iOS=https://bosstoragemirror.blob.core.windows.net/wrench/d17-2/568bdb24e9d53ac9b8c96512b1591165031a7f98/6003154/package/bundle.zip
 APIDIFF_REFERENCES_Mac=https://bosstoragemirror.blob.core.windows.net/wrench/d17-2/568bdb24e9d53ac9b8c96512b1591165031a7f98/6003154/package/bundle.zip
-APIDIFF_REFERENCES_DOTNET_iOS=https://bosstoragemirror.blob.core.windows.net/wrench/6.0.3xx/3f73ae00b1c49501673f56bcf6359f4eafc14bd2/6103038/package/bundle.zip
-APIDIFF_REFERENCES_DOTNET_tvOS=https://bosstoragemirror.blob.core.windows.net/wrench/6.0.3xx/3f73ae00b1c49501673f56bcf6359f4eafc14bd2/6103038/package/bundle.zip
-APIDIFF_REFERENCES_DOTNET_macOS=https://bosstoragemirror.blob.core.windows.net/wrench/6.0.3xx/3f73ae00b1c49501673f56bcf6359f4eafc14bd2/6103038/package/bundle.zip
-APIDIFF_REFERENCES_DOTNET_MacCatalyst=https://bosstoragemirror.blob.core.windows.net/wrench/6.0.3xx/3f73ae00b1c49501673f56bcf6359f4eafc14bd2/6103038/package/bundle.zip
+APIDIFF_REFERENCES_DOTNET_iOS=https://bosstoragemirror.blob.core.windows.net/wrench/6.0.3xx/ce10c913a2921673b0caedcd268778b46d52c392/6131168/package/bundle.zip
+APIDIFF_REFERENCES_DOTNET_tvOS=https://bosstoragemirror.blob.core.windows.net/wrench/6.0.3xx/ce10c913a2921673b0caedcd268778b46d52c392/6131168/package/bundle.zip
+APIDIFF_REFERENCES_DOTNET_macOS=https://bosstoragemirror.blob.core.windows.net/wrench/6.0.3xx/ce10c913a2921673b0caedcd268778b46d52c392/6131168/package/bundle.zip
+APIDIFF_REFERENCES_DOTNET_MacCatalyst=https://bosstoragemirror.blob.core.windows.net/wrench/6.0.3xx/ce10c913a2921673b0caedcd268778b46d52c392/6131168/package/bundle.zip
 
 PACKAGE_HEAD_REV=$(shell git rev-parse HEAD)
 

dotnet/Templates/Microsoft.MacCatalyst.Templates/maccatalyst/AppDelegate.cs

@@ -17,7 +17,7 @@ public override bool FinishedLaunching (UIApplication application, NSDictionary
 		vc.View!.AddSubview (new UILabel (Window!.Frame) {
 			BackgroundColor = UIColor.SystemBackground,
 			TextAlignment = UITextAlignment.Center,
-			Text = "Hello, Catalyst!",
+			Text = "Hello, Mac Catalyst!",
 			AutoresizingMask = UIViewAutoresizing.All,
 		});
 		Window.RootViewController = vc;

dotnet/Templates/Microsoft.macOS.Templates/macos/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,68 +1,68 @@
 {
   "images": [
     {
-      "filename": "AppIcon-16.png",
-      "size": "16x16",
-      "scale": "1x",
-      "idiom": "mac"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "16x16",
+      "filename": "Icon16.png"
     },
     {
-      "filename": "AppIcon-16@2x.png",
-      "size": "16x16",
-      "scale": "2x",
-      "idiom": "mac"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "16x16",
+      "filename": "Icon32.png"
     },
     {
-      "filename": "AppIcon-32.png",
-      "size": "32x32",
-      "scale": "1x",
-      "idiom": "mac"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "32x32",
+      "filename": "Icon32.png"
     },
     {
-      "filename": "AppIcon-32@2x.png",
-      "size": "32x32",
-      "scale": "2x",
-      "idiom": "mac"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "32x32",
+      "filename": "Icon64.png"
     },
     {
-      "filename": "AppIcon-128.png",
-      "size": "128x128",
-      "scale": "1x",
-      "idiom": "mac"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "128x128",
+      "filename": "Icon128.png"
     },
     {
-      "filename": "AppIcon-128@2x.png",
-      "size": "128x128",
-      "scale": "2x",
-      "idiom": "mac"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "128x128",
+      "filename": "Icon256.png"
     },
     {
-      "filename": "AppIcon-256.png",
-      "size": "256x256",
-      "scale": "1x",
-      "idiom": "mac"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "256x256",
+      "filename": "Icon256.png"
     },
     {
-      "filename": "AppIcon-256@2x.png",
-      "size": "256x256",
-      "scale": "2x",
-      "idiom": "mac"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "256x256",
+      "filename": "Icon512.png"
     },
     {
-      "filename": "AppIcon-512.png",
-      "size": "512x512",
-      "scale": "1x",
-      "idiom": "mac"
+      "idiom" : "mac",
+      "scale" : "1x",
+      "size" : "512x512",
+      "filename": "Icon512.png"
     },
     {
-      "filename": "AppIcon-512@2x.png",
-      "size": "512x512",
-      "scale": "2x",
-      "idiom": "mac"
+      "idiom" : "mac",
+      "scale" : "2x",
+      "size" : "512x512",
+      "filename": "Icon1024.png"
     }
   ],
   "info": {
     "version": 1,
     "author": "xcode"
-  }
-}
+  },
+}

msbuild/ILMerge.targets

@@ -13,7 +13,7 @@
   </ItemGroup>
   <PropertyGroup>
     <!-- Unfortunately the ILRepack.MSBuild.Task package doesn't define any variables that help us find its ilrepack.exe executable, so manually create this variable (which the IRepack package defines, so remove this workaround can be removed once we switch back to ILRepack) -->
-    <ILRepack>$(HOME)/.nuget/packages/ilrepack.msbuild.task/2.0.13/tools/ilrepack.exe</ILRepack>
+    <ILRepack>$(MSBuildThisFileDirectory)/../packages/ilrepack.msbuild.task/2.0.13/tools/ilrepack.exe</ILRepack>
   </PropertyGroup>
 
   <Target Name="ILRepack" BeforeTargets="CopyFilesToOutputDirectory" Inputs="@(IntermediateAssembly -&gt; '%(FullPath)')" Outputs="$(IntermediateOutputPath)ilrepack.txt" Returns="@(MergedAssemblies)" Condition="Exists(@(IntermediateAssembly -&gt; '%(FullPath)')) And '$(ILRepack)' != 'false'">

msbuild/Xamarin.HotRestart.PreBuilt/Xamarin.PreBuilt.iOS/Xamarin.PreBuilt.iOS.csproj

@@ -11,6 +11,8 @@
     <_LinkMode>None</_LinkMode>
     <UseInterpreter>true</UseInterpreter>
     <MtouchExtraArgs>--registrar:dynamic</MtouchExtraArgs>
+    <!-- disable code signing unless we're building in CI, to avoid requiring code signing during developer builds (who will usually never need the prebuilt app) -->
+    <EnableCodeSigning Condition="'$(BUILD_REVISION)' == ''">false</EnableCodeSigning>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.iOS.HotRestart.Application" Version="1.1.5" />

msbuild/Xamarin.MacDev.Tasks.Core/Tasks/DetectSigningIdentityTaskBase.cs

@@ -581,6 +581,16 @@ public override bool Execute ()
 
 					return !Log.HasLoggedErrors;
 				}
+
+				if (!SdkIsSimulator && !RequireCodeSigning) {
+					// The "-" key is a special value allowed by the codesign utility that
+					// allows us to get away with not having an actual codesign key.
+					DetectedCodeSigningKey = "-";
+
+					ReportDetectedCodesignInfo ();
+
+					return !Log.HasLoggedErrors;
+				}
 			}
 
 			// Note: if we make it this far, we absolutely need a codesigning certificate

tests/introspection/ApiProtocolTest.cs

@@ -485,8 +485,26 @@ protected virtual bool Skip (Type type, string protocolName)
 					if (!TestRuntime.CheckXcodeVersion (11,0))
 						return true;
 					break;
+				case "VNRecognizedText":
+					// Conformance added in Xcode 13
+					if (!TestRuntime.CheckXcodeVersion (13, 0))
+						return true;
+					break;
 				}
 				break;
+			case "NSUserActivityRestoring":
+				return true;
+#if __MACCATALYST__
+			case "UIScrollViewDelegate":
+				// The headers say PKCanvasViewDelegate implements UIScrollViewDelegate
+				if (type.Name == "PKCanvasViewDelegate")
+					return true;
+				break;
+#endif
+			case "NSExtensionRequestHandling":
+				if (type.Name == "HMChipServiceRequestHandler") // Apple removed this class
+					return true;
+				break;
 			}
 			return false;
 		}
@@ -714,7 +732,9 @@ public void GeneralCase ()
 
 					if (t.IsPublic && !ConformTo (klass.Handle, protocol)) {
 						// note: some internal types, e.g. like UIAppearance subclasses, return false (and there's not much value in changing this)
-						list.Add ($"Type {t.FullName} (native: {klass.Name}) does not conform {protocolName}");
+						var msg = $"Type {t.FullName} (native: {klass.Name}) does not conform {protocolName}";
+						list.Add (msg);
+						ReportError (msg);
 					}
 				}
 			}

tests/introspection/Mac/MacApiProtocolTest.cs

@@ -19,10 +19,19 @@
 namespace Introspection {
 
 	[TestFixture]
-	public class MonoMacFixtures : ApiProtocolTest {
+	public class MacApiProtocolTest : ApiProtocolTest {
 
 		protected override bool Skip (Type type)
 		{
+#if !NET
+			switch (type.Namespace) {
+			case "Chip":
+				// The Chip framework is not stable, it's been added and removed and added and removed a few times already, so just skip verifying the entire framework.
+				// This is legacy Xamarin only, because we removed the framework for .NET.
+				return true;
+			}
+#endif
+
 			switch (type.Name) {
 #if !NET
 			case "NSDraggingInfo":

tests/introspection/Mac/MacApiSelectorTest.cs

@@ -114,6 +114,12 @@ protected override bool Skip (Type type)
 				if (Mac.CheckSystemVersion (10, 15))
 					return true;
 				break;
+#if !NET
+			case "Chip":
+				// The Chip framework is not stable, it's been added and removed and added and removed a few times already, so just skip verifying the entire framework.
+				// This is legacy Xamarin only, because we removed the framework for .NET.
+				return true;
+#endif
 			}
 
 			return base.Skip (type);

tests/introspection/iOS/iOSApiProtocolTest.cs

@@ -205,6 +205,7 @@ protected override bool Skip (Type type, string protocolName)
 			case "UIStepper":
 			case "UISwitch":
 			case "ASAuthorizationAppleIdButton":
+			case "INUIAddVoiceShortcutButton":
 				if (protocolName == "UIContextMenuInteractionDelegate")
 					return !TestRuntime.CheckXcodeVersion (12, 0);
 				break;

tests/monotouch-test/HomeKit/HMCharacteristicTest.cs

@@ -27,7 +27,9 @@ public class HMCharacteristicTest
 		[Test]
 		public void WriteValueNullTest ()
 		{
+#if __MACCATALYST__
 			TestRuntime.AssertSystemVersion (ApplePlatform.MacCatalyst, 14,0);
+#endif
 			var characteristic = new HMCharacteristic ();
 			Assert.Throws<ArgumentNullException> (delegate { characteristic.WriteValue (null, null); }, $"WriteValue should accept a null argument for 'value'.");
 		}