From aa0d14c8857edefd5e385a649cc142982a902cf4 Mon Sep 17 00:00:00 2001
From: Martin Zikmund <martin@zikmund.dev>
Date: Thu, 3 Mar 2022 17:19:21 +0100
Subject: [PATCH 1/2] refactor: Improve default App.xaml template

---
 .../UnoSolutionTemplate.net6/Shared/App.xaml         | 12 +++++++++---
 .../UnoSolutionTemplate/Shared/App.xaml              |  3 ++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/SolutionTemplate/UnoSolutionTemplate.net6/Shared/App.xaml b/src/SolutionTemplate/UnoSolutionTemplate.net6/Shared/App.xaml
index 573f18d1dfdd..4523c520d81c 100644
--- a/src/SolutionTemplate/UnoSolutionTemplate.net6/Shared/App.xaml
+++ b/src/SolutionTemplate/UnoSolutionTemplate.net6/Shared/App.xaml
@@ -4,8 +4,14 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:$ext_safeprojectname$">
 	
-	<Application.Resources>
-		<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-	</Application.Resources>
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+                <!-- Add resource dictionaries here -->                
+            </ResourceDictionary.MergedDictionaries>
+            <!-- Add resources here -->
+        </ResourceDictionary>
+    </Application.Resources>
 
 </Application>
diff --git a/src/SolutionTemplate/UnoSolutionTemplate/Shared/App.xaml b/src/SolutionTemplate/UnoSolutionTemplate/Shared/App.xaml
index 8146cfec57d2..4523c520d81c 100644
--- a/src/SolutionTemplate/UnoSolutionTemplate/Shared/App.xaml
+++ b/src/SolutionTemplate/UnoSolutionTemplate/Shared/App.xaml
@@ -8,8 +8,9 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-                <!-- Place resources here -->
+                <!-- Add resource dictionaries here -->                
             </ResourceDictionary.MergedDictionaries>
+            <!-- Add resources here -->
         </ResourceDictionary>
     </Application.Resources>
 

From cade03273627602fef5509751efe4bb49cf8e14a Mon Sep 17 00:00:00 2001
From: Martin Zikmund <martin@zikmund.dev>
Date: Fri, 4 Mar 2022 09:59:39 +0100
Subject: [PATCH 2/2] chore: Remove whitespace

---
 src/SolutionTemplate/UnoSolutionTemplate/Shared/App.xaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SolutionTemplate/UnoSolutionTemplate/Shared/App.xaml b/src/SolutionTemplate/UnoSolutionTemplate/Shared/App.xaml
index 4523c520d81c..52dcb1f49a0e 100644
--- a/src/SolutionTemplate/UnoSolutionTemplate/Shared/App.xaml
+++ b/src/SolutionTemplate/UnoSolutionTemplate/Shared/App.xaml
@@ -8,7 +8,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-                <!-- Add resource dictionaries here -->                
+                <!-- Add resource dictionaries here -->
             </ResourceDictionary.MergedDictionaries>
             <!-- Add resources here -->
         </ResourceDictionary>