Skip to content

Revert "feat: Make Directory.Build files conditional on package requirements #1872" #1956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agneszitte merged 4 commits into from
Jan 28, 2026
Merged

Revert "feat: Make Directory.Build files conditional on package requirements #1872" #1956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5d39bb9
Revert "fix: Remove NU1507 when not using CPM and make NETSDK1201/PRI…
agneszitte Jan 28, 2026
d45a7e6
Revert "feat: Add parameters for Uno.SDK version and global.json gene…
agneszitte Jan 28, 2026
a50e0f4
Revert "fix: Restore ManagePackageVersionsCentrally in Directory.Buil…
agneszitte Jan 28, 2026
1bfd20d
Revert "feat: Make Directory.Build files self-contained and conditional"
agneszitte Jan 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions src/Uno.Templates/content/unoapp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -1220,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",
Expand Down Expand Up @@ -2332,7 +2318,6 @@
"path": "MyExtensionsApp.1.UITests\\MyExtensionsApp.1.UITests.csproj"
},
{
"condition": "requiresNugetPackages",
"path": "Directory.Packages.props"
}
],
Expand Down Expand Up @@ -2756,20 +2741,6 @@
"exclude": [
"MyExtensionsApp.1/Styles/ColorPaletteOverride.json"
]
},
{
"condition": "(!requiresNugetPackages)",
"exclude": [
"Directory.Build.props",
"Directory.Build.targets",
"Directory.Packages.props"
]
},
{
"condition": "(!includeGlobalJson)",
"exclude": [
"global.json"
]
}
]
}
Expand Down
18 changes: 9 additions & 9 deletions src/Uno.Templates/content/unoapp/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
22 changes: 0 additions & 22 deletions src/Uno.Templates/content/unoapp/MyExtensionsApp.1/MyExtensionsApp.1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,6 @@
<ApplicationPublisher>$appPublisher$</ApplicationPublisher>
<!-- Package Description -->
<Description>MyExtensionsApp.1 powered by Uno Platform.</Description>
<!--#if (!requiresNugetPackages)-->

<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<!--#if (useWinAppSdk)-->

<!--
Adding NoWarn to remove build warnings
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);NETSDK1201;PRI257</NoWarn>
<!--#endif-->
<!--#if (mauiEmbedding)-->

<!--
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
-->
<NoWarn>$(NoWarn);NETSDK1023</NoWarn>
<!--#endif-->
<!--#endif-->
<!--#if (useWinAppSdk) -->
<!--
If you encounter this error message:
Expand Down
Loading