diff --git a/build/.azure-pipelines.TemplateValidation.yml b/build/.azure-pipelines.TemplateValidation.yml
index a146d85e..bfd48c5a 100644
--- a/build/.azure-pipelines.TemplateValidation.yml
+++ b/build/.azure-pipelines.TemplateValidation.yml
@@ -79,17 +79,15 @@ jobs:
templateArgs: '-preset=recommended -auth=msal -markup csharp'
MsalAuthMvvmCSharp:
templateArgs: '-preset=recommended -presentation mvvm -auth=msal -markup csharp'
- # NOTE: Temporarily disabling so we can merge #585
- # MauiBlank:
- # templateArgs: '-preset=blank -maui'
- # MauiRecommended:
- # templateArgs: '-preset=recommended -maui'
+ MauiBlank:
+ templateArgs: '-preset=blank -maui'
+ MauiRecommended:
+ templateArgs: '-preset=recommended -maui'
ThemeService:
templateArgs: '-theme-service'
- # NOTE: Temporarily disabling so we can merge #585
# https://github.com/unoplatform/uno.templates/issues/396
- # Issue396:
- # templateArgs: '-preset blank -platforms windows -platforms android -presentation none -theme fluent -nav blank -log none -maui -markup csharp'
+ Issue396:
+ templateArgs: '-preset blank -platforms windows -platforms android -presentation none -theme fluent -nav blank -log none -maui -markup csharp'
# https://github.com/unoplatform/uno.templates/issues/414
Issue414:
templateArgs: '-preset recommended -auth msal -markup csharp'
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index cbde7772..847190c2 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -2,11 +2,11 @@
- 5.2.7
- 4.1.1
- 5.0.1
- 6.0.2
- 5.2.0
+ 5.2.22
+ 4.1.4
+ 5.0.2
+ 6.0.5
+ 5.2.2
8.0.11
9.0.0-dev.39
1.7.0
diff --git a/src/Uno.Templates/content/unoapp/Directory.Packages.props b/src/Uno.Templates/content/unoapp/Directory.Packages.props
index 979f9ab6..15df4c00 100644
--- a/src/Uno.Templates/content/unoapp/Directory.Packages.props
+++ b/src/Uno.Templates/content/unoapp/Directory.Packages.props
@@ -29,6 +29,10 @@
+
+
+
+
$$EnableDeveloperMode_CPM_PackageVersion$$
diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj
index e0ac3f09..5ba86c41 100644
--- a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj
+++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1.MauiControls/MyExtensionsApp.1.MauiControls.csproj
@@ -4,7 +4,11 @@
enable
enable
+ true
+
+
+ $baseTargetFramework$-windows10.0.19041
$baseTargetFramework$;
@@ -18,7 +22,7 @@
$baseTargetFramework$-maccatalyst;
- $baseTargetFramework$-windows10.0.19041;
+ $(TargetFrameworks);
@@ -63,8 +67,8 @@
-
-
+
+
diff --git a/src/Uno.Templates/content/unomauilib/Directory.Packages.props b/src/Uno.Templates/content/unomauilib/Directory.Packages.props
new file mode 100644
index 00000000..5efbf15c
--- /dev/null
+++ b/src/Uno.Templates/content/unomauilib/Directory.Packages.props
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file