From 2187a82435da0f3e20c712f7a23cd7892f72f1be Mon Sep 17 00:00:00 2001
From: Curtis Wensley <curtis.wensley@gmail.com>
Date: Sun, 10 Apr 2022 17:57:09 -0700
Subject: [PATCH] More updates for latest .NET 6 sdk

---
 .github/workflows/build.yml                   |  2 +-
 build/Build.proj                              |  8 +++---
 lib/monomac                                   |  2 +-
 .../EmbedEtoInXamarinMac.csproj               |  3 +-
 .../EmbedXamarinMacInEto.csproj               |  3 +-
 src/Eto.Core.sln                              | 28 +++++++++++++++++++
 .../App-CSharp/.template.config/template.json |  4 +--
 .../App-CSharp/EtoApp.1/EtoApp.1.csproj       |  2 +-
 .../Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.csproj |  2 +-
 .../Separate/EtoApp.1.Mac/EtoApp.1.Mac.csproj |  4 +--
 .../EtoApp.1.WinForms.csproj                  |  4 +--
 .../Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj |  4 +--
 .../App-FSharp/.template.config/template.json |  4 +--
 .../App-FSharp/EtoApp.1/EtoApp.1.fsproj       |  2 +-
 .../Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.fsproj |  2 +-
 .../Separate/EtoApp.1.Mac/EtoApp.1.Mac.fsproj |  4 +--
 .../EtoApp.1.WinForms.fsproj                  |  4 +--
 .../Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.fsproj |  4 +--
 .../.template.config/template.json            |  4 +--
 .../App-VisualBasic/EtoApp.1/EtoApp.1.vbproj  |  2 +-
 .../Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.vbproj |  2 +-
 .../Separate/EtoApp.1.Mac/EtoApp.1.Mac.vbproj |  4 +--
 .../EtoApp.1.WinForms.vbproj                  |  4 +--
 .../Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.vbproj |  4 +--
 src/Eto.Mac/build/BundleDotNetCore.targets    |  5 +++-
 src/Eto.Mac/build/Dmg.targets                 |  3 +-
 src/Eto.sln                                   | 21 ++++++++++++++
 src/Eto/sdk/Sdk.targets                       | 12 ++++----
 test/Eto.Test.Mac/Eto.Test.XamMac2.csproj     |  5 ++--
 test/Eto.Test.Mac/Eto.Test.macOS.csproj       |  2 +-
 30 files changed, 106 insertions(+), 48 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 5d4e7c83e7..82de036e92 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ on:
     types: [ published ]
 
 env:
-  DotNetVersion: "6.0.100"
+  DotNetVersion: "6.0.201"
   BuildConfiguration: "Release"
   BuildParameters: "build/Build.proj /v:Minimal /consoleLoggerParameters:NoSummary /p:Configuration=Release /p:BuildVersion=${{ github.run_id }} /p:BuildBranch=${{ github.ref }}"
 
diff --git a/build/Build.proj b/build/Build.proj
index 1d85d16ff5..71f8d9b8c3 100644
--- a/build/Build.proj
+++ b/build/Build.proj
@@ -268,10 +268,10 @@
       <Config Include="debug" Value="-c Debug" />
 
       <Build Include="build-net4" Create="-f net48" Build="build" />
-      <Build Include="build-net5" Create="-f net5.0" Build="build" />
-      <Build Include="build-rid-net5" Create="-f net5.0" Build="build -r osx-x64" />
-      <Build Include="publish-net5" Create="-f net5.0" Build="publish" />
-      <Build Include="publish-rid-net5" Create="-f net5.0" Build="publish -r osx-x64" />
+      <Build Include="build-net5" Create="-f net6.0" Build="build" />
+      <Build Include="build-rid-net5" Create="-f net6.0" Build="build -r osx-x64" />
+      <Build Include="publish-net5" Create="-f net6.0" Build="publish" />
+      <Build Include="publish-rid-net5" Create="-f net6.0" Build="publish -r osx-x64" />
 
       <Combined Include="combined" Value="-c" />
       <Combined Include="separate" Value="" Build="**/*.Mac.csproj" />
diff --git a/lib/monomac b/lib/monomac
index 079297c1ad..03ef2ed71e 160000
--- a/lib/monomac
+++ b/lib/monomac
@@ -1 +1 @@
-Subproject commit 079297c1ad9c52f19abccbc1e5ba86f2df1063f0
+Subproject commit 03ef2ed71ef6c0511a09a8fa7ba007c45524cc3d
diff --git a/samples/XamarinMac/EmbedEtoInXamarinMac/EmbedEtoInXamarinMac.csproj b/samples/XamarinMac/EmbedEtoInXamarinMac/EmbedEtoInXamarinMac.csproj
index 0730dd4bf4..a00b99e943 100644
--- a/samples/XamarinMac/EmbedEtoInXamarinMac/EmbedEtoInXamarinMac.csproj
+++ b/samples/XamarinMac/EmbedEtoInXamarinMac/EmbedEtoInXamarinMac.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <UseXamarinMac>True</UseXamarinMac>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net48</TargetFrameworks>
+    <TargetFrameworks>xamarinmac20</TargetFrameworks>
     <EnableDefaultNoneItems>False</EnableDefaultNoneItems>
     <EnableDefaultContentItems>False</EnableDefaultContentItems>
     <CodeSigningKey>Mac Developer</CodeSigningKey>
@@ -11,6 +11,7 @@
     <MonoBundlingExtraArgs>--nowarn:2006 --nowarn:5220</MonoBundlingExtraArgs>
     <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
     <EnableDefaultImageAssets>False</EnableDefaultImageAssets>
+    <LinkMode Condition="$(Configuration) == 'Release'">SdkOnly</LinkMode>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/samples/XamarinMac/EmbedXamarinMacInEto/EmbedXamarinMacInEto.csproj b/samples/XamarinMac/EmbedXamarinMacInEto/EmbedXamarinMacInEto.csproj
index cdd02c65d8..8469fab1fa 100644
--- a/samples/XamarinMac/EmbedXamarinMacInEto/EmbedXamarinMacInEto.csproj
+++ b/samples/XamarinMac/EmbedXamarinMacInEto/EmbedXamarinMacInEto.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <UseXamarinMac>True</UseXamarinMac>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net48</TargetFrameworks>
+    <TargetFrameworks>xamarinmac20</TargetFrameworks>
     <EnableDefaultNoneItems>False</EnableDefaultNoneItems>
     <EnableDefaultContentItems>False</EnableDefaultContentItems>
     <CodeSigningKey>Mac Developer</CodeSigningKey>
@@ -11,6 +11,7 @@
     <MonoBundlingExtraArgs>--nowarn:2006 --nowarn:5220</MonoBundlingExtraArgs>
     <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
     <EnableDefaultImageAssets>False</EnableDefaultImageAssets>
+    <LinkMode Condition="$(Configuration) == 'Release'">SdkOnly</LinkMode>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Eto.Core.sln b/src/Eto.Core.sln
index 8cf1d79fd5..2618f80445 100644
--- a/src/Eto.Core.sln
+++ b/src/Eto.Core.sln
@@ -35,6 +35,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "monomac", "monomac", "{E77D
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "generator", "..\lib\monomac\src\generator.csproj", "{EE5D4296-DFD7-4D1B-B9F9-C43AD9ED4F6F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.macOS", "Eto.Mac\Eto.macOS.csproj", "{B3AB773A-BCF6-4679-AC13-E2879F61DF33}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.macOS", "..\test\Eto.Test.Mac\Eto.Test.macOS.csproj", "{8A002565-996A-45F9-8D74-89E8D272717F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -228,6 +232,30 @@ Global
 		{EE5D4296-DFD7-4D1B-B9F9-C43AD9ED4F6F}.Release|x64.Build.0 = Release|Any CPU
 		{EE5D4296-DFD7-4D1B-B9F9-C43AD9ED4F6F}.Release|x86.ActiveCfg = Release|Any CPU
 		{EE5D4296-DFD7-4D1B-B9F9-C43AD9ED4F6F}.Release|x86.Build.0 = Release|Any CPU
+		{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Debug|x64.Build.0 = Debug|Any CPU
+		{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Debug|x86.Build.0 = Debug|Any CPU
+		{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Release|x64.ActiveCfg = Release|Any CPU
+		{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Release|x64.Build.0 = Release|Any CPU
+		{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Release|x86.ActiveCfg = Release|Any CPU
+		{B3AB773A-BCF6-4679-AC13-E2879F61DF33}.Release|x86.Build.0 = Release|Any CPU
+		{8A002565-996A-45F9-8D74-89E8D272717F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8A002565-996A-45F9-8D74-89E8D272717F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8A002565-996A-45F9-8D74-89E8D272717F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8A002565-996A-45F9-8D74-89E8D272717F}.Debug|x64.Build.0 = Debug|Any CPU
+		{8A002565-996A-45F9-8D74-89E8D272717F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8A002565-996A-45F9-8D74-89E8D272717F}.Debug|x86.Build.0 = Debug|Any CPU
+		{8A002565-996A-45F9-8D74-89E8D272717F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8A002565-996A-45F9-8D74-89E8D272717F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8A002565-996A-45F9-8D74-89E8D272717F}.Release|x64.ActiveCfg = Release|Any CPU
+		{8A002565-996A-45F9-8D74-89E8D272717F}.Release|x64.Build.0 = Release|Any CPU
+		{8A002565-996A-45F9-8D74-89E8D272717F}.Release|x86.ActiveCfg = Release|Any CPU
+		{8A002565-996A-45F9-8D74-89E8D272717F}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{EE5D4296-DFD7-4D1B-B9F9-C43AD9ED4F6F} = {E77D6350-0CCF-11EB-A5F5-69BE9D4F31C9}
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/.template.config/template.json b/src/Eto.Forms.Templates/content/App-CSharp/.template.config/template.json
index f4114c5793..51684cb5fb 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/.template.config/template.json
+++ b/src/Eto.Forms.Templates/content/App-CSharp/.template.config/template.json
@@ -72,8 +72,8 @@
 			"type": "parameter",
 			"description": "Specify the framework(s) to support",
 			"dataType": "choice",
-			"defaultValue": "net5.0",
-			"replaces": "net5.0",
+			"defaultValue": "net6.0",
+			"replaces": "net6.0",
 			"choices": [
 				{
 					"choice": "net6.0",
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/EtoApp.1.csproj b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/EtoApp.1.csproj
index e099d73833..c85529d1ae 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/EtoApp.1.csproj
+++ b/src/Eto.Forms.Templates/content/App-CSharp/EtoApp.1/EtoApp.1.csproj
@@ -8,7 +8,7 @@
   -->
 
   <PropertyGroup>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1</RootNamespace>
 
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.csproj b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.csproj
index 7a935b314f..0685f0a313 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.csproj
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.csproj
@@ -2,7 +2,7 @@
 	
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1.Gtk</RootNamespace>
   </PropertyGroup>
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.csproj b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.csproj
index b1ce9b6da1..9ec19a21d6 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.csproj
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.csproj
@@ -2,11 +2,11 @@
 	
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1.Mac</RootNamespace>
 
-    <RuntimeIdentifiers>osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
   </PropertyGroup>
 	
   <ItemGroup>
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.csproj b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.csproj
index 8019b36fc9..dd781a37b2 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.csproj
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net5.0-windows</TargetFramework>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net5.0</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net6.0-windows</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net6.0</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'True'">TargetFrameworkOverride-windows</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'False'">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1.WinForms</RootNamespace>
diff --git a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj
index 8bbca56e09..d6a3d7467d 100755
--- a/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj
+++ b/src/Eto.Forms.Templates/content/App-CSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net5.0-windows</TargetFramework>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net5.0</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net6.0-windows</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net6.0</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'True'">TargetFrameworkOverride-windows</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'False'">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1.Wpf</RootNamespace>
diff --git a/src/Eto.Forms.Templates/content/App-FSharp/.template.config/template.json b/src/Eto.Forms.Templates/content/App-FSharp/.template.config/template.json
index b30e4c481e..6b0450e207 100755
--- a/src/Eto.Forms.Templates/content/App-FSharp/.template.config/template.json
+++ b/src/Eto.Forms.Templates/content/App-FSharp/.template.config/template.json
@@ -72,8 +72,8 @@
 			"type": "parameter",
 			"description": "Specify the framework(s) to support",
 			"dataType": "choice",
-			"defaultValue": "net5.0",
-			"replaces": "net5.0",
+			"defaultValue": "net6.0",
+			"replaces": "net6.0",
 			"choices": [
 				{
 					"choice": "net6.0",
diff --git a/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/EtoApp.1.fsproj b/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/EtoApp.1.fsproj
index 52fe1cdd9d..f37f14dfa4 100644
--- a/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/EtoApp.1.fsproj
+++ b/src/Eto.Forms.Templates/content/App-FSharp/EtoApp.1/EtoApp.1.fsproj
@@ -8,7 +8,7 @@
   -->
 
   <PropertyGroup>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1</RootNamespace>
 
diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.fsproj b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.fsproj
index 3ebc633f87..71c3c80257 100755
--- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.fsproj
+++ b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1.Gtk</RootNamespace>
   </PropertyGroup>
diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.fsproj b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.fsproj
index 05fc4e04cd..41af683a6c 100755
--- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.fsproj
+++ b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Mac/EtoApp.1.Mac.fsproj
@@ -2,11 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1.Mac</RootNamespace>
 
-    <RuntimeIdentifiers>osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.fsproj b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.fsproj
index f88dd75037..ba89bc69f6 100755
--- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.fsproj
+++ b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.fsproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net5.0-windows</TargetFramework>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net5.0</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net6.0-windows</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net6.0</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'True'">TargetFrameworkOverride-windows</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'False'">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1.WinForms</RootNamespace>
diff --git a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.fsproj b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.fsproj
index 48a21fc48b..d90de0e87e 100755
--- a/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.fsproj
+++ b/src/Eto.Forms.Templates/content/App-FSharp/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.fsproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net5.0-windows</TargetFramework>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net5.0</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net6.0-windows</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net6.0</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'True'">TargetFrameworkOverride-windows</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'False'">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1.Wpf</RootNamespace>
diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/.template.config/template.json b/src/Eto.Forms.Templates/content/App-VisualBasic/.template.config/template.json
index 5ab15ac0a8..bdabaae422 100755
--- a/src/Eto.Forms.Templates/content/App-VisualBasic/.template.config/template.json
+++ b/src/Eto.Forms.Templates/content/App-VisualBasic/.template.config/template.json
@@ -72,8 +72,8 @@
 			"type": "parameter",
 			"description": "Specify the framework(s) to support",
 			"dataType": "choice",
-			"defaultValue": "net5.0",
-			"replaces": "net5.0",
+			"defaultValue": "net6.0",
+			"replaces": "net6.0",
 			"choices": [
 				{
 					"choice": "net6.0",
diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1/EtoApp.1.vbproj b/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1/EtoApp.1.vbproj
index e099d73833..c85529d1ae 100755
--- a/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1/EtoApp.1.vbproj
+++ b/src/Eto.Forms.Templates/content/App-VisualBasic/EtoApp.1/EtoApp.1.vbproj
@@ -8,7 +8,7 @@
   -->
 
   <PropertyGroup>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1</RootNamespace>
 
diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.vbproj b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.vbproj
index ae95f72301..5dd39124ae 100755
--- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.vbproj
+++ b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Gtk/EtoApp.1.Gtk.vbproj
@@ -2,7 +2,7 @@
 	
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1</RootNamespace>
   </PropertyGroup>
diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Mac/EtoApp.1.Mac.vbproj b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Mac/EtoApp.1.Mac.vbproj
index 7a42b579e2..7641e652ac 100755
--- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Mac/EtoApp.1.Mac.vbproj
+++ b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Mac/EtoApp.1.Mac.vbproj
@@ -2,11 +2,11 @@
 	
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net5.0</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == ''">net6.0</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != ''">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1</RootNamespace>
 
-    <RuntimeIdentifiers>osx-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
   </PropertyGroup>
 	
   <ItemGroup>
diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.vbproj b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.vbproj
index a4fde130e5..6c228c7db0 100755
--- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.vbproj
+++ b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.WinForms/EtoApp.1.WinForms.vbproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net5.0-windows</TargetFramework>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net5.0</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net6.0-windows</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net6.0</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'True'">TargetFrameworkOverride-windows</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'False'">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1</RootNamespace>
diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.vbproj b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.vbproj
index d6d5f45baa..fb77367d3f 100755
--- a/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.vbproj
+++ b/src/Eto.Forms.Templates/content/App-VisualBasic/Separate/EtoApp.1.Wpf/EtoApp.1.Wpf.vbproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net5.0-windows</TargetFramework>
-    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net5.0</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'True'">net6.0-windows</TargetFramework>
+    <TargetFramework Condition="$(TargetFrameworkOverride) == '' AND $(IsNetCore) == 'False'">net6.0</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'True'">TargetFrameworkOverride-windows</TargetFramework>
     <TargetFramework Condition="$(TargetFrameworkOverride) != '' AND $(IsNetCore) == 'False'">TargetFrameworkOverride</TargetFramework>
     <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">EtoApp._1</RootNamespace>
diff --git a/src/Eto.Mac/build/BundleDotNetCore.targets b/src/Eto.Mac/build/BundleDotNetCore.targets
index 72d7c9c346..835faa741a 100644
--- a/src/Eto.Mac/build/BundleDotNetCore.targets
+++ b/src/Eto.Mac/build/BundleDotNetCore.targets
@@ -26,9 +26,12 @@
   
   <Target Name="_MacBuildUnifiedAppBundle" Condition="@(MacBundleRuntimeIdentifiers->Count()) > 1">
     <!-- Copy both bundles together, using lipo to generate unified binaries -->
+    <PropertyGroup>
+      <_FullBaseOutputAppPath>$([System.IO.Path]::GetFullPath('$(BaseOutputAppPath)'))</_FullBaseOutputAppPath>
+    </PropertyGroup>
     
     <ItemGroup>
-      <UnifiedFiles Include="$(BaseOutputAppPath)%(MacBundleRuntimeIdentifiers.Identity)\$(MacBundleName).app\**" RuntimeIdentifier="%(MacBundleRuntimeIdentifiers.Identity)" BasePath="$(BaseOutputAppPath)%(MacBundleRuntimeIdentifiers.Identity)\$(MacBundleName).app\" />
+      <UnifiedFiles Include="$(_FullBaseOutputAppPath)%(MacBundleRuntimeIdentifiers.Identity)\$(MacBundleName).app\**" RuntimeIdentifier="%(MacBundleRuntimeIdentifiers.Identity)" BasePath="$(_FullBaseOutputAppPath)%(MacBundleRuntimeIdentifiers.Identity)/$(MacBundleName).app/" />
       <UnifiedFiles TargetPath="$([System.String]::Copy('%(FullPath)').TrimStart('%(BasePath)'))" />
     </ItemGroup>
     
diff --git a/src/Eto.Mac/build/Dmg.targets b/src/Eto.Mac/build/Dmg.targets
index adc8a301a6..caac4c3f68 100644
--- a/src/Eto.Mac/build/Dmg.targets
+++ b/src/Eto.Mac/build/Dmg.targets
@@ -74,7 +74,8 @@
 
     <Exec Command="sleep 2" />
 
-    <Exec Command="bless '$(_DmgVolume)/' --openfolder '$(_DmgVolume)'" />
+    <Exec Command="bless --folder '$(_DmgVolume)/'" />
+    <!-- <Exec Command="bless '$(_DmgVolume)/' -openfolder '$(_DmgVolume)'" /> -->
 
     <PropertyGroup>
       <DmgBackgroundImage Condition="$(DmgBackgroundImage) != '' AND !Exists($(DmgBackgroundImage)) AND Exists('$(MSBuildProjectDirectory)\$(DmgBackgroundImage)')">$(MSBuildProjectDirectory)\$(DmgBackgroundImage)</DmgBackgroundImage>
diff --git a/src/Eto.sln b/src/Eto.sln
index e408a23153..19f49c18cb 100644
--- a/src/Eto.sln
+++ b/src/Eto.sln
@@ -68,6 +68,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "generator", "..\lib\monomac
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Forms.Templates", "Eto.Forms.Templates\Eto.Forms.Templates.csproj", "{AC238CEB-D54C-4DC5-A141-C3B8CC0E384D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.macOS", "Eto.Mac\Eto.macOS.csproj", "{0C899B62-5F6D-4B12-AA52-814AF3B69AF9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.macOS", "..\test\Eto.Test.Mac\Eto.Test.macOS.csproj", "{A5237C58-9EF0-4A34-A1F6-9D4C394A7EE4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Linux = Debug|Linux
@@ -330,11 +334,28 @@ Global
 		{AC238CEB-D54C-4DC5-A141-C3B8CC0E384D}.Release|Mac.Build.0 = Release|Any CPU
 		{AC238CEB-D54C-4DC5-A141-C3B8CC0E384D}.Release|Windows.ActiveCfg = Release|Any CPU
 		{AC238CEB-D54C-4DC5-A141-C3B8CC0E384D}.Release|Windows.Build.0 = Release|Any CPU
+		{0C899B62-5F6D-4B12-AA52-814AF3B69AF9}.Debug|Linux.ActiveCfg = Debug|Any CPU
+		{0C899B62-5F6D-4B12-AA52-814AF3B69AF9}.Debug|Mac.ActiveCfg = Debug|Any CPU
+		{0C899B62-5F6D-4B12-AA52-814AF3B69AF9}.Debug|Mac.Build.0 = Debug|Any CPU
+		{0C899B62-5F6D-4B12-AA52-814AF3B69AF9}.Debug|Windows.ActiveCfg = Debug|Any CPU
+		{0C899B62-5F6D-4B12-AA52-814AF3B69AF9}.Release|Linux.ActiveCfg = Release|Any CPU
+		{0C899B62-5F6D-4B12-AA52-814AF3B69AF9}.Release|Mac.ActiveCfg = Release|Any CPU
+		{0C899B62-5F6D-4B12-AA52-814AF3B69AF9}.Release|Mac.Build.0 = Release|Any CPU
+		{0C899B62-5F6D-4B12-AA52-814AF3B69AF9}.Release|Windows.ActiveCfg = Release|Any CPU
+		{A5237C58-9EF0-4A34-A1F6-9D4C394A7EE4}.Debug|Linux.ActiveCfg = Debug|Any CPU
+		{A5237C58-9EF0-4A34-A1F6-9D4C394A7EE4}.Debug|Mac.ActiveCfg = Debug|Any CPU
+		{A5237C58-9EF0-4A34-A1F6-9D4C394A7EE4}.Debug|Mac.Build.0 = Debug|Any CPU
+		{A5237C58-9EF0-4A34-A1F6-9D4C394A7EE4}.Debug|Windows.ActiveCfg = Debug|Any CPU
+		{A5237C58-9EF0-4A34-A1F6-9D4C394A7EE4}.Release|Linux.ActiveCfg = Release|Any CPU
+		{A5237C58-9EF0-4A34-A1F6-9D4C394A7EE4}.Release|Mac.ActiveCfg = Release|Any CPU
+		{A5237C58-9EF0-4A34-A1F6-9D4C394A7EE4}.Release|Mac.Build.0 = Release|Any CPU
+		{A5237C58-9EF0-4A34-A1F6-9D4C394A7EE4}.Release|Windows.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{A5237C58-9EF0-4A34-A1F6-9D4C394A7EE4} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC}
 		{DD0C2B40-CA55-11E3-9C1A-0800200C9A66} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC}
 		{B5BC1D10-24ED-441C-A4D6-1F3AB9FF3689} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC}
 		{063AF7E7-18BD-488F-85BF-53B6E3D75685} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC}
diff --git a/src/Eto/sdk/Sdk.targets b/src/Eto/sdk/Sdk.targets
index 1e9cf00d1e..b75feaeb06 100755
--- a/src/Eto/sdk/Sdk.targets
+++ b/src/Eto/sdk/Sdk.targets
@@ -4,14 +4,16 @@
     <BuildPlatform Condition="$(BuildPlatform) == 'WinForms'">Windows</BuildPlatform>
 
     <UseXamarinMac Condition="$(UseXamarinMac) == '' AND $(BuildPlatform) == 'XamMac2'">True</UseXamarinMac>
+    <UseMacOSWorkload Condition="$(UseMacOSWorkload) == '' AND $(BuildPlatform) == 'MacOS'">True</UseMacOSWorkload>
   </PropertyGroup>
 
   <PropertyGroup Condition="$(BuildPlatform) == '' ">
     <!-- Detect the platform to build for based on current OS and runtime identifier, if not specified -->
     <BuildPlatform Condition="$(UseWinForms) != 'True' and (($([MSBuild]::IsOSPlatform(Windows)) and $(RuntimeIdentifier) == '') or $(RuntimeIdentifier.StartsWith('win')))">Wpf</BuildPlatform>
     <BuildPlatform Condition="$(UseWinForms) == 'True' and (($([MSBuild]::IsOSPlatform(Windows)) and $(RuntimeIdentifier) == '') or $(RuntimeIdentifier.StartsWith('win')))">Windows</BuildPlatform>
-    <BuildPlatform Condition="$(UseXamarinMac) != 'True' and (($([MSBuild]::IsOSPlatform(OSX)) and $(RuntimeIdentifier) == '') or $(RuntimeIdentifier.StartsWith('osx')))">Mac64</BuildPlatform>
+    <BuildPlatform Condition="$(UseXamarinMac) != 'True' and $(UseMacOSWorkload) != 'True' and (($([MSBuild]::IsOSPlatform(OSX)) and $(RuntimeIdentifier) == '') or $(RuntimeIdentifier.StartsWith('osx')))">Mac64</BuildPlatform>
     <BuildPlatform Condition="$(UseXamarinMac) == 'True' and (($([MSBuild]::IsOSPlatform(OSX)) and $(RuntimeIdentifier) == '') or $(RuntimeIdentifier.StartsWith('osx')))">XamMac2</BuildPlatform>
+    <BuildPlatform Condition="$(UseMacOSWorkload) == 'True' and (($([MSBuild]::IsOSPlatform(OSX)) and $(RuntimeIdentifier) == '') or $(RuntimeIdentifier.StartsWith('osx')))">MacOS</BuildPlatform>
     <BuildPlatform Condition="($([MSBuild]::IsOSPlatform(Linux)) and $(RuntimeIdentifier) == '') or $(RuntimeIdentifier.StartsWith('linux'))">Gtk</BuildPlatform>
   </PropertyGroup>
 
@@ -19,8 +21,8 @@
   <PropertyGroup>
     <!-- Windows requires windows TFM suffix -->
     <_TfmSuffix Condition="$(BuildPlatform) == 'Wpf' or $(BuildPlatform) == 'Windows'">-windows</_TfmSuffix>
-    <!-- Xamarin.Mac requires macos TFM suffix -->
-    <_TfmSuffix Condition="$(BuildPlatform) == 'XamMac2'">-macos</_TfmSuffix>
+    <!-- MacOS requires macos TFM suffix -->
+    <_TfmSuffix Condition="$(BuildPlatform) == 'MacOS'">-macos</_TfmSuffix>
 
     <OutputType Condition="$(OutputType) == 'Exe' and ($(BuildPlatform) == 'Wpf' or $(BuildPlatform) == 'Windows')">WinExe</OutputType>
   </PropertyGroup>
@@ -66,12 +68,12 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="$(RuntimeIdentifiers) == '' and !$(TargetFramework.Contains('-'))">
-    <RuntimeIdentifiers Condition="$(BuildPlatform) == 'Mac64' OR $(BuildPlatform) == 'XamMac2'">osx-x64;osx-arm64</RuntimeIdentifiers>
+    <RuntimeIdentifiers Condition="$(BuildPlatform) == 'Mac64' OR $(BuildPlatform) == 'MacOS'">osx-x64;osx-arm64</RuntimeIdentifiers>
     <RuntimeIdentifiers Condition="$(BuildPlatform) == 'Wpf' OR $(BuildPlatform) == 'Windows' or $(BuildPlatform) == 'Direct2D'">win-x64</RuntimeIdentifiers>
     <RuntimeIdentifiers Condition="$(BuildPlatform) == 'Gtk'">linux-x64</RuntimeIdentifiers>
   </PropertyGroup>
 
-  <Import Project="Xamarin.Mac.targets" Condition="$(BuildPlatform) == 'XamMac2' and !$(TargetFramework.Contains('-macos'))" />
+  <Import Project="Xamarin.Mac.targets" Condition="$(BuildPlatform) == 'XamMac2'" />
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
diff --git a/test/Eto.Test.Mac/Eto.Test.XamMac2.csproj b/test/Eto.Test.Mac/Eto.Test.XamMac2.csproj
index 6627d3aaf6..680bff1fa1 100644
--- a/test/Eto.Test.Mac/Eto.Test.XamMac2.csproj
+++ b/test/Eto.Test.Mac/Eto.Test.XamMac2.csproj
@@ -10,12 +10,13 @@
     <CodeSigningKey>Mac Developer</CodeSigningKey>
     <PackageSigningKey>3rd Party Mac Developer Installer</PackageSigningKey>
     <MonoBundlingExtraArgs>--nowarn:2006 --nowarn:0176</MonoBundlingExtraArgs>
+    <MonoBundlingExtraArgs Condition="$(TargetFramework) == 'net48'">$(MonoBundlingExtraArgs) --registrar:dynamic</MonoBundlingExtraArgs>
     <DefineConstants>XAMMAC;XAMMAC2</DefineConstants>
     <SupportedOSPlatformVersion>10.15</SupportedOSPlatformVersion>
     <NoWarn>CA1416</NoWarn>
   </PropertyGroup>
   
-  <PropertyGroup Condition="$(TargetFramework) == 'xamarinmac20' or $(TargetFramework) == 'net6.0-macos'">
+  <PropertyGroup Condition="$(TargetFramework) == 'xamarinmac20'">
     <LinkMode Condition="$(Configuration) == 'Release'">SdkOnly</LinkMode>
   </PropertyGroup>
   
@@ -45,6 +46,6 @@
     <BundleResource Include="Assets\TestBundleResource.txt" />
   </ItemGroup>
 
-  <Import Project="..\..\build\Xamarin.Mac.targets" Condition="!$(TargetFramework.Contains('-macos'))" />
+  <Import Project="..\..\build\Xamarin.Mac.targets" />
 
 </Project>
\ No newline at end of file
diff --git a/test/Eto.Test.Mac/Eto.Test.macOS.csproj b/test/Eto.Test.Mac/Eto.Test.macOS.csproj
index 09efa8fbec..1f1ee9960a 100644
--- a/test/Eto.Test.Mac/Eto.Test.macOS.csproj
+++ b/test/Eto.Test.Mac/Eto.Test.macOS.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFrameworks>net6.0-macos</TargetFrameworks>
-    <RuntimeIdentifier>osx-arm64</RuntimeIdentifier>
+    <RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
     <RootNamespace>Eto.Test.Mac</RootNamespace>
     <EnableDefaultNoneItems>False</EnableDefaultNoneItems>
     <EnableDefaultContentItems>False</EnableDefaultContentItems>