[net6.0] Update dependencies from xamarin/xamarin-macios

NuGet.config

@@ -6,14 +6,10 @@
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-pub-dotnet-runtime-531f715" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-531f715f/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--  Begin: Package sources from dotnet-emsdk -->
-    <add key="darc-pub-dotnet-emsdk-3f6c45a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-3f6c45a-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2-2/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-emsdk-3f6c45a-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <!-- <add key="local" value="artifacts" /> -->

eng/Version.Details.xml

@@ -12,21 +12,21 @@
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
       <Sha>04623cdc317c3da5efce46cb16d94befe4833125</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.454">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.465">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>4bd34d034c8c5a4e092c8bd3c8868153d94277b4</Sha>
+      <Sha>ad955c0d4f7c1e680fddae23707c94faf3cb2802</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk" Version="15.4.454">
+    <Dependency Name="Microsoft.iOS.Sdk" Version="16.0.514">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>4bd34d034c8c5a4e092c8bd3c8868153d94277b4</Sha>
+      <Sha>d84d07446e1163cb15012e3a6d181599a1054192</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk" Version="15.4.454">
+    <Dependency Name="Microsoft.tvOS.Sdk" Version="16.0.514">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>4bd34d034c8c5a4e092c8bd3c8868153d94277b4</Sha>
+      <Sha>d84d07446e1163cb15012e3a6d181599a1054192</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.454">
+    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.465">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>4bd34d034c8c5a4e092c8bd3c8868153d94277b4</Sha>
+      <Sha>ad955c0d4f7c1e680fddae23707c94faf3cb2802</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.9" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>

eng/Versions.props

@@ -11,10 +11,10 @@
     <!-- xamarin/xamarin-android -->
     <MicrosoftAndroidSdkWindowsPackageVersion>32.0.468</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
-    <MicrosoftiOSSdkPackageVersion>15.4.454</MicrosoftiOSSdkPackageVersion>
-    <MicrosoftMacCatalystSdkPackageVersion>15.4.454</MicrosoftMacCatalystSdkPackageVersion>
-    <MicrosoftmacOSSdkPackageVersion>12.3.454</MicrosoftmacOSSdkPackageVersion>
-    <MicrosofttvOSSdkPackageVersion>15.4.454</MicrosofttvOSSdkPackageVersion>
+    <MicrosoftiOSSdkPackageVersion>16.0.514</MicrosoftiOSSdkPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>15.4.465</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftmacOSSdkPackageVersion>12.3.465</MicrosoftmacOSSdkPackageVersion>
+    <MicrosofttvOSSdkPackageVersion>16.0.514</MicrosofttvOSSdkPackageVersion>
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>7.0.400-preview.1.0</SamsungTizenSdkPackageVersion>
     <!-- emsdk -->

eng/pipelines/common/variables.yml

@@ -7,6 +7,10 @@ variables:
   value: true
 - name: DOTNET_VERSION
   value: 5.0.201
+- name: REQUIRED_XCODE
+  value: 14.0.0
+- name: DEVICETESTS_REQUIRED_XCODE
+  value: 14.0.0
 - name: LocBranchPrefix
   value: 'loc-hb'
 - name: isMainBranch

src/BlazorWebView/src/Maui/iOS/BlazorWebViewHandler.iOS.cs

@@ -207,7 +207,7 @@ public void StartUrlSchemeTask(WKWebView webView, IWKUrlSchemeTask urlSchemeTask
 				}
 			}
 
-			private byte[] GetResponseBytes(string url, out string contentType, out int statusCode)
+			private byte[] GetResponseBytes(string? url, out string contentType, out int statusCode)
 			{
 				var allowFallbackOnHostPage = AppOriginUri.IsBaseOfPage(url);
 				url = QueryStringHelper.RemovePossibleQueryString(url);

src/BlazorWebView/src/Maui/iOS/IOSWebViewManager.cs

@@ -266,8 +266,11 @@ public override void DidReceiveServerRedirectForProvisionalNavigation(WKWebView
 					var uri = _currentUri;
 					_currentUri = null;
 					_currentNavigation = null;
-					var request = new NSUrlRequest(uri);
-					webView.LoadRequest(request);
+					if (uri is not null)
+					{
+						var request = new NSUrlRequest(new NSUrl(uri.AbsoluteUri));
+						webView.LoadRequest(request);
+					}
 				}
 			}
 

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

@@ -221,15 +221,23 @@ protected override void OnElementChanged(ElementChangedEventArgs<ListView> e)
 			{
 				if (Control == null)
 				{
-					if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11))
+					if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11)
+#if TVOS
+						|| OperatingSystem.IsTvOSVersionAtLeast(11)
+#endif
+					)
 					{
 						var parentNav = e.NewElement.FindParentOfType<NavigationPage>();
 						_usingLargeTitles = (parentNav != null && parentNav.OnThisPlatform().PrefersLargeTitles());
 					}
 					_tableViewController = new FormsUITableViewController(e.NewElement, _usingLargeTitles);
 					SetNativeControl(_tableViewController.TableView);
 
-					if (OperatingSystem.IsIOSVersionAtLeast(15) || OperatingSystem.IsTvOSVersionAtLeast(15))
+					if (OperatingSystem.IsIOSVersionAtLeast(15) || OperatingSystem.IsMacCatalystVersionAtLeast(15)
+#if TVOS
+						|| OperatingSystem.IsTvOSVersionAtLeast(15)
+#endif
+					)
 						_tableViewController.TableView.SectionHeaderTopPadding = new nfloat(0);
 
 					_backgroundUIView = _tableViewController.TableView.BackgroundView;

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

@@ -127,8 +127,14 @@ private set
 				else if (ContentView is IPlatformViewHandler ver && ver.PlatformView is UIScrollView uIScroll)
 					ScrollView = uIScroll;
 
-				if (ScrollView != null && (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11)))
+				if (ScrollView != null && (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11)
+#if TVOS
+					|| OperatingSystem.IsTvOSVersionAtLeast(11)
+#endif
+				))
+				{
 					ScrollView.ContentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentBehavior.Never;
+				}
 
 				LayoutParallax();
 				SetHeaderContentInset();

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

@@ -68,7 +68,11 @@ public void OnLayoutSubviews()
 			if (!_isInShell)
 				return;
 
-			if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11))
+			if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11)
+#if TVOS
+				|| OperatingSystem.IsTvOSVersionAtLeast(11)
+#endif
+				)
 			{
 				var newBounds = _scrollView.AdjustedContentInset.InsetRect(_scrollView.Bounds).ToRectangle();
 				newBounds.X = 0;
@@ -108,7 +112,11 @@ void UpdateContentInset(Thickness inset, double tabThickness)
 		{
 			_lastInset = inset;
 			_tabThickness = tabThickness;
-			if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11))
+			if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11)
+#if TVOS
+				|| OperatingSystem.IsTvOSVersionAtLeast(11)
+#endif
+			)
 			{
 				if (ShellSectionController.GetItems().Count > 1 && _isInItems)
 				{
@@ -173,7 +181,7 @@ void UpdateVerticalBounce()
 			}
 		}
 
-		#region IDisposable Support
+#region IDisposable Support
 
 		public void Dispose()
 		{
@@ -197,6 +205,6 @@ protected virtual void Dispose(bool disposing)
 			}
 		}
 
-		#endregion IDisposable Support
+#endregion IDisposable Support
 	}
 }

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

@@ -74,8 +74,14 @@ public override void ViewDidLoad()
 			base.ViewDidLoad();
 
 			_containerArea = new UIView();
-			if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11))
+			if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11)
+#if TVOS
+				|| OperatingSystem.IsTvOSVersionAtLeast(11)
+#endif
+			)
+			{
 				_containerArea.InsetsLayoutMarginsFromSafeArea = false;
+			}
 
 			View.AddSubview(_containerArea);
 
@@ -508,7 +514,12 @@ void LayoutHeader()
 			if (_header != null)
 			{
 				tabThickness = HeaderHeight;
-				var headerTop = (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11)) ? View.SafeAreaInsets.Top : TopLayoutGuide.Length;
+				var headerTop = (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11)
+#if TVOS
+				|| OperatingSystem.IsTvOSVersionAtLeast(11)
+#endif
+					) ? View.SafeAreaInsets.Top : TopLayoutGuide.Length;
+
 				CGRect frame = new CGRect(View.Bounds.X, headerTop, View.Bounds.Width, HeaderHeight);
 				_blurView.Frame = frame;
 				_header.ViewController.View.Frame = frame;
@@ -518,7 +529,11 @@ void LayoutHeader()
 			nfloat top;
 			nfloat right;
 			nfloat bottom;
-			if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11))
+			if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11)
+#if TVOS
+				|| OperatingSystem.IsTvOSVersionAtLeast(11)
+#endif
+			)
 			{
 				left = View.SafeAreaInsets.Left;
 				top = View.SafeAreaInsets.Top;

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

@@ -76,8 +76,14 @@ public override void ViewDidLoad()
 			base.ViewDidLoad();
 
 			TableView.SeparatorStyle = UITableViewCellSeparatorStyle.None;
-			if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11))
+			if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11)
+#if TVOS
+				|| OperatingSystem.IsTvOSVersionAtLeast(11)
+#endif
+			)
+			{
 				TableView.ContentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentBehavior.Never;
+			}
 
 			TableView.Source = _source;
 			ShellFlyoutContentManager.ViewDidLoad();

src/Controls/src/Core/Handlers/Items/iOS/ItemsViewController.cs

@@ -134,7 +134,11 @@ public override void ViewDidLoad()
 
 			ItemsSource = CreateItemsViewSource();
 
-			if (!(OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11)))
+			if (!(OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11)
+#if TVOS
+				|| OperatingSystem.IsTvOSVersionAtLeast(11)
+#endif
+			))
 			{
 				AutomaticallyAdjustsScrollViewInsets = false;
 			}

src/Controls/src/Core/Handlers/Items/iOS/ItemsViewLayout.cs

@@ -44,7 +44,11 @@ protected ItemsViewLayout(ItemsLayout itemsLayout, ItemSizingStrategy itemSizing
 
 			Initialize(scrollDirection);
 
-			if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11))
+			if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11)
+#if TVOS
+				|| OperatingSystem.IsTvOSVersionAtLeast(11)
+#endif
+			)
 			{
 				// `ContentInset` is actually the default value, but I'm leaving this here as a note to
 				// future maintainers; it's likely that someone will want a Platform Specific to change this behavior
@@ -563,7 +567,11 @@ public override bool ShouldInvalidateLayoutForBoundsChange(CGRect newBounds)
 				return base.ShouldInvalidateLayoutForBoundsChange(newBounds);
 			}
 
-			if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11))
+			if (OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsMacCatalystVersionAtLeast(11)
+#if TVOS
+				|| OperatingSystem.IsTvOSVersionAtLeast(11)
+#endif
+			)
 			{
 				UpdateConstraints(CollectionView.AdjustedContentInset.InsetRect(newBounds).Size);
 			}

src/Controls/src/Core/Platform/GestureManager/GestureManager.iOS.cs

@@ -412,7 +412,11 @@ _handler.VirtualView is View v &&
 			{
 				_platformView.AccessibilityTraits |= UIAccessibilityTrait.Button;
 				_addedFlags |= UIAccessibilityTrait.Button;
-				if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsTvOSVersionAtLeast(13))
+				if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsMacCatalystVersionAtLeast(13)
+#if TVOS
+				|| OperatingSystem.IsTvOSVersionAtLeast(11)
+#endif
+					)
 				{
 					_defaultAccessibilityRespondsToUserInteraction = _platformView.AccessibilityRespondsToUserInteraction;
 					_platformView.AccessibilityRespondsToUserInteraction = true;
@@ -528,7 +532,7 @@ void GestureRecognizersOnCollectionChanged(object? sender, NotifyCollectionChang
 			{
 				_platformView.AccessibilityTraits &= ~_addedFlags;
 
-				if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsTvOSVersionAtLeast(13))
+				if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsMacCatalystVersionAtLeast(13))
 				{
 					if (_defaultAccessibilityRespondsToUserInteraction != null)
 						_platformView.AccessibilityRespondsToUserInteraction = _defaultAccessibilityRespondsToUserInteraction.Value;

src/Core/src/Handlers/ViewHandlerExtensions.iOS.cs

@@ -23,7 +23,13 @@ internal static void LayoutVirtualView(
 			}
 
 			bounds = bounds ?? platformView.Bounds;
-			if (virtualView is ISafeAreaView sav && !sav.IgnoreSafeArea && (System.OperatingSystem.IsIOSVersionAtLeast(11) || System.OperatingSystem.IsTvOSVersionAtLeast(11)))
+
+			if (virtualView is ISafeAreaView sav && !sav.IgnoreSafeArea
+				&& (System.OperatingSystem.IsIOSVersionAtLeast(11) || System.OperatingSystem.IsMacCatalystVersionAtLeast(11)
+#if TVOS
+				|| OperatingSystem.IsTvOSVersionAtLeast(11)
+#endif
+				))
 			{
 				bounds = platformView.SafeAreaInsets.InsetRect(bounds.Value);
 			}

src/Core/src/Handlers/WebView/WebViewHandler.iOS.cs

@@ -158,7 +158,7 @@ internal async Task FirstLoadUrlAsync(string url)
 
 				var safeHostUri = new Uri($"{uri.Scheme}://{uri.Authority}", UriKind.Absolute);
 				var safeRelativeUri = new Uri($"{uri.PathAndQuery}{uri.Fragment}", UriKind.Relative);
-				NSUrlRequest request = new NSUrlRequest(new Uri(safeHostUri, safeRelativeUri));
+				var request = new NSUrlRequest(new NSUrl(new Uri(safeHostUri, safeRelativeUri).AbsoluteUri));
 
 				if (HasCookiesToLoad(url) && !(OperatingSystem.IsIOSVersionAtLeast(11) || OperatingSystem.IsTvOSVersionAtLeast(11)))
 					return;

src/Core/src/Platform/iOS/MauiPageControl.cs

@@ -15,7 +15,12 @@ public class MauiPageControl : UIPageControl
 		public MauiPageControl()
 		{
 			ValueChanged += MauiPageControlValueChanged;
-			if (OperatingSystem.IsIOSVersionAtLeast(14) || OperatingSystem.IsTvOSVersionAtLeast(14))
+
+			if (OperatingSystem.IsIOSVersionAtLeast(14) || OperatingSystem.IsMacCatalystVersionAtLeast(14)
+#if TVOS
+				|| OperatingSystem.IsTvOSVersionAtLeast(14)
+#endif
+			)
 			{
 				AllowsContinuousInteraction = false;
 				BackgroundStyle = UIPageControlBackgroundStyle.Minimal;

src/Core/src/Platform/iOS/MauiWKWebView.cs

@@ -77,7 +77,7 @@ public void LoadUrl(string? url)
 			var uri = new Uri(url ?? string.Empty);
 			var safeHostUri = new Uri($"{uri.Scheme}://{uri.Authority}", UriKind.Absolute);
 			var safeRelativeUri = new Uri($"{uri.PathAndQuery}{uri.Fragment}", UriKind.Relative);
-			NSUrlRequest request = new NSUrlRequest(new Uri(safeHostUri, safeRelativeUri));
+			NSUrlRequest request = new NSUrlRequest(new NSUrl(new Uri(safeHostUri, safeRelativeUri).AbsoluteUri));
 
 			LoadRequest(request);
 		}

src/Essentials/samples/Sample.Server.WebAuthenticator/Essentials.Sample.Server.WebAuthenticator.csproj

@@ -4,12 +4,13 @@
     <TargetFramework>$(_MauiDotNetTfm)</TargetFramework>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(RunConfiguration)' == 'Sample.Server.WebAuthenticator' " />
   <ItemGroup>
     <PackageReference Include="AspNet.Security.OAuth.Apple" Version="6.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.7" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="6.0.7" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="6.0.7" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsPackageVersion)" />
   </ItemGroup>
 
 </Project>

src/Essentials/samples/Sample.Server.WebAuthenticator/Properties/launchSettings.json

@@ -18,10 +18,10 @@
     "Sample.Server.WebAuthenticator": {
       "commandName": "Project",
       "launchBrowser": true,
+      "applicationUrl": "https://localhost:5001;http://localhost:5000",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "applicationUrl": "https://localhost:5001;http://localhost:5000"
+      }
     }
   }
 }

src/Essentials/src/DeviceDisplay/DeviceDisplay.ios.cs

@@ -18,9 +18,16 @@ protected override DisplayInfo GetMainDisplayInfo()
 			var bounds = UIScreen.MainScreen.Bounds;
 			var scale = UIScreen.MainScreen.Scale;
 
-			var rate = (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsTvOSVersionAtLeast(10, 3))
-				? UIScreen.MainScreen.MaximumFramesPerSecond
-				: 0;
+			nint rate = 0;
+
+			if (OperatingSystem.IsIOSVersionAtLeast(10, 3) || OperatingSystem.IsMacCatalystVersionAtLeast(10, 3)
+#if TVOS
+				|| OperatingSystem.IsTvOSVersionAtLeast(11)
+#endif
+			)
+			{
+				rate = UIScreen.MainScreen.MaximumFramesPerSecond;
+			}
 
 			return new DisplayInfo(
 				width: bounds.Width * scale,