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.

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

chore(deps): update Cocoa SDK to v8.7.2 #2375

Merged
merged 3 commits into from
May 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@

### Dependencies

- Bump Cocoa SDK from v8.6.0 to v8.7.1 ([#2359](https://github.com/getsentry/sentry-dotnet/pull/2359), [#2370](https://github.com/getsentry/sentry-dotnet/pull/2370))
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#871)
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.6.0...8.7.1)
- Bump Cocoa SDK from v8.6.0 to v8.7.2 ([#2359](https://github.com/getsentry/sentry-dotnet/pull/2359), [#2370](https://github.com/getsentry/sentry-dotnet/pull/2370), [#2375](https://github.com/getsentry/sentry-dotnet/pull/2375))
- [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#872)
- [diff](https://github.com/getsentry/sentry-cocoa/compare/8.6.0...8.7.2)

## 3.31.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.*" PrivateAssets="All" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
Expand Down
21 changes: 12 additions & 9 deletions test/MauiTestUtils/DeviceTests/AssertionExtensions.iOS.cs
Original file line number Diff line number Diff line change
Expand Up @@ -380,22 +380,25 @@ public static void AssertEqual(this CATransform3D expected, CATransform3D actual

static UIWindow? GetKeyWindow(UIApplication application)
{
if (OperatingSystem.IsIOSVersionAtLeast(15))
if (OperatingSystem.IsIOSVersionAtLeast(13) || OperatingSystem.IsMacCatalystVersionAtLeast(13, 1))
{
#pragma warning disable CA1416
foreach (var scene in application.ConnectedScenes)
{
if (scene is UIWindowScene windowScene
&& windowScene.ActivationState == UISceneActivationState.ForegroundActive)
if (scene is not UIWindowScene {ActivationState: UISceneActivationState.ForegroundActive} windowScene)
{
foreach (var window in windowScene.Windows)
continue;
}

foreach (var window in windowScene.Windows)
{
if (window.IsKeyWindow)
{
if (window.IsKeyWindow)
{
return window;
}
return window;
}
}
}
#pragma warning restore CA1416

return null;
}
Expand All @@ -411,4 +414,4 @@ public static void AssertEqual(this CATransform3D expected, CATransform3D actual

return null;
}
}
}