Merge pull request #8223 from unoplatform/dev/mazi/8222-net-6-solutio…

…n-template-does-not-wrap-`xamlcontrolsresources` refactor: Improve default App.xaml template
unoplatform · Mar 4, 2022 · 67f224d · 67f224d
2 parents 1d0745f + cade032
commit 67f224d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git 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
@@ -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>