[release/8.0.1xx-rc2.3] Bump macios to latest

build.ps1

@@ -9,7 +9,11 @@ Param(
 )
 
 # Restore Cake tool
-& dotnet tool restore
+#& dotnet tool restore
+$tools = Get-Content ".config/dotnet-tools.json" | ConvertFrom-Json
+foreach ($tool in $tools.tools.PsObject.Properties) {
+    & dotnet tool install $tool.Name --version $tool.Value.version
+}
 
 # Build Cake arguments
 $cakeArguments = @("$Script");

eng/Version.Details.xml

@@ -12,21 +12,21 @@
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
       <Sha>735e895bce788c158c67d7322a3873af217832c9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="17.0.8465-net8-rc2.1">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="17.0.8477-net8-rc2.2">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>d6a0ca010e0031e7c6ed2519fae849494a48eebb</Sha>
+      <Sha>b7bc60291d5a4055730b8fb3ddf20167c97e6108</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk" Version="14.0.8465-net8-rc2.1">
+    <Dependency Name="Microsoft.macOS.Sdk" Version="14.0.8477-net8-rc2.2">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>d6a0ca010e0031e7c6ed2519fae849494a48eebb</Sha>
+      <Sha>b7bc60291d5a4055730b8fb3ddf20167c97e6108</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk" Version="17.0.8465-net8-rc2.1">
+    <Dependency Name="Microsoft.iOS.Sdk" Version="17.0.8477-net8-rc2.2">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>d6a0ca010e0031e7c6ed2519fae849494a48eebb</Sha>
+      <Sha>b7bc60291d5a4055730b8fb3ddf20167c97e6108</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk" Version="17.0.8465-net8-rc2.1">
+    <Dependency Name="Microsoft.tvOS.Sdk" Version="17.0.8477-net8-rc2.2">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>d6a0ca010e0031e7c6ed2519fae849494a48eebb</Sha>
+      <Sha>b7bc60291d5a4055730b8fb3ddf20167c97e6108</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport" Version="8.0.0-rc.2.23473.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>

eng/Versions.props

@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <!-- Current previous .NET SDK major version's stable release of MAUI packages -->
-    <MicrosoftMauiPreviousDotNetReleasedVersion>7.0.96</MicrosoftMauiPreviousDotNetReleasedVersion>
+    <MicrosoftMauiPreviousDotNetReleasedVersion>7.0.100</MicrosoftMauiPreviousDotNetReleasedVersion>
     <!-- dotnet/installer -->
     <MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.2.23502.2</MicrosoftDotnetSdkInternalPackageVersion>
     <!-- dotnet/runtime -->
@@ -25,10 +25,10 @@
     <!-- xamarin/xamarin-android -->
     <MicrosoftAndroidSdkWindowsPackageVersion>34.0.0-rc.2.479</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
-    <MicrosoftMacCatalystSdkPackageVersion>17.0.8465-net8-rc2.1</MicrosoftMacCatalystSdkPackageVersion>
-    <MicrosoftmacOSSdkPackageVersion>14.0.8465-net8-rc2.1</MicrosoftmacOSSdkPackageVersion>
-    <MicrosoftiOSSdkPackageVersion>17.0.8465-net8-rc2.1</MicrosoftiOSSdkPackageVersion>
-    <MicrosofttvOSSdkPackageVersion>17.0.8465-net8-rc2.1</MicrosofttvOSSdkPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>17.0.8477-net8-rc2.2</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftmacOSSdkPackageVersion>14.0.8477-net8-rc2.2</MicrosoftmacOSSdkPackageVersion>
+    <MicrosoftiOSSdkPackageVersion>17.0.8477-net8-rc2.2</MicrosoftiOSSdkPackageVersion>
+    <MicrosofttvOSSdkPackageVersion>17.0.8477-net8-rc2.2</MicrosofttvOSSdkPackageVersion>
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>7.0.125</SamsungTizenSdkPackageVersion>
     <!-- emsdk -->

eng/pipelines/common/ui-tests-steps.yml

@@ -55,9 +55,6 @@ steps:
       DOTNET_TOKEN: $(dotnetbuilds-internal-container-read-token)
       PRIVATE_BUILD: $(PrivateBuild)
 
-  - pwsh: echo "##vso[task.prependpath]$(DotNet.Dir)"
-    displayName: 'Add .NET to PATH'
-
   - pwsh: ./build.ps1 --target=dotnet-buildtasks --configuration="${{ parameters.configuration }}"
     displayName: 'Build the MSBuild Tasks'
 

eng/pipelines/common/variables.yml

@@ -59,10 +59,10 @@ variables:
   value: false
 - group: Xamarin-Secrets
 # Variable groups required for private builds
-# - ${{ if or(eq(variables['System.TeamProject'], 'DevDiv'), eq(variables['Build.DefinitionName'], 'dotnet-maui')) }}:
-#   - name: PrivateBuild
-#     value: true
-#   # For eng/common/SetupNugetSources.ps1
-#   - group: DotNetBuilds storage account read tokens
-#   - group: AzureDevOps-Artifact-Feeds-Pats
+- ${{ if or(eq(variables['System.TeamProject'], 'DevDiv'), eq(variables['Build.DefinitionName'], 'dotnet-maui')) }}:
+  - name: PrivateBuild
+    value: true
+   # For eng/common/SetupNugetSources.ps1
+  - group: DotNetBuilds storage account read tokens
+  - group: AzureDevOps-Artifact-Feeds-Pats
 

src/Compatibility/ControlGallery/src/iOS/Compatibility.ControlGallery.iOS.csproj

@@ -10,6 +10,8 @@
     <!--<DefineConstants>$(DefineConstants);HAVE_OPENTK</DefineConstants>-->
     <!--<MtouchLink Condition="'$(CI)' == 'true'">Full</MtouchLink>-->
     <NoWarn>0612</NoWarn>
+    <SupportedOSPlatformVersion>11.0</SupportedOSPlatformVersion>
+    <TargetPlatformMinVersion>11.0</TargetPlatformMinVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">

src/Compatibility/Core/src/iOS/Renderers/FrameRenderer.cs

@@ -58,7 +58,11 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 
 		public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection)
 		{
+
+#pragma warning disable CA1422 // Validate platform compatibility
 			base.TraitCollectionDidChange(previousTraitCollection);
+#pragma warning restore CA1422 // Validate platform compatibility
+
 			// Make sure the control adheres to changes in UI theme
 			if (Forms.IsiOS13OrNewer && previousTraitCollection?.UserInterfaceStyle != TraitCollection.UserInterfaceStyle)
 				SetupLayer();

src/Compatibility/Core/src/iOS/Renderers/ListViewRenderer.cs

@@ -357,7 +357,10 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 
 		public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection)
 		{
+#pragma warning disable CA1422 // Validate platform compatibility
 			base.TraitCollectionDidChange(previousTraitCollection);
+#pragma warning restore CA1422 // Validate platform compatibility
+
 			// Make sure the cells adhere to changes UI theme
 			if (Forms.IsiOS13OrNewer && previousTraitCollection?.UserInterfaceStyle != TraitCollection.UserInterfaceStyle)
 				ReloadData();

src/Compatibility/Core/src/iOS/Renderers/NavigationRenderer.cs

@@ -370,7 +370,10 @@ protected virtual async Task<bool> OnPushAsync(Page page, bool animated)
 
 		public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection)
 		{
+#pragma warning disable CA1422 // Validate platform compatibility
 			base.TraitCollectionDidChange(previousTraitCollection);
+#pragma warning restore CA1422 // Validate platform compatibility
+
 			// Make sure the control adheres to changes in UI theme
 			if (Forms.IsiOS13OrNewer && previousTraitCollection?.UserInterfaceStyle != TraitCollection.UserInterfaceStyle)
 				UpdateBackgroundColor();

src/Compatibility/Core/src/iOS/Renderers/PageRenderer.cs

@@ -321,7 +321,9 @@ public override UIKit.UIStatusBarAnimation PreferredStatusBarUpdateAnimation
 
 		public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection)
 		{
+#pragma warning disable CA1422 // Validate platform compatibility
 			base.TraitCollectionDidChange(previousTraitCollection);
+#pragma warning restore CA1422 // Validate platform compatibility
 
 			if (Forms.IsiOS13OrNewer &&
 				previousTraitCollection.UserInterfaceStyle != TraitCollection.UserInterfaceStyle &&

src/Compatibility/Core/src/iOS/Renderers/SearchBarRenderer.cs

@@ -197,7 +197,9 @@ public override CoreGraphics.CGSize SizeThatFits(CoreGraphics.CGSize size)
 
 		public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection)
 		{
+#pragma warning disable CA1422 // Validate platform compatibility
 			base.TraitCollectionDidChange(previousTraitCollection);
+#pragma warning restore CA1422 // Validate platform compatibility
 			// Make sure the control adheres to changes in UI theme
 			if (Forms.IsiOS13OrNewer && previousTraitCollection?.UserInterfaceStyle != TraitCollection.UserInterfaceStyle)
 				UpdateTextColor();

src/Compatibility/Core/src/iOS/Renderers/TableViewRenderer.cs

@@ -139,7 +139,9 @@ protected override void UpdateNativeWidget()
 
 		public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection)
 		{
+#pragma warning disable CA1422 // Validate platform compatibility
 			base.TraitCollectionDidChange(previousTraitCollection);
+#pragma warning restore CA1422 // Validate platform compatibility
 			// Make sure the cells adhere to changes UI theme
 			if (Forms.IsiOS13OrNewer && previousTraitCollection?.UserInterfaceStyle != TraitCollection.UserInterfaceStyle)
 				Control.ReloadData();

src/Compatibility/Core/src/iOS/ViewRenderer.cs

@@ -255,7 +255,9 @@ protected void SetNativeControl(TNativeView uiview)
 #if __MOBILE__
 		public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection)
 		{
+#pragma warning disable CA1422 // Validate platform compatibility
 			base.TraitCollectionDidChange(previousTraitCollection);
+#pragma warning restore CA1422 // Validate platform compatibility
 			// Make sure the control adheres to changes in UI theme
 			if (Forms.IsiOS13OrNewer && previousTraitCollection?.UserInterfaceStyle != TraitCollection.UserInterfaceStyle)
 				Control?.SetNeedsDisplay();

src/Controls/src/Core/Compatibility/Handlers/ListView/iOS/ListViewRenderer.cs

@@ -302,7 +302,9 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 
 		public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection)
 		{
+#pragma warning disable CA1422 // Validate platform compatibility
 			base.TraitCollectionDidChange(previousTraitCollection);
+#pragma warning restore CA1422 // Validate platform compatibility
 			// Make sure the cells adhere to changes UI theme
 			if (OperatingSystem.IsIOSVersionAtLeast(13) && previousTraitCollection?.UserInterfaceStyle != TraitCollection.UserInterfaceStyle)
 				ReloadData();

src/Controls/src/Core/Compatibility/Handlers/NavigationPage/iOS/NavigationRenderer.cs

@@ -345,7 +345,9 @@ protected virtual async Task<bool> OnPushAsync(Page page, bool animated)
 
 		public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection)
 		{
+#pragma warning disable CA1422 // Validate platform compatibility
 			base.TraitCollectionDidChange(previousTraitCollection);
+#pragma warning restore CA1422 // Validate platform compatibility
 			// Make sure the control adheres to changes in UI theme
 			if (OperatingSystem.IsIOSVersionAtLeast(13) && previousTraitCollection?.UserInterfaceStyle != TraitCollection.UserInterfaceStyle)
 				UpdateBackgroundColor();

src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellSectionRootRenderer.cs

@@ -143,7 +143,9 @@ public override void ViewSafeAreaInsetsDidChange()
 
 		public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection)
 		{
+#pragma warning disable CA1422 // Validate platform compatibility
 			base.TraitCollectionDidChange(previousTraitCollection);
+#pragma warning restore CA1422 // Validate platform compatibility
 
 			var application = _shellContext?.Shell?.FindMauiContext().Services.GetService<IApplication>();
 			application?.ThemeChanged();

src/Controls/src/Core/Compatibility/Handlers/TableView/iOS/TableViewRenderer.cs

@@ -122,7 +122,9 @@ protected override void UpdateNativeWidget()
 
 		public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection)
 		{
+#pragma warning disable CA1422 // Validate platform compatibility
 			base.TraitCollectionDidChange(previousTraitCollection);
+#pragma warning restore CA1422 // Validate platform compatibility
 			// Make sure the cells adhere to changes UI theme
 			if (OperatingSystem.IsIOSVersionAtLeast(13) && previousTraitCollection?.UserInterfaceStyle != TraitCollection.UserInterfaceStyle)
 				Control.ReloadData();

src/Controls/src/Core/Compatibility/Handlers/iOS/FrameRenderer.cs

@@ -73,7 +73,9 @@ protected override void OnElementPropertyChanged(object sender, PropertyChangedE
 
 		public override void TraitCollectionDidChange(UITraitCollection previousTraitCollection)
 		{
+#pragma warning disable CA1422 // Validate platform compatibility
 			base.TraitCollectionDidChange(previousTraitCollection);
+#pragma warning restore CA1422 // Validate platform compatibility
 			// Make sure the control adheres to changes in UI theme
 			if (OperatingSystem.IsIOSVersionAtLeast(13) && previousTraitCollection?.UserInterfaceStyle != TraitCollection.UserInterfaceStyle)
 				SetupLayer();

src/Core/src/Platform/iOS/ApplicationExtensions.cs

@@ -23,11 +23,21 @@ public static void RequestNewWindow(this IUIApplicationDelegate platformApplicat
 			var state = args?.State;
 			var userActivity = state.ToUserActivity(MauiUIApplicationDelegate.MauiSceneConfigurationKey);
 
-			UIApplication.SharedApplication.RequestSceneSessionActivation(
-				null,
-				userActivity,
-				null,
-				err => application.Handler?.MauiContext?.CreateLogger<IApplication>()?.LogError(new NSErrorException(err), err.Description));
+			Action<NSError> errorAction = err => application.Handler?.MauiContext?.CreateLogger<IApplication>()?.LogError(new NSErrorException(err), err.Description);
+			if (OperatingSystem.IsIOSVersionAtLeast(17))
+			{
+				var request = UISceneSessionActivationRequest.Create();
+				request.UserActivity = userActivity;
+				UIApplication.SharedApplication.ActivateSceneSession(request, errorAction);
+			}
+			else if(OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsMacCatalystVersionAtLeast(13, 1))
+			{
+				UIApplication.SharedApplication.RequestSceneSessionActivation(
+					null,
+					userActivity,
+					null,
+					errorAction);
+			}
 		}
 
 		public static void CreatePlatformWindow(this IUIApplicationDelegate platformApplication, IApplication application, UIApplication uiApplication, NSDictionary launchOptions)

src/Core/src/Platform/iOS/PageViewController.cs

@@ -31,7 +31,9 @@ public override void TraitCollectionDidChange(UITraitCollection? previousTraitCo
 				application?.ThemeChanged();
 			}
 
+#pragma warning disable CA1422 // Validate platform compatibility
 			base.TraitCollectionDidChange(previousTraitCollection);
+#pragma warning restore CA1422 // Validate platform compatibility
 		}
 	}
 }

src/Essentials/src/Screenshot/Screenshot.ios.cs

@@ -183,9 +183,9 @@ Task<Stream> PlatformOpenReadAsync(ScreenshotFormat format, int quality)
 				_ => throw new ArgumentOutOfRangeException(nameof(format))
 			};
 
-			var result = data.AsStream();
+			ArgumentNullException.ThrowIfNull(data);
 
-			return Task.FromResult(result);
+			return Task.FromResult(data.AsStream());
 		}
 
 		Task PlatformCopyToAsync(Stream destination, ScreenshotFormat format, int quality)
@@ -197,6 +197,8 @@ Task PlatformCopyToAsync(Stream destination, ScreenshotFormat format, int qualit
 				_ => throw new ArgumentOutOfRangeException(nameof(format))
 			};
 
+			ArgumentNullException.ThrowIfNull(data);
+
 			using var result = data.AsStream();
 
 			result.CopyTo(destination);

src/TestUtils/src/DeviceTests/AssertionExtensions.iOS.cs

@@ -89,6 +89,9 @@ public static string CreateScreenshotError(this UIImage bitmap, string message)
 		public static string ToBase64String(this UIImage bitmap)
 		{
 			var data = bitmap.AsPNG();
+
+			ArgumentNullException.ThrowIfNull(data);
+
 			return data.GetBase64EncodedString(NSDataBase64EncodingOptions.None);
 		}