From 3fe090a2815bc7add2318bd415ba4fbf8c96bda3 Mon Sep 17 00:00:00 2001 From: Curtis Wensley Date: Mon, 16 May 2022 11:54:48 -0700 Subject: [PATCH 1/2] Mac: Fix crash with IconFrame on ARM64 / XamMac2 / .NET 6.0.1xx --- src/Eto.Mac/Drawing/IconFrameHandler.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Eto.Mac/Drawing/IconFrameHandler.cs b/src/Eto.Mac/Drawing/IconFrameHandler.cs index 4736ad97c0..6bec2fda73 100644 --- a/src/Eto.Mac/Drawing/IconFrameHandler.cs +++ b/src/Eto.Mac/Drawing/IconFrameHandler.cs @@ -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) From 881f1c9243d2c1430bf8795dfa18d6ae9066f90d Mon Sep 17 00:00:00 2001 From: Curtis Wensley Date: Mon, 16 May 2022 12:26:10 -0700 Subject: [PATCH 2/2] Fix build issue with osascrtipt --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 742f4e3323..47164c33ec 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,7 +63,7 @@ jobs: build-mac: - runs-on: macos-12 + runs-on: macos-11 steps: - uses: actions/checkout@v2