diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db3a43a09ff4..a29996eaeb39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,21 +12,21 @@ https://github.com/xamarin/xamarin-android 27347a7c258a62b9bf212f27f5492b4a7d16ac7b - + https://github.com/xamarin/xamarin-macios - c901665f345c21cdf29601e76a7e84cdec0d5482 + fafba4fb601e27cad93cac83ced7eee8bc7b33b5 - + https://github.com/xamarin/xamarin-macios - c901665f345c21cdf29601e76a7e84cdec0d5482 + fafba4fb601e27cad93cac83ced7eee8bc7b33b5 - + https://github.com/xamarin/xamarin-macios - c901665f345c21cdf29601e76a7e84cdec0d5482 + fafba4fb601e27cad93cac83ced7eee8bc7b33b5 - + https://github.com/xamarin/xamarin-macios - c901665f345c21cdf29601e76a7e84cdec0d5482 + fafba4fb601e27cad93cac83ced7eee8bc7b33b5 https://github.com/dotnet/emsdk diff --git a/eng/Versions.props b/eng/Versions.props index 5c58edcf12d1..9a1a6022b3ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,14 +25,10 @@ 34.0.0-rc.2.468 - 16.4.8911-net8-rc2 - 13.3.8911-net8-rc2 - 16.4.8911-net8-rc2 - 16.4.8911-net8-rc2 - $(MicrosoftMacCatalystSdknet80_164PackageVersion) - $(MicrosoftmacOSSdknet80_133PackageVersion) - $(MicrosoftiOSSdknet80_164PackageVersion) - $(MicrosofttvOSSdknet80_164PackageVersion) + 16.4.8968-net8-rc2 + 13.3.8968-net8-rc2 + 16.4.8968-net8-rc2 + 16.4.8968-net8-rc2 7.0.125 diff --git a/src/Core/src/Platform/iOS/LayoutView.cs b/src/Core/src/Platform/iOS/LayoutView.cs index bf80c04b0497..a86b69555fa7 100644 --- a/src/Core/src/Platform/iOS/LayoutView.cs +++ b/src/Core/src/Platform/iOS/LayoutView.cs @@ -34,7 +34,7 @@ public override UIView HitTest(CGPoint point, UIEvent? uievent) return null!; } - return result; + return result!; } internal bool UserInteractionEnabledOverride => _userInteractionEnabled; diff --git a/src/Core/src/Platform/iOS/MauiSwipeView.cs b/src/Core/src/Platform/iOS/MauiSwipeView.cs index 1ef55a4a31b0..0bcd6704d0f4 100644 --- a/src/Core/src/Platform/iOS/MauiSwipeView.cs +++ b/src/Core/src/Platform/iOS/MauiSwipeView.cs @@ -138,7 +138,7 @@ public override UIView HitTest(CGPoint point, UIEvent? uievent) if (subview.UserInteractionEnabled) { CGPoint subPoint = subview.ConvertPointFromView(point, this); - UIView result = subview.HitTest(subPoint, uievent); + UIView? result = subview.HitTest(subPoint, uievent); if (result != null) {