feat: Add net6.0-macos support

build/Uno.WinUI.Lottie.nuspec

@@ -31,7 +31,12 @@
 		<dependency id="Com.Airbnb.iOS.Lottie" version="2.5.11" />
 		<dependency id="System.Json" version="4.7.1" />
 	  </group>
-	  <group targetFramework="net6.0-catalyst">
+	  <group targetFramework="net6.0-maccatalyst">
+		<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
+		<dependency id="Com.Airbnb.iOS.Lottie" version="2.5.11" />
+		<dependency id="System.Json" version="4.7.1" />
+	  </group>
+	  <group targetFramework="net6.0-macos">
 		<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
 		<dependency id="Com.Airbnb.iOS.Lottie" version="2.5.11" />
 		<dependency id="System.Json" version="4.7.1" />
@@ -71,6 +76,9 @@
 	  <group targetFramework="net6.0-maccatalyst">
 		<reference file="Uno.UI.Lottie.dll" />
 	  </group>
+	  <group targetFramework="net6.0-macos">
+		<reference file="Uno.UI.Lottie.dll" />
+	  </group>
 	  <group targetFramework="net6.0-android">
 		<reference file="Uno.UI.Lottie.dll" />
 	  </group>

build/Uno.WinUI.RemoteControl.nuspec

@@ -58,6 +58,13 @@
 		<dependency id="Newtonsoft.Json" version="12.0.2" />
 	  </group>
 
+	  <!-- net6.0-macos -->
+	  <group targetFramework="net6.0-macos">
+		<dependency id="Uno.WinUI" version="1.29.0-dev.93" />
+
+		<dependency id="Newtonsoft.Json" version="12.0.2" />
+	  </group>
+
 	  <!-- net6.0-android -->
 	  <group targetFramework="net6.0-android">
 		<dependency id="Uno.WinUI" version="1.29.0-dev.93" />
@@ -139,6 +146,9 @@
 	<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.net6\Release\net6.0-maccatalyst\Uno.UI.RemoteControl.dll" target="lib\net6.0-maccatalyst" />
 	<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.net6\Release\net6.0-maccatalyst\Uno.UI.RemoteControl.pdb" target="lib\net6.0-maccatalyst" />
 
+	<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.net6\Release\net6.0-macos\Uno.UI.RemoteControl.dll" target="lib\net6.0-macos" />
+	<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.net6\Release\net6.0-macos\Uno.UI.RemoteControl.pdb" target="lib\net6.0-macos" />
+
 	<!-- Processors -->
 	<file src="..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\netcoreapp3.1\Uno.UI.RemoteControl.Server.Processors.dll" target="tools\rc\processors" />
 	<file src="..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\netcoreapp3.1\Uno.UI.RemoteControl.Server.Processors.pdb" target="tools\rc\processors" />

build/Uno.WinUI.nuspec

@@ -44,6 +44,14 @@
 		<dependency id="Uno.Diagnostics.Eventing" version="1.0.4" />
 	  </group>
 
+	  <!-- net6.0-macos -->
+	  <group targetFramework="net6.0-macos">
+		<dependency id="Uno.SourceGenerationTasks" version="3.1.0" />
+		<dependency id="Uno.Core" version="2.4.0" />
+		<dependency id="Uno.Core.Build" version="2.4.0" />
+		<dependency id="Uno.Diagnostics.Eventing" version="1.0.4" />
+	  </group>
+
 	  <!-- Android 11.0 -->
 	  <group targetFramework="MonoAndroid11.0">
 		<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0" />
@@ -152,6 +160,16 @@
 		<reference file="Uno.UI.FluentTheme.dll" />
 	  </group>
 
+	  <!-- net6.0-macos -->
+	  <group targetFramework="net6.0-macos">
+		<reference file="Uno.Xaml.dll" />
+		<reference file="Uno.UI.dll" />
+		<reference file="Uno.Foundation.dll" />
+		<reference file="Uno.dll" />
+		<reference file="Uno.UI.Toolkit.dll" />
+		<reference file="Uno.UI.FluentTheme.dll" />
+	  </group>
+
 	  <!-- macOS -->
 	  <group targetFramework="xamarinmac20">
 		<reference file="Uno.Xaml.dll" />
@@ -277,6 +295,21 @@
 	<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-maccatalyst\Uno.UI.FluentTheme.pdb" target="lib\net6.0-maccatalyst" />
 	<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-maccatalyst\Uno.UI.Toolkit.dll" target="lib\net6.0-maccatalyst" />
 	<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-maccatalyst\Uno.UI.Toolkit.pdb" target="lib\net6.0-maccatalyst" />
+
+	<!-- net6.0-macos -->
+	<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-macos\Uno.dll" target="lib\net6.0-macos" />
+	<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-macos\Uno.pdb" target="lib\net6.0-macos" />
+	<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-macos\Uno.Foundation.dll" target="lib\net6.0-macos" />
+	<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-macos\Uno.Foundation.pdb" target="lib\net6.0-macos" />
+	<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-macos\Uno.UI.dll" target="lib\net6.0-macos" />
+	<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-macos\Uno.UI.pdb" target="lib\net6.0-macos" />
+	<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-macos\Uno.Xaml.dll" target="lib\net6.0-macos" />
+	<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-macos\Uno.Xaml.pdb" target="lib\net6.0-macos" />
+	<file src="..\src\Uno.UI\bin\Uno.UI.net6\Release\net6.0-macos\*.xml" target="lib\net6.0-macos" />
+	<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-macos\Uno.UI.FluentTheme.dll" target="lib\net6.0-macos" />
+	<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-macos\Uno.UI.FluentTheme.pdb" target="lib\net6.0-macos" />
+	<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-macos\Uno.UI.Toolkit.dll" target="lib\net6.0-macos" />
+	<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-macos\Uno.UI.Toolkit.pdb" target="lib\net6.0-macos" />
 
 	<!-- net6.0-android30.0 -->
 	<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.dll" target="lib\net6.0-android30.0" />
@@ -392,31 +425,35 @@
 	<file src="Uno.WinUI.targets" target="buildTransitive\netstandard2.0" />
 	<file src="Uno.WinUI.targets" target="buildTransitive\net6.0-android30.0" />
 	<file src="Uno.WinUI.targets" target="buildTransitive\net6.0-ios" />
-	<file src="Uno.WinUI.targets" target="buildTransitive\net6.0-catalyst" />
+	<file src="Uno.WinUI.targets" target="buildTransitive\net6.0-maccatalyst" />
+	<file src="Uno.WinUI.targets" target="buildTransitive\net6.0-macos" />
 
 	<file src="uno.winui.cross-runtime.targets" target="buildTransitive\MonoAndroid" />
 	<file src="uno.winui.cross-runtime.targets" target="buildTransitive\xamarinios10" />
 	<file src="uno.winui.cross-runtime.targets" target="buildTransitive\xamarinmac20" />
 	<file src="uno.winui.cross-runtime.targets" target="buildTransitive\netstandard2.0" />
 	<file src="uno.winui.cross-runtime.targets" target="buildTransitive\net6.0-android30.0" />
 	<file src="uno.winui.cross-runtime.targets" target="buildTransitive\net6.0-ios" />
-	<file src="uno.winui.cross-runtime.targets" target="buildTransitive\net6.0-catalyst" />
+	<file src="uno.winui.cross-runtime.targets" target="buildTransitive\net6.0-maccatalyst" />
+	<file src="uno.winui.cross-runtime.targets" target="buildTransitive\net6.0-macos" />
 
 	<file src="uno.winui.single-project.targets" target="buildTransitive\MonoAndroid" />
 	<file src="uno.winui.single-project.targets" target="buildTransitive\xamarinios10" />
 	<file src="uno.winui.single-project.targets" target="buildTransitive\xamarinmac20" />
 	<file src="uno.winui.single-project.targets" target="buildTransitive\netstandard2.0" />
 	<file src="uno.winui.single-project.targets" target="buildTransitive\net6.0-android30.0" />
 	<file src="uno.winui.single-project.targets" target="buildTransitive\net6.0-ios" />
-	<file src="uno.winui.single-project.targets" target="buildTransitive\net6.0-catalyst" />
+	<file src="uno.winui.single-project.targets" target="buildTransitive\net6.0-maccatalyst" />
+	<file src="uno.winui.single-project.targets" target="buildTransitive\net6.0-macos" />
 
 	<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\MonoAndroid" />
 	<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\xamarinios10" />
 	<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\xamarinmac20" />
 	<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\netstandard2.0" />
 	<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\net6.0-android30.0" />
 	<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\net6.0-ios" />
-	<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\net6.0-catalyst" />
+	<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\net6.0-maccatalyst" />
+	<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\net6.0-macos" />
 
 	<!-- Force UAP to ignore netstandard 2.0 -->
 	<file src="uno.winui.uap.targets" target="buildTransitive\uap10.0.16299\uno.winui.targets" />

build/run-net6-template-tests.ps1

@@ -22,6 +22,7 @@ $dotnetBuildConfigurations =
     @("Mobile", "-f:net6.0-android"),
     @("Mobile", "-f:net6.0-ios"),
     @("Mobile", "-f:net6.0-maccatalyst"),
+    @("Mobile", "-f:net6.0-macos"),
     @("Wasm", ""),
     @("Skia.Gtk", ""),
     @("Skia.Linux.FrameBuffer", ""),
@@ -60,6 +61,7 @@ $dotnetBuildNet6Configurations =
     @("Mobile", "-f:net6.0-android"),
     @("Mobile", "-f:net6.0-ios"),
     @("Mobile", "-f:net6.0-maccatalyst"),
+    @("Mobile", "-f:net6.0-macos"),
     @("Wasm", ""),
     @("Skia.Gtk", ""),
     @("Skia.Linux.FrameBuffer", ""),

build/uno.winui.single-project.targets

@@ -32,6 +32,14 @@
 	<InterfaceDefinition Include="$(MacCatalystProjectFolder)**/*.storyboard;$(MacCatalystProjectFolder)**/*.xib" Exclude="$(_SingleProjectMacCatalystExcludes)" Link="%(RecursiveDir)%(FileName)%(Extension)" IsDefaultItem="true" />
   </ItemGroup>
 
+  <!-- macOS -->
+  <ItemGroup Condition=" '$(EnableDefaultItems)' == 'true' and '$(SingleProject)' == 'true' and '$(TargetPlatformIdentifier)' == 'macos' and '$(MacOSProjectFolder)' != '' ">
+	<None Include="$(MacOSProjectFolder)Info.plist" LogicalName="Info.plist" />
+	<ImageAsset Include="$(MacOSProjectFolder)**/*.xcassets/**/*.png;$(MacOSProjectFolder)**/*.xcassets/*/*.jpg;$(MacOSProjectFolder)**/*.xcassets/**/*.pdf;$(MacOSProjectFolder)**/*.xcassets/**/*.json" Exclude="$(_SingleProjectMacOSExcludes)" Link="%(RecursiveDir)%(FileName)%(Extension)" Visible="false" IsDefaultItem="true" />
+	<SceneKitAsset Include="$(MacOSProjectFolder)**/*.scnassets/*" Exclude="$(_SingleProjectMacOSExcludes)" Link="%(RecursiveDir)%(FileName)%(Extension)" IsDefaultItem="true" />
+	<InterfaceDefinition Include="$(MacOSProjectFolder)**/*.storyboard;$(MacOSProjectFolder)**/*.xib" Exclude="$(_SingleProjectMacOSExcludes)" Link="%(RecursiveDir)%(FileName)%(Extension)" IsDefaultItem="true" />
+  </ItemGroup>
+
   <!-- Targets -->
 
   <PropertyGroup Condition=" '$(SingleProject)' == 'true' ">
@@ -53,13 +61,20 @@
 	<MacCatalystProjectFolder Condition=" '$(MacCatalystProjectFolder)' == '' ">MacCatalyst\</MacCatalystProjectFolder>
 	<IPhoneResourcePrefix Condition=" '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'maccatalyst' ">$(MacCatalystProjectFolder)Resources</IPhoneResourcePrefix>
 	<_SingleProjectMacCatalystExcludes>$(MacCatalystProjectFolder)/**/.*/**</_SingleProjectMacCatalystExcludes>
+
+	<!-- MacOS -->
+	<EnableDefaultMacOSItems>false</EnableDefaultMacOSItems>
+	<MacOSProjectFolder Condition=" '$(MacOSProjectFolder)' == '' ">MacOS\</MacOSProjectFolder>
+	<IPhoneResourcePrefix Condition=" '$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework)))' == 'macos' ">$(MacOSProjectFolder)Resources</IPhoneResourcePrefix>
+	<_SingleProjectMacOSExcludes>$(MacOSProjectFolder)/**/.*/**</_SingleProjectMacOSExcludes>
   </PropertyGroup>
 
   <!-- Removals -->
   <ItemGroup Condition=" '$(EnableDefaultItems)' == 'true' and '$(SingleProject)' == 'true' ">
 	<Compile Condition=" '$(TargetPlatformIdentifier)' != 'android' and '$(AndroidProjectFolder)' != '' " Remove="$(AndroidProjectFolder)**/*$(DefaultLanguageSourceExtension)" />
 	<Compile Condition=" '$(TargetPlatformIdentifier)' != 'ios' and '$(iOSProjectFolder)' != '' " Remove="$(iOSProjectFolder)**/*$(DefaultLanguageSourceExtension)" />
 	<Compile Condition=" '$(TargetPlatformIdentifier)' != 'maccatalyst' and '$(MacCatalystProjectFolder)' != '' " Remove="$(MacCatalystProjectFolder)**/*$(DefaultLanguageSourceExtension)" />
+	<Compile Condition=" '$(TargetPlatformIdentifier)' != 'macos' and '$(MacOSProjectFolder)' != '' " Remove="$(MacOSProjectFolder)**/*$(DefaultLanguageSourceExtension)" />
   </ItemGroup>
 
   <!-- IDE capabilities -->

doc/articles/get-started-dotnet-new.md

@@ -11,7 +11,7 @@ If you need to determine the parameters available for a template use `dotnet new
 
 ## Uno Platform Blank Application
 
-This template can be used to create a blank cross-platform application for iOS, Android, WebAssembly, macOS, Skia/GTK (Windows, Linux, macOS) and Skia/Wpf (Windows 7 and 10).
+This template can be used to create a blank multi-platform application for iOS, Android, WebAssembly, macOS, Skia/GTK (Windows, Linux, macOS) and Skia/Wpf (Windows 7 and 10).
 
 A basic example:
 ```
@@ -24,9 +24,9 @@ A more advanced example which will not generate the android and macOS heads:
 dotnet new unoapp -o MyApp -android=false -macos=false
 ```
 
-## Uno Platform Blank Application for Project Reunion - WinUI 3
+## Uno Platform Blank Application for WinAppSDK - WinUI 3
 
-This template can be used to create a blank cross-platform application for iOS, Android, WebAssembly, macOS, Linux, and Win32 Desktop which uses the new WinUI 3 apis.
+This template can be used to create a blank multi-platform application for iOS, Android, WebAssembly, macOS, Linux, and Win32 Desktop which uses the new WinUI 3 apis.
 
 [**Find detailed instructions here.**](get-started-winui3.md)
 
@@ -105,6 +105,41 @@ To use it:
 1. Open the **Nuget Package manager** for the Wasm project and update the `Uno.Xamarin.Forms.Platform` project to the latest **stable** package 
 1. Run the app using **Ctrl+F5** (without the Visual Studio debugger), and you�re good to go!
 
+## Uno Platform Blank Application (.NET 6 - Preview)
+
+This template can be used to create a blank multi-platform application for iOS, Android, WebAssembly, macOS, mac Catalyst, Skia/GTK (Windows, Linux, macOS) and Skia/Wpf (Windows 7 and 10).
+
+This template uses a single project head for iOS, Android, macOS and mac Catalyst and requires Visual Studio 2022.
+
+A basic example:
+```
+dotnet new unoapp-net6 -o MyApp
+```
+
+A more advanced example which will not generate the android and macOS heads:
+
+```
+dotnet new unoapp-net6 -o MyApp -mobile=false
+```
+
+## Uno Platform Blank Application for WinAppSDK - WinUI 3 (.NET 6 - Preview)
+
+This template can be used to create a blank multi-platform application for iOS, Android, WebAssembly, macOS, mac Catalyst, Linux, and Win32 Desktop which uses the new WinUI 3 apis.
+
+This template uses a single project head for iOS, Android, macOS and mac Catalyst and requires Visual Studio 2022.
+
+[**Find detailed instructions here.**](get-started-winui3.md)
+
+A basic example:
+```
+dotnet new unoapp-winui-net6 -o MyApp
+```
+
+More articles on WinUI 3:
+
+ * [WinUI 3, UWP, and Uno Platform.](uwp-vs-winui3.md)
+ * [Updating from UWP to WinUI 3.](updating-to-winui3.md)
+
 ### Uninstalling the templates
 
 Using a command line or terminal, run the following command:

src/AddIns/Uno.UI.Lottie/Uno.UI.Lottie.net6.csproj

@@ -4,8 +4,8 @@
 		<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
 		<TargetFrameworksCI>net6.0-android;net6.0-ios</TargetFrameworksCI>
 
-		<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworksCI>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworksCI>
+		<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst;net6.0-macos</TargetFrameworks>
+		<TargetFrameworksCI>$(TargetFrameworks);net6.0-maccatalyst;net6.0-macos</TargetFrameworksCI>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -56,6 +56,11 @@
 		<!--<PackageReference Include="Com.Airbnb.iOS.Lottie" Version="2.5.11" PrivateAssets="none" />-->
 		<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
 	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net6.0-macos'">
+		<!--<PackageReference Include="Com.Airbnb.iOS.Lottie" Version="2.5.11" PrivateAssets="none" />-->
+		<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+	</ItemGroup>
 
 	<Import Project="..\..\SourceGenerators\Uno.UI.SourceGenerators\Content\Uno.UI.SourceGenerators.props" />
 

src/AddIns/Uno.UI.MSAL/Uno.UI.MSAL.net6.csproj

@@ -4,8 +4,8 @@
 		<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
 		<TargetFrameworksCI>net6.0-android;net6.0-ios</TargetFrameworksCI>
 
-		<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworksCI>$(TargetFrameworks);net6.0-maccatalyst</TargetFrameworksCI>
+		<TargetFrameworks>$(TargetFrameworks);net6.0-maccatalyst;net6.0-macos</TargetFrameworks>
+		<TargetFrameworksCI>$(TargetFrameworks);net6.0-maccatalyst;net6.0-macos</TargetFrameworksCI>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(UnoTargetFrameworkOverride)'!=''">

src/Directory.Build.props

@@ -121,9 +121,14 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <IsMonoAndroid>$(TargetFramework.ToLower().StartsWith('monoandroid'))</IsMonoAndroid>
-    <IsXamarinIOS>$(TargetFramework.ToLower().StartsWith('xamarinios'))</IsXamarinIOS>
-    <IsXamarinMac>$(TargetFramework.ToLower().StartsWith('xamarinmac'))</IsXamarinMac>
+	<IsMonoAndroid>false</IsMonoAndroid>
+	<IsMonoAndroid Condition="$(TargetFramework.ToLower().StartsWith('monoandroid')) or '$(TargetFramework)'=='net6.0-android'">true</IsMonoAndroid>
+
+	<IsXamarinIOS>false</IsXamarinIOS>
+	<IsXamarinIOS Condition="$(TargetFramework.ToLower().StartsWith('xamarinios')) or '$(TargetFramework)'=='net6.0-ios'">true</IsXamarinIOS>
+
+	<IsXamarinMac>false</IsXamarinMac>
+	<IsXamarinMac Condition="$(TargetFramework.ToLower().StartsWith('xamarinmac')) or '$(TargetFramework)'=='net6.0-macos'">true</IsXamarinMac>
   </PropertyGroup>
 
   <PropertyGroup>

src/Directory.Build.targets

@@ -18,8 +18,8 @@
   <ItemGroup>
 	<PackageReference Update="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.9" />
 	<!-- Keep aligned with MSBuild extras' default ExtrasUwpMetaPackageVersion -->
-	<PackageReference Update="Uno.SourceGenerationTasks" Version="3.1.0" />
-	<PackageReference Update="Uno.SourceGeneration" Version="3.1.0" />
+	<PackageReference Update="Uno.SourceGenerationTasks" Version="3.2.0-dev.2" />
+	<PackageReference Update="Uno.SourceGeneration" Version="3.2.0-dev.2" />
 	<PackageReference Update="Uno.Core" Version="2.4.0" />
 	<PackageReference Update="Uno.Core.Build" Version="2.4.0" />
 	<PackageReference Update="Uno.Diagnostics.Eventing" Version="1.0.4" />

src/PlatformItemGroups.props

@@ -11,7 +11,7 @@
 	<_IsIOS Condition="$(IsXamarinIOS) or '$(TargetFramework)'=='net6.0-ios' or '$(TargetFramework)'=='net6.0-maccatalyst'">true</_IsIOS>
 
 	<_IsMacOS>false</_IsMacOS>
-    <_IsMacOS Condition="'$(TargetFramework)'=='xamarinmac20'">true</_IsMacOS>
+    <_IsMacOS Condition="'$(TargetFramework)'=='xamarinmac20' or '$(TargetFramework)'=='net6.0-macos'">true</_IsMacOS>
 
     <_IsNet>false</_IsNet>
     <_IsNet Condition="'$(TargetFramework)'=='net461'">true</_IsNet>

src/SamplesApp/SamplesApp.net6mobile/MacOS/AppDelegate.cs

@@ -0,0 +1,7 @@
+using AppKit;
+using Foundation;
+
+namespace SamplesApp.macOS
+{
+
+}

src/SamplesApp/SamplesApp.net6mobile/MacOS/Entitlements.plist

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)com.companyname.SamplesApp</string>
+	</array>
+</dict>
+</plist>