From 4289dc6108460a5df318a020ae6d7ef22115eebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Su=C3=A1rez=20Ruiz?= <javiersuarezruiz@hotmail.com>
Date: Sun, 27 Mar 2022 13:25:13 +0200
Subject: [PATCH] Updated Behaviors .NET MAUI sample

---
 Behaviors/.NET MAUI/Behaviors.sln             |  26 +++----
 Behaviors/.NET MAUI/Behaviors/App.xaml        |   7 ++
 Behaviors/.NET MAUI/Behaviors/App.xaml.cs     |  11 +++
 .../Behaviors.WinUI/Behaviors.WinUI.csproj    |  64 ------------------
 .../Properties/launchSettings.json            |   7 --
 .../Behaviors.WinUI/Windows/App.xaml          |  15 ----
 .../Behaviors.WinUI/Windows/App.xaml.cs       |  34 ----------
 .../Windows/Package.appxmanifest              |  58 ----------------
 .../.NET MAUI/Behaviors/Behaviors.csproj      |  63 +++++++++++++++++
 .../Behaviors/Android/AndroidEnvironment.txt  |   1 -
 .../Behaviors/Android/MainActivity.cs         |  11 ---
 .../Behaviors/Android/MainApplication.cs      |  16 -----
 .../Android/Resources/values/styles.xml       |  16 -----
 .../.NET MAUI/Behaviors/Behaviors/App.xaml    |   6 --
 .../.NET MAUI/Behaviors/Behaviors/App.xaml.cs |  23 -------
 .../Behaviors/Behaviors/Behaviors.csproj      |  53 ---------------
 .../Behaviors/MacCatalyst/AppDelegate.cs      |  10 ---
 .../Behaviors/MacCatalyst/Entitlements.plist  |   6 --
 .../Behaviors/MacCatalyst/Program.cs          |  15 ----
 .../Behaviors/Behaviors/MainPage.xaml.cs      |  12 ----
 .../.NET MAUI/Behaviors/Behaviors/Startup.cs  |  19 ------
 .../Behaviors/Behaviors/iOS/AppDelegate.cs    |  10 ---
 .../Behaviors/iOS/Entitlements.plist          |   6 --
 .../Behaviors/Behaviors/iOS/Program.cs        |  15 ----
 .../Behaviors/iOS/Resources/LaunchScreen.xib  |  43 ------------
 .../Behaviors/Directory.Build.targets         |  21 ------
 .../Behaviors/{Behaviors => }/MainPage.xaml   |   3 +-
 .../.NET MAUI/Behaviors/MainPage.xaml.cs      |   9 +++
 Behaviors/.NET MAUI/Behaviors/MauiProgram.cs  |  17 +++++
 .../NumericValidationBehavior.cs              |   0
 .../Android/AndroidManifest.xml               |   2 +-
 .../Platforms/Android/MainActivity.cs         |  10 +++
 .../Platforms/Android/MainApplication.cs      |  15 ++++
 .../Android/Resources/values/colors.xml       |   0
 .../Platforms/MacCatalyst/AppDelegate.cs      |   9 +++
 .../MacCatalyst/Info.plist                    |   4 --
 .../Platforms/MacCatalyst/Program.cs          |  15 ++++
 .../Behaviors/Platforms/Windows/App.xaml      |   8 +++
 .../Behaviors/Platforms/Windows/App.xaml.cs   |  24 +++++++
 .../Platforms/Windows/Package.appxmanifest    |  33 +++++++++
 .../Windows/app.manifest                      |   0
 .../Behaviors/Platforms/iOS/AppDelegate.cs    |   9 +++
 .../{Behaviors => Platforms}/iOS/Info.plist   |   2 -
 .../Behaviors/Platforms/iOS/Program.cs        |  15 ++++
 .../Behaviors/Properties/launchSettings.json  |   8 +++
 .../Resources/Fonts/OpenSans-Regular.ttf      | Bin 96932 -> 107136 bytes
 .../Resources/Images/dotnet_bot.svg           |   0
 .../Behaviors/Resources/Raw/AboutAssets.txt   |  14 ++++
 .../{Behaviors => }/Resources/appicon.svg     |   0
 .../{Behaviors => }/Resources/appiconfg.svg   |   0
 50 files changed, 279 insertions(+), 486 deletions(-)
 create mode 100644 Behaviors/.NET MAUI/Behaviors/App.xaml
 create mode 100644 Behaviors/.NET MAUI/Behaviors/App.xaml.cs
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Behaviors.WinUI.csproj
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Properties/launchSettings.json
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Windows/App.xaml
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Windows/App.xaml.cs
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Windows/Package.appxmanifest
 create mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors.csproj
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors/Android/AndroidEnvironment.txt
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors/Android/MainActivity.cs
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors/Android/MainApplication.cs
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors/Android/Resources/values/styles.xml
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors/App.xaml
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors/App.xaml.cs
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors/Behaviors.csproj
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors/MacCatalyst/AppDelegate.cs
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors/MacCatalyst/Entitlements.plist
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors/MacCatalyst/Program.cs
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors/MainPage.xaml.cs
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors/Startup.cs
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/AppDelegate.cs
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/Entitlements.plist
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/Program.cs
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/Resources/LaunchScreen.xib
 delete mode 100644 Behaviors/.NET MAUI/Behaviors/Directory.Build.targets
 rename Behaviors/.NET MAUI/Behaviors/{Behaviors => }/MainPage.xaml (88%)
 create mode 100644 Behaviors/.NET MAUI/Behaviors/MainPage.xaml.cs
 create mode 100644 Behaviors/.NET MAUI/Behaviors/MauiProgram.cs
 rename Behaviors/.NET MAUI/Behaviors/{Behaviors => }/NumericValidationBehavior.cs (100%)
 rename Behaviors/.NET MAUI/Behaviors/{Behaviors => Platforms}/Android/AndroidManifest.xml (95%)
 create mode 100644 Behaviors/.NET MAUI/Behaviors/Platforms/Android/MainActivity.cs
 create mode 100644 Behaviors/.NET MAUI/Behaviors/Platforms/Android/MainApplication.cs
 rename Behaviors/.NET MAUI/Behaviors/{Behaviors => Platforms}/Android/Resources/values/colors.xml (100%)
 create mode 100644 Behaviors/.NET MAUI/Behaviors/Platforms/MacCatalyst/AppDelegate.cs
 rename Behaviors/.NET MAUI/Behaviors/{Behaviors => Platforms}/MacCatalyst/Info.plist (87%)
 create mode 100644 Behaviors/.NET MAUI/Behaviors/Platforms/MacCatalyst/Program.cs
 create mode 100644 Behaviors/.NET MAUI/Behaviors/Platforms/Windows/App.xaml
 create mode 100644 Behaviors/.NET MAUI/Behaviors/Platforms/Windows/App.xaml.cs
 create mode 100644 Behaviors/.NET MAUI/Behaviors/Platforms/Windows/Package.appxmanifest
 rename Behaviors/.NET MAUI/Behaviors/{Behaviors.WinUI => Platforms}/Windows/app.manifest (100%)
 create mode 100644 Behaviors/.NET MAUI/Behaviors/Platforms/iOS/AppDelegate.cs
 rename Behaviors/.NET MAUI/Behaviors/{Behaviors => Platforms}/iOS/Info.plist (94%)
 create mode 100644 Behaviors/.NET MAUI/Behaviors/Platforms/iOS/Program.cs
 create mode 100644 Behaviors/.NET MAUI/Behaviors/Properties/launchSettings.json
 rename Behaviors/.NET MAUI/Behaviors/{Behaviors => }/Resources/Fonts/OpenSans-Regular.ttf (90%)
 rename Behaviors/.NET MAUI/Behaviors/{Behaviors => }/Resources/Images/dotnet_bot.svg (100%)
 create mode 100644 Behaviors/.NET MAUI/Behaviors/Resources/Raw/AboutAssets.txt
 rename Behaviors/.NET MAUI/Behaviors/{Behaviors => }/Resources/appicon.svg (100%)
 rename Behaviors/.NET MAUI/Behaviors/{Behaviors => }/Resources/appiconfg.svg (100%)

diff --git a/Behaviors/.NET MAUI/Behaviors.sln b/Behaviors/.NET MAUI/Behaviors.sln
index aefd6e4..1a4bcd9 100644
--- a/Behaviors/.NET MAUI/Behaviors.sln	
+++ b/Behaviors/.NET MAUI/Behaviors.sln	
@@ -1,11 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31220.234
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31611.283
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Behaviors", "Behaviors\Behaviors\Behaviors.csproj", "{A2A717C5-A249-4070-8C58-F12A4AAF6480}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Behaviors.WinUI", "Behaviors\Behaviors.WinUI\Behaviors.WinUI.csproj", "{483F575C-D5E6-4D70-B0F9-FF66FAA823F2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Behaviors", "Behaviors\Behaviors.csproj", "{4F004180-84A1-4CD9-8F23-95CAA5FD6C85}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,18 +11,12 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A2A717C5-A249-4070-8C58-F12A4AAF6480}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A2A717C5-A249-4070-8C58-F12A4AAF6480}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A2A717C5-A249-4070-8C58-F12A4AAF6480}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{A2A717C5-A249-4070-8C58-F12A4AAF6480}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A2A717C5-A249-4070-8C58-F12A4AAF6480}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A2A717C5-A249-4070-8C58-F12A4AAF6480}.Release|Any CPU.Deploy.0 = Release|Any CPU
-		{483F575C-D5E6-4D70-B0F9-FF66FAA823F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{483F575C-D5E6-4D70-B0F9-FF66FAA823F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{483F575C-D5E6-4D70-B0F9-FF66FAA823F2}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{483F575C-D5E6-4D70-B0F9-FF66FAA823F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{483F575C-D5E6-4D70-B0F9-FF66FAA823F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{483F575C-D5E6-4D70-B0F9-FF66FAA823F2}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{4F004180-84A1-4CD9-8F23-95CAA5FD6C85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F004180-84A1-4CD9-8F23-95CAA5FD6C85}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F004180-84A1-4CD9-8F23-95CAA5FD6C85}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{4F004180-84A1-4CD9-8F23-95CAA5FD6C85}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F004180-84A1-4CD9-8F23-95CAA5FD6C85}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F004180-84A1-4CD9-8F23-95CAA5FD6C85}.Release|Any CPU.Deploy.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Behaviors/.NET MAUI/Behaviors/App.xaml b/Behaviors/.NET MAUI/Behaviors/App.xaml
new file mode 100644
index 0000000..a5bc53e
--- /dev/null
+++ b/Behaviors/.NET MAUI/Behaviors/App.xaml	
@@ -0,0 +1,7 @@
+<?xml version = "1.0" encoding = "UTF-8" ?>
+<Application 
+    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:local="clr-namespace:Behaviors"
+    x:Class="Behaviors.App">
+</Application>
diff --git a/Behaviors/.NET MAUI/Behaviors/App.xaml.cs b/Behaviors/.NET MAUI/Behaviors/App.xaml.cs
new file mode 100644
index 0000000..d6c3d9b
--- /dev/null
+++ b/Behaviors/.NET MAUI/Behaviors/App.xaml.cs	
@@ -0,0 +1,11 @@
+namespace Behaviors;
+
+public partial class App : Application
+{
+	public App()
+	{
+		InitializeComponent();
+
+		MainPage = new MainPage();
+	}
+}
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Behaviors.WinUI.csproj b/Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Behaviors.WinUI.csproj
deleted file mode 100644
index 03286c2..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Behaviors.WinUI.csproj	
+++ /dev/null
@@ -1,64 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<TargetFrameworks>net6.0-windows10.0.19041</TargetFrameworks>
-		<OutputType>WinExe</OutputType>
-		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-		<SingleProject>true</SingleProject>
-		<RootNamespace>Behaviors</RootNamespace>
-
-		<!-- Required - Enable Single Project for WinUI -->
-		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
-		<WindowsPackageType>MSIX</WindowsPackageType>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<!-- App Icon -->
-		<MauiImage
-			Include="..\Behaviors\Resources\appicon.svg"
-			Link="Resources\appicon.svg"
-			ForegroundFile="..\Behaviors\Resources\appiconfg.svg"
-			IsAppIcon="true"
-			Color="#512BD4" />
-
-		<!-- Splash Screen -->
-		<MauiSplashScreen
-			Include="..\Behaviors\Resources\appiconfg.svg"
-			Link="Resources\appiconfg.svg"
-			Color="#512BD4" />
-
-		<!-- Images -->
-		<MauiImage
-			Include="..\Behaviors\Resources\Images\*"
-			Link="Resources\Images\%(Filename)%(Extension)" />
-
-		<!-- Custom Fonts -->
-		<MauiFont
-			Include="..\Behaviors\Resources\Fonts\*"
-			Link="Resources\Fonts\%(Filename)%(Extension)" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Compile
-			Include="..\Behaviors\**\*.cs"
-			Exclude="..\Behaviors\bin\**;..\Behaviors\obj\**;..\Behaviors\Android\**;..\Behaviors\iOS\**;..\Behaviors\MacCatalyst\**"
-			Link="%(RecursiveDir)%(Filename)%(Extension)"/>
-		<MauiXaml
-			Include="..\Behaviors\**\*.xaml"
-			Exclude="..\Behaviors\bin\**;..\Behaviors\obj\**"
-			Link="%(RecursiveDir)%(FileName)%(Extension)" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui" Version="6.0.100-preview.5.794" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.ProjectReunion" Version="0.8.0-preview" />
-		<PackageReference Include="Microsoft.ProjectReunion.Foundation" Version="0.8.0-preview" />
-		<PackageReference Include="Microsoft.ProjectReunion.WinUI" Version="0.8.0-preview" />
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.19041.16" />
-		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.19041.16" />
-	</ItemGroup>
-
-</Project>
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Properties/launchSettings.json b/Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Properties/launchSettings.json
deleted file mode 100644
index e4b5658..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Properties/launchSettings.json	
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "profiles": {
-    "Behaviors.WinUI": {
-      "commandName": "AppContainer"
-    }
-  }
-}
\ No newline at end of file
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Windows/App.xaml b/Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Windows/App.xaml
deleted file mode 100644
index e49afd3..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Windows/App.xaml	
+++ /dev/null
@@ -1,15 +0,0 @@
-<local:MiddleApp
-    x:Class="Behaviors.WinUI.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Behaviors.WinUI">
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-                <!-- Other merged dictionaries here -->
-            </ResourceDictionary.MergedDictionaries>
-            <!-- Other app resources here -->
-        </ResourceDictionary>
-    </Application.Resources>
-</local:MiddleApp>
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Windows/App.xaml.cs b/Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Windows/App.xaml.cs
deleted file mode 100644
index 563f376..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Windows/App.xaml.cs	
+++ /dev/null
@@ -1,34 +0,0 @@
-using Microsoft.Maui;
-using Microsoft.UI.Xaml;
-using Windows.ApplicationModel;
-
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
-namespace Behaviors.WinUI
-{
-    /// <summary>
-    /// Provides application-specific behavior to supplement the default Application class.
-    /// </summary>
-    public partial class App : MiddleApp
-    {
-        /// <summary>
-        /// Initializes the singleton application object.  This is the first line of authored code
-        /// executed, and as such is the logical equivalent of main() or WinMain().
-        /// </summary>
-        public App()
-        {
-            this.InitializeComponent();
-        }
-
-        protected override void OnLaunched(LaunchActivatedEventArgs args)
-        {
-            base.OnLaunched(args);
-
-            Microsoft.Maui.Essentials.Platform.OnLaunched(args);
-        }
-    }
-    public class MiddleApp : MauiWinUIApplication<Startup>
-    {
-    }
-}
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Windows/Package.appxmanifest b/Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Windows/Package.appxmanifest
deleted file mode 100644
index 693efd0..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Windows/Package.appxmanifest	
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Package
-  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
-  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
-  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  IgnorableNamespaces="uap rescap">
-
-  <Identity
-    Name="D5F6423D-B130-4BFD-A0B3-8713C33C204E"
-    Publisher="CN=User Name"
-    Version="1.0.0.0" />
-
-  <Properties>
-    <DisplayName>Behaviors</DisplayName>
-    <PublisherDisplayName>Microsoft</PublisherDisplayName>
-    <Logo>Assets\appiconStoreLogo.png</Logo>
-  </Properties>
-
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
-    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
-  </Dependencies>
-
-  <Resources>
-    <Resource Language="x-generate"/>
-  </Resources>
-
-  <Applications>
-    <Application Id="App"
-      Executable="$targetnametoken$.exe"
-      EntryPoint="$targetentrypoint$">
-      <uap:VisualElements
-        DisplayName="Behaviors"
-        Description="Behaviors"
-        BackgroundColor="transparent"
-        Square150x150Logo="Assets\appiconMediumTile.png"
-        Square44x44Logo="Assets\appiconLogo.png">
-        <uap:DefaultTile
-          Wide310x150Logo="Assets\appiconWideTile.png"
-          Square71x71Logo="Assets\appiconSmallTile.png"
-          Square310x310Logo="Assets\appiconLargeTile.png"
-          ShortName="Behaviors">
-          <uap:ShowNameOnTiles>
-            <uap:ShowOn Tile="square150x150Logo"/>
-            <uap:ShowOn Tile="wide310x150Logo"/>
-          </uap:ShowNameOnTiles>
-        </uap:DefaultTile >
-        <uap:SplashScreen Image="Assets\appiconfgSplashScreen.png" />
-      </uap:VisualElements>
-    </Application>
-  </Applications>
-
-  <Capabilities>
-    <rescap:Capability Name="runFullTrust" />
-  </Capabilities>
-
-</Package>
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors.csproj b/Behaviors/.NET MAUI/Behaviors/Behaviors.csproj
new file mode 100644
index 0000000..b58076e
--- /dev/null
+++ b/Behaviors/.NET MAUI/Behaviors/Behaviors.csproj	
@@ -0,0 +1,63 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) and '$(MSBuildRuntimeType)' == 'Full'">$(TargetFrameworks);net6.0-windows10.0.19041</TargetFrameworks>
+		<OutputType>Exe</OutputType>
+		<RootNamespace>Behaviors</RootNamespace>
+		<UseMaui>true</UseMaui>
+		<SingleProject>true</SingleProject>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<EnablePreviewMsixTooling>true</EnablePreviewMsixTooling>
+
+		<!-- Display name -->
+		<ApplicationTitle>Behaviors</ApplicationTitle>
+
+		<!-- App Identifier -->
+		<ApplicationId>com.companyname.behaviors</ApplicationId>
+		<ApplicationId Condition="$(TargetFramework.Contains('-windows'))">A698EE57-5651-41E1-8EF5-95519583BC9D</ApplicationId>
+
+		<!-- Versions -->
+		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
+		<ApplicationVersion>1</ApplicationVersion>
+
+		<!-- Required for C# Hot Reload -->
+		<UseInterpreter Condition="'$(Configuration)' == 'Debug'">True</UseInterpreter>
+
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">14.2</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-maccatalyst'">14.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</SupportedOSPlatformVersion>
+		<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</TargetPlatformMinVersion>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<!-- App Icon -->
+		<MauiIcon Include="Resources\appicon.svg" ForegroundFile="Resources\appiconfg.svg" Color="#512BD4" />
+
+		<!-- Splash Screen -->
+		<MauiSplashScreen Include="Resources\appiconfg.svg" Color="#512BD4" BaseSize="128,128" />
+
+		<!-- Images -->
+		<MauiImage Include="Resources\Images\*" />
+		<MauiImage Update="Resources\Images\dotnet_bot.svg" BaseSize="168,208" />
+
+		<!-- Custom Fonts -->
+		<MauiFont Include="Resources\Fonts\*" />
+
+		<!-- Raw Assets (also remove the "Resources\Raw" prefix) -->
+		<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
+	</ItemGroup>
+
+	<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
+		<!-- Required - WinUI does not yet have buildTransitive for everything -->
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.0.0" />
+		<PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.0.30" />
+	</ItemGroup>
+
+	<PropertyGroup Condition="$(TargetFramework.Contains('-windows'))">
+		<OutputType>WinExe</OutputType>
+		<RuntimeIdentifier>win10-x64</RuntimeIdentifier>
+	</PropertyGroup>
+	
+</Project>
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/Android/AndroidEnvironment.txt b/Behaviors/.NET MAUI/Behaviors/Behaviors/Android/AndroidEnvironment.txt
deleted file mode 100644
index 2cdf769..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/Android/AndroidEnvironment.txt	
+++ /dev/null
@@ -1 +0,0 @@
-DOTNET_MODIFIABLE_ASSEMBLIES=Debug
\ No newline at end of file
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/Android/MainActivity.cs b/Behaviors/.NET MAUI/Behaviors/Behaviors/Android/MainActivity.cs
deleted file mode 100644
index 81a01ea..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/Android/MainActivity.cs	
+++ /dev/null
@@ -1,11 +0,0 @@
-using Android.App;
-using Android.Content.PM;
-using Microsoft.Maui;
-
-namespace Behaviors
-{
-	[Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize)]
-	public class MainActivity : MauiAppCompatActivity
-	{
-	}
-}
\ No newline at end of file
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/Android/MainApplication.cs b/Behaviors/.NET MAUI/Behaviors/Behaviors/Android/MainApplication.cs
deleted file mode 100644
index ccc8eea..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/Android/MainApplication.cs	
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using Android.App;
-using Android.Runtime;
-using Microsoft.Maui;
-
-namespace Behaviors
-{
-	[Application]
-	public class MainApplication : MauiApplication<Startup>
-	{
-		public MainApplication(IntPtr handle, JniHandleOwnership ownership)
-			: base(handle, ownership)
-		{
-		}
-	}
-}
\ No newline at end of file
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/Android/Resources/values/styles.xml b/Behaviors/.NET MAUI/Behaviors/Behaviors/Android/Resources/values/styles.xml
deleted file mode 100644
index b749b60..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/Android/Resources/values/styles.xml	
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-</resources>
\ No newline at end of file
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/App.xaml b/Behaviors/.NET MAUI/Behaviors/Behaviors/App.xaml
deleted file mode 100644
index c190caf..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/App.xaml	
+++ /dev/null
@@ -1,6 +0,0 @@
-<Application 
-    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-	xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-	xmlns:local="clr-namespace:Behaviors"
-	x:Class="Behaviors.App">
-</Application>
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/App.xaml.cs b/Behaviors/.NET MAUI/Behaviors/Behaviors/App.xaml.cs
deleted file mode 100644
index 569d644..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/App.xaml.cs	
+++ /dev/null
@@ -1,23 +0,0 @@
-using Microsoft.Maui;
-using Microsoft.Maui.Controls;
-using Microsoft.Maui.Controls.PlatformConfiguration.WindowsSpecific;
-using Application = Microsoft.Maui.Controls.Application;
-
-namespace Behaviors
-{
-	public partial class App : Application
-	{
-		public App()
-		{
-			InitializeComponent();
-		}
-
-		protected override IWindow CreateWindow(IActivationState activationState)
-		{
-			this.On<Microsoft.Maui.Controls.PlatformConfiguration.Windows>()
-				.SetImageDirectory("Assets");
-
-			return new Microsoft.Maui.Controls.Window(new MainPage());
-		}
-	}
-}
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/Behaviors.csproj b/Behaviors/.NET MAUI/Behaviors/Behaviors/Behaviors.csproj
deleted file mode 100644
index 347c71a..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/Behaviors.csproj	
+++ /dev/null
@@ -1,53 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-	<PropertyGroup>
-		<!-- iOS, Android, MacCatalyst -->
-		<TargetFrameworks>net6.0-ios;net6.0-android;net6.0-maccatalyst</TargetFrameworks>
-		<OutputType>Exe</OutputType>
-		<SingleProject>true</SingleProject>
-		<RootNamespace>Behaviors</RootNamespace>
-
-		<!-- Display name -->
-		<ApplicationTitle>Behaviors</ApplicationTitle>
-
-		<!-- App Identifier -->
-		<ApplicationId>com.companyname.Behaviors</ApplicationId>
-
-		<!-- Versions -->
-		<ApplicationVersion>1.0</ApplicationVersion>
-		<AndroidVersionCode>1</AndroidVersionCode>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<!-- App Icon -->
-		<MauiImage
-			Include="Resources\appicon.svg"
-			ForegroundFile="Resources\appiconfg.svg"
-			IsAppIcon="true"
-			Color="#512BD4" />
-
-		<!-- Splash Screen -->
-		<MauiSplashScreen Include="Resources\appiconfg.svg" Color="#512BD4" />
-
-		<!-- Images -->
-		<MauiImage Include="Resources\Images\*" />
-
-		<!-- Custom Fonts -->
-		<MauiFont Include="Resources\Fonts\*" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui" Version="6.0.100-preview.5.794" />
-	</ItemGroup>
-
-	<PropertyGroup>
-		<InvariantGlobalization Condition="$(TargetFramework.Contains('-maccatalyst'))">true</InvariantGlobalization>
-		<RuntimeIdentifier Condition="$(TargetFramework.Contains('-ios'))">iossimulator-x64</RuntimeIdentifier>
-		<RuntimeIdentifier Condition="$(TargetFramework.Contains('-maccatalyst'))">maccatalyst-x64</RuntimeIdentifier>
-		<UseInterpreter Condition="$(TargetFramework.Contains('-android'))">True</UseInterpreter>
-	</PropertyGroup>
-	<ItemGroup Condition="$(TargetFramework.Contains('-android'))">
-		<AndroidEnvironment Include="Android\AndroidEnvironment.txt" />
-	</ItemGroup>
-
-</Project>
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/MacCatalyst/AppDelegate.cs b/Behaviors/.NET MAUI/Behaviors/Behaviors/MacCatalyst/AppDelegate.cs
deleted file mode 100644
index 01c3b79..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/MacCatalyst/AppDelegate.cs	
+++ /dev/null
@@ -1,10 +0,0 @@
-using Foundation;
-using Microsoft.Maui;
-
-namespace Behaviors
-{
-	[Register("AppDelegate")]
-	public class AppDelegate : MauiUIApplicationDelegate<Startup>
-	{
-	}
-}
\ No newline at end of file
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/MacCatalyst/Entitlements.plist b/Behaviors/.NET MAUI/Behaviors/Behaviors/MacCatalyst/Entitlements.plist
deleted file mode 100644
index 36a8706..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/MacCatalyst/Entitlements.plist	
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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>
-    </dict>
-</plist>
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/MacCatalyst/Program.cs b/Behaviors/.NET MAUI/Behaviors/Behaviors/MacCatalyst/Program.cs
deleted file mode 100644
index 4ca8904..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/MacCatalyst/Program.cs	
+++ /dev/null
@@ -1,15 +0,0 @@
-using UIKit;
-
-namespace Behaviors
-{
-	public class Program
-	{
-		// This is the main entry point of the application.
-		static void Main(string[] args)
-		{
-			// if you want to use a different Application Delegate class from "AppDelegate"
-			// you can specify it here.
-			UIApplication.Main(args, null, "AppDelegate");
-		}
-	}
-}
\ No newline at end of file
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/MainPage.xaml.cs b/Behaviors/.NET MAUI/Behaviors/Behaviors/MainPage.xaml.cs
deleted file mode 100644
index 18e0ef1..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/MainPage.xaml.cs	
+++ /dev/null
@@ -1,12 +0,0 @@
-using Microsoft.Maui.Controls;
-
-namespace Behaviors
-{
-    public partial class MainPage : ContentPage
-	{
-		public MainPage()
-		{
-			InitializeComponent();
-		}
-	}
-}
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/Startup.cs b/Behaviors/.NET MAUI/Behaviors/Behaviors/Startup.cs
deleted file mode 100644
index f4b8b06..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/Startup.cs	
+++ /dev/null
@@ -1,19 +0,0 @@
-using Microsoft.Maui;
-using Microsoft.Maui.Hosting;
-using Microsoft.Maui.Controls.Hosting;
-
-namespace Behaviors
-{
-	public class Startup : IStartup
-	{
-		public void Configure(IAppHostBuilder appBuilder)
-		{
-			appBuilder
-				.UseMauiApp<App>()
-				.ConfigureFonts(fonts =>
-				{
-					fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
-				});
-		}
-	}
-}
\ No newline at end of file
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/AppDelegate.cs b/Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/AppDelegate.cs
deleted file mode 100644
index 01c3b79..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/AppDelegate.cs	
+++ /dev/null
@@ -1,10 +0,0 @@
-using Foundation;
-using Microsoft.Maui;
-
-namespace Behaviors
-{
-	[Register("AppDelegate")]
-	public class AppDelegate : MauiUIApplicationDelegate<Startup>
-	{
-	}
-}
\ No newline at end of file
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/Entitlements.plist b/Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/Entitlements.plist
deleted file mode 100644
index 36a8706..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/Entitlements.plist	
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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>
-    </dict>
-</plist>
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/Program.cs b/Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/Program.cs
deleted file mode 100644
index 4ca8904..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/Program.cs	
+++ /dev/null
@@ -1,15 +0,0 @@
-using UIKit;
-
-namespace Behaviors
-{
-	public class Program
-	{
-		// This is the main entry point of the application.
-		static void Main(string[] args)
-		{
-			// if you want to use a different Application Delegate class from "AppDelegate"
-			// you can specify it here.
-			UIApplication.Main(args, null, "AppDelegate");
-		}
-	}
-}
\ No newline at end of file
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/Resources/LaunchScreen.xib b/Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/Resources/LaunchScreen.xib
deleted file mode 100644
index 3e5075f..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/Resources/LaunchScreen.xib	
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6214" systemVersion="14A314h" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6207" />
-        <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1" />
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" />
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder" />
-        <view contentMode="scaleToFill" id="iN0-l3-epB">
-            <rect key="frame" x="0.0" y="0.0" width="480" height="480" />
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" />
-            <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2017 " textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines"
-                    minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
-                    <rect key="frame" x="20" y="439" width="441" height="21" />
-                    <fontDescription key="fontDescription" type="system" pointSize="17" />
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor" />
-                    <nil key="highlightedColor" />
-                </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sample.iOS" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines"
-                    minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
-                    <rect key="frame" x="20" y="140" width="441" height="43" />
-                    <fontDescription key="fontDescription" type="boldSystem" pointSize="36" />
-                    <color key="textColor" cocoaTouchSystemColor="darkTextColor" />
-                    <nil key="highlightedColor" />
-                </label>
-            </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite" />
-            <constraints>
-                <constraint firstItem="kId-c2-rCX" firstAttribute="centerY" secondItem="iN0-l3-epB" secondAttribute="bottom" multiplier="1/3" constant="1" id="5cJ-9S-tgC" />
-                <constraint firstAttribute="centerX" secondItem="kId-c2-rCX" secondAttribute="centerX" id="Koa-jz-hwk" />
-                <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Kzo-t9-V3l" />
-                <constraint firstItem="8ie-xW-0ye" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="MfP-vx-nX0" />
-                <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9" />
-                <constraint firstItem="kId-c2-rCX" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="20" symbolic="YES" id="fvb-Df-36g" />
-            </constraints>
-            <nil key="simulatedStatusBarMetrics" />
-            <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics" />
-            <point key="canvasLocation" x="548" y="455" />
-        </view>
-    </objects>
-</document>
diff --git a/Behaviors/.NET MAUI/Behaviors/Directory.Build.targets b/Behaviors/.NET MAUI/Behaviors/Directory.Build.targets
deleted file mode 100644
index fa64a89..0000000
--- a/Behaviors/.NET MAUI/Behaviors/Directory.Build.targets	
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <!-- Required - Enable Launch Profiles for .NET 6 iOS/Android -->
-    <_KeepLaunchProfiles>true</_KeepLaunchProfiles>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- Required - Setup Single Project features -->
-    <ProjectCapability Include="MauiSingleProject" />
-
-    <!-- Optional - Enables a list of TFM's and device categories in the debug menu -->
-    <!-- This allows easily toggling of debug target TFM by selecting the platform -->
-    <!-- If removed, Top level debug targets show as a list of devices for the selected TFM -->
-    <ProjectCapability Include="XamarinStaticLaunchProfiles" />
-  </ItemGroup>
-
-  <!-- Required - Overwrite tasks that are not needed when multitargeting -->
-  <Target Name="ValidateWinUIPlatform" />
-  <Target Name="BinPlaceBootstrapDll" />
-
-</Project>
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/MainPage.xaml b/Behaviors/.NET MAUI/Behaviors/MainPage.xaml
similarity index 88%
rename from Behaviors/.NET MAUI/Behaviors/Behaviors/MainPage.xaml
rename to Behaviors/.NET MAUI/Behaviors/MainPage.xaml
index 79c30f3..2206e15 100644
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/MainPage.xaml	
+++ b/Behaviors/.NET MAUI/Behaviors/MainPage.xaml	
@@ -1,8 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
 <ContentPage 
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:Behaviors"
     x:Class="Behaviors.MainPage"
+    xmlns:local="clr-namespace:Behaviors"
     Title="Behaviors">
     <StackLayout>
         <Entry Placeholder="Enter a System.Double">
diff --git a/Behaviors/.NET MAUI/Behaviors/MainPage.xaml.cs b/Behaviors/.NET MAUI/Behaviors/MainPage.xaml.cs
new file mode 100644
index 0000000..ebe4e3c
--- /dev/null
+++ b/Behaviors/.NET MAUI/Behaviors/MainPage.xaml.cs	
@@ -0,0 +1,9 @@
+namespace Behaviors;
+
+public partial class MainPage : ContentPage
+{
+	public MainPage()
+	{
+		InitializeComponent();
+	}
+}
\ No newline at end of file
diff --git a/Behaviors/.NET MAUI/Behaviors/MauiProgram.cs b/Behaviors/.NET MAUI/Behaviors/MauiProgram.cs
new file mode 100644
index 0000000..f4e0226
--- /dev/null
+++ b/Behaviors/.NET MAUI/Behaviors/MauiProgram.cs	
@@ -0,0 +1,17 @@
+namespace Behaviors;
+
+public static class MauiProgram
+{
+	public static MauiApp CreateMauiApp()
+	{
+		var builder = MauiApp.CreateBuilder();
+		builder
+			.UseMauiApp<App>()
+			.ConfigureFonts(fonts =>
+			{
+				fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
+			});
+
+		return builder.Build();
+	}
+}
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/NumericValidationBehavior.cs b/Behaviors/.NET MAUI/Behaviors/NumericValidationBehavior.cs
similarity index 100%
rename from Behaviors/.NET MAUI/Behaviors/Behaviors/NumericValidationBehavior.cs
rename to Behaviors/.NET MAUI/Behaviors/NumericValidationBehavior.cs
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/Android/AndroidManifest.xml b/Behaviors/.NET MAUI/Behaviors/Platforms/Android/AndroidManifest.xml
similarity index 95%
rename from Behaviors/.NET MAUI/Behaviors/Behaviors/Android/AndroidManifest.xml
rename to Behaviors/.NET MAUI/Behaviors/Platforms/Android/AndroidManifest.xml
index 85bd4d5..7570ff6 100644
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/Android/AndroidManifest.xml	
+++ b/Behaviors/.NET MAUI/Behaviors/Platforms/Android/AndroidManifest.xml	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="30" />
+	<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="31" />
 	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:roundIcon="@mipmap/appicon_round" android:supportsRtl="true"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 </manifest>
\ No newline at end of file
diff --git a/Behaviors/.NET MAUI/Behaviors/Platforms/Android/MainActivity.cs b/Behaviors/.NET MAUI/Behaviors/Platforms/Android/MainActivity.cs
new file mode 100644
index 0000000..20286e6
--- /dev/null
+++ b/Behaviors/.NET MAUI/Behaviors/Platforms/Android/MainActivity.cs	
@@ -0,0 +1,10 @@
+using Android.App;
+using Android.Content.PM;
+using Android.OS;
+
+namespace Behaviors;
+
+[Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize)]
+public class MainActivity : MauiAppCompatActivity
+{
+}
diff --git a/Behaviors/.NET MAUI/Behaviors/Platforms/Android/MainApplication.cs b/Behaviors/.NET MAUI/Behaviors/Platforms/Android/MainApplication.cs
new file mode 100644
index 0000000..bc4c7d6
--- /dev/null
+++ b/Behaviors/.NET MAUI/Behaviors/Platforms/Android/MainApplication.cs	
@@ -0,0 +1,15 @@
+using Android.App;
+using Android.Runtime;
+
+namespace Behaviors;
+
+[Application]
+public class MainApplication : MauiApplication
+{
+	public MainApplication(IntPtr handle, JniHandleOwnership ownership)
+		: base(handle, ownership)
+	{
+	}
+
+	protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+}
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/Android/Resources/values/colors.xml b/Behaviors/.NET MAUI/Behaviors/Platforms/Android/Resources/values/colors.xml
similarity index 100%
rename from Behaviors/.NET MAUI/Behaviors/Behaviors/Android/Resources/values/colors.xml
rename to Behaviors/.NET MAUI/Behaviors/Platforms/Android/Resources/values/colors.xml
diff --git a/Behaviors/.NET MAUI/Behaviors/Platforms/MacCatalyst/AppDelegate.cs b/Behaviors/.NET MAUI/Behaviors/Platforms/MacCatalyst/AppDelegate.cs
new file mode 100644
index 0000000..1c27ad9
--- /dev/null
+++ b/Behaviors/.NET MAUI/Behaviors/Platforms/MacCatalyst/AppDelegate.cs	
@@ -0,0 +1,9 @@
+using Foundation;
+
+namespace Behaviors;
+
+[Register("AppDelegate")]
+public class AppDelegate : MauiUIApplicationDelegate
+{
+	protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+}
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/MacCatalyst/Info.plist b/Behaviors/.NET MAUI/Behaviors/Platforms/MacCatalyst/Info.plist
similarity index 87%
rename from Behaviors/.NET MAUI/Behaviors/Behaviors/MacCatalyst/Info.plist
rename to Behaviors/.NET MAUI/Behaviors/Platforms/MacCatalyst/Info.plist
index c70cb4a..c96dd0a 100644
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/MacCatalyst/Info.plist	
+++ b/Behaviors/.NET MAUI/Behaviors/Platforms/MacCatalyst/Info.plist	
@@ -2,15 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>LSMinimumSystemVersion</key>
-	<string>10.15</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>
 		<integer>2</integer>
 	</array>
-	<key>XSAppIconAssets</key>
-	<string>Assets.xcassets/appicon.appiconset</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>arm64</string>
diff --git a/Behaviors/.NET MAUI/Behaviors/Platforms/MacCatalyst/Program.cs b/Behaviors/.NET MAUI/Behaviors/Platforms/MacCatalyst/Program.cs
new file mode 100644
index 0000000..76b6a5f
--- /dev/null
+++ b/Behaviors/.NET MAUI/Behaviors/Platforms/MacCatalyst/Program.cs	
@@ -0,0 +1,15 @@
+using ObjCRuntime;
+using UIKit;
+
+namespace Behaviors;
+
+public class Program
+{
+	// This is the main entry point of the application.
+	static void Main(string[] args)
+	{
+		// if you want to use a different Application Delegate class from "AppDelegate"
+		// you can specify it here.
+		UIApplication.Main(args, null, typeof(AppDelegate));
+	}
+}
diff --git a/Behaviors/.NET MAUI/Behaviors/Platforms/Windows/App.xaml b/Behaviors/.NET MAUI/Behaviors/Platforms/Windows/App.xaml
new file mode 100644
index 0000000..4e7e339
--- /dev/null
+++ b/Behaviors/.NET MAUI/Behaviors/Platforms/Windows/App.xaml	
@@ -0,0 +1,8 @@
+<maui:MauiWinUIApplication
+    x:Class="Behaviors.WinUI.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:maui="using:Microsoft.Maui"
+    xmlns:local="using:Behaviors.WinUI">
+
+</maui:MauiWinUIApplication>
diff --git a/Behaviors/.NET MAUI/Behaviors/Platforms/Windows/App.xaml.cs b/Behaviors/.NET MAUI/Behaviors/Platforms/Windows/App.xaml.cs
new file mode 100644
index 0000000..84a606f
--- /dev/null
+++ b/Behaviors/.NET MAUI/Behaviors/Platforms/Windows/App.xaml.cs	
@@ -0,0 +1,24 @@
+using Microsoft.UI.Xaml;
+
+// To learn more about WinUI, the WinUI project structure,
+// and more about our project templates, see: http://aka.ms/winui-project-info.
+
+namespace Behaviors.WinUI;
+
+/// <summary>
+/// Provides application-specific behavior to supplement the default Application class.
+/// </summary>
+public partial class App : MauiWinUIApplication
+{
+    /// <summary>
+    /// Initializes the singleton application object.  This is the first line of authored code
+    /// executed, and as such is the logical equivalent of main() or WinMain().
+    /// </summary>
+    public App()
+    {
+        this.InitializeComponent();
+    }
+
+    protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+}
+
diff --git a/Behaviors/.NET MAUI/Behaviors/Platforms/Windows/Package.appxmanifest b/Behaviors/.NET MAUI/Behaviors/Platforms/Windows/Package.appxmanifest
new file mode 100644
index 0000000..0cb469c
--- /dev/null
+++ b/Behaviors/.NET MAUI/Behaviors/Platforms/Windows/Package.appxmanifest	
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  IgnorableNamespaces="uap rescap">
+
+  <Identity Publisher="CN=User Name" />
+
+  <Properties>
+    <PublisherDisplayName>User Name</PublisherDisplayName>
+  </Properties>
+
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+  </Dependencies>
+
+  <Resources>
+    <Resource Language="x-generate" />
+  </Resources>
+
+  <Applications>
+    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$">
+      <uap:VisualElements />
+    </Application>
+  </Applications>
+
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+
+</Package>
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Windows/app.manifest b/Behaviors/.NET MAUI/Behaviors/Platforms/Windows/app.manifest
similarity index 100%
rename from Behaviors/.NET MAUI/Behaviors/Behaviors.WinUI/Windows/app.manifest
rename to Behaviors/.NET MAUI/Behaviors/Platforms/Windows/app.manifest
diff --git a/Behaviors/.NET MAUI/Behaviors/Platforms/iOS/AppDelegate.cs b/Behaviors/.NET MAUI/Behaviors/Platforms/iOS/AppDelegate.cs
new file mode 100644
index 0000000..1c27ad9
--- /dev/null
+++ b/Behaviors/.NET MAUI/Behaviors/Platforms/iOS/AppDelegate.cs	
@@ -0,0 +1,9 @@
+using Foundation;
+
+namespace Behaviors;
+
+[Register("AppDelegate")]
+public class AppDelegate : MauiUIApplicationDelegate
+{
+	protected override MauiApp CreateMauiApp() => MauiProgram.CreateMauiApp();
+}
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/Info.plist b/Behaviors/.NET MAUI/Behaviors/Platforms/iOS/Info.plist
similarity index 94%
rename from Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/Info.plist
rename to Behaviors/.NET MAUI/Behaviors/Platforms/iOS/Info.plist
index ed2ffb6..0004a4f 100644
--- a/Behaviors/.NET MAUI/Behaviors/Behaviors/iOS/Info.plist	
+++ b/Behaviors/.NET MAUI/Behaviors/Platforms/iOS/Info.plist	
@@ -4,8 +4,6 @@
 <dict>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>MinimumOSVersion</key>
-	<string>10.3.4</string>
 	<key>UIDeviceFamily</key>
 	<array>
 		<integer>1</integer>
diff --git a/Behaviors/.NET MAUI/Behaviors/Platforms/iOS/Program.cs b/Behaviors/.NET MAUI/Behaviors/Platforms/iOS/Program.cs
new file mode 100644
index 0000000..76b6a5f
--- /dev/null
+++ b/Behaviors/.NET MAUI/Behaviors/Platforms/iOS/Program.cs	
@@ -0,0 +1,15 @@
+using ObjCRuntime;
+using UIKit;
+
+namespace Behaviors;
+
+public class Program
+{
+	// This is the main entry point of the application.
+	static void Main(string[] args)
+	{
+		// if you want to use a different Application Delegate class from "AppDelegate"
+		// you can specify it here.
+		UIApplication.Main(args, null, typeof(AppDelegate));
+	}
+}
diff --git a/Behaviors/.NET MAUI/Behaviors/Properties/launchSettings.json b/Behaviors/.NET MAUI/Behaviors/Properties/launchSettings.json
new file mode 100644
index 0000000..edf8aad
--- /dev/null
+++ b/Behaviors/.NET MAUI/Behaviors/Properties/launchSettings.json	
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "Windows Machine": {
+      "commandName": "MsixPackage",
+      "nativeDebugging": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/Resources/Fonts/OpenSans-Regular.ttf b/Behaviors/.NET MAUI/Behaviors/Resources/Fonts/OpenSans-Regular.ttf
similarity index 90%
rename from Behaviors/.NET MAUI/Behaviors/Behaviors/Resources/Fonts/OpenSans-Regular.ttf
rename to Behaviors/.NET MAUI/Behaviors/Resources/Fonts/OpenSans-Regular.ttf
index 29bfd35a2bfdd92b6e8b4ec2970f4d1eebf49357..df0182716ff2b377d6c2e98221301c1e0d665c83 100644
GIT binary patch
delta 10594
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

delta 309
zcmZoT%C_VyYdr%a0|SE~kYHgDaCdQa<F4Vk!oXNw0u<GA5AY9WkYwNi@|OVl0`9?~
zPLDTh?f~+)FfcH^^AFZHT4*-!Bm<+n15iF8IXAIj-R`fyf&2vw49p$LWhDyyz7k6q
z7=vE`<rk$Dr03QpZWCl+^wwZtVBeCSSX^JgAj+T&G%y9IKp;J*GOfg7rZ)ovqYMM1
z{+5i?#1y7o$ps9I79K!(vkagB?-|Zwpan8OzDh=JNyQ6Oo4Y{y1_lPcSvmR1iJBsJ
zJ~A*Gd;nSymYY~n!0ODz1>|1<s#nNM%uS7+)F98m7}5iD;H83msp69Q9h~_Lj1dV8
n4D!qcMX3eO+ou6t9CW8ygK@hCBcp{mi@fdD+U+S8i~&vn-E~t=

diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/Resources/Images/dotnet_bot.svg b/Behaviors/.NET MAUI/Behaviors/Resources/Images/dotnet_bot.svg
similarity index 100%
rename from Behaviors/.NET MAUI/Behaviors/Behaviors/Resources/Images/dotnet_bot.svg
rename to Behaviors/.NET MAUI/Behaviors/Resources/Images/dotnet_bot.svg
diff --git a/Behaviors/.NET MAUI/Behaviors/Resources/Raw/AboutAssets.txt b/Behaviors/.NET MAUI/Behaviors/Resources/Raw/AboutAssets.txt
new file mode 100644
index 0000000..3f7a940
--- /dev/null
+++ b/Behaviors/.NET MAUI/Behaviors/Resources/Raw/AboutAssets.txt	
@@ -0,0 +1,14 @@
+Any raw assets you want to be deployed with your application can be placed in
+this directory (and child directories) and given a Build Action of "MauiAsset":
+
+	<MauiAsset Include="AboutAssets.txt" />
+
+These files will be deployed with you package and will be accessible using Essentials:
+
+	async Task LoadMauiAsset()
+	{
+		using var stream = await FileSystem.OpenAppPackageFileAsync("AboutAssets.txt");
+		using var reader = new StreamReader(stream);
+
+		var contents = reader.ReadToEnd();
+	}
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/Resources/appicon.svg b/Behaviors/.NET MAUI/Behaviors/Resources/appicon.svg
similarity index 100%
rename from Behaviors/.NET MAUI/Behaviors/Behaviors/Resources/appicon.svg
rename to Behaviors/.NET MAUI/Behaviors/Resources/appicon.svg
diff --git a/Behaviors/.NET MAUI/Behaviors/Behaviors/Resources/appiconfg.svg b/Behaviors/.NET MAUI/Behaviors/Resources/appiconfg.svg
similarity index 100%
rename from Behaviors/.NET MAUI/Behaviors/Behaviors/Resources/appiconfg.svg
rename to Behaviors/.NET MAUI/Behaviors/Resources/appiconfg.svg