chore: correct App.xaml

unoplatform · Jan 28, 2025 · c3a4df9 · c3a4df9
1 parent 688158e
commit c3a4df9
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 3 deletions.
diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json
@@ -1113,6 +1113,11 @@
       "datatype": "bool",
       "value": "(platforms == wasm && server)"
     },
+    "useMeadowAndCsharpMarkup": {
+      "type": "computed",
+      "datatype": "bool",
+      "value": "(useCsharpMarkup && meadowSupport)"
+    },
     "useWinAppSdk": {
       "type": "computed",
       "datatype": "bool",

diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1/App.xaml b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1/App.xaml
@@ -1,14 +1,33 @@
 <!--#if (useCsharpMarkup)-->
 <Application x:Class="MyExtensionsApp._1.App"
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       xmlns:local="using:_1">
 <!--#else-->
 <Application x:Class="MyExtensionsApp._1.App"
        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"$useThemesResourceNamespace$>
+       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+       xmlns:local="using:_1"$useThemesResourceNamespace$>
 
+<!--#if (meadowSupport)-->
+<local:UnoMeadowDesktopApplication x:Class="MyExtensionsApp._1.App"
+                               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                               xmlns:local="using:_1"$useThemesResourceNamespace$>
+<!--#endif-->
+<!--#if (useMeadowAndCsharpMarkup)-->
+<local:UnoMeadowDesktopApplication x:Class="MyExtensionsApp._1.App"
+                                   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                                   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                                   xmlns:local="using:_1">
+<!--#endif-->
+
+<!--#if (meadowSupport)-->
+  <local:UnoMeadowDesktopApplication.Resources>
+<!--#else-->
   <Application.Resources>
-    <ResourceDictionary>
+<!--#endif-->
+      <ResourceDictionary>
       <ResourceDictionary.MergedDictionaries>
         <!-- Load WinUI resources -->
         <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
@@ -55,7 +74,16 @@
       <!-- Add resources here -->
 
     </ResourceDictionary>
+<!--#if (meadowSupport)-->
+  </local:UnoMeadowDesktopApplication.Resources>
+<!--#else-->
   </Application.Resources>
+<!--#endif-->
 
 <!--#endif-->
+<!--#if (meadowSupport)-->
+</local:UnoMeadowDesktopApplication>
+<!--#else-->
 </Application>
+<!--#else-->
+