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

Mac: Fix crash with IconFrame on ARM64 / XamMac2 / .NET 6.0.1xx #2221

Merged
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:

build-mac:

runs-on: macos-12
runs-on: macos-11

steps:
- uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion src/Eto.Mac/Drawing/IconFrameHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public NSBitmapImageRep Rep
}
}

#if MACOS_NET
#if MACOS_NET || ( XAMMAC && NET6_0_OR_GREATER )
// .NET 6 on ARM64 crashes when using the override in macos workload preview 11, remove this when fixed.
[Export("CGImageForProposedRect:context:hints:")]
public CGImage AsCGImage(IntPtr proposedDestRectPtr, NSGraphicsContext context, NSDictionary hints)
Expand Down