fix: Correcting namespace behaviour

unoplatform · Sep 19, 2023 · 448e654 · 448e654
1 parent 32f8e0c
commit 448e654
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json
@@ -918,24 +918,6 @@
         ]
       }
     },
-    "xamlNamespaces": {
-      "type": "generated",
-      "generator": "switch",
-      "replaces": "$xamlNamespaces$",
-      "parameters": {
-        "evaluator": "C++",
-        "cases": [
-          {
-            "condition": "!(mauiEmbedding) || !(useNonMauiPlatforms)",
-            "value": "\n\txmlns:d=\"http://schemas.microsoft.com/expression/blend/2008\"\n\txmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\"\n\txmlns:maui=\"http://schemas.microsoft.com/winfx/2006/xaml/presentation\"\n\txmlns:not_maui=\"http://notmaui\"\n\tmc:Ignorable=\"d not_maui\""
-          },
-          {
-            "condition": "(mauiEmbedding && useNonMauiPlatforms)",
-            "value": "\n\txmlns:d=\"http://schemas.microsoft.com/expression/blend/2008\"\n\txmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\"\n\tmc:Ignorable=\"d\""
-          }
-        ]
-      }
-    },
     "presetDependencyInjectionDefault": {
       "type": "generated",
       "generator": "switch",
@@ -1130,6 +1112,26 @@
       "datatype": "bool",
       "value": "(platforms == wpf || platforms == wasm || platforms == gtk || platforms == linux-fb || platforms == macos)"
     },
+    "xamlNamespaces": {
+      "type": "generated",
+      "generator": "switch",
+      "replaces": "$xamlNamespaces$",
+      "parameters": {
+        "evaluator": "C++",
+        "datatype": "string",
+        "cases": [
+          {
+            // For some reason this doesn't work: "condition": "(mauiEmbedding && useNonMauiPlatforms)"
+            "condition": "(mauiEmbedding && (platforms == wpf || platforms == wasm || platforms == gtk || platforms == linux-fb || platforms == macos))",
+            "value": "\n\txmlns:d=\"http://schemas.microsoft.com/expression/blend/2008\"\n\txmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\"\n\txmlns:maui=\"http://schemas.microsoft.com/winfx/2006/xaml/presentation\"\n\txmlns:not_maui=\"http://notmaui\"\n\tmc:Ignorable=\"d not_maui\""
+          },
+          {
+            "condition": "!(mauiEmbedding && (platforms == wpf || platforms == wasm || platforms == gtk || platforms == linux-fb || platforms == macos))",
+            "value": "\n\txmlns:d=\"http://schemas.microsoft.com/expression/blend/2008\"\n\txmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\"\n\tmc:Ignorable=\"d\""
+          }
+        ]
+      }
+    },
     "useDataContracts": {
       "type": "computed",
       "dataType": "bool",