[xcode26.2] Merge main into xcode26.2 (#24318)

Author: dalexsoto

.azuredevops/dependabot.yml

@@ -0,0 +1,5 @@
+version: 2
+
+# Disabling dependabot on Azure DevOps as this is a mirrored repo. Updates should go through github.
+enable-campaigned-updates: false
+enable-security-updates: false

NuGet.config

@@ -10,11 +10,10 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-dotnet -->
-    <add key="darc-pub-dotnet-dotnet-ba86126" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-ba861262/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-dotnet-4090eb3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-4090eb30/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-dotnet -->
     <!--  Begin: Package sources from dotnet-macios -->
     <add key="darc-pub-dotnet-macios-4177c9d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-4177c9d9/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-macios-23eb1c2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-23eb1c2c/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-macios -->
     <!--  Begin: Package sources from xamarin-xamarin-macios -->
     <!--  End: Package sources from xamarin-xamarin-macios -->
@@ -39,6 +38,8 @@
     <add key="darc-pub-dotnet-runtime-ad2d4fbc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ad2d4fbc/nuget/v3/index.json" />
     <!-- Add a 9.0.11 feed -->
     <add key="darc-pub-dotnet-runtime-35fe9c61" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-35fe9c61/nuget/v3/index.json" />
+    <!-- Add a 9.0.12 feed -->
+    <add key="darc-pub-dotnet-runtime-9c2fb4b7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-9c2fb4b7/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

docs/ReleaseCheckList.md

@@ -67,7 +67,7 @@ This happens after the stable version of Xcode has been released and the `xcodeX
 * [ ] Update https://github.com/dotnet/maui/wiki/Release-Versions
 * [ ] Update API diff (the `STABLE_NUGET_VERSION_*` variables in `Make.config`). Can only be done after the NuGets have been published to nuget.org.
 * [ ] Update docs by executing `docs/sync-mobile-docs.sh`. Beware if docs were modified in the [docs-mobile](https://github.com/dotnet/docs-mobile) repository by somebody else, any such changes will have to be copied back first.
-* [ ] Update API / reference docs. See [update-api-docs.md](/tree/main/docs/update-api-docs.md) for instructions.
+* [ ] Update API / reference docs. See [update-api-docs.md](https://github.com/dotnet/macios/blob/main/docs/update-api-docs.md) for instructions.
 * [ ] Make sure all items in the milestone for the current release have been closed.
 * [ ] Close this issue & close the milestone.
 * [ ] Wonder about life as you consider the impossibility of actually reaching this point, because you can't close the milestone before all issues have been closed, and you can't close this issue until checking off all items, which you can't do until you've closed the milestone. Decide to schedule yet another viewing of [Life of Brian](https://en.wikipedia.org/wiki/Monty_Python%27s_Life_of_Brian) to ~cope~ celebrate the release 🍾.

docs/api/Foundation/NSErrorEventArgs.xml

@@ -1903,7 +1903,6 @@
 	<!-- When we're building a universal app, we need to collect the list of user frameworks we need to run dsymutil on -->
 	<Target Name="_CollectRidSpecificUserFrameworksWithoutDebugSymbols">
 		<ReadItemsFromFile
-			SessionId="$(BuildSessionId)"
 			File="%(_RidSpecificUserFrameworksWithoutDebugSymbolsPath.Identity)"
 			Condition="Exists('%(_RidSpecificUserFrameworksWithoutDebugSymbolsPath.Identity)')"
 		>
@@ -1924,9 +1923,8 @@
 
 		<!-- Read the stored list of files to sign if we're an outer build of a multi-rid build -->
 		<ReadItemsFromFile
-			SessionId="$(BuildSessionId)"
 			File="%(_RidSpecificCodesignItemsPath.Identity)"
-			Condition="@(_RidSpecificCodesignItemsPath->Count()) &gt; 0 And '$(IsMacEnabled)' == 'true'"
+			Condition="@(_RidSpecificCodesignItemsPath->Count()) &gt; 0"
 		>
 			<Output TaskParameter="Items" ItemName="_RidSpecificCodesignItems" />
 		</ReadItemsFromFile>
@@ -2236,8 +2234,7 @@
 
 		<!-- Write a list of files to sign if we're not an outer build of a multi-rid build -->
 		<WriteItemsToFile
-			SessionId="$(BuildSessionId)"
-			Condition="'$(IsMacEnabled)' == 'true' And '$(_CodesignItemsPath)' != ''"
+			Condition="'$(_CodesignItemsPath)' != ''"
 			Items="@(_CreateDumpExecutableToSign)"
 			ItemName="_CodesignItems"
 			File="$(_CodesignItemsPath)"

dotnet/targets/Xamarin.Shared.Sdk.targets

@@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props
 <Project>
   <PropertyGroup>
     <!-- dotnet/dotnet dependencies -->
-    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetArcadeSdkPackageVersion>
-    <MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25531.102</MicrosoftDotNetCecilPackageVersion>
-    <MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25531.102</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
-    <MicrosoftNETILLinkPackageVersion>10.0.0-rtm.25531.102</MicrosoftNETILLinkPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>10.0.0</MicrosoftNETILLinkTasksPackageVersion>
-    <MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.0</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
-    <MicrosoftNETSdkPackageVersion>10.0.100-rtm.25531.102</MicrosoftNETSdkPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25569.104</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25569.104</MicrosoftDotNetBuildTasksFeedPackageVersion>
+    <MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25569.104</MicrosoftDotNetCecilPackageVersion>
+    <MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25569.104</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
+    <MicrosoftNETILLinkPackageVersion>10.0.1-servicing.25569.104</MicrosoftNETILLinkPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>10.0.1</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.1</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
+    <MicrosoftNETSdkPackageVersion>10.0.101-servicing.25569.104</MicrosoftNETSdkPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>10.0.1</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.101</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
     <!-- dotnet/macios dependencies -->
     <MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
     <MicrosoftiOSSdknet90_185PackageVersion>18.5.9227</MicrosoftiOSSdknet90_185PackageVersion>
@@ -35,7 +35,7 @@ This file should be imported by eng/Versions.props
     <MicrosoftmacOSSdknet90_150PackageVersion>15.0.9617</MicrosoftmacOSSdknet90_150PackageVersion>
     <MicrosofttvOSSdknet90_180PackageVersion>18.0.9617</MicrosofttvOSSdknet90_180PackageVersion>
     <!-- dotnet/xharness dependencies -->
-    <MicrosoftDotNetXHarnessiOSSharedPackageVersion>10.0.0-prerelease.25527.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
+    <MicrosoftDotNetXHarnessiOSSharedPackageVersion>11.0.0-prerelease.25569.2</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
   </PropertyGroup>
   <!--Property group for alternate package version names-->
   <PropertyGroup>

eng/Version.Details.props

@@ -1,29 +1,29 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rtm.25531.102">
+    <Dependency Name="Microsoft.NET.Sdk" Version="10.0.101-servicing.25569.104">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
+      <Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink" Version="10.0.0-rtm.25531.102">
+    <Dependency Name="Microsoft.NET.ILLink" Version="10.0.1-servicing.25569.104">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
+      <Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.1">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
+      <Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.0">
+    <Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.1">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
+      <Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
     </Dependency>
     <!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.1">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
+      <Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25531.102">
+    <Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25569.104">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
+      <Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
     </Dependency>
     <!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
     <Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_18.5" Version="18.5.9227">
@@ -95,25 +95,25 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25531.102">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25569.104">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
+      <Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25531.102">
+    <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25569.104">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
+      <Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100">
+    <Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.101">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
+      <Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="10.0.0-prerelease.25527.1">
+    <Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="11.0.0-prerelease.25569.2">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>b9f51d9ff3ac9411d1aa9988ef20bfda9a041418</Sha>
+      <Sha>f02363153e30c96ad6e170852b2e272103b71945</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25531.102">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25569.104">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>ba86126261026d26f7c30cd3434680d3965a88cf</Sha>
+      <Sha>4090eb301f5e5db13760aa57eeb32b516c42c56b</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
   </ToolsetDependencies>

eng/Version.Details.xml

@@ -1,6 +1,7 @@
 # This script adds internal feeds required to build commits that depend on internal package sources. For instance,
-# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
-# disabled internal Maestro (darc-int*) feeds.
+# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
+# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
+# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
 #
 # Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
 #
@@ -173,4 +174,16 @@ foreach ($dotnetVersion in $dotnetVersions) {
     }
 }
 
+# Check for dotnet-eng and add dotnet-eng-internal if present
+$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']")
+if ($dotnetEngSource -ne $null) {
+    AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
+}
+
+# Check for dotnet-tools and add dotnet-tools-internal if present
+$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']")
+if ($dotnetToolsSource -ne $null) {
+    AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
+}
+
 $doc.Save($filename)

eng/common/SetupNugetSources.ps1

@@ -1,8 +1,9 @@
 #!/usr/bin/env bash
 
 # This script adds internal feeds required to build commits that depend on internal package sources. For instance,
-# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables
-# disabled internal Maestro (darc-int*) feeds.
+# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly,
+# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present.
+# In addition, this script also enables disabled internal Maestro (darc-int*) feeds.
 # 
 # Optionally, this script also adds a credential entry for each of the internal feeds if supplied.
 #
@@ -173,6 +174,18 @@ for DotNetVersion in ${DotNetVersions[@]} ; do
     fi
 done
 
+# Check for dotnet-eng and add dotnet-eng-internal if present
+grep -i "<add key=\"dotnet-eng\"" $ConfigFile > /dev/null
+if [ "$?" == "0" ]; then
+    AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix"
+fi
+
+# Check for dotnet-tools and add dotnet-tools-internal if present
+grep -i "<add key=\"dotnet-tools\"" $ConfigFile > /dev/null
+if [ "$?" == "0" ]; then
+    AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix"
+fi
+
 # I want things split line by line
 PrevIFS=$IFS
 IFS=$'\n'

eng/common/SetupNugetSources.sh

@@ -180,6 +180,11 @@ jobs:
           PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
           is1ESPipeline: ${{ parameters.is1ESPipeline }}
 
+      # Darc is targeting 8.0, so make sure it's installed
+      - task: UseDotNet@2
+        inputs:
+          version: 8.0.x
+
       - task: AzureCLI@2
         displayName: Publish Using Darc
         inputs: