Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/8.0.1xx-rc2] Bump iOS version #17797

Merged
merged 3 commits into from
Oct 3, 2023
Merged

[release/8.0.1xx-rc2] Bump iOS version #17797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9aa6571
[ios] Bump to correct versions of iOS
rmarinho Oct 3, 2023
9a4d2a4
Try fix null checks
rmarinho Oct 3, 2023
b8c11dd
Merge branch 'release/8.0.1xx-rc2' into fix-ios
rmarinho Oct 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
<Uri>https://github.com/xamarin/xamarin-android</Uri>
<Sha>27347a7c258a62b9bf212f27f5492b4a7d16ac7b</Sha>
</Dependency>
<Dependency Name="Microsoft.MacCatalyst.Sdk.net8.0_16.4" Version="16.4.8911-net8-rc2">
<Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.4.8968-net8-rc2">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>c901665f345c21cdf29601e76a7e84cdec0d5482</Sha>
<Sha>fafba4fb601e27cad93cac83ced7eee8bc7b33b5</Sha>
</Dependency>
<Dependency Name="Microsoft.macOS.Sdk.net8.0_13.3" Version="13.3.8911-net8-rc2">
<Dependency Name="Microsoft.macOS.Sdk" Version="13.3.8968-net8-rc2">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>c901665f345c21cdf29601e76a7e84cdec0d5482</Sha>
<Sha>fafba4fb601e27cad93cac83ced7eee8bc7b33b5</Sha>
</Dependency>
<Dependency Name="Microsoft.iOS.Sdk.net8.0_16.4" Version="16.4.8911-net8-rc2">
<Dependency Name="Microsoft.iOS.Sdk" Version="16.4.8968-net8-rc2">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>c901665f345c21cdf29601e76a7e84cdec0d5482</Sha>
<Sha>fafba4fb601e27cad93cac83ced7eee8bc7b33b5</Sha>
</Dependency>
<Dependency Name="Microsoft.tvOS.Sdk.net8.0_16.4" Version="16.4.8911-net8-rc2">
<Dependency Name="Microsoft.tvOS.Sdk" Version="16.4.8968-net8-rc2">
<Uri>https://github.com/xamarin/xamarin-macios</Uri>
<Sha>c901665f345c21cdf29601e76a7e84cdec0d5482</Sha>
<Sha>fafba4fb601e27cad93cac83ced7eee8bc7b33b5</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>
Expand Down
12 changes: 4 additions & 8 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,10 @@
<!-- xamarin/xamarin-android -->
<MicrosoftAndroidSdkWindowsPackageVersion>34.0.0-rc.2.468</MicrosoftAndroidSdkWindowsPackageVersion>
<!-- xamarin/xamarin-macios -->
<MicrosoftMacCatalystSdknet80_164PackageVersion>16.4.8911-net8-rc2</MicrosoftMacCatalystSdknet80_164PackageVersion>
<MicrosoftmacOSSdknet80_133PackageVersion>13.3.8911-net8-rc2</MicrosoftmacOSSdknet80_133PackageVersion>
<MicrosoftiOSSdknet80_164PackageVersion>16.4.8911-net8-rc2</MicrosoftiOSSdknet80_164PackageVersion>
<MicrosofttvOSSdknet80_164PackageVersion>16.4.8911-net8-rc2</MicrosofttvOSSdknet80_164PackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>$(MicrosoftMacCatalystSdknet80_164PackageVersion)</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>$(MicrosoftmacOSSdknet80_133PackageVersion)</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>$(MicrosoftiOSSdknet80_164PackageVersion)</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>$(MicrosofttvOSSdknet80_164PackageVersion)</MicrosofttvOSSdkPackageVersion>
<MicrosoftMacCatalystSdkPackageVersion>16.4.8968-net8-rc2</MicrosoftMacCatalystSdkPackageVersion>
<MicrosoftmacOSSdkPackageVersion>13.3.8968-net8-rc2</MicrosoftmacOSSdkPackageVersion>
<MicrosoftiOSSdkPackageVersion>16.4.8968-net8-rc2</MicrosoftiOSSdkPackageVersion>
<MicrosofttvOSSdkPackageVersion>16.4.8968-net8-rc2</MicrosofttvOSSdkPackageVersion>
<!-- Samsung/Tizen.NET -->
<SamsungTizenSdkPackageVersion>7.0.125</SamsungTizenSdkPackageVersion>
<!-- emsdk -->
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/iOS/LayoutView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public override UIView HitTest(CGPoint point, UIEvent? uievent)
return null!;
}

return result;
return result!;
}

internal bool UserInteractionEnabledOverride => _userInteractionEnabled;
Expand Down
2 changes: 1 addition & 1 deletion src/Core/src/Platform/iOS/MauiSwipeView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down