Skip to content

[net10.0] Clean up template options for the CLI #31849

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
rmarinho merged 2 commits into from
Oct 10, 2025
Merged

[net10.0] Clean up template options for the CLI #31849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4b3c86
[net10.0] Clean up template options for the CLI
mattleibow Oct 2, 2025
ea4bae3
Fix the tests
mattleibow Oct 7, 2025
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
22 changes: 13 additions & 9 deletions src/Templates/src/templates/maui-aspire-servicedefaults/.template.config/dotnetcli.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
{
"$schema": "http://json.schemastore.org/dotnetcli.host",
"symbolInfo": {
"Framework": {
"longName": "framework"
}
"$schema": "https://json.schemastore.org/dotnetcli.host",
"symbolInfo": {
"Framework": {
"longName": "framework"
},
"usageExamples": [
"--framework DOTNET_TFM_VALUE"
]
}
"skipRestore": {
"longName": "no-restore",
"shortName": ""
}
},
"usageExamples": [
"--framework DOTNET_TFM_VALUE"
]
}
66 changes: 66 additions & 0 deletions src/Templates/src/templates/maui-blazor-solution/.template.config/dotnetcli.host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,74 @@
{
"$schema": "https://json.schemastore.org/dotnetcli.host",
"symbolInfo": {
"msExtensionsLoggingDebugVersion": {
"isHidden": true
},
"componentsWebVersion": {
"isHidden": true
},
"componentsWebAssemblyVersion": {
"isHidden": true
},
"componentsWebAssemblyServerVersion": {
"isHidden": true
},
"FrameworkAspNet": {
"isHidden": true
},
"InteractivityPlatform": {
"longName": "interactivity",
"shortName": "int"
},
"AllInteractive": {
"longName": "all-interactive"
},
"InteractivityLocation": {
"isHidden": true
},
"Empty": {
"longName": "empty"
},
"IncludeSampleContent": {
"isHidden": true
},
"UseLocalDB": {
"longName": "use-local-db",
"isHidden": true
},
"Framework": {
"longName": "framework"
},
"kestrelHttpPort": {
"isHidden": true
},
"kestrelHttpsPort": {
"isHidden": true
},
"iisHttpPort": {
"isHidden": true
},
"iisHttpsPort": {
"isHidden": true
},
"ExcludeLaunchSettings": {
"longName": "exclude-launch-settings",
"shortName": ""
},
"UserSecretsId": {
"isHidden": true
},
"NoHttps": {
"longName": "no-https",
"shortName": ""
},
"UseProgramMain": {
"longName": "use-program-main",
"shortName": ""
},
"LocalhostTld": {
"longName": "localhost-tld",
"shortName": ""
}
},
"usageExamples": [
Expand Down
11 changes: 10 additions & 1 deletion src/Templates/src/templates/maui-blazor/.template.config/dotnetcli.host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
{
"$schema": "http://json.schemastore.org/dotnetcli.host",
"$schema": "https://json.schemastore.org/dotnetcli.host",
"symbolInfo": {
"msExtensionsLoggingDebugVersion": {
"isHidden": true
},
"Framework": {
"longName": "framework"
},
"IncludeSampleContent": {
"isHidden": true
},
"Empty": {
"longName": "empty"
}
},
"usageExamples": [
Expand Down
38 changes: 20 additions & 18 deletions src/Templates/src/templates/maui-mobile/.template.config/dotnetcli.host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
{
"$schema": "http://json.schemastore.org/dotnetcli.host",
"symbolInfo": {
"Framework": {
"longName": "framework"
},
"IncludeSampleContent": {

"longName": "sample-content",
"shortName": "sc"
},
"skipRestore": {
"longName": "no-restore",
"shortName": ""
}
"$schema": "https://json.schemastore.org/dotnetcli.host",
"symbolInfo": {
"msExtensionsLoggingDebugVersion": {
"isHidden": true
},
"usageExamples": [
"--framework DOTNET_TFM_VALUE"
]
}
"Framework": {
"longName": "framework"
},
"IncludeSampleContent": {
"longName": "sample-content",
"shortName": "sc"
},
"skipRestore": {
"longName": "no-restore",
"shortName": ""
}
},
"usageExamples": [
"--framework DOTNET_TFM_VALUE"
]
}
5 changes: 4 additions & 1 deletion src/Templates/src/templates/maui-multiproject/.template.config/dotnetcli.host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"$schema": "http://json.schemastore.org/dotnetcli.host",
"$schema": "https://json.schemastore.org/dotnetcli.host",
"symbolInfo": {
"msExtensionsLoggingDebugVersion": {
"isHidden": true
},
"Framework": {
"longName": "framework"
},
Expand Down
34 changes: 17 additions & 17 deletions src/TestUtils/src/Microsoft.Maui.IntegrationTests/BlazorTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,28 @@ public class BlazorTemplateTest : BaseTemplateTests
// And alternately testing other options for a healthy mix.
// additionalDotNetBuildParams is a space-separated list of additional properties to pass to .NET MAUI build
// Like "TrimMode=partial" for faster builds with AOT
[TestCase(DotNetCurrent, "Debug", "-I None --Empty", false, "")]
[TestCase(DotNetCurrent, "Release", "-I WebAssembly --Empty", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "-I Server --Empty", false, "")]
[TestCase(DotNetCurrent, "Release", "-I Auto --Empty", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "-I None", false, "")]
[TestCase(DotNetCurrent, "Release", "-I WebAssembly", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "-I Server", false, "")]
[TestCase(DotNetCurrent, "Release", "-I Auto", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "-I None --Empty --UseProgramMain", false, "")]
[TestCase(DotNetCurrent, "Release", "-I WebAssembly --Empty --UseProgramMain", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "-I Server --Empty --UseProgramMain", false, "")]
[TestCase(DotNetCurrent, "Release", "-I Auto --Empty --UseProgramMain", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "-I None --UseProgramMain", false, "")]
[TestCase(DotNetCurrent, "Release", "-I WebAssembly --UseProgramMain", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "-I Server --UseProgramMain", false, "")]
[TestCase(DotNetCurrent, "Release", "-I Auto --UseProgramMain", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "--interactivity None --empty", false, "")]
[TestCase(DotNetCurrent, "Release", "--interactivity WebAssembly --empty", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "--interactivity Server --empty", false, "")]
[TestCase(DotNetCurrent, "Release", "--interactivity Auto --empty", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "--interactivity None", false, "")]
[TestCase(DotNetCurrent, "Release", "--interactivity WebAssembly", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "--interactivity Server", false, "")]
[TestCase(DotNetCurrent, "Release", "--interactivity Auto", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "--interactivity None --empty --use-program-main", false, "")]
[TestCase(DotNetCurrent, "Release", "--interactivity WebAssembly --empty --use-program-main", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "--interactivity Server --empty --use-program-main", false, "")]
[TestCase(DotNetCurrent, "Release", "--interactivity Auto --empty --use-program-main", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "--interactivity None --use-program-main", false, "")]
[TestCase(DotNetCurrent, "Release", "--interactivity WebAssembly --use-program-main", false, "TrimMode=partial")]
[TestCase(DotNetCurrent, "Debug", "--interactivity Server --use-program-main", false, "")]
[TestCase(DotNetCurrent, "Release", "--interactivity Auto --use-program-main", false, "TrimMode=partial")]

// Then, some scenarios with tricky names in Debug builds only
// This doesn't work on Android in Release, so we skip that for now
// See https://github.com/dotnet/android/issues/9107
// [TestCase(DotNetCurrent, "Debug", "", true)]
// [TestCase(DotNetCurrent, "Debug", "-I Server --UseProgramMain", true)]
// [TestCase(DotNetCurrent, "Debug", "--interactivity Server --use-program-main", true)]
public void BuildMauiBlazorWebSolution(string framework, string config, string additionalDotNetNewParams, bool useTrickyProjectName, string additionalDotNetBuildParams)
{
const string templateShortName = "maui-blazor-web";
Expand Down
4 changes: 2 additions & 2 deletions src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ public class SimpleTemplateTest : BaseTemplateTests
[TestCase("maui-blazor", DotNetPrevious, "Release", false, "", "")]
[TestCase("maui-blazor", DotNetCurrent, "Debug", false, "", "")]
[TestCase("maui-blazor", DotNetCurrent, "Release", false, "", "TrimMode=partial")]
[TestCase("maui-blazor", DotNetCurrent, "Debug", false, "--Empty", "")]
[TestCase("maui-blazor", DotNetCurrent, "Release", false, "--Empty", "TrimMode=partial")]
[TestCase("maui-blazor", DotNetCurrent, "Debug", false, "--empty", "")]
[TestCase("maui-blazor", DotNetCurrent, "Release", false, "--empty", "TrimMode=partial")]
[TestCase("mauilib", DotNetPrevious, "Debug", true, "", "")]
[TestCase("mauilib", DotNetPrevious, "Release", true, "", "")]
[TestCase("mauilib", DotNetCurrent, "Debug", true, "", "")]
Expand Down
Loading