[xcode26.4] Merge remote-tracking branch main into xcode26.4

Make.config

@@ -260,8 +260,20 @@ MACCATALYST_SDK_VERSION=$(word 1, $(subst ., ,$(MACCATALYST_NUGET_VERSION))).$(w
 MAX_IOS_DEPLOYMENT_TARGET=$(IOS_SDK_VERSION)
 MAX_TVOS_DEPLOYMENT_TARGET=$(TVOS_SDK_VERSION)
 
+# Decide which OS version we should run the simulator tests in.
+# Note that this may not necessarily match the SDK version, if there are OS releases with no API changes, then there wouldn't necessarily be a corresponding SDK version.
+# If the errors below trigger, update the hardcoded Xcode version check (currently 26.3) to use the current Xcode version, and assign the corresponding max simulator versions.
+ifeq ($(XCODE_VERSION),26.3)
+MAX_IOS_SIMULATOR_VERSION=26.3
+MAX_TVOS_SIMULATOR_VERSION=26.2
+else ifneq ($(XCODE_VERSION),$(IOS_SDK_VERSION))
+$(error Check if a max iOS simulator is different than the current SDK version (this happens when there's a new iOS release, with no API changes so no new SDK))
+else ifneq ($(XCODE_VERSION),$(TVOS_SDK_VERSION))
+$(error Check if a max tvOS simulator is different than the current SDK version (this happens when there's a new tvOS release, with no API changes so no new SDK))
+else
 MAX_IOS_SIMULATOR_VERSION=$(IOS_SDK_VERSION)
 MAX_TVOS_SIMULATOR_VERSION=$(TVOS_SDK_VERSION)
+endif
 
 # Minimum OS versions for running XI/XM apps.
 MIN_IOS_SDK_VERSION=12.2

NuGet.config

@@ -12,7 +12,7 @@
     <!--  Begin: Package sources from dotnet-dotnet -->
     <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from dotnet-macios -->
-    <add key="darc-pub-dotnet-macios-42038e1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-42038e18/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-macios-b34b8d3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-b34b8d33/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-macios -->
     <!--  Begin: Package sources from xamarin-xamarin-macios -->
     <!--  End: Package sources from xamarin-xamarin-macios -->

eng/Version.Details.props

@@ -5,41 +5,41 @@ This file should be imported by eng/Versions.props
 -->
 <Project>
   <PropertyGroup>
-    <!-- dotnet/dotnet dependencies -->
-    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26153.116</MicrosoftDotNetArcadeSdkPackageVersion>
-    <MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.26153.116</MicrosoftDotNetBuildTasksFeedPackageVersion>
+    <!-- dotnet-dotnet dependencies -->
+    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26160.113</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.26160.113</MicrosoftDotNetBuildTasksFeedPackageVersion>
     <MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.26070.104</MicrosoftDotNetCecilPackageVersion>
-    <MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.26153.116</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
+    <MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.26160.113</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
     <MicrosoftNETILLinkPackageVersion>10.0.3-servicing.26070.104</MicrosoftNETILLinkPackageVersion>
     <MicrosoftNETILLinkTasksPackageVersion>10.0.3</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.3</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
-    <MicrosoftNETSdkPackageVersion>10.0.300-preview.26153.116</MicrosoftNETSdkPackageVersion>
+    <MicrosoftNETSdkPackageVersion>10.0.300-preview.26160.113</MicrosoftNETSdkPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>10.0.3</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.300-preview.26153.116</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
-    <!-- dotnet/macios dependencies -->
+    <MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.300-preview.26160.113</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
+    <!-- dotnet-macios dependencies -->
     <MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
     <MicrosoftiOSSdknet90_185PackageVersion>18.5.9227</MicrosoftiOSSdknet90_185PackageVersion>
-    <MicrosoftiOSSdknet90_262PackageVersion>26.2.9001</MicrosoftiOSSdknet90_262PackageVersion>
+    <MicrosoftiOSSdknet90_262PackageVersion>26.2.9002</MicrosoftiOSSdknet90_262PackageVersion>
     <MicrosoftMacCatalystSdknet100_260PackageVersion>26.0.11017</MicrosoftMacCatalystSdknet100_260PackageVersion>
     <MicrosoftMacCatalystSdknet90_185PackageVersion>18.5.9227</MicrosoftMacCatalystSdknet90_185PackageVersion>
-    <MicrosoftMacCatalystSdknet90_262PackageVersion>26.2.9001</MicrosoftMacCatalystSdknet90_262PackageVersion>
+    <MicrosoftMacCatalystSdknet90_262PackageVersion>26.2.9002</MicrosoftMacCatalystSdknet90_262PackageVersion>
     <MicrosoftmacOSSdknet100_260PackageVersion>26.0.11017</MicrosoftmacOSSdknet100_260PackageVersion>
     <MicrosoftmacOSSdknet90_155PackageVersion>15.5.9227</MicrosoftmacOSSdknet90_155PackageVersion>
-    <MicrosoftmacOSSdknet90_262PackageVersion>26.2.9001</MicrosoftmacOSSdknet90_262PackageVersion>
+    <MicrosoftmacOSSdknet90_262PackageVersion>26.2.9002</MicrosoftmacOSSdknet90_262PackageVersion>
     <MicrosofttvOSSdknet100_260PackageVersion>26.0.11017</MicrosofttvOSSdknet100_260PackageVersion>
     <MicrosofttvOSSdknet90_185PackageVersion>18.5.9227</MicrosofttvOSSdknet90_185PackageVersion>
-    <MicrosofttvOSSdknet90_262PackageVersion>26.2.9001</MicrosofttvOSSdknet90_262PackageVersion>
-    <!-- xamarin/xamarin-macios dependencies -->
+    <MicrosofttvOSSdknet90_262PackageVersion>26.2.9002</MicrosofttvOSSdknet90_262PackageVersion>
+    <!-- dotnet-xharness dependencies -->
+    <MicrosoftDotNetXHarnessiOSSharedPackageVersion>11.0.0-prerelease.26160.2</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
+    <!-- xamarin-xamarin-macios dependencies -->
     <MicrosoftiOSSdknet90_180PackageVersion>18.0.9617</MicrosoftiOSSdknet90_180PackageVersion>
     <MicrosoftMacCatalystSdknet90_180PackageVersion>18.0.9617</MicrosoftMacCatalystSdknet90_180PackageVersion>
     <MicrosoftmacOSSdknet90_150PackageVersion>15.0.9617</MicrosoftmacOSSdknet90_150PackageVersion>
     <MicrosofttvOSSdknet90_180PackageVersion>18.0.9617</MicrosofttvOSSdknet90_180PackageVersion>
-    <!-- dotnet/xharness dependencies -->
-    <MicrosoftDotNetXHarnessiOSSharedPackageVersion>11.0.0-prerelease.26117.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
   </PropertyGroup>
   <!--Property group for alternate package version names-->
   <PropertyGroup>
-    <!-- dotnet/dotnet dependencies -->
+    <!-- dotnet-dotnet dependencies -->
     <MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
     <MicrosoftDotNetBuildTasksFeedVersion>$(MicrosoftDotNetBuildTasksFeedPackageVersion)</MicrosoftDotNetBuildTasksFeedVersion>
     <MicrosoftDotNetCecilVersion>$(MicrosoftDotNetCecilPackageVersion)</MicrosoftDotNetCecilVersion>
@@ -50,7 +50,7 @@ This file should be imported by eng/Versions.props
     <MicrosoftNETSdkVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETSdkVersion>
     <MicrosoftNETCoreAppRefVersion>$(MicrosoftNETCoreAppRefPackageVersion)</MicrosoftNETCoreAppRefVersion>
     <MicrosoftTemplateEngineAuthoringTasksVersion>$(MicrosoftTemplateEngineAuthoringTasksPackageVersion)</MicrosoftTemplateEngineAuthoringTasksVersion>
-    <!-- dotnet/macios dependencies -->
+    <!-- dotnet-macios dependencies -->
     <MicrosoftiOSSdknet100_260Version>$(MicrosoftiOSSdknet100_260PackageVersion)</MicrosoftiOSSdknet100_260Version>
     <MicrosoftiOSSdknet90_185Version>$(MicrosoftiOSSdknet90_185PackageVersion)</MicrosoftiOSSdknet90_185Version>
     <MicrosoftiOSSdknet90_262Version>$(MicrosoftiOSSdknet90_262PackageVersion)</MicrosoftiOSSdknet90_262Version>
@@ -63,12 +63,12 @@ This file should be imported by eng/Versions.props
     <MicrosofttvOSSdknet100_260Version>$(MicrosofttvOSSdknet100_260PackageVersion)</MicrosofttvOSSdknet100_260Version>
     <MicrosofttvOSSdknet90_185Version>$(MicrosofttvOSSdknet90_185PackageVersion)</MicrosofttvOSSdknet90_185Version>
     <MicrosofttvOSSdknet90_262Version>$(MicrosofttvOSSdknet90_262PackageVersion)</MicrosofttvOSSdknet90_262Version>
-    <!-- xamarin/xamarin-macios dependencies -->
+    <!-- dotnet-xharness dependencies -->
+    <MicrosoftDotNetXHarnessiOSSharedVersion>$(MicrosoftDotNetXHarnessiOSSharedPackageVersion)</MicrosoftDotNetXHarnessiOSSharedVersion>
+    <!-- xamarin-xamarin-macios dependencies -->
     <MicrosoftiOSSdknet90_180Version>$(MicrosoftiOSSdknet90_180PackageVersion)</MicrosoftiOSSdknet90_180Version>
     <MicrosoftMacCatalystSdknet90_180Version>$(MicrosoftMacCatalystSdknet90_180PackageVersion)</MicrosoftMacCatalystSdknet90_180Version>
     <MicrosoftmacOSSdknet90_150Version>$(MicrosoftmacOSSdknet90_150PackageVersion)</MicrosoftmacOSSdknet90_150Version>
     <MicrosofttvOSSdknet90_180Version>$(MicrosofttvOSSdknet90_180PackageVersion)</MicrosofttvOSSdknet90_180Version>
-    <!-- dotnet/xharness dependencies -->
-    <MicrosoftDotNetXHarnessiOSSharedVersion>$(MicrosoftDotNetXHarnessiOSSharedPackageVersion)</MicrosoftDotNetXHarnessiOSSharedVersion>
   </PropertyGroup>
 </Project>

eng/Version.Details.xml

@@ -1,8 +1,8 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NET.Sdk" Version="10.0.300-preview.26153.116">
+    <Dependency Name="Microsoft.NET.Sdk" Version="10.0.300-preview.26160.113">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>cdfa38403fbb85d0c2f582b8dbc522c1df9a9b83</Sha>
+      <Sha>37ac471dd9cf9b9b784497fa71dcce9045eb1a78</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink" Version="10.0.3-servicing.26070.104">
       <Uri>https://github.com/dotnet/dotnet</Uri>
@@ -60,21 +60,21 @@
       <Sha>797d30720e5e629d23eb146935da94cb1b61047e</Sha>
     </Dependency>
     <!-- This is a subscription of the .NET 9/Xcode 26.2 versions of our packages -->
-    <Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_26.2" Version="26.2.9001">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_26.2" Version="26.2.9002">
       <Uri>https://github.com/dotnet/macios</Uri>
-      <Sha>42038e186c8e8d9ce0f4a4ff0961bb2b061a35eb</Sha>
+      <Sha>b34b8d33dfd662493a68b1e443fa04071eebe2b6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk.net9.0_26.2" Version="26.2.9001">
+    <Dependency Name="Microsoft.macOS.Sdk.net9.0_26.2" Version="26.2.9002">
       <Uri>https://github.com/dotnet/macios</Uri>
-      <Sha>42038e186c8e8d9ce0f4a4ff0961bb2b061a35eb</Sha>
+      <Sha>b34b8d33dfd662493a68b1e443fa04071eebe2b6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk.net9.0_26.2" Version="26.2.9001">
+    <Dependency Name="Microsoft.iOS.Sdk.net9.0_26.2" Version="26.2.9002">
       <Uri>https://github.com/dotnet/macios</Uri>
-      <Sha>42038e186c8e8d9ce0f4a4ff0961bb2b061a35eb</Sha>
+      <Sha>b34b8d33dfd662493a68b1e443fa04071eebe2b6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk.net9.0_26.2" Version="26.2.9001">
+    <Dependency Name="Microsoft.tvOS.Sdk.net9.0_26.2" Version="26.2.9002">
       <Uri>https://github.com/dotnet/macios</Uri>
-      <Sha>42038e186c8e8d9ce0f4a4ff0961bb2b061a35eb</Sha>
+      <Sha>b34b8d33dfd662493a68b1e443fa04071eebe2b6</Sha>
     </Dependency>
     <!-- This is a subscription of the .NET 10/Xcode 26.0 versions of our packages -->
     <Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.11017">
@@ -95,25 +95,25 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.26153.116">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.26160.113">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>cdfa38403fbb85d0c2f582b8dbc522c1df9a9b83</Sha>
+      <Sha>37ac471dd9cf9b9b784497fa71dcce9045eb1a78</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.26153.116">
+    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.26160.113">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>cdfa38403fbb85d0c2f582b8dbc522c1df9a9b83</Sha>
+      <Sha>37ac471dd9cf9b9b784497fa71dcce9045eb1a78</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.300-preview.26153.116">
+    <Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.300-preview.26160.113">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>cdfa38403fbb85d0c2f582b8dbc522c1df9a9b83</Sha>
+      <Sha>37ac471dd9cf9b9b784497fa71dcce9045eb1a78</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="11.0.0-prerelease.26117.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="11.0.0-prerelease.26160.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>0eeaa60169fe6a95932d29d822e20eb225ce0143</Sha>
+      <Sha>c32a7777a0f8f7a4fc8d9920d445f5f4b5658d38</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26153.116">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26160.113">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>cdfa38403fbb85d0c2f582b8dbc522c1df9a9b83</Sha>
+      <Sha>37ac471dd9cf9b9b784497fa71dcce9045eb1a78</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
   </ToolsetDependencies>

eng/common/core-templates/steps/publish-logs.yml

@@ -31,7 +31,6 @@ steps:
       -runtimeSourceFeed https://ci.dot.net/internal 
       -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
       '$(publishing-dnceng-devdiv-code-r-build-re)'
-      '$(MaestroAccessToken)'
       '$(dn-bot-all-orgs-artifact-feeds-rw)'
       '$(akams-client-id)'
       '$(microsoft-symbol-server-pat)'

global.json

@@ -1,16 +1,16 @@
 {
   "sdk": {
-    "version": "10.0.300-preview.26153.116",
+    "version": "10.0.300-preview.26160.113",
     "paths": [
       "builds/downloads/dotnet",
       "$host$"
     ],
     "errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
   },
   "tools": {
-    "dotnet": "10.0.300-preview.26153.116"
+    "dotnet": "10.0.300-preview.26160.113"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26153.116"
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26160.113"
   }
 }

src/CoreGraphics/CGFont.cs

@@ -48,10 +48,10 @@ internal CGFont (NativeHandle handle, bool owns)
 		{
 		}
 
-		static CGFont Create (IntPtr handle)
+		static CGFont? Create (IntPtr handle)
 		{
 			if (handle == IntPtr.Zero)
-				ObjCRuntime.ThrowHelper.ThrowArgumentNullException (nameof (handle));
+				return null;
 			return new CGFont (handle, true);
 		}
 
@@ -74,29 +74,27 @@ protected internal override void Release ()
 		[DllImport (Constants.CoreGraphicsLibrary)]
 		extern static /* CGFontRef */ IntPtr CGFontCreateWithDataProvider (/* CGDataProviderRef __nullable */ IntPtr provider);
 
+		/// <summary>Creates a font from a data provider.</summary>
 		/// <param name="provider">Data provider that wraps the font.</param>
-		///         <summary>Creates a font from a data provider.</summary>
-		///         <returns>The constructed font.</returns>
-		///         <remarks>
-		///           <para>
-		/// 	    You can use this method to create CGFonts from an
-		/// 	    in-memory representation of the font (for example, to
-		/// 	    embed binary fonts into your application to prevent easy
-		/// 	    copying of licensed fonts, or when you fetch the font from
-		/// 	    a streaming source and do not want to store it on disk).
-		///
-		/// 	  </para>
-		///           <example>
-		///             <code lang="csharp lang-csharp"><![CDATA[
-		/// // 
+		/// <returns>The constructed font, or <see langword="null" /> in case of failure.</returns>
+		/// <remarks>
+		///   <para>
+		///     You can use this method to create <see cref="CGFont" /> instances from an
+		///     in-memory representation of the font (for example, to
+		///     embed binary fonts into your application to prevent easy
+		///     copying of licensed fonts, or when you fetch the font from
+		///     a streaming source and do not want to store it on disk).
+		///   </para>
+		///   <example>
+		///     <code lang="csharp lang-csharp"><![CDATA[
+		/// //
 		/// // Load font into byte array from a file.
 		/// //
-		/// byte [] myBuffer = File.ReadAllBytes ("demo.ttf"); 
-		/// CGFont font = CGFont.CreateFromProvider (new CGDataProvider (myBuffer, 0, myBuffer.Count));
-		///
+		/// var myBuffer = File.ReadAllBytes ("demo.ttf");
+		/// var font = CGFont.CreateFromProvider (new CGDataProvider (myBuffer, 0, myBuffer.Count));
 		/// ]]></code>
-		///           </example>
-		///         </remarks>
+		///   </example>
+		/// </remarks>
 		public static CGFont? CreateFromProvider (CGDataProvider provider)
 		{
 			// the API accept a `nil` argument but returns `nil`, we take a shortcut (no native call)
@@ -111,22 +109,24 @@ protected internal override void Release ()
 		[DllImport (Constants.CoreGraphicsLibrary)]
 		extern static /* CGFontRef */ IntPtr CGFontCreateWithFontName (/* CFStringRef __nullable */ IntPtr name);
 
-		/// <param name="name">To be added.</param>
-		///         <summary>Creates a new CGFont representing the specified PostScript or full name.</summary>
-		///         <returns>To be added.</returns>
-		///         <remarks>To be added.</remarks>
+		/// <summary>Creates a new <see cref="CGFont" /> representing the specified PostScript or full name.</summary>
+		/// <param name="name">The PostScript or full name of the font.</param>
+		/// <returns>The new <see cref="CGFont" />, or <see langword="null" /> if <paramref name="name" /> is <see langword="null" /> or no matching font is found.</returns>
+		/// <remarks>
+		///   <para>
+		///     This method looks up a font by its PostScript name or full
+		///     name. If no font matching <paramref name="name" /> is found,
+		///     the method returns <see langword="null" />.
+		///   </para>
+		/// </remarks>
 		public static CGFont? CreateWithFontName (string name)
 		{
 			// the API accept a `nil` argument but returns `nil`, we take a shortcut (no native call)
 			// and have a unit tests to make sure this behavior does not change over time
 			if (name is null)
 				return null;
-			var nameHandle = CFString.CreateNative (name);
-			try {
-				return Create (CGFontCreateWithFontName (nameHandle));
-			} finally {
-				CFString.ReleaseNative (nameHandle);
-			}
+			var nameHandle = new TransientCFString (name);
+			return Create (CGFontCreateWithFontName (nameHandle));
 		}
 
 		//[DllImport (Constants.CoreGraphicsLibrary)]