From 5d39bb994e0170c517391784cd69166a5a64a1a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agn=C3=A8s=20ZITTE?=
 <16295702+agneszitte@users.noreply.github.com>
Date: Wed, 28 Jan 2026 13:51:46 -0500
Subject: [PATCH 1/4] Revert "fix: Remove NU1507 when not using CPM and make
 NETSDK1201/PRI257 conditional on WinAppSDK"

This reverts commit 86ce7f383626c20599443ceb4cad86af700e117f.
---
 .../content/unoapp/Directory.Build.props       | 18 +++++++++---------
 .../MyExtensionsApp.1/MyExtensionsApp.1.csproj | 16 +++++++++-------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/Uno.Templates/content/unoapp/Directory.Build.props b/src/Uno.Templates/content/unoapp/Directory.Build.props
index 5440b6c1f..461072de6 100644
--- a/src/Uno.Templates/content/unoapp/Directory.Build.props
+++ b/src/Uno.Templates/content/unoapp/Directory.Build.props
@@ -4,23 +4,23 @@
     <Nullable>enable</Nullable>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 
+    <!--#if (mauiEmbedding)-->
     <!--
       Adding NoWarn to remove build warnings
       NU1507: Warning when there are multiple package sources when using CPM with no source mapping
-    -->
-    <NoWarn>$(NoWarn);NU1507</NoWarn>
-    <!--#if (useWinAppSdk)-->
-    <!--
       NETSDK1201: Warning that specifying RID won't create self containing app
+      NETSDK1023:	Microsoft.Maui.Graphics reference required to avoid build error causes warning because it's already implicitly referenced by Maui SDK
       PRI257: Ignore default language (en) not being one of the included resources (eg en-us, en-uk)
     -->
-    <NoWarn>$(NoWarn);NETSDK1201;PRI257</NoWarn>
-    <!--#endif-->
-    <!--#if (mauiEmbedding)-->
+    <NoWarn>$(NoWarn);NU1507;NETSDK1201;NETSDK1023;PRI257</NoWarn>
+    <!--#else-->
     <!--
-      NETSDK1023:	Microsoft.Maui.Graphics reference required to avoid build error causes warning because it's already implicitly referenced by Maui SDK
+      Adding NoWarn to remove build warnings
+      NU1507: Warning when there are multiple package sources when using CPM with no source mapping
+      NETSDK1201: Warning that specifying RID won't create self containing app
+      PRI257: Ignore default language (en) not being one of the included resources (eg en-us, en-uk)
     -->
-    <NoWarn>$(NoWarn);NETSDK1023</NoWarn>
+    <NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
     <!--#endif-->
   </PropertyGroup>
 </Project>
diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1/MyExtensionsApp.1.csproj b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1/MyExtensionsApp.1.csproj
index 71dd7a893..b42167d13 100644
--- a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1/MyExtensionsApp.1.csproj
+++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1/MyExtensionsApp.1.csproj
@@ -20,22 +20,24 @@
 
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <!--#if (useWinAppSdk)-->
 
+    <!--#if (mauiEmbedding)-->
     <!--
       Adding NoWarn to remove build warnings
+      NU1507: Warning when there are multiple package sources when using CPM with no source mapping
       NETSDK1201: Warning that specifying RID won't create self containing app
+      NETSDK1023:	Microsoft.Maui.Graphics reference required to avoid build error causes warning because it's already implicitly referenced by Maui SDK
       PRI257: Ignore default language (en) not being one of the included resources (eg en-us, en-uk)
     -->
-    <NoWarn>$(NoWarn);NETSDK1201;PRI257</NoWarn>
-    <!--#endif-->
-    <!--#if (mauiEmbedding)-->
-
+    <NoWarn>$(NoWarn);NU1507;NETSDK1201;NETSDK1023;PRI257</NoWarn>
+    <!--#else-->
     <!--
       Adding NoWarn to remove build warnings
-      NETSDK1023:	Microsoft.Maui.Graphics reference required to avoid build error causes warning because it's already implicitly referenced by Maui SDK
+      NU1507: Warning when there are multiple package sources when using CPM with no source mapping
+      NETSDK1201: Warning that specifying RID won't create self containing app
+      PRI257: Ignore default language (en) not being one of the included resources (eg en-us, en-uk)
     -->
-    <NoWarn>$(NoWarn);NETSDK1023</NoWarn>
+    <NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
     <!--#endif-->
     <!--#endif-->
     <!--#if (useWinAppSdk) -->

From d45a7e606fa0be48d9d4a25d2b132f5d204a9dbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agn=C3=A8s=20ZITTE?=
 <16295702+agneszitte@users.noreply.github.com>
Date: Wed, 28 Jan 2026 13:51:46 -0500
Subject: [PATCH 2/4] Revert "feat: Add parameters for Uno.SDK version and
 global.json generation"

This reverts commit 6766e4430f91c8f262a283d3d7822659715b9d12.
---
 .../content/unoapp/.template.config/template.json | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json
index 8c95ecf98..db9ea1321 100644
--- a/src/Uno.Templates/content/unoapp/.template.config/template.json
+++ b/src/Uno.Templates/content/unoapp/.template.config/template.json
@@ -806,18 +806,9 @@
     "unoSdkVersion": {
       "type": "parameter",
       "datatype": "text",
-      "displayName": "Uno.SDK Version",
-      "description": "Version of the Uno.SDK to use in global.json. Defaults to the version included with the template.",
       "defaultValue": "DefaultUnoSdkVersion",
       "replaces": "$UnoSdkVersion$"
     },
-    "includeGlobalJson": {
-      "type": "parameter",
-      "datatype": "bool",
-      "displayName": "Include global.json",
-      "description": "If specified, generates a global.json file with the Uno.SDK version. Set to false to manage SDK versions externally.",
-      "defaultValue": "true"
-    },
     "unoWasmBootstrapVersion": {
       "type": "parameter",
       "datatype": "text"
@@ -2764,12 +2755,6 @@
             "Directory.Build.targets",
             "Directory.Packages.props"
           ]
-        },
-        {
-          "condition": "(!includeGlobalJson)",
-          "exclude": [
-            "global.json"
-          ]
         }
       ]
     }

From a50e0f438539d7910dded838e58eae9b054c7b83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agn=C3=A8s=20ZITTE?=
 <16295702+agneszitte@users.noreply.github.com>
Date: Wed, 28 Jan 2026 13:51:46 -0500
Subject: [PATCH 3/4] Revert "fix: Restore ManagePackageVersionsCentrally in
 Directory.Build.props"

This reverts commit 6990db12924c8d488a184d050883395ded8eae33.
---
 src/Uno.Templates/content/unoapp/Directory.Build.props | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Uno.Templates/content/unoapp/Directory.Build.props b/src/Uno.Templates/content/unoapp/Directory.Build.props
index 461072de6..67f940048 100644
--- a/src/Uno.Templates/content/unoapp/Directory.Build.props
+++ b/src/Uno.Templates/content/unoapp/Directory.Build.props
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 
     <!--#if (mauiEmbedding)-->
     <!--

From 1bfd20d877ae8ba14eff1651ac718cdef5e87e33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agn=C3=A8s=20ZITTE?=
 <16295702+agneszitte@users.noreply.github.com>
Date: Wed, 28 Jan 2026 13:51:46 -0500
Subject: [PATCH 4/4] Revert "feat: Make Directory.Build files self-contained
 and conditional"

This reverts commit 56f2c0295bb523873b9f3e474590ab9cc082ca60.
---
 .../unoapp/.template.config/template.json     | 14 -----------
 .../content/unoapp/Directory.Build.props      |  1 +
 .../MyExtensionsApp.1.csproj                  | 24 -------------------
 3 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/src/Uno.Templates/content/unoapp/.template.config/template.json b/src/Uno.Templates/content/unoapp/.template.config/template.json
index db9ea1321..1fe99c3bb 100644
--- a/src/Uno.Templates/content/unoapp/.template.config/template.json
+++ b/src/Uno.Templates/content/unoapp/.template.config/template.json
@@ -1211,11 +1211,6 @@
       "datatype": "bool",
       "value": "(server)"
     },
-    "requiresNugetPackages": {
-      "type": "computed",
-      "datatype": "bool",
-      "value": "(useTestSolutionFolder || useUITests || useAspNetCoreSerilogPackage || useServer || mauiEmbedding || enableDeveloperMode || useWasmPackageVersions)"
-    },
     "useAndroidMaterial": {
       "type": "computed",
       "datatype": "bool",
@@ -2323,7 +2318,6 @@
       "path": "MyExtensionsApp.1.UITests\\MyExtensionsApp.1.UITests.csproj"
     },
     {
-      "condition": "requiresNugetPackages",
       "path": "Directory.Packages.props"
     }
   ],
@@ -2747,14 +2741,6 @@
           "exclude": [
             "MyExtensionsApp.1/Styles/ColorPaletteOverride.json"
           ]
-        },
-        {
-          "condition": "(!requiresNugetPackages)",
-          "exclude": [
-            "Directory.Build.props",
-            "Directory.Build.targets",
-            "Directory.Packages.props"
-          ]
         }
       ]
     }
diff --git a/src/Uno.Templates/content/unoapp/Directory.Build.props b/src/Uno.Templates/content/unoapp/Directory.Build.props
index 67f940048..461072de6 100644
--- a/src/Uno.Templates/content/unoapp/Directory.Build.props
+++ b/src/Uno.Templates/content/unoapp/Directory.Build.props
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 
     <!--#if (mauiEmbedding)-->
     <!--
diff --git a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1/MyExtensionsApp.1.csproj b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1/MyExtensionsApp.1.csproj
index b42167d13..73a1fd03a 100644
--- a/src/Uno.Templates/content/unoapp/MyExtensionsApp.1/MyExtensionsApp.1.csproj
+++ b/src/Uno.Templates/content/unoapp/MyExtensionsApp.1/MyExtensionsApp.1.csproj
@@ -16,30 +16,6 @@
     <ApplicationPublisher>$appPublisher$</ApplicationPublisher>
     <!-- Package Description -->
     <Description>MyExtensionsApp.1 powered by Uno Platform.</Description>
-    <!--#if (!requiresNugetPackages)-->
-
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-
-    <!--#if (mauiEmbedding)-->
-    <!--
-      Adding NoWarn to remove build warnings
-      NU1507: Warning when there are multiple package sources when using CPM with no source mapping
-      NETSDK1201: Warning that specifying RID won't create self containing app
-      NETSDK1023:	Microsoft.Maui.Graphics reference required to avoid build error causes warning because it's already implicitly referenced by Maui SDK
-      PRI257: Ignore default language (en) not being one of the included resources (eg en-us, en-uk)
-    -->
-    <NoWarn>$(NoWarn);NU1507;NETSDK1201;NETSDK1023;PRI257</NoWarn>
-    <!--#else-->
-    <!--
-      Adding NoWarn to remove build warnings
-      NU1507: Warning when there are multiple package sources when using CPM with no source mapping
-      NETSDK1201: Warning that specifying RID won't create self containing app
-      PRI257: Ignore default language (en) not being one of the included resources (eg en-us, en-uk)
-    -->
-    <NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
-    <!--#endif-->
-    <!--#endif-->
     <!--#if (useWinAppSdk) -->
     <!--
       If you encounter this error message: