diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json index c991ab802..64f8d44a6 100644 --- a/src/Uno.Templates/content/unoapp/.template.config/template.json +++ b/src/Uno.Templates/content/unoapp/.template.config/template.json @@ -1551,8 +1551,8 @@ "evaluator": "C++", "cases": [ { - "condition": "(useToolkit)", - "value": "\n xmlns:utum=\"using:Uno.Toolkit.UI.Material\"" + "condition": "(useToolkit && useMaterial)", + "value": "\n xmlns:utum=\"using:Uno.Toolkit.UI.Material\"" }, { "condition": "true", @@ -1569,7 +1569,7 @@ "evaluator": "C++", "cases": [ { - "condition": "(useMaterial)", + "condition": "(useMaterial && !useToolkit)", "value": "\n xmlns:um=\"using:Uno.Material\"" }, { @@ -1587,7 +1587,7 @@ "evaluator": "C++", "cases": [ { - "condition": "(useMaterial)", + "condition": "(useCupertino)", "value": "\n xmlns:uc=\"using:Uno.Cupertino\"" }, { diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp._1/AppResources.xaml b/src/Uno.Templates/content/unoapp/MyExtensionsApp._1/AppResources.xaml index fde9f4803..16e70bca6 100644 --- a/src/Uno.Templates/content/unoapp/MyExtensionsApp._1/AppResources.xaml +++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp._1/AppResources.xaml @@ -6,8 +6,7 @@ - + - +