[iOS] Update net10 iOS to rc2

Directory.Build.props

@@ -157,16 +157,16 @@
   <!-- version number information -->
   <PropertyGroup>
     <!-- Default versions from the SDKs (update when there is a new TFM version) -->
-    <IosTargetFrameworkVersionSdkDefault>18.5</IosTargetFrameworkVersionSdkDefault>
-    <TvosTargetFrameworkVersionSdkDefault>18.5</TvosTargetFrameworkVersionSdkDefault>
-    <MacCatalystTargetFrameworkVersionSdkDefault>18.5</MacCatalystTargetFrameworkVersionSdkDefault>
-    <MacosTargetFrameworkVersionSdkDefault>15.5</MacosTargetFrameworkVersionSdkDefault>
+    <IosTargetFrameworkVersionSdkDefault>26.0</IosTargetFrameworkVersionSdkDefault>
+    <TvosTargetFrameworkVersionSdkDefault>26.0</TvosTargetFrameworkVersionSdkDefault>
+    <MacCatalystTargetFrameworkVersionSdkDefault>26.0</MacCatalystTargetFrameworkVersionSdkDefault>
+    <MacosTargetFrameworkVersionSdkDefault>26.0</MacosTargetFrameworkVersionSdkDefault>
     <AndroidTargetFrameworkVersionSdkDefault>36.0</AndroidTargetFrameworkVersionSdkDefault>
     <!-- Current .NET -->
-    <IosTargetFrameworkVersion>18.5</IosTargetFrameworkVersion>
-    <TvosTargetFrameworkVersion>18.5</TvosTargetFrameworkVersion>
-    <MacCatalystTargetFrameworkVersion>18.5</MacCatalystTargetFrameworkVersion>
-    <MacosTargetFrameworkVersion>15.5</MacosTargetFrameworkVersion>
+    <IosTargetFrameworkVersion>26.0</IosTargetFrameworkVersion>
+    <TvosTargetFrameworkVersion>26.0</TvosTargetFrameworkVersion>
+    <MacCatalystTargetFrameworkVersion>26.0</MacCatalystTargetFrameworkVersion>
+    <MacosTargetFrameworkVersion>26.0</MacosTargetFrameworkVersion>
     <AndroidTargetFrameworkVersion>36.0</AndroidTargetFrameworkVersion>
     <WindowsTargetFrameworkVersion>10.0.19041.0</WindowsTargetFrameworkVersion>
     <Windows2TargetFrameworkVersion>10.0.20348.0</Windows2TargetFrameworkVersion>

NuGet.config

@@ -10,8 +10,8 @@
     <add key="darc-pub-dotnet-android-1dcfb6f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-1dcfb6f8-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-android -->
     <!--  Begin: Package sources from dotnet-macios -->
-    <add key="darc-pub-dotnet-macios-4681bf9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-4681bf92/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-macios-4681bf9-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-4681bf92-1/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-macios-177f431" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-177f4311/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-macios-177f431-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-177f4311-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-macios -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="local" value="LOCAL_PLACEHOLDER" />

eng/Version.Details.xml

@@ -17,39 +17,39 @@
       <Uri>https://github.com/dotnet/android</Uri>
       <Sha>1dcfb6f8779c33b6f768c996495cb90ecd729329</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_18.5" Version="18.5.10892-net10-rc.2">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.10970-net10-rc.2">
       <Uri>https://github.com/dotnet/macios</Uri>
-      <Sha>f7fc1a300221412643d5e29802d78f93acadd8b0</Sha>
+      <Sha>042ba3e24d9c81be1f2a19e84cebc17d672080b2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk.net10.0_15.5" Version="15.5.10892-net10-rc.2">
+    <Dependency Name="Microsoft.macOS.Sdk.net10.0_26.0" Version="26.0.10970-net10-rc.2">
       <Uri>https://github.com/dotnet/macios</Uri>
-      <Sha>f7fc1a300221412643d5e29802d78f93acadd8b0</Sha>
+      <Sha>042ba3e24d9c81be1f2a19e84cebc17d672080b2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk.net10.0_18.5" Version="18.5.10892-net10-rc.2">
+    <Dependency Name="Microsoft.iOS.Sdk.net10.0_26.0" Version="26.0.10970-net10-rc.2">
       <Uri>https://github.com/dotnet/macios</Uri>
-      <Sha>f7fc1a300221412643d5e29802d78f93acadd8b0</Sha>
+      <Sha>042ba3e24d9c81be1f2a19e84cebc17d672080b2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk.net10.0_18.5" Version="18.5.10892-net10-rc.2">
+    <Dependency Name="Microsoft.tvOS.Sdk.net10.0_26.0" Version="26.0.10970-net10-rc.2">
       <Uri>https://github.com/dotnet/macios</Uri>
-      <Sha>f7fc1a300221412643d5e29802d78f93acadd8b0</Sha>
+      <Sha>042ba3e24d9c81be1f2a19e84cebc17d672080b2</Sha>
     </Dependency>
     <!-- Previous .NET iOS version(s) -->
     <!-- 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" CoherentParentDependency="Microsoft.MacCatalyst.Sdk.net10.0_18.5">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_26.0" Version="26.0.9752" CoherentParentDependency="Microsoft.MacCatalyst.Sdk.net10.0_26.0">
       <Uri>https://github.com/dotnet/macios</Uri>
-      <Sha>4681bf928d70aa79cff2c33ad324b3be9c62b66d</Sha>
+      <Sha>177f4311930b32eecc1e462a71ebbe34b7e01a0b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk.net9.0_15.5" Version="15.5.9227" CoherentParentDependency="Microsoft.macOS.Sdk.net10.0_15.5">
+    <Dependency Name="Microsoft.macOS.Sdk.net9.0_26.0" Version="26.0.9752" CoherentParentDependency="Microsoft.macOS.Sdk.net10.0_26.0">
       <Uri>https://github.com/dotnet/macios</Uri>
-      <Sha>4681bf928d70aa79cff2c33ad324b3be9c62b66d</Sha>
+      <Sha>177f4311930b32eecc1e462a71ebbe34b7e01a0b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk.net9.0_18.5" Version="18.5.9227" CoherentParentDependency="Microsoft.iOS.Sdk.net10.0_18.5">
+    <Dependency Name="Microsoft.iOS.Sdk.net9.0_26.0" Version="26.0.9752" CoherentParentDependency="Microsoft.iOS.Sdk.net10.0_26.0">
       <Uri>https://github.com/dotnet/macios</Uri>
-      <Sha>4681bf928d70aa79cff2c33ad324b3be9c62b66d</Sha>
+      <Sha>177f4311930b32eecc1e462a71ebbe34b7e01a0b</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk.net9.0_18.5" Version="18.5.9227" CoherentParentDependency="Microsoft.tvOS.Sdk.net10.0_18.5">
+    <Dependency Name="Microsoft.tvOS.Sdk.net9.0_26.0" Version="26.0.9752" CoherentParentDependency="Microsoft.tvOS.Sdk.net10.0_26.0">
       <Uri>https://github.com/dotnet/macios</Uri>
-      <Sha>4681bf928d70aa79cff2c33ad324b3be9c62b66d</Sha>
+      <Sha>177f4311930b32eecc1e462a71ebbe34b7e01a0b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>

eng/Versions.props

@@ -56,15 +56,15 @@
     <MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.105</MicrosoftNETSdkAndroidManifest90100PackageVersion>
     <AndroidNetPreviousVersion>$(MicrosoftNETSdkAndroidManifest90100PackageVersion)</AndroidNetPreviousVersion>
     <!-- xamarin/xamarin-macios -->
-    <MicrosoftMacCatalystSdknet100_185PackageVersion>18.5.10892-net10-rc.2</MicrosoftMacCatalystSdknet100_185PackageVersion>
-    <MicrosoftmacOSSdknet100_155PackageVersion>15.5.10892-net10-rc.2</MicrosoftmacOSSdknet100_155PackageVersion>
-    <MicrosoftiOSSdknet100_185PackageVersion>18.5.10892-net10-rc.2</MicrosoftiOSSdknet100_185PackageVersion>
-    <MicrosofttvOSSdknet100_185PackageVersion>18.5.10892-net10-rc.2</MicrosofttvOSSdknet100_185PackageVersion>
+    <MicrosoftMacCatalystSdknet100_260PackageVersion>26.0.10970-net10-rc.2</MicrosoftMacCatalystSdknet100_260PackageVersion>
+    <MicrosoftmacOSSdknet100_260PackageVersion>26.0.10970-net10-rc.2</MicrosoftmacOSSdknet100_260PackageVersion>
+    <MicrosoftiOSSdknet100_260PackageVersion>26.0.10970-net10-rc.2</MicrosoftiOSSdknet100_260PackageVersion>
+    <MicrosofttvOSSdknet100_260PackageVersion>26.0.10970-net10-rc.2</MicrosofttvOSSdknet100_260PackageVersion>
     <!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
-    <MicrosoftMacCatalystSdknet90_185PackageVersion>18.5.9227</MicrosoftMacCatalystSdknet90_185PackageVersion>
-    <MicrosoftmacOSSdknet90_155PackageVersion>15.5.9227</MicrosoftmacOSSdknet90_155PackageVersion>
-    <MicrosoftiOSSdknet90_185PackageVersion>18.5.9227</MicrosoftiOSSdknet90_185PackageVersion>
-    <MicrosofttvOSSdknet90_185PackageVersion>18.5.9227</MicrosofttvOSSdknet90_185PackageVersion>
+    <MicrosoftMacCatalystSdknet90_260PackageVersion>26.0.9752</MicrosoftMacCatalystSdknet90_260PackageVersion>
+    <MicrosoftmacOSSdknet90_260PackageVersion>26.0.9752</MicrosoftmacOSSdknet90_260PackageVersion>
+    <MicrosoftiOSSdknet90_260PackageVersion>26.0.9752</MicrosoftiOSSdknet90_260PackageVersion>
+    <MicrosofttvOSSdknet90_260PackageVersion>26.0.9752</MicrosofttvOSSdknet90_260PackageVersion>
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>8.0.148</SamsungTizenSdkPackageVersion>
     <!-- wasdk -->
@@ -211,9 +211,9 @@
     <DotNetAndroidManifestVersionBand>$(DotNetVersionBand)</DotNetAndroidManifestVersionBand>
     <DotNetMaciOSManifestVersionBand>$(DotNetVersionBand)</DotNetMaciOSManifestVersionBand>
     <DotNetTizenManifestVersionBand>9.0.100</DotNetTizenManifestVersionBand>
-    <MicrosoftMacCatalystSdkPackageVersion>$(MicrosoftMacCatalystSdknet100_185PackageVersion)</MicrosoftMacCatalystSdkPackageVersion>
-    <MicrosoftmacOSSdkPackageVersion>$(MicrosoftmacOSSdknet100_155PackageVersion)</MicrosoftmacOSSdkPackageVersion>
-    <MicrosoftiOSSdkPackageVersion>$(MicrosoftiOSSdknet100_185PackageVersion)</MicrosoftiOSSdkPackageVersion>
-    <MicrosofttvOSSdkPackageVersion>$(MicrosofttvOSSdknet100_185PackageVersion)</MicrosofttvOSSdkPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>$(MicrosoftMacCatalystSdknet100_260PackageVersion)</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftmacOSSdkPackageVersion>$(MicrosoftmacOSSdknet100_260PackageVersion)</MicrosoftmacOSSdkPackageVersion>
+    <MicrosoftiOSSdkPackageVersion>$(MicrosoftiOSSdknet100_260PackageVersion)</MicrosoftiOSSdkPackageVersion>
+    <MicrosofttvOSSdkPackageVersion>$(MicrosofttvOSSdknet100_260PackageVersion)</MicrosofttvOSSdkPackageVersion>
   </PropertyGroup>
 </Project>

eng/pipelines/common/variables.yml

@@ -8,9 +8,9 @@ variables:
 - name: DOTNET_VERSION
   value: 10.0.100-preview.2.25164.34
 - name: REQUIRED_XCODE
-  value: 16.4.0
+  value: 26.0.0
 - name: DEVICETESTS_REQUIRED_XCODE
-  value: 16.4.0
+  value: 26.0.0
 - name: POWERSHELL_VERSION
   value: 7.4.0
 # Localization variables

eng/pipelines/device-tests.yml

@@ -73,6 +73,7 @@ parameters:
     vmImage: $(iosDeviceTestsVmImage)
     demands:
     - macOS.Name -equals Sequoia
+    - Agent.OSVersion -equals 15.6
 
 - name: catalystPool
   type: object
@@ -81,6 +82,7 @@ parameters:
     vmImage: $(iosDeviceTestsVmImage)
     demands:
     - macOS.Name -equals Sequoia
+    - Agent.OSVersion -equals 15.6
 
 - name: windowsPool
   type: object

eng/pipelines/handlers.yml

@@ -80,6 +80,7 @@ parameters:
     demands:
     - macOS.Name -equals Sequoia
     - macOS.Architecture -equals x64
+    - Agent.OSVersion -equals 15.6
     artifact: build-macos
 
 - name: PackPlatforms
@@ -107,6 +108,7 @@ parameters:
     demands:
     - macOS.Name -equals Sequoia
     - macOS.Architecture -equals x64
+    - Agent.OSVersion -equals 15.6
     artifact: build-macos
 
 - name: RunTemplatePlatforms
@@ -117,13 +119,15 @@ parameters:
     demands:
     - macOS.Name -equals Sequoia
     - macOS.Architecture -equals x64
+    - Agent.OSVersion -equals 15.6
     testName: RunOnAndroid
     artifact: templates-run-android
   - name: $(iosTestsVmPool)
     vmImage: $(iosTestsVmImage)
     demands:
     - macOS.Name -equals Sequoia
     - macOS.Architecture -equals x64
+    - Agent.OSVersion -equals 15.6
     testName: RunOniOS
     artifact: templates-run-ios
 
@@ -135,6 +139,7 @@ parameters:
     demands:
     - macOS.Name -equals Sequoia
     - macOS.Architecture -equals arm64
+    - Agent.OSVersion -equals 15.6
 
 resources:
   repositories:

eng/pipelines/ui-tests.yml

@@ -74,6 +74,7 @@ parameters:
       demands:
         - macOS.Name -equals Sequoia
         - macOS.Architecture -equals x64
+        - Agent.OSVersion -equals 15.6
 
   - name: androidPoolLinux
     type: object
@@ -91,6 +92,7 @@ parameters:
       demands:
         - macOS.Name -equals Sequoia
         - macOS.Architecture -equals x64
+        - Agent.OSVersion -equals 15.6
 
   - name: windowsBuildPool
     type: object

src/Controls/tests/TestCases.HostApp/Issues/Issue21948.xaml.cs

@@ -24,11 +24,23 @@ public void OpenNewWindowClicked(object obj, EventArgs e)
 #if IOS || MACCATALYST
 		async void OpenNewWindow()
 		{
-			var uIWindow = new UIWindow();
+
 			var keyWindow = (this.Window.Handler.PlatformView as UIWindow);
 			if (keyWindow?.WindowLevel == UIWindowLevel.Normal)
 				keyWindow.WindowLevel = -1;
 
+			UIWindow uIWindow;
+			if (OperatingSystem.IsIOSVersionAtLeast(13) && keyWindow?.WindowScene is not null)
+			{
+				uIWindow = new UIWindow(keyWindow.WindowScene);
+			}
+			else
+			{
+#pragma warning disable CA1422 // This call site is reachable on iOS < 13.0
+				uIWindow = new UIWindow();
+#pragma warning restore CA1422
+			}
+
 			var page = new ContentPage();
 			this.AddLogicalChild(page);
 			var handler = page.ToHandler(this.Handler.MauiContext);

src/Controls/tests/TestCases.HostApp/Issues/Issues16321.xaml.cs

@@ -46,8 +46,19 @@ async void OpenActionSheetWithModals(System.Object sender, System.EventArgs e)
 
 		async void OpenPrompt(System.Object sender, System.EventArgs e, Func<Page, Task> promptAction)
 		{
-			var uIWindow = new UIWindow();
 			var keyWindow = (this.Window.Handler.PlatformView as UIWindow);
+
+			UIWindow uIWindow;
+			if (OperatingSystem.IsIOSVersionAtLeast(13) && keyWindow?.WindowScene is not null)
+			{
+				uIWindow = new UIWindow(keyWindow.WindowScene);
+			}
+			else
+			{
+#pragma warning disable CA1422 // This call site is reachable on iOS < 13.0
+				uIWindow = new UIWindow();
+#pragma warning restore CA1422
+			}
 			if (keyWindow?.WindowLevel == UIWindowLevel.Normal)
 				keyWindow.WindowLevel = -1;