diff --git a/src/Templates/src/templates/maui-aspire-servicedefaults/.template.config/dotnetcli.json b/src/Templates/src/templates/maui-aspire-servicedefaults/.template.config/dotnetcli.json index 4430950393c9..545e9c985058 100644 --- a/src/Templates/src/templates/maui-aspire-servicedefaults/.template.config/dotnetcli.json +++ b/src/Templates/src/templates/maui-aspire-servicedefaults/.template.config/dotnetcli.json @@ -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" - ] - } \ No newline at end of file + "skipRestore": { + "longName": "no-restore", + "shortName": "" + } + }, + "usageExamples": [ + "--framework DOTNET_TFM_VALUE" + ] +} \ No newline at end of file diff --git a/src/Templates/src/templates/maui-blazor-solution/.template.config/dotnetcli.host.json b/src/Templates/src/templates/maui-blazor-solution/.template.config/dotnetcli.host.json index afc0706de6a9..03aa5c11c516 100644 --- a/src/Templates/src/templates/maui-blazor-solution/.template.config/dotnetcli.host.json +++ b/src/Templates/src/templates/maui-blazor-solution/.template.config/dotnetcli.host.json @@ -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": [ diff --git a/src/Templates/src/templates/maui-blazor/.template.config/dotnetcli.host.json b/src/Templates/src/templates/maui-blazor/.template.config/dotnetcli.host.json index 97a8ef71383e..d0437a6f343d 100644 --- a/src/Templates/src/templates/maui-blazor/.template.config/dotnetcli.host.json +++ b/src/Templates/src/templates/maui-blazor/.template.config/dotnetcli.host.json @@ -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": [ diff --git a/src/Templates/src/templates/maui-mobile/.template.config/dotnetcli.host.json b/src/Templates/src/templates/maui-mobile/.template.config/dotnetcli.host.json index b21577aff2ad..fe8a737815c1 100644 --- a/src/Templates/src/templates/maui-mobile/.template.config/dotnetcli.host.json +++ b/src/Templates/src/templates/maui-mobile/.template.config/dotnetcli.host.json @@ -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" - ] - } \ No newline at end of file + "Framework": { + "longName": "framework" + }, + "IncludeSampleContent": { + "longName": "sample-content", + "shortName": "sc" + }, + "skipRestore": { + "longName": "no-restore", + "shortName": "" + } + }, + "usageExamples": [ + "--framework DOTNET_TFM_VALUE" + ] +} \ No newline at end of file diff --git a/src/Templates/src/templates/maui-multiproject/.template.config/dotnetcli.host.json b/src/Templates/src/templates/maui-multiproject/.template.config/dotnetcli.host.json index 8d12aaf0fc7a..170e3e0dca72 100644 --- a/src/Templates/src/templates/maui-multiproject/.template.config/dotnetcli.host.json +++ b/src/Templates/src/templates/maui-multiproject/.template.config/dotnetcli.host.json @@ -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" }, diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BlazorTemplateTest.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BlazorTemplateTest.cs index 9642c76fd0ca..b126e8615e9d 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BlazorTemplateTest.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/BlazorTemplateTest.cs @@ -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"; diff --git a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs index cc49cf51af1f..af27a4721ab6 100644 --- a/src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs +++ b/src/TestUtils/src/Microsoft.Maui.IntegrationTests/SimpleTemplateTest.cs @@ -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, "", "")]