diff --git a/.editorconfig b/.editorconfig
index bc17bbe69267..e35b5cd19b0f 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -511,11 +511,11 @@ dotnet_diagnostic.IDE0040.severity = warning
 insert_final_newline = false
 
 # Verify settings
-[*.{received,verified}.{txt,xml,json}]
+[*.{received,verified}.{txt,xml,json,sh,zsh,nu,fish,ps1}]
 charset = "utf-8-bom"
 end_of_line = lf
 indent_size = unset
 indent_style = unset
 insert_final_newline = false
 tab_width = unset
-trim_trailing_whitespace = false
\ No newline at end of file
+trim_trailing_whitespace = false
diff --git a/.gitattributes b/.gitattributes
index 2f46e347155a..a7c35ea1b75a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -67,3 +67,7 @@
 *.verified.txt text eol=lf working-tree-encoding=UTF-8
 *.verified.xml text eol=lf working-tree-encoding=UTF-8
 *.verified.json text eol=lf working-tree-encoding=UTF-8
+*.verified.sh text eol=lf working-tree-encoding=UTF-8
+*.verified.zsh text eol=lf working-tree-encoding=UTF-8
+*.verified.nu text eol=lf working-tree-encoding=UTF-8
+*.verified.fish text eol=lf working-tree-encoding=UTF-8
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1cdcc7c1869e..212ebd955c26 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,11 @@
 {
     "dotnet.testWindow.disableAutoDiscovery": true,
-    "dotnet.defaultSolution": "sdk.slnx"
+    "dotnet.testWindow.disableBuildOnRun": true,
+    "dotnet.defaultSolution": "cli.slnf",
+    "files.associations": {
+      "*.slnf": "json",
+      "*.props": "xml",
+      "*.targets": "xml",
+      "*.*proj": "xml"
+    }
 }
diff --git a/cli.slnf b/cli.slnf
new file mode 100644
index 000000000000..a300800156bf
--- /dev/null
+++ b/cli.slnf
@@ -0,0 +1,15 @@
+{
+  "solution": {
+    "path": "sdk.slnx",
+    "projects": [
+      "src\\BuiltInTools\\dotnet-watch\\dotnet-watch.csproj",
+      "src\\Cli\\dotnet\\dotnet.csproj",
+      "src\\Cli\\Microsoft.DotNet.Cli.Utils\\Microsoft.DotNet.Cli.Utils.csproj",
+      "test\\dotnet-new.IntegrationTests\\dotnet-new.IntegrationTests.csproj",
+      "test\\dotnet-watch.Tests\\dotnet-watch.Tests.csproj",
+      "test\\dotnet.Tests\\dotnet.Tests.csproj",
+      "test\\Microsoft.DotNet.Cli.Utils.Tests\\Microsoft.DotNet.Cli.Utils.Tests.csproj",
+      "test\\Microsoft.NET.TestFramework\\Microsoft.NET.TestFramework.csproj"
+    ]
+  }
+}
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Env.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/Env.cs
index dbedb133bfc0..c85eaa1d0bf7 100644
--- a/src/Cli/Microsoft.DotNet.Cli.Utils/Env.cs
+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Env.cs
@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
+
 namespace Microsoft.DotNet.Cli.Utils;
 
 public static class Env
@@ -21,6 +23,9 @@ public static class Env
     public static bool GetEnvironmentVariableAsBool(string name, bool defaultValue = false) =>
         s_environment.GetEnvironmentVariableAsBool(name, defaultValue);
 
+    public static bool TryGetEnvironmentVariableAsBool(string name, [NotNullWhen(true)] out bool value) =>
+        s_environment.TryGetEnvironmentVariableAsBool(name, out value);
+
     public static int? GetEnvironmentVariableAsNullableInt(string name) =>
         s_environment.GetEnvironmentVariableAsNullableInt(name);
 
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/EnvironmentProvider.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/EnvironmentProvider.cs
index 50984a692d1c..06c64b67110a 100644
--- a/src/Cli/Microsoft.DotNet.Cli.Utils/EnvironmentProvider.cs
+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/EnvironmentProvider.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.DotNet.Cli.Utils.Extensions;
 
 namespace Microsoft.DotNet.Cli.Utils;
@@ -136,6 +137,12 @@ public bool GetEnvironmentVariableAsBool(string name, bool defaultValue)
         return Environment.GetEnvironmentVariable(variable, target);
     }
 
+    public bool TryGetEnvironmentVariable(string name, [NotNullWhen(true)] out string? value)
+    {
+        value = Environment.GetEnvironmentVariable(name);
+        return value != null;
+    }
+
     public void SetEnvironmentVariable(string variable, string value, EnvironmentVariableTarget target)
     {
         Environment.SetEnvironmentVariable(variable, value, target);
@@ -150,4 +157,57 @@ public void SetEnvironmentVariable(string variable, string value, EnvironmentVar
 
         return null;
     }
+
+    public bool TryGetEnvironmentVariableAsBool(string name, [NotNullWhen(true)] out bool value)
+    {
+        if (TryGetEnvironmentVariable(name, out string? strValue) &&
+            (bool.TryParse(strValue, out bool boolValue)
+             || TryParseNonBoolConstantStringAsBool(strValue, out boolValue)))
+        {
+            value = boolValue;
+            return true;
+        }
+        else
+        {
+            value = false;
+            return false;
+        }
+    }
+
+    /// <summary>
+    /// Parses non-boolean constant strings like "1", "0", "yes", "no", "on", "off" as boolean values.
+    /// </summary>
+    private static bool TryParseNonBoolConstantStringAsBool(string? strValue, out bool value)
+    {
+        switch (strValue?.ToLowerInvariant())
+        {
+            case "1":
+            case "yes":
+            case "on":
+                value = true;
+                return true;
+            case "0":
+            case "no":
+            case "off":
+                value = false;
+                return true;
+            default:
+                value = false;
+                return false;
+        }
+    }
+
+    public bool TryGetEnvironmentVariableAsInt(string name, [NotNullWhen(true)] out int value)
+    {
+        if (TryGetEnvironmentVariable(name, out string? strValue) && int.TryParse(strValue, out int intValue))
+        {
+            value = intValue;
+            return true;
+        }
+        else
+        {
+            value = -1;
+            return false;
+        }
+    }
 }
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/IEnvironmentProvider.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/IEnvironmentProvider.cs
index 385f989d4990..8aaacf30fbad 100644
--- a/src/Cli/Microsoft.DotNet.Cli.Utils/IEnvironmentProvider.cs
+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/IEnvironmentProvider.cs
@@ -3,6 +3,9 @@
 
 namespace Microsoft.DotNet.Cli.Utils;
 
+using System.Diagnostics.CodeAnalysis;
+
+
 public interface IEnvironmentProvider
 {
     IEnumerable<string> ExecutableExtensions { get; }
@@ -19,6 +22,10 @@ public interface IEnvironmentProvider
 
     string? GetEnvironmentVariable(string name);
 
+    bool TryGetEnvironmentVariable(string name, [NotNullWhen(true)] out string? value);
+    bool TryGetEnvironmentVariableAsBool(string name, [NotNullWhen(true)] out bool value);
+    bool TryGetEnvironmentVariableAsInt(string name, [NotNullWhen(true)] out int value);
+
     string? GetEnvironmentVariable(string variable, EnvironmentVariableTarget target);
 
     void SetEnvironmentVariable(string variable, string value, EnvironmentVariableTarget target);
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildArgs.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildArgs.cs
index 12226f42f0d6..7fedc17f3878 100644
--- a/src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildArgs.cs
+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildArgs.cs
@@ -21,7 +21,9 @@ private MSBuildArgs(
         string[]? getTargetResult,
         string[]? getResultOutputFile,
         VerbosityOptions? verbosity,
-        string[]? otherMSBuildArgs)
+        bool noLogo,
+        string[]? otherMSBuildArgs
+        )
     {
         GlobalProperties = properties;
         RestoreGlobalProperties = restoreProperties;
@@ -31,6 +33,7 @@ private MSBuildArgs(
         GetTargetResult = getTargetResult;
         GetResultOutputFile = getResultOutputFile;
         Verbosity = verbosity;
+        NoLogo = noLogo;
         OtherMSBuildArgs = otherMSBuildArgs is not null
             ? [.. otherMSBuildArgs]
             : new List<string>();
@@ -51,16 +54,33 @@ private MSBuildArgs(
     /// </summary>
     public string[]? RequestedTargets { get; }
 
+    /// <summary>
+    /// If specified, the list of MSBuild Property names to retrieve and report directly for this build of a single project.
+    /// </summary>
     public string[]? GetProperty { get; }
 
+    /// <summary>
+    /// If specified, the list of MSBuild Item names to retrieve and report directly for this build of a single project.
+    /// </summary>
     public string[]? GetItem { get; }
 
+    /// <summary>
+    /// If specified, the list of MSBuild Target Output/Return Items to retrieve and report directly for this build of a single project.
+    /// </summary>
     public string[]? GetTargetResult { get; }
 
+    /// <summary>
+    /// If specified, the list of output files to which to write --getProperty, --getItem, and --getTargetResult outputs.
+    /// </summary>
     public string[]? GetResultOutputFile { get; }
 
     public VerbosityOptions? Verbosity { get; }
 
+    /// <summary>
+    /// Whether or not the MSBuild product header text should be emitted at the start of this build
+    /// </summary>
+    public bool NoLogo { get; }
+
     /// <summary>
     /// All other arguments that aren't already explicitly modeled by this structure.
     /// The main categories of these today are logger configurations
@@ -89,16 +109,15 @@ public static MSBuildArgs AnalyzeMSBuildArguments(IEnumerable<string> forwardedA
         }
 
         var parseResult = fakeCommand.Parse([.. forwardedAndUserFacingArgs], _analysisParsingConfiguration);
-        var globalProperties = parseResult.GetResult("--property") is OptionResult propResult ? propResult.GetValueOrDefault<ReadOnlyDictionary<string, string>?>() : null;
-        var restoreProperties = parseResult.GetResult("--restoreProperty") is OptionResult restoreResult ? restoreResult.GetValueOrDefault<ReadOnlyDictionary<string, string>?>() : null;
-        var requestedTargets = parseResult.GetResult("--target") is OptionResult targetResult ? targetResult.GetValueOrDefault<string[]?>() : null;
+        var globalProperties = TryGetValue<ReadOnlyDictionary<string, string>?>("--property");
+        var restoreProperties = TryGetValue<ReadOnlyDictionary<string, string>?>("--restoreProperty");
+        var requestedTargets = TryGetValue<string[]?>("--target");
         var getProperty = TryGetValue<string[]>("--getProperty");
         var getItem = TryGetValue<string[]?>("--getItem");
         var getTargetResult = TryGetValue<string[]?>("--getTargetResult");
         var getResultOutputFile = TryGetValue<string[]?>("--getResultOutputFile");
-        var verbosity = parseResult.GetResult("--verbosity") is OptionResult verbosityResult
-            ? verbosityResult.GetValueOrDefault<VerbosityOptions?>()
-            : null;
+        var verbosity = TryGetValue<VerbosityOptions?>("--verbosity");
+        var nologo = TryGetValue<bool?>("--no-logo") ?? true; // Default to nologo if not specified
         var otherMSBuildArgs = parseResult.UnmatchedTokens.ToArray();
         return new MSBuildArgs(
             properties: globalProperties,
@@ -109,8 +128,12 @@ public static MSBuildArgs AnalyzeMSBuildArguments(IEnumerable<string> forwardedA
             getTargetResult: getTargetResult,
             getResultOutputFile: getResultOutputFile,
             otherMSBuildArgs: otherMSBuildArgs,
-            verbosity: verbosity);
+            verbosity: verbosity,
+            noLogo: nologo);
 
+        /// We can't use <see cref="ParseResult.GetResult(string)"/> to check if the names of the options we care
+        /// about were specified, because if they weren't specified it throws.
+        /// So we first check if the option was specified, and only then get its value.
         T? TryGetValue<T>(string name)
         {
             return options.Any(o => o.Name == name) ? parseResult.GetValue<T>(name) : default;
@@ -120,19 +143,19 @@ public static MSBuildArgs AnalyzeMSBuildArguments(IEnumerable<string> forwardedA
 
     public static MSBuildArgs FromProperties(ReadOnlyDictionary<string, string>? properties)
     {
-        return new MSBuildArgs(properties, null, null, null, null, null, null, null, null);
+        return new MSBuildArgs(properties, null, null, null, null, null, null, null, noLogo: false, null);
     }
 
     public static MSBuildArgs FromOtherArgs(params ReadOnlySpan<string> args)
     {
-        return new MSBuildArgs(null, null, null, null, null, null, null, null, args.ToArray());
+        return new MSBuildArgs(null, null, null, null, null, null, null, null, noLogo: false, args.ToArray());
     }
     public static MSBuildArgs FromVerbosity(VerbosityOptions verbosity)
     {
-        return new MSBuildArgs(null, null, null, null, null, null, null, verbosity, null);
+        return new MSBuildArgs(null, null, null, null, null, null, null, verbosity, noLogo: false, null);
     }
 
-    public static readonly MSBuildArgs ForHelp = new(null, null, null, null, null, null, null, null, ["--help"]);
+    public static readonly MSBuildArgs ForHelp = new(null, null, null, null, null, null, null, null, noLogo: true, ["--help"]);
 
     /// <summary>
     /// Completely replaces the MSBuild arguments with the provided <paramref name="newArgs"/>.
@@ -148,6 +171,7 @@ public MSBuildArgs CloneWithExplicitArgs(string[] newArgs)
             getTargetResult: GetTargetResult,
             getResultOutputFile: GetResultOutputFile,
             otherMSBuildArgs: newArgs,
+            noLogo: NoLogo,
             verbosity: Verbosity);
     }
 
@@ -168,6 +192,7 @@ public MSBuildArgs CloneWithAdditionalArgs(params string[] additionalArgs)
                 GetTargetResult,
                 GetResultOutputFile,
                 Verbosity,
+                NoLogo,
                 OtherMSBuildArgs.ToArray());
         }
 
@@ -180,6 +205,7 @@ public MSBuildArgs CloneWithAdditionalArgs(params string[] additionalArgs)
             GetTargetResult,
             GetResultOutputFile,
             Verbosity,
+            NoLogo,
             [.. OtherMSBuildArgs, .. additionalArgs]);
     }
 
@@ -197,6 +223,7 @@ public MSBuildArgs CloneWithAdditionalRestoreProperties(ReadOnlyDictionary<strin
                 GetTargetResult,
                 GetResultOutputFile,
                 Verbosity,
+                NoLogo,
                 OtherMSBuildArgs.ToArray());
         }
         if (RestoreGlobalProperties is null)
@@ -210,6 +237,7 @@ public MSBuildArgs CloneWithAdditionalRestoreProperties(ReadOnlyDictionary<strin
                 GetTargetResult,
                 GetResultOutputFile,
                 Verbosity,
+                NoLogo,
                 OtherMSBuildArgs.ToArray());
         }
 
@@ -227,6 +255,7 @@ public MSBuildArgs CloneWithAdditionalRestoreProperties(ReadOnlyDictionary<strin
             GetTargetResult,
             GetResultOutputFile,
             Verbosity,
+            NoLogo,
             OtherMSBuildArgs.ToArray());
     }
 
@@ -244,6 +273,7 @@ public MSBuildArgs CloneWithAdditionalProperties(ReadOnlyDictionary<string, stri
                 GetTargetResult,
                 GetResultOutputFile,
                 Verbosity,
+                NoLogo,
                 OtherMSBuildArgs.ToArray());
         }
         if (GlobalProperties is null)
@@ -257,6 +287,7 @@ public MSBuildArgs CloneWithAdditionalProperties(ReadOnlyDictionary<string, stri
                 GetTargetResult,
                 GetResultOutputFile,
                 Verbosity,
+                NoLogo,
                 OtherMSBuildArgs.ToArray());
         }
 
@@ -274,6 +305,7 @@ public MSBuildArgs CloneWithAdditionalProperties(ReadOnlyDictionary<string, stri
             GetTargetResult,
             GetResultOutputFile,
             Verbosity,
+            NoLogo,
             OtherMSBuildArgs.ToArray());
     }
 
@@ -291,6 +323,7 @@ public MSBuildArgs CloneWithAdditionalTargets(params ReadOnlySpan<string> additi
             GetTargetResult,
             GetResultOutputFile,
             Verbosity,
+            NoLogo,
             OtherMSBuildArgs.ToArray());
     }
 
@@ -305,6 +338,22 @@ public MSBuildArgs CloneWithVerbosity(VerbosityOptions newVerbosity)
             GetTargetResult,
             GetResultOutputFile,
             newVerbosity,
+            NoLogo,
+            OtherMSBuildArgs.ToArray());
+    }
+
+    public MSBuildArgs CloneWithNoLogo(bool noLogo)
+    {
+        return new MSBuildArgs(
+            GlobalProperties,
+            RestoreGlobalProperties,
+            RequestedTargets,
+            GetProperty,
+            GetItem,
+            GetTargetResult,
+            GetResultOutputFile,
+            Verbosity,
+            noLogo,
             OtherMSBuildArgs.ToArray());
     }
 
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
index e0dca709ac3c..87d021eda157 100644
--- a/src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/MSBuildForwardingAppWithoutLogging.cs
@@ -44,17 +44,11 @@ public static string MSBuildVersion
 
     private readonly List<string> _msbuildRequiredParameters = ["-maxcpucount", $"--verbosity:{DefaultVerbosity}"];
 
-    public MSBuildForwardingAppWithoutLogging(MSBuildArgs msbuildArgs, string? msbuildPath = null, bool includeLogo = false, bool isRestoring = true)
+    public MSBuildForwardingAppWithoutLogging(MSBuildArgs msbuildArgs, string? msbuildPath = null)
     {
         string defaultMSBuildPath = GetMSBuildExePath();
         _msbuildArgs = msbuildArgs;
-        if (!includeLogo && !msbuildArgs.OtherMSBuildArgs.Contains("-nologo", StringComparer.OrdinalIgnoreCase))
-        {
-            // If the user didn't explicitly ask for -nologo, we add it to avoid the MSBuild logo.
-            // This is useful for scenarios like restore where we don't want to print the logo.
-            // Note that this is different from the default behavior of MSBuild, which prints the logo.
-            msbuildArgs.OtherMSBuildArgs.Add("-nologo");
-        }
+
         string? tlpDefault = TerminalLoggerDefault;
         if (string.IsNullOrWhiteSpace(tlpDefault))
         {
@@ -101,6 +95,7 @@ private string[] EmitMSBuildArgs(MSBuildArgs msbuildArgs) => [
         .. msbuildArgs.RestoreGlobalProperties?.Select(kvp => EmitProperty(kvp, "restoreProperty")) ?? [],
         .. msbuildArgs.RequestedTargets?.Select(target => $"--target:{target}") ?? [],
         .. msbuildArgs.Verbosity is not null ? new string[1] { $"--verbosity:{msbuildArgs.Verbosity}" } : [],
+        .. msbuildArgs.NoLogo is true ? new string[1] { "--nologo" } : [],
         .. msbuildArgs.OtherMSBuildArgs
     ];
 
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Polyfills.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/Polyfills.cs
index ab674a2906ee..59668dbae394 100644
--- a/src/Cli/Microsoft.DotNet.Cli.Utils/Polyfills.cs
+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Polyfills.cs
@@ -4,11 +4,24 @@
 #if NET472
 
 #pragma warning disable IDE0130 // Namespace does not match folder structure
-namespace System.Runtime.CompilerServices;
-#pragma warning restore IDE0130 // Namespace does not match folder structure
+namespace System.Runtime.CompilerServices {
+
+    internal static class IsExternalInit
+    {
+    }
+
+}
 
-internal static class IsExternalInit
+namespace System.Diagnostics.CodeAnalysis
 {
+    [AttributeUsage(AttributeTargets.Parameter, Inherited = false)]
+    internal sealed class NotNullWhenAttribute : Attribute
+    {
+        public NotNullWhenAttribute(bool returnValue) => ReturnValue = returnValue;
+
+        public bool ReturnValue { get; }
+    }
 }
+#pragma warning restore IDE0130 // Namespace does not match folder structure
 
 #endif
diff --git a/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs b/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs
index 2f8bb7badd98..aa844850e316 100644
--- a/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs
+++ b/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs
@@ -385,7 +385,7 @@ internal void GenerateDepsJsonFile(
         string? stdOut;
         string? stdErr;
 
-        var msbuildArgs = MSBuildArgs.AnalyzeMSBuildArguments([..args], CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, BuildCommandParser.TargetOption, BuildCommandParser.VerbosityOption);
+        var msbuildArgs = MSBuildArgs.AnalyzeMSBuildArguments([..args], CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, BuildCommandParser.TargetOption, BuildCommandParser.VerbosityOption, BuildCommandParser.NoLogoOption);
         var forwardingAppWithoutLogging = new MSBuildForwardingAppWithoutLogging(msbuildArgs, msBuildExePath);
         if (forwardingAppWithoutLogging.ExecuteMSBuildOutOfProc)
         {
diff --git a/src/Cli/dotnet/Commands/Build/BuildCommand.cs b/src/Cli/dotnet/Commands/Build/BuildCommand.cs
index 3d8943315a94..264abdad7d80 100644
--- a/src/Cli/dotnet/Commands/Build/BuildCommand.cs
+++ b/src/Cli/dotnet/Commands/Build/BuildCommand.cs
@@ -43,7 +43,7 @@ public static CommandBase FromParseResult(ParseResult parseResult, string? msbui
                 noRestore: noRestore,
                 msbuildPath: msbuildPath
             ),
-            [CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, BuildCommandParser.TargetOption, BuildCommandParser.VerbosityOption],
+            [CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, BuildCommandParser.TargetOption, BuildCommandParser.VerbosityOption, BuildCommandParser.NoLogoOption],
             parseResult,
             msbuildPath
         );
diff --git a/src/Cli/dotnet/Commands/Build/BuildCommandParser.cs b/src/Cli/dotnet/Commands/Build/BuildCommandParser.cs
index 74b4efa2a712..be2e52c45263 100644
--- a/src/Cli/dotnet/Commands/Build/BuildCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Build/BuildCommandParser.cs
@@ -36,11 +36,7 @@ internal static class BuildCommandParser
         Arity = ArgumentArity.Zero
     }.ForwardAs("--property:BuildProjectReferences=false");
 
-    public static readonly Option<bool> NoLogoOption = new Option<bool>("--nologo")
-    {
-        Description = CliCommandStrings.BuildCmdNoLogo,
-        Arity = ArgumentArity.Zero
-    }.ForwardAs("-nologo");
+    public static readonly Option<bool> NoLogoOption = CommonOptions.NoLogoOption();
 
     public static readonly Option<bool> NoRestoreOption = CommonOptions.NoRestoreOption;
 
diff --git a/src/Cli/dotnet/Commands/Clean/CleanCommand.cs b/src/Cli/dotnet/Commands/Clean/CleanCommand.cs
index 1290b8b68cfd..c7e48c376ee9 100644
--- a/src/Cli/dotnet/Commands/Clean/CleanCommand.cs
+++ b/src/Cli/dotnet/Commands/Clean/CleanCommand.cs
@@ -33,7 +33,7 @@ public static CommandBase FromParseResult(ParseResult result, string? msbuildPat
                 NoWriteBuildMarkers = true,
             },
             static (msbuildArgs, msbuildPath) => new CleanCommand(msbuildArgs, msbuildPath),
-            [ CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CleanCommandParser.TargetOption, CleanCommandParser.VerbosityOption ],
+            [ CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CleanCommandParser.TargetOption, CleanCommandParser.VerbosityOption, CleanCommandParser.NoLogoOption],
             result,
             msbuildPath
         );
diff --git a/src/Cli/dotnet/Commands/Clean/CleanCommandParser.cs b/src/Cli/dotnet/Commands/Clean/CleanCommandParser.cs
index 24e83acc8b64..117537d7fd1f 100644
--- a/src/Cli/dotnet/Commands/Clean/CleanCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Clean/CleanCommandParser.cs
@@ -24,15 +24,11 @@ internal static class CleanCommandParser
         HelpName = CliCommandStrings.CleanCmdOutputDir
     }.ForwardAsOutputPath("OutputPath");
 
-    public static readonly Option<bool> NoLogoOption = new Option<bool>("--nologo")
-    {
-        Description = CliCommandStrings.CleanCmdNoLogo,
-        Arity = ArgumentArity.Zero
-    }.ForwardAs("-nologo");
+    public static readonly Option<bool> NoLogoOption = CommonOptions.NoLogoOption();
 
-    public static readonly Option FrameworkOption = CommonOptions.FrameworkOption(CliCommandStrings.CleanFrameworkOptionDescription);
+    public static readonly Option<string> FrameworkOption = CommonOptions.FrameworkOption(CliCommandStrings.CleanFrameworkOptionDescription);
 
-    public static readonly Option ConfigurationOption = CommonOptions.ConfigurationOption(CliCommandStrings.CleanConfigurationOptionDescription);
+    public static readonly Option<string?> ConfigurationOption = CommonOptions.ConfigurationOption(CliCommandStrings.CleanConfigurationOptionDescription);
 
     public static readonly Option<string[]> TargetOption = CommonOptions.RequiredMSBuildTargetOption("Clean");
 
diff --git a/src/Cli/dotnet/Commands/CliCommandStrings.resx b/src/Cli/dotnet/Commands/CliCommandStrings.resx
index 4fbcfb5e5d2b..2c94953811c9 100644
--- a/src/Cli/dotnet/Commands/CliCommandStrings.resx
+++ b/src/Cli/dotnet/Commands/CliCommandStrings.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -166,7 +166,7 @@
   <data name="BuildAppFullName" xml:space="preserve">
     <value>.NET Builder</value>
   </data>
-  <data name="BuildCmdNoLogo" xml:space="preserve">
+  <data name="NoLogoOptionDescription" xml:space="preserve">
     <value>Do not display the startup banner or the copyright message.</value>
   </data>
   <data name="BuildConfigurationOptionDescription" xml:space="preserve">
@@ -250,9 +250,6 @@ Paths searched: '{1}', '{2}'.</value>
   <data name="CleanAppFullName" xml:space="preserve">
     <value>.NET Clean Command</value>
   </data>
-  <data name="CleanCmdNoLogo" xml:space="preserve">
-    <value>Do not display the startup banner or the copyright message.</value>
-  </data>
   <data name="CleanCmdOutputDir" xml:space="preserve">
     <value>OUTPUT_DIR</value>
   </data>
@@ -1322,9 +1319,6 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
   <data name="PackAppFullName" xml:space="preserve">
     <value>.NET Core NuGet Package Packer</value>
   </data>
-  <data name="PackCmdNoLogo" xml:space="preserve">
-    <value>Do not display the startup banner or the copyright message.</value>
-  </data>
   <data name="PackCmdOutputDir" xml:space="preserve">
     <value>OUTPUT_DIR</value>
   </data>
@@ -1597,9 +1591,6 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
   <data name="PublishAppDescription" xml:space="preserve">
     <value>Publisher for the .NET Platform</value>
   </data>
-  <data name="PublishCmdNoLogo" xml:space="preserve">
-    <value>Do not display the startup banner or the copyright message.</value>
-  </data>
   <data name="PublishConfigurationOptionDescription" xml:space="preserve">
     <value>The configuration to publish for. The default is 'Release' for NET 8.0 projects and above, but 'Debug' for older projects.</value>
   </data>
diff --git a/src/Cli/dotnet/Commands/MSBuild/MSBuildCommand.cs b/src/Cli/dotnet/Commands/MSBuild/MSBuildCommand.cs
index d7edaea57478..7e28945067a3 100644
--- a/src/Cli/dotnet/Commands/MSBuild/MSBuildCommand.cs
+++ b/src/Cli/dotnet/Commands/MSBuild/MSBuildCommand.cs
@@ -11,7 +11,17 @@ namespace Microsoft.DotNet.Cli.Commands.MSBuild;
 public class MSBuildCommand(
     IEnumerable<string> msbuildArgs,
     string? msbuildPath = null
-) : MSBuildForwardingApp(MSBuildArgs.AnalyzeMSBuildArguments([..msbuildArgs], CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, MSBuildCommandParser.TargetOption, CommonOptions.VerbosityOption()), msbuildPath, includeLogo: true)
+) : MSBuildForwardingApp(MSBuildArgs.AnalyzeMSBuildArguments(
+        [.. msbuildArgs],
+        CommonOptions.PropertiesOption,
+        CommonOptions.RestorePropertiesOption,
+        MSBuildCommandParser.TargetOption,
+        CommonOptions.VerbosityOption(),
+        // We set the no-logo option to false here to ensure that by default the logo is shown for this command.
+        // This is different from other commands that default to hiding the logo - but this command is meant to mimic
+        // the behavior of calling MSBuild directly, which shows the logo by default.
+        CommonOptions.NoLogoOption(false)
+    ), msbuildPath)
 {
     public static MSBuildCommand FromArgs(string[] args, string? msbuildPath = null)
     {
diff --git a/src/Cli/dotnet/Commands/MSBuild/MSBuildForwardingApp.cs b/src/Cli/dotnet/Commands/MSBuild/MSBuildForwardingApp.cs
index 3055de0883f5..df0eaf4d166a 100644
--- a/src/Cli/dotnet/Commands/MSBuild/MSBuildForwardingApp.cs
+++ b/src/Cli/dotnet/Commands/MSBuild/MSBuildForwardingApp.cs
@@ -42,18 +42,17 @@ private static MSBuildArgs ConcatTelemetryLogger(MSBuildArgs msbuildArgs)
     /// Mostly intended for quick/one-shot usage - most 'core' SDK commands should do more hands-on parsing.
     /// </summary>
     public MSBuildForwardingApp(IEnumerable<string> rawMSBuildArgs, string? msbuildPath = null) : this(
-        MSBuildArgs.AnalyzeMSBuildArguments(rawMSBuildArgs.ToArray(), CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CommonOptions.MSBuildTargetOption(), CommonOptions.VerbosityOption()),
+        MSBuildArgs.AnalyzeMSBuildArguments(rawMSBuildArgs.ToArray(), CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CommonOptions.MSBuildTargetOption(), CommonOptions.VerbosityOption(), CommonOptions.NoLogoOption()),
         msbuildPath)
     {
     }
 
-    public MSBuildForwardingApp(MSBuildArgs msBuildArgs, string? msbuildPath = null, bool includeLogo = false)
+    public MSBuildForwardingApp(MSBuildArgs msBuildArgs, string? msbuildPath = null)
     {
         var modifiedMSBuildArgs = CommonRunHelpers.AdjustMSBuildForLLMs(ConcatTelemetryLogger(msBuildArgs));
         _forwardingAppWithoutLogging = new MSBuildForwardingAppWithoutLogging(
             modifiedMSBuildArgs,
-            msbuildPath: msbuildPath,
-            includeLogo: includeLogo);
+            msbuildPath: msbuildPath);
 
         // Add the performance log location to the environment of the target process.
         if (PerformanceLogManager.Instance != null && !string.IsNullOrEmpty(PerformanceLogManager.Instance.CurrentLogDirectory))
diff --git a/src/Cli/dotnet/Commands/New/DotnetCommandCallbacks.cs b/src/Cli/dotnet/Commands/New/DotnetCommandCallbacks.cs
index 46ddfe28c4b0..4aae2f0f037e 100644
--- a/src/Cli/dotnet/Commands/New/DotnetCommandCallbacks.cs
+++ b/src/Cli/dotnet/Commands/New/DotnetCommandCallbacks.cs
@@ -38,7 +38,7 @@ internal static bool RestoreProject(string pathToRestore)
     {
         PathUtility.EnsureAllPathsExist([pathToRestore], CliStrings.CommonFileNotFound, allowDirectories: true);
         // for the implicit restore we do not want the terminal logger to emit any output unless there are errors
-        return RestoreCommand.Run([pathToRestore, "-tlp:verbosity=quiet"]) == 0;
+        return RestoreCommand.Run([pathToRestore, "-tlp:verbosity=quiet", "--no-logo"]) == 0;
     }
 
     internal static bool AddProjectsToSolution(string solutionPath, IReadOnlyList<string> projectsToAdd, string? solutionFolder, bool? inRoot)
diff --git a/src/Cli/dotnet/Commands/Pack/PackCommand.cs b/src/Cli/dotnet/Commands/Pack/PackCommand.cs
index 57342f67bad2..9f31bfa145fe 100644
--- a/src/Cli/dotnet/Commands/Pack/PackCommand.cs
+++ b/src/Cli/dotnet/Commands/Pack/PackCommand.cs
@@ -60,6 +60,7 @@ public static CommandBase FromParseResult(ParseResult parseResult, string? msbui
                 CommonOptions.RestorePropertiesOption,
                 PackCommandParser.TargetOption,
                 PackCommandParser.VerbosityOption,
+                PackCommandParser.NoLogoOption
             ],
             parseResult,
             msbuildPath,
diff --git a/src/Cli/dotnet/Commands/Pack/PackCommandParser.cs b/src/Cli/dotnet/Commands/Pack/PackCommandParser.cs
index a57aa2fabfcd..23fc1ef58f69 100644
--- a/src/Cli/dotnet/Commands/Pack/PackCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Pack/PackCommandParser.cs
@@ -49,11 +49,7 @@ internal static class PackCommandParser
         Arity = ArgumentArity.Zero
     }.ForwardAs("-property:Serviceable=true");
 
-    public static readonly Option<bool> NoLogoOption = new Option<bool>("--nologo")
-    {
-        Description = CliCommandStrings.PackCmdNoLogo,
-        Arity = ArgumentArity.Zero
-    }.ForwardAs("-nologo");
+    public static readonly Option<bool> NoLogoOption = CommonOptions.NoLogoOption();
 
     public static readonly Option<bool> NoRestoreOption = CommonOptions.NoRestoreOption;
 
diff --git a/src/Cli/dotnet/Commands/Package/Add/PackageAddCommand.cs b/src/Cli/dotnet/Commands/Package/Add/PackageAddCommand.cs
index d6c1ef2f4afd..a463165828cb 100644
--- a/src/Cli/dotnet/Commands/Package/Add/PackageAddCommand.cs
+++ b/src/Cli/dotnet/Commands/Package/Add/PackageAddCommand.cs
@@ -91,7 +91,7 @@ private static void GetProjectDependencyGraph(string projectFilePath, string dgF
             $"-property:RestoreDotnetCliToolReferences=false",
 
             // Output should not include MSBuild version header
-            "-nologo",
+            "--nologo",
 
             // Set verbosity to quiet to avoid cluttering the output for this 'inner' build
             "-v:quiet"
diff --git a/src/Cli/dotnet/Commands/Publish/PublishCommand.cs b/src/Cli/dotnet/Commands/Publish/PublishCommand.cs
index 2bfb835871a9..424a2250c25a 100644
--- a/src/Cli/dotnet/Commands/Publish/PublishCommand.cs
+++ b/src/Cli/dotnet/Commands/Publish/PublishCommand.cs
@@ -58,7 +58,7 @@ public static CommandBase FromParseResult(ParseResult parseResult, string? msbui
                 noRestore: noRestore,
                 msbuildPath: msbuildPath
             ),
-            [CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, PublishCommandParser.TargetOption, PublishCommandParser.VerbosityOption],
+            [CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, PublishCommandParser.TargetOption, PublishCommandParser.VerbosityOption, PublishCommandParser.NoLogoOption],
             parseResult,
             msbuildPath,
             (msbuildArgs) =>
diff --git a/src/Cli/dotnet/Commands/Publish/PublishCommandParser.cs b/src/Cli/dotnet/Commands/Publish/PublishCommandParser.cs
index 9fbe305d4877..2c2b1b20e36f 100644
--- a/src/Cli/dotnet/Commands/Publish/PublishCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Publish/PublishCommandParser.cs
@@ -38,11 +38,7 @@ internal static class PublishCommandParser
         Arity = ArgumentArity.Zero
     }.ForwardAs("-property:NoBuild=true");
 
-    public static readonly Option<bool> NoLogoOption = new Option<bool>("--nologo")
-    {
-        Description = CliCommandStrings.PublishCmdNoLogo,
-        Arity = ArgumentArity.Zero
-    }.ForwardAs("-nologo");
+    public static readonly Option<bool> NoLogoOption = CommonOptions.NoLogoOption();
 
     public static readonly Option<bool> NoRestoreOption = CommonOptions.NoRestoreOption;
 
diff --git a/src/Cli/dotnet/Commands/Restore/RestoreCommand.cs b/src/Cli/dotnet/Commands/Restore/RestoreCommand.cs
index 6eb650b0e261..5a9ff6a37056 100644
--- a/src/Cli/dotnet/Commands/Restore/RestoreCommand.cs
+++ b/src/Cli/dotnet/Commands/Restore/RestoreCommand.cs
@@ -40,7 +40,7 @@ public static CommandBase FromParseResult(ParseResult result, string? msbuildPat
             {
                 return CreateForwarding(msbuildArgs, msbuildPath);
             },
-            [CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, RestoreCommandParser.TargetOption, RestoreCommandParser.VerbosityOption],
+            [CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, RestoreCommandParser.TargetOption, RestoreCommandParser.VerbosityOption, RestoreCommandParser.NoLogoOption],
             result,
             msbuildPath
         );
diff --git a/src/Cli/dotnet/Commands/Restore/RestoreCommandParser.cs b/src/Cli/dotnet/Commands/Restore/RestoreCommandParser.cs
index 7e1f4a48106d..f32a0b1545b7 100644
--- a/src/Cli/dotnet/Commands/Restore/RestoreCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Restore/RestoreCommandParser.cs
@@ -27,36 +27,36 @@ internal static class RestoreCommandParser
 
     public static readonly Option<string[]> TargetOption = CommonOptions.RequiredMSBuildTargetOption("Restore");
     public static readonly Option<Utils.VerbosityOptions> VerbosityOption = CommonOptions.VerbosityOption(Utils.VerbosityOptions.minimal);
-
-    private static IEnumerable<Option> FullRestoreOptions() =>
-        ImplicitRestoreOptions(true, true, true, true).Concat(
-            [
-                VerbosityOption,
-                CommonOptions.InteractiveMsBuildForwardOption,
-                CommonOptions.ArtifactsPathOption,
-                new Option<bool>("--use-lock-file")
-                {
-                    Description = CliCommandStrings.CmdUseLockFileOptionDescription,
-                    Arity = ArgumentArity.Zero
-                }.ForwardAs("-property:RestorePackagesWithLockFile=true"),
-                new Option<bool>("--locked-mode")
-                {
-                    Description = CliCommandStrings.CmdLockedModeOptionDescription,
-                    Arity = ArgumentArity.Zero
-                }.ForwardAs("-property:RestoreLockedMode=true"),
-                new Option<string>("--lock-file-path")
-                {
-                    Description = CliCommandStrings.CmdLockFilePathOptionDescription,
-                    HelpName = CliCommandStrings.CmdLockFilePathOption
-                }.ForwardAsSingle(o => $"-property:NuGetLockFilePath={o}"),
-                new Option<bool>("--force-evaluate")
-                {
-                    Description = CliCommandStrings.CmdReevaluateOptionDescription,
-                    Arity = ArgumentArity.Zero
-                }.ForwardAs("-property:RestoreForceEvaluate=true"),
-                TargetOption
-            ]);
-
+    public static readonly Option<bool> NoLogoOption = CommonOptions.NoLogoOption();
+
+    private static IEnumerable<Option> FullRestoreOptions() => [
+        ..ImplicitRestoreOptions(true, true, true, true),
+        VerbosityOption,
+        CommonOptions.InteractiveMsBuildForwardOption,
+        CommonOptions.ArtifactsPathOption,
+        new Option<bool>("--use-lock-file")
+        {
+            Description = CliCommandStrings.CmdUseLockFileOptionDescription,
+            Arity = ArgumentArity.Zero
+        }.ForwardAs("-property:RestorePackagesWithLockFile=true"),
+        new Option<bool>("--locked-mode")
+        {
+            Description = CliCommandStrings.CmdLockedModeOptionDescription,
+            Arity = ArgumentArity.Zero
+        }.ForwardAs("-property:RestoreLockedMode=true"),
+        new Option<string>("--lock-file-path")
+        {
+            Description = CliCommandStrings.CmdLockFilePathOptionDescription,
+            HelpName = CliCommandStrings.CmdLockFilePathOption
+        }.ForwardAsSingle(o => $"-property:NuGetLockFilePath={o}"),
+        new Option<bool>("--force-evaluate")
+        {
+            Description = CliCommandStrings.CmdReevaluateOptionDescription,
+            Arity = ArgumentArity.Zero
+        }.ForwardAs("-property:RestoreForceEvaluate=true"),
+        TargetOption,
+        NoLogoOption
+    ];
     private static readonly Command Command = ConstructCommand();
 
     public static Command GetCommand()
diff --git a/src/Cli/dotnet/Commands/Restore/RestoringCommand.cs b/src/Cli/dotnet/Commands/Restore/RestoringCommand.cs
index dd2e961c1524..bf75c95e16a6 100644
--- a/src/Cli/dotnet/Commands/Restore/RestoringCommand.cs
+++ b/src/Cli/dotnet/Commands/Restore/RestoringCommand.cs
@@ -76,11 +76,7 @@ private static MSBuildArgs GetCommandArguments(
         // we're running two separate build operations
         if (HasPropertyToExcludeFromRestore(msbuildArgs))
         {
-            if (!msbuildArgs.OtherMSBuildArgs.Contains("-nologo"))
-            {
-                msbuildArgs.OtherMSBuildArgs.Add("-nologo");
-            }
-            return msbuildArgs;
+            return msbuildArgs.CloneWithNoLogo(true);
         }
 
         // otherwise we're going to run an inline restore. In this case, we need to make sure that the restore properties
@@ -187,26 +183,21 @@ private static (string[] newArgumentsToAdd, string[] existingArgumentsToForward)
         // Separate restore should be silent in terminal logger - regardless of actual scenario
         HashSet<string> newArgumentsToAdd = ["-tlp:verbosity=quiet"];
         List<string> existingArgumentsToForward = [];
-        bool hasSetNologo = false;
+        bool hasSetNologo = msbuildArgs.NoLogo;
+        if (hasSetNologo)
+        {
+            newArgumentsToAdd.Add("--nologo");
+        }
 
         foreach (var argument in msbuildArgs.OtherMSBuildArgs ?? [])
         {
             if (!IsExcludedFromSeparateRestore(argument))
             {
-                if (argument.Equals("-nologo", StringComparison.OrdinalIgnoreCase))
-                {
-                    hasSetNologo = true;
-                }
                 existingArgumentsToForward.Add(argument);
             }
 
             if (TriggersSilentSeparateRestore(argument))
             {
-                if (!hasSetNologo)
-                {
-                    newArgumentsToAdd.Add("-nologo");
-                    hasSetNologo = true;
-                }
                 newArgumentsToAdd.Add("--verbosity:quiet");
             }
         }
diff --git a/src/Cli/dotnet/Commands/Run/RunCommand.cs b/src/Cli/dotnet/Commands/Run/RunCommand.cs
index 9fc55999dd1c..ba57cb7e44f4 100644
--- a/src/Cli/dotnet/Commands/Run/RunCommand.cs
+++ b/src/Cli/dotnet/Commands/Run/RunCommand.cs
@@ -365,7 +365,7 @@ private VirtualProjectBuildingCommand CreateVirtualCommand()
     /// <returns></returns>
     private MSBuildArgs SetupSilentBuildArgs(MSBuildArgs msbuildArgs)
     {
-        msbuildArgs = msbuildArgs.CloneWithAdditionalArgs("-nologo");
+        msbuildArgs = msbuildArgs.CloneWithNoLogo(true);
 
         if (msbuildArgs.Verbosity is VerbosityOptions userVerbosity)
         {
diff --git a/src/Cli/dotnet/Commands/Store/StoreCommandParser.cs b/src/Cli/dotnet/Commands/Store/StoreCommandParser.cs
index fc8951979792..0c963fefaa5a 100644
--- a/src/Cli/dotnet/Commands/Store/StoreCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Store/StoreCommandParser.cs
@@ -93,6 +93,7 @@ private static Command ConstructCommand()
         command.Options.Add(CommonOptions.VerbosityOption());
         command.Options.Add(CommonOptions.CurrentRuntimeOption(CliCommandStrings.CurrentRuntimeOptionDescription));
         command.Options.Add(CommonOptions.DisableBuildServersOption);
+        command.Options.Add(CommonOptions.NoLogoOption(true));
 
         command.SetAction(StoreCommand.Run);
 
diff --git a/src/Cli/dotnet/Commands/Test/MTP/MSBuildUtility.cs b/src/Cli/dotnet/Commands/Test/MTP/MSBuildUtility.cs
index da2d057bfadc..839aa7b9b5a3 100644
--- a/src/Cli/dotnet/Commands/Test/MTP/MSBuildUtility.cs
+++ b/src/Cli/dotnet/Commands/Test/MTP/MSBuildUtility.cs
@@ -36,7 +36,7 @@ public static (IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModul
 
         FacadeLogger? logger = LoggerUtility.DetermineBinlogger([.. buildOptions.MSBuildArgs], dotnetTestVerb);
 
-        var msbuildArgs = MSBuildArgs.AnalyzeMSBuildArguments(buildOptions.MSBuildArgs, CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CommonOptions.MSBuildTargetOption(), CommonOptions.VerbosityOption());
+        var msbuildArgs = MSBuildArgs.AnalyzeMSBuildArguments(buildOptions.MSBuildArgs, CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CommonOptions.MSBuildTargetOption(), CommonOptions.VerbosityOption(), CommonOptions.NoLogoOption());
 
         using var collection = new ProjectCollection(globalProperties: CommonRunHelpers.GetGlobalPropertiesFromArgs(msbuildArgs), loggers: logger is null ? null : [logger], toolsetDefinitionLocations: ToolsetDefinitionLocations.Default);
         var evaluationContext = EvaluationContext.Create(EvaluationContext.SharingPolicy.Shared);
@@ -58,7 +58,7 @@ public static (IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModul
 
         FacadeLogger? logger = LoggerUtility.DetermineBinlogger([.. buildOptions.MSBuildArgs], dotnetTestVerb);
 
-        var msbuildArgs = MSBuildArgs.AnalyzeMSBuildArguments(buildOptions.MSBuildArgs, CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CommonOptions.MSBuildTargetOption(), CommonOptions.VerbosityOption());
+        var msbuildArgs = MSBuildArgs.AnalyzeMSBuildArguments(buildOptions.MSBuildArgs, CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CommonOptions.MSBuildTargetOption(), CommonOptions.VerbosityOption(), CommonOptions.NoLogoOption());
 
         using var collection = new ProjectCollection(globalProperties: CommonRunHelpers.GetGlobalPropertiesFromArgs(msbuildArgs), logger is null ? null : [logger], toolsetDefinitionLocations: ToolsetDefinitionLocations.Default);
         var evaluationContext = EvaluationContext.Create(EvaluationContext.SharingPolicy.Shared);
@@ -124,7 +124,7 @@ private static bool BuildOrRestoreProjectOrSolution(string filePath, BuildOption
             msbuildArgs.Add($"-verbosity:quiet");
         }
 
-        var parsedMSBuildArgs = MSBuildArgs.AnalyzeMSBuildArguments(msbuildArgs, CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, TestCommandParser.MTPTargetOption, TestCommandParser.VerbosityOption);
+        var parsedMSBuildArgs = MSBuildArgs.AnalyzeMSBuildArguments(msbuildArgs, CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, TestCommandParser.MTPTargetOption, TestCommandParser.VerbosityOption, CommonOptions.NoLogoOption());
 
         int result = new RestoringCommand(parsedMSBuildArgs, buildOptions.HasNoRestore).Execute();
 
diff --git a/src/Cli/dotnet/Commands/Test/TestCommandParser.cs b/src/Cli/dotnet/Commands/Test/TestCommandParser.cs
index b8200bd722e1..57be7086f011 100644
--- a/src/Cli/dotnet/Commands/Test/TestCommandParser.cs
+++ b/src/Cli/dotnet/Commands/Test/TestCommandParser.cs
@@ -154,11 +154,7 @@ private static Option<string> CreateBlameHangDumpOption()
         HelpName = CliCommandStrings.HangTimeoutArgumentName
     }.ForwardAsMany(o => ["-property:VSTestBlameHang=true", $"-property:VSTestBlameHangTimeout={o}"]);
 
-    public static readonly Option<bool> NoLogoOption = new Option<bool>("--nologo")
-    {
-        Description = CliCommandStrings.TestCmdNoLogo,
-        Arity = ArgumentArity.Zero
-    }.ForwardIfEnabled("-property:VSTestNoLogo=true");
+    public static readonly Option<bool> NoLogoOption = CommonOptions.NoLogoOption(forwardAs: "--property:VSTestNoLogo=true", description: CliCommandStrings.TestCmdNoLogo);
 
     public static readonly Option<bool> NoRestoreOption = CommonOptions.NoRestoreOption;
 
diff --git a/src/Cli/dotnet/Commands/Test/VSTest/TestCommand.cs b/src/Cli/dotnet/Commands/Test/VSTest/TestCommand.cs
index 3ff1d3e6b37a..5fc54e4e1630 100644
--- a/src/Cli/dotnet/Commands/Test/VSTest/TestCommand.cs
+++ b/src/Cli/dotnet/Commands/Test/VSTest/TestCommand.cs
@@ -205,12 +205,7 @@ private static TestCommand FromParseResult(ParseResult result, string[] settings
 
         VSTestTrace.SafeWriteTrace(() => $"MSBuild args from forwarded options: {string.Join(", ", parsedArgs)}");
 
-        var msbuildArgs = new List<string>(additionalBuildProperties)
-        {
-            "-nologo",
-        };
-
-        msbuildArgs.AddRange(parsedArgs);
+        List<string> msbuildArgs = [.. additionalBuildProperties, .. parsedArgs];
 
         if (settings.Any())
         {
@@ -245,7 +240,9 @@ private static TestCommand FromParseResult(ParseResult result, string[] settings
             CommonOptions.PropertiesOption,
             CommonOptions.RestorePropertiesOption,
             TestCommandParser.VsTestTargetOption,
-            TestCommandParser.VerbosityOption);
+            TestCommandParser.VerbosityOption,
+            CommonOptions.NoLogoOption())
+            .CloneWithNoLogo(true);
 
         TestCommand testCommand = new(
             parsedMSBuildArgs,
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf
index 91f846e1ab62..6215a2a91ec5 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf
@@ -92,7 +92,7 @@
         <target state="translated">.NET Builder</target>
         <note />
       </trans-unit>
-      <trans-unit id="BuildCmdNoLogo">
+      <trans-unit id="NoLogoOptionDescription">
         <source>Do not display the startup banner or the copyright message.</source>
         <target state="translated">Nezobrazovat úvodní nápis ani zprávu o autorských právech</target>
         <note />
@@ -229,11 +229,6 @@ Prohledané cesty: „{1}“, „{2}“.</target>
         <target state="translated">Příkaz rozhraní .NET pro vyčištění</target>
         <note />
       </trans-unit>
-      <trans-unit id="CleanCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Nezobrazovat úvodní nápis ani zprávu o autorských právech</target>
-        <note />
-      </trans-unit>
       <trans-unit id="CleanCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -1932,11 +1927,6 @@ Nástroj {1} (verze {2}) se úspěšně nainstaloval. Do souboru manifestu {3} s
         <target state="translated">Nástroj .NET Core pro balení balíčku NuGet</target>
         <note />
       </trans-unit>
-      <trans-unit id="PackCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Nezobrazovat úvodní nápis ani zprávu o autorských právech</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PackCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -2480,11 +2470,6 @@ Nástroj {1} (verze {2}) se úspěšně nainstaloval. Do souboru manifestu {3} s
         <target state="translated">Vydavatel pro platformu .NET</target>
         <note />
       </trans-unit>
-      <trans-unit id="PublishCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Nezobrazovat úvodní nápis ani zprávu o autorských právech</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishConfigurationOptionDescription">
         <source>The configuration to publish for. The default is 'Release' for NET 8.0 projects and above, but 'Debug' for older projects.</source>
         <target state="translated">Konfigurace, pro kterou se má publikovat. Pro projekty NET 8.0 a vyšší je výchozí hodnota Release, ale pro starší projekty je hodnota Debug.</target>
@@ -4128,4 +4113,4 @@ Pokud chcete zobrazit hodnotu, zadejte odpovídající volbu příkazového řá
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf
index 0cae8f9d68ca..451f2ccc2f5a 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf
@@ -92,7 +92,7 @@
         <target state="translated">.NET-Generator</target>
         <note />
       </trans-unit>
-      <trans-unit id="BuildCmdNoLogo">
+      <trans-unit id="NoLogoOptionDescription">
         <source>Do not display the startup banner or the copyright message.</source>
         <target state="translated">Zeigt kein Startbanner und keine Copyrightmeldung an.</target>
         <note />
@@ -229,11 +229,6 @@ Durchsuchte Pfade: "{1}", "{2}".</target>
         <target state="translated">.NET-Befehl "Clean"</target>
         <note />
       </trans-unit>
-      <trans-unit id="CleanCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Zeigt kein Startbanner und keine Copyrightmeldung an.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="CleanCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -360,11 +355,11 @@ Wird ein Absturz erkannt, wird in "TestResults/guid/guid_Sequence.xml" eine Sequ
 
 Basierend auf den zusätzlichen Einstellungen kann auch ein Blockade- oder Absturzabbild erfasst werden.
 
-Beispiel: 
+Beispiel:
   Es wird ein Timeout für die Testausführung ausgelöst, wenn der Test länger als 1 Stunde (Standardtimeout) dauert, und es wird ein Absturzabbild erfasst, wenn der Testhost unerwartet beendet wird.
   (Für Absturzabbilder ist eine zusätzlicher Setup erforderlich, siehe unten.)
   dotnet test --blame-hang --blame-crash
-Beispiel: 
+Beispiel:
   Es wird ein Timeout für die Testausführung ausgelöst, wenn der Test mehr als 20 Minuten dauert, und es wird ein Blockadeabbild erfasst.
   dotnet test --blame-hang-timeout 20min
 </target>
@@ -1932,11 +1927,6 @@ Das Tool "{1}" (Version {2}) wurde erfolgreich installiert. Der Eintrag wird der
         <target state="translated">.NET Core NuGet Package Packer</target>
         <note />
       </trans-unit>
-      <trans-unit id="PackCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Zeigt kein Startbanner und keine Copyrightmeldung an.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PackCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -2316,11 +2306,11 @@ Das Tool "{1}" (Version {2}) wurde erfolgreich installiert. Der Eintrag wird der
     </source>
         <target state="translated">„dotnet workload search version“ hat je nach Argument drei Funktionen:
       1. Wird kein Argument angegeben, dann wird eine Liste der zuletzt veröffentlichten Workloadversionen aus diesem Featureband ausgegeben. Akzeptiert die Option „--take“, um anzugeben, wie viele angegeben werden sollen, und „--format“, um das Format zu ändern.
-         Beispiel: 
+         Beispiel:
            dotnet workload search version --take 2 --format json
            [{"workloadVersion":"9.0.201"},{"workloadVersion":"9.0.200.1"}]
       2. Wenn eine Workloadversion als Argument angegeben wird, dann werden eine Tabelle mit verschiedenen Workloads und deren Versionen für die angegebene Workloadversion ausgegeben. Akzeptiert die Option „--format“, um das Ausgabeformat zu ändern.
-         Beispiel: 
+         Beispiel:
            dotnet workload search version 9.0.201
            Workloadmanifest-ID                               Manifest-Featureband      Manifestversion
            ------------------------------------------------------------------------------------------------
@@ -2339,7 +2329,7 @@ Das Tool "{1}" (Version {2}) wurde erfolgreich installiert. Der Eintrag wird der
            microsoft.net.workload.mono.toolchain.net7         9.0.100-rc.1               9.0.0-rc.1.24431.7
            microsoft.net.workload.mono.toolchain.net8         9.0.100-rc.1               9.0.0-rc.1.24431.7
       3. Wenn eine oder mehrere Workloads zusammen mit ihren Versionen bereitgestellt werden (indem sie mit dem @-Zeichen verbunden werden), werden die Workloadversionen, die mit den angegebenen Versionen übereinstimmen, ausgegebenen. Akzeptiert die Option „--take“, um anzugeben, wie viele angegeben werden sollen, und „--format“, um das Format zu ändern.
-         Beispiel: 
+         Beispiel:
            dotnet workload search version maui@9.0.0-rc.1.24453.9 ios@17.5.9270-net9-rc1
            9.0.201
     </target>
@@ -2480,11 +2470,6 @@ Das Tool "{1}" (Version {2}) wurde erfolgreich installiert. Der Eintrag wird der
         <target state="translated">Herausgeber für die .NET-Plattform</target>
         <note />
       </trans-unit>
-      <trans-unit id="PublishCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Zeigt kein Startbanner und keine Copyrightmeldung an.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishConfigurationOptionDescription">
         <source>The configuration to publish for. The default is 'Release' for NET 8.0 projects and above, but 'Debug' for older projects.</source>
         <target state="translated">Die Konfiguration, für die veröffentlicht werden soll. Der Standardwert ist "Release" für NET 8.0-Projekte und höher, aber "Debug" für ältere Projekte.</target>
@@ -4128,4 +4113,4 @@ Um einen Wert anzuzeigen, geben Sie die entsprechende Befehlszeilenoption an, oh
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf
index 97ddf0ef0090..602df59ae22b 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf
@@ -92,7 +92,7 @@
         <target state="translated">Generador para .NET</target>
         <note />
       </trans-unit>
-      <trans-unit id="BuildCmdNoLogo">
+      <trans-unit id="NoLogoOptionDescription">
         <source>Do not display the startup banner or the copyright message.</source>
         <target state="translated">No mostrar la pancarta de inicio ni el mensaje de copyright.</target>
         <note />
@@ -229,11 +229,6 @@ Rutas de acceso buscadas: "{1}", "{2}".</target>
         <target state="translated">Comando Clean de .NET</target>
         <note />
       </trans-unit>
-      <trans-unit id="CleanCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">No mostrar la pancarta de inicio ni el mensaje de copyright.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="CleanCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -1932,11 +1927,6 @@ La herramienta "{1}" (versión "{2}") se instaló correctamente. Se ha agregado
         <target state="translated">.NET Core NuGet Package Packer</target>
         <note />
       </trans-unit>
-      <trans-unit id="PackCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">No mostrar la pancarta de inicio ni el mensaje de copyright.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PackCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -2480,11 +2470,6 @@ La herramienta "{1}" (versión "{2}") se instaló correctamente. Se ha agregado
         <target state="translated">Publicador para la plataforma .NET</target>
         <note />
       </trans-unit>
-      <trans-unit id="PublishCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">No mostrar la pancarta de inicio ni el mensaje de copyright.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishConfigurationOptionDescription">
         <source>The configuration to publish for. The default is 'Release' for NET 8.0 projects and above, but 'Debug' for older projects.</source>
         <target state="translated">Configuración para la que se va a publicar. El valor predeterminado es "Versión" para proyectos de NET 8.0 y versiones posteriores, pero "Depurar" para proyectos anteriores.</target>
@@ -2697,7 +2682,7 @@ El valor predeterminado es publicar una aplicación dependiente del marco.</targ
       <trans-unit id="RunCommandExceptionCouldNotLocateALaunchSettingsFile">
         <source>Cannot use launch profile '{0}' because the launch settings file could not be located. Locations tried:
 {1}</source>
-        <target state="translated">No se puede usar el perfil de inicio '{0}' porque no se pudo localizar el archivo de configuración de inicio. Ubicaciones probadas: 
+        <target state="translated">No se puede usar el perfil de inicio '{0}' porque no se pudo localizar el archivo de configuración de inicio. Ubicaciones probadas:
 {1}</target>
         <note />
       </trans-unit>
@@ -4128,4 +4113,4 @@ Para mostrar un valor, especifique la opción de línea de comandos correspondie
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf
index 8b7c023e949c..420523dd6317 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf
@@ -92,7 +92,7 @@
         <target state="translated">Générateur .NET</target>
         <note />
       </trans-unit>
-      <trans-unit id="BuildCmdNoLogo">
+      <trans-unit id="NoLogoOptionDescription">
         <source>Do not display the startup banner or the copyright message.</source>
         <target state="translated">N'affiche pas la bannière de démarrage ni le message de copyright.</target>
         <note />
@@ -229,11 +229,6 @@ Les chemins d’accès ont recherché : « {1} », « {2} ».</target>
         <target state="translated">Commande de nettoyage .NET</target>
         <note />
       </trans-unit>
-      <trans-unit id="CleanCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">N'affiche pas la bannière de démarrage ni le message de copyright.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="CleanCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -1201,7 +1196,7 @@ Pour découvrir plus d’informations, consultez https://aka.ms/dotnet-test/mtp.
         <source>There are several launch profiles with case-sensitive names, which isn't permitted:
 {0}
 Make the profile names distinct.</source>
-        <target state="translated">Il existe plusieurs profils de lancement avec des noms sensibles à la casse, ce qui n'est pas autorisé : 
+        <target state="translated">Il existe plusieurs profils de lancement avec des noms sensibles à la casse, ce qui n'est pas autorisé :
 {0}
 Faites en sorte que les noms de profil soient distincts.</target>
         <note />
@@ -1932,11 +1927,6 @@ L'outil '{1}' (version '{2}') a été correctement installé. L'entrée est ajou
         <target state="translated">Compresseur de package NuGet .NET Core</target>
         <note />
       </trans-unit>
-      <trans-unit id="PackCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">N'affiche pas la bannière de démarrage ni le message de copyright.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PackCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -2480,11 +2470,6 @@ L'outil '{1}' (version '{2}') a été correctement installé. L'entrée est ajou
         <target state="translated">Éditeur pour la plateforme .NET</target>
         <note />
       </trans-unit>
-      <trans-unit id="PublishCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">N'affiche pas la bannière de démarrage ni le message de copyright.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishConfigurationOptionDescription">
         <source>The configuration to publish for. The default is 'Release' for NET 8.0 projects and above, but 'Debug' for older projects.</source>
         <target state="translated">Configuration pour lequel publier. La valeur par défaut est « Release » pour les projets NET 8.0 et versions ultérieures, mais « Debug » pour les projets plus anciens.</target>
@@ -2697,7 +2682,7 @@ La valeur par défaut est de publier une application dépendante du framework.</
       <trans-unit id="RunCommandExceptionCouldNotLocateALaunchSettingsFile">
         <source>Cannot use launch profile '{0}' because the launch settings file could not be located. Locations tried:
 {1}</source>
-        <target state="translated">Impossible d’utiliser le profil de lancement « {0} », car le fichier de paramètres de lancement est introuvable. Emplacements essayés : 
+        <target state="translated">Impossible d’utiliser le profil de lancement « {0} », car le fichier de paramètres de lancement est introuvable. Emplacements essayés :
 {1}</target>
         <note />
       </trans-unit>
@@ -4128,4 +4113,4 @@ Pour afficher une valeur, spécifiez l’option de ligne de commande corresponda
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf
index fdf9fb3bd31b..51634ff32480 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf
@@ -92,7 +92,7 @@
         <target state="translated">Generatore .NET</target>
         <note />
       </trans-unit>
-      <trans-unit id="BuildCmdNoLogo">
+      <trans-unit id="NoLogoOptionDescription">
         <source>Do not display the startup banner or the copyright message.</source>
         <target state="translated">Evita la visualizzazione del messaggio di avvio o di copyright.</target>
         <note />
@@ -229,11 +229,6 @@ Percorsi cercati: '{1}', '{2}'.</target>
         <target state="translated">Comando di pulizia .NET</target>
         <note />
       </trans-unit>
-      <trans-unit id="CleanCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Evita la visualizzazione del messaggio di avvio o di copyright.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="CleanCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -1932,11 +1927,6 @@ Lo strumento '{1}' versione '{2}' è stato installato. La voce è stata aggiunta
         <target state="translated">Strumento di creazione pacchetti NuGet di .NET Core</target>
         <note />
       </trans-unit>
-      <trans-unit id="PackCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Evita la visualizzazione del messaggio di avvio o di copyright.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PackCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -2480,11 +2470,6 @@ Lo strumento '{1}' versione '{2}' è stato installato. La voce è stata aggiunta
         <target state="translated">Editore per la piattaforma .NET</target>
         <note />
       </trans-unit>
-      <trans-unit id="PublishCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Evita la visualizzazione del messaggio di avvio o di copyright.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishConfigurationOptionDescription">
         <source>The configuration to publish for. The default is 'Release' for NET 8.0 projects and above, but 'Debug' for older projects.</source>
         <target state="translated">Configurazione per la pubblicazione. Il valore predefinito per i progetti NET 8.0 e versioni successive è 'Release', ma per i progetti meno recenti è 'Debug'.</target>
@@ -2697,7 +2682,7 @@ Per impostazione predefinita, viene generato un pacchetto dipendente dal framewo
       <trans-unit id="RunCommandExceptionCouldNotLocateALaunchSettingsFile">
         <source>Cannot use launch profile '{0}' because the launch settings file could not be located. Locations tried:
 {1}</source>
-        <target state="translated">Non è possibile usare il profilo di avvio "{0}" perché il file delle impostazioni di avvio non è stato trovato. Posizioni tentate: 
+        <target state="translated">Non è possibile usare il profilo di avvio "{0}" perché il file delle impostazioni di avvio non è stato trovato. Posizioni tentate:
 {1}</target>
         <note />
       </trans-unit>
@@ -4128,4 +4113,4 @@ Per visualizzare un valore, specifica l'opzione della riga di comando corrispond
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf
index a41c41d483ca..c0081e525ea6 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf
@@ -92,7 +92,7 @@
         <target state="translated">.NET ビルダー</target>
         <note />
       </trans-unit>
-      <trans-unit id="BuildCmdNoLogo">
+      <trans-unit id="NoLogoOptionDescription">
         <source>Do not display the startup banner or the copyright message.</source>
         <target state="translated">著作権情報を表示しません。</target>
         <note />
@@ -229,11 +229,6 @@ Paths searched: '{1}', '{2}'.</source>
         <target state="translated">.NET Clean コマンド</target>
         <note />
       </trans-unit>
-      <trans-unit id="CleanCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">著作権情報を表示しません。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="CleanCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -1201,7 +1196,7 @@ See https://aka.ms/dotnet-test/mtp for more information.</source>
         <source>There are several launch profiles with case-sensitive names, which isn't permitted:
 {0}
 Make the profile names distinct.</source>
-        <target state="translated">大文字と小文字が区別される名前の起動プロファイルがいくつかありますが、これは許可されていません: 
+        <target state="translated">大文字と小文字が区別される名前の起動プロファイルがいくつかありますが、これは許可されていません:
 {0}
 プロファイル名を区別できるようにしてください。</target>
         <note />
@@ -1932,11 +1927,7 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">.NET Core NuGet パッケージ パッカー</target>
         <note />
       </trans-unit>
-      <trans-unit id="PackCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">著作権情報を表示しません。</target>
-        <note />
-      </trans-unit>
+
       <trans-unit id="PackCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -2339,7 +2330,7 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
            microsoft.net.workload.mono.toolchain.net7         9.0.100-rc.1               9.0.0-rc.1.24431.7
            microsoft.net.workload.mono.toolchain.net8         9.0.100-rc.1               9.0.0-rc.1.24431.7
       3. 1 つ以上のワークロードをバージョンと共に ('@' 文字で結合して) 指定すると、指定されたバージョンに一致するワークロード バージョンが出力されます。--take オプションを指定して提供する数を指定し、--format を指定して形式を変更します。
-         例: 
+         例:
            dotnet workload search version maui@9.0.0-rc.1.24453.9 ios@17.5.9270-net9-rc1
            9.0.201
     </target>
@@ -2480,11 +2471,6 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">.NET Platform 用パブリッシャー</target>
         <note />
       </trans-unit>
-      <trans-unit id="PublishCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">著作権情報を表示しません。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishConfigurationOptionDescription">
         <source>The configuration to publish for. The default is 'Release' for NET 8.0 projects and above, but 'Debug' for older projects.</source>
         <target state="translated">発行する構成。既定値は、NET 8.0 以降のプロジェクトの場合は 'Release' ですが、旧プロジェクトの場合は 'Debug' です。</target>
@@ -2697,7 +2683,7 @@ The default is to publish a framework-dependent application.</source>
       <trans-unit id="RunCommandExceptionCouldNotLocateALaunchSettingsFile">
         <source>Cannot use launch profile '{0}' because the launch settings file could not be located. Locations tried:
 {1}</source>
-        <target state="translated">起動設定ファイルが見つからないため、起動プロファイル '{0}' を使用できません。試行された場所: 
+        <target state="translated">起動設定ファイルが見つからないため、起動プロファイル '{0}' を使用できません。試行された場所:
 {1}</target>
         <note />
       </trans-unit>
@@ -4128,4 +4114,4 @@ To display a value, specify the corresponding command-line option without provid
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf
index 0bdc4cec7d92..9bc8643027c0 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf
@@ -92,7 +92,7 @@
         <target state="translated">.NET 작성기</target>
         <note />
       </trans-unit>
-      <trans-unit id="BuildCmdNoLogo">
+      <trans-unit id="NoLogoOptionDescription">
         <source>Do not display the startup banner or the copyright message.</source>
         <target state="translated">시작 배너 또는 저작권 메시지를 표시하지 않습니다.</target>
         <note />
@@ -229,11 +229,6 @@ Paths searched: '{1}', '{2}'.</source>
         <target state="translated">.NET 정리 명령</target>
         <note />
       </trans-unit>
-      <trans-unit id="CleanCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">시작 배너 또는 저작권 메시지를 표시하지 않습니다.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="CleanCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -360,11 +355,11 @@ Example:
 
 추가 설정에 따라 중단 덤프 또는 크래시 덤프가 수집될 수도 있습니다.
 
-예: 
+예:
   테스트에 걸리는 시간이 기본 시간 제한인 1시간보다 길면 테스트 실행이 시간 초과되고, 테스트 호스트가 예기치 않게 종료되면 크래시 덤프를 수집합니다.
   (크래시 덤프에는 추가 설정이 필요합니다. 아래를 참조하세요.)
   dotnet test --blame-hang --blame-crash
-예: 
+예:
   테스트에 걸리는 시간이 20분보다 길면 테스트 실행이 시간 초과되고 중단 덤프를 수집합니다.
   dotnet test --blame-hang-timeout 20min
 </target>
@@ -1932,11 +1927,6 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">.NET Core NuGet 패키지 패커</target>
         <note />
       </trans-unit>
-      <trans-unit id="PackCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">시작 배너 또는 저작권 메시지를 표시하지 않습니다.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PackCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -2320,7 +2310,7 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
            dotnet workload search version --take 2 --format json
            [{"workloadVersion":"9.0.201"},{"workloadVersion":"9.0.200.1"}]
       2. 특정 워크로드 버전이 인수로 제공되는 경우 지정된 워크로드 버전에 대한 다양한 워크로드 및 해당 버전의 테이블을 출력합니다. --format 옵션을 사용하여 출력 형식을 변경합니다.
-         예: 
+         예:
            dotnet workload search version 9.0.201
            워크로드 매니페스트 ID                               매니페스트 기능 밴드      매니페스트 버전
            ------------------------------------------------------------------------------------------------
@@ -2339,7 +2329,7 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
            microsoft.net.workload.mono.toolchain.net7         9.0.100-rc.1               9.0.0-rc.1.24431.7
            microsoft.net.workload.mono.toolchain.net8         9.0.100-rc.1               9.0.0-rc.1.24431.7
       3. 하나 이상의 워크로드가 해당 버전과 함께 제공되는 경우('@' 문자와 조인하여) 제공된 버전과 일치하는 워크로드 버전을 출력합니다. --take 옵션을 사용하여 얼마나 제공할지 지정하고 --format을 사용하여 형식을 변경합니다.
-         예: 
+         예:
            dotnet workload search version maui@9.0.0-rc.1.24453.9 ios@17.5.9270-net9-rc1
            9.0.201
     </target>
@@ -2480,11 +2470,6 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">.NET 플랫폼용 게시자입니다.</target>
         <note />
       </trans-unit>
-      <trans-unit id="PublishCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">시작 배너 또는 저작권 메시지를 표시하지 않습니다.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishConfigurationOptionDescription">
         <source>The configuration to publish for. The default is 'Release' for NET 8.0 projects and above, but 'Debug' for older projects.</source>
         <target state="translated">게시할 구성입니다. 기본값은 NET 8.0 프로젝트의 경우 'Release'이지만, 이전 프로젝트의 경우 'Debug'입니다.</target>
@@ -2697,7 +2682,7 @@ The default is to publish a framework-dependent application.</source>
       <trans-unit id="RunCommandExceptionCouldNotLocateALaunchSettingsFile">
         <source>Cannot use launch profile '{0}' because the launch settings file could not be located. Locations tried:
 {1}</source>
-        <target state="translated">시작 설정 파일을 찾을 수 없으므로 시작 프로필 '{0}'을(를) 사용할 수 없습니다. 시도한 위치: 
+        <target state="translated">시작 설정 파일을 찾을 수 없으므로 시작 프로필 '{0}'을(를) 사용할 수 없습니다. 시도한 위치:
 {1}</target>
         <note />
       </trans-unit>
@@ -4128,4 +4113,4 @@ To display a value, specify the corresponding command-line option without provid
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf
index d706beeb66f3..175ac52a189b 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf
@@ -92,7 +92,7 @@
         <target state="translated">Konstruktor platformy .NET</target>
         <note />
       </trans-unit>
-      <trans-unit id="BuildCmdNoLogo">
+      <trans-unit id="NoLogoOptionDescription">
         <source>Do not display the startup banner or the copyright message.</source>
         <target state="translated">Nie wyświetlaj baneru początkowego ani komunikatu o prawach autorskich.</target>
         <note />
@@ -229,11 +229,6 @@ Przeszukane ścieżki: „{1}”, „{2}”.</target>
         <target state="translated">Polecenie clean platformy .NET</target>
         <note />
       </trans-unit>
-      <trans-unit id="CleanCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Nie wyświetlaj baneru początkowego ani komunikatu o prawach autorskich.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="CleanCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -1932,11 +1927,6 @@ Narzędzie „{1}” (wersja „{2}”) zostało pomyślnie zainstalowane. Wpis
         <target state="translated">Tworzenie pakietów NuGet w programie .NET Core</target>
         <note />
       </trans-unit>
-      <trans-unit id="PackCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Nie wyświetlaj baneru początkowego ani komunikatu o prawach autorskich.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PackCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -2480,11 +2470,6 @@ Narzędzie „{1}” (wersja „{2}”) zostało pomyślnie zainstalowane. Wpis
         <target state="translated">Wydawca dla platformy .NET.</target>
         <note />
       </trans-unit>
-      <trans-unit id="PublishCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Nie wyświetlaj baneru początkowego ani komunikatu o prawach autorskich.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishConfigurationOptionDescription">
         <source>The configuration to publish for. The default is 'Release' for NET 8.0 projects and above, but 'Debug' for older projects.</source>
         <target state="translated">Konfiguracja do opublikowania. Wartość domyślna to „Wersja” dla projektów NET 8.0 i nowszych, ale „Debugowanie” dla starszych projektów.</target>
@@ -4128,4 +4113,4 @@ Aby wyświetlić wartość, należy podać odpowiednią opcję wiersza poleceń
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf
index e5edad508f7e..3aba8ac88a6c 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf
@@ -92,7 +92,7 @@
         <target state="translated">Construtor do .NET</target>
         <note />
       </trans-unit>
-      <trans-unit id="BuildCmdNoLogo">
+      <trans-unit id="NoLogoOptionDescription">
         <source>Do not display the startup banner or the copyright message.</source>
         <target state="translated">Não exibe a faixa de inicialização ou a mensagem de direitos autorais.</target>
         <note />
@@ -229,11 +229,6 @@ Caminhos pesquisados: "{1}", "{2}".</target>
         <target state="translated">Comando Clean do .NET</target>
         <note />
       </trans-unit>
-      <trans-unit id="CleanCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Não exibe a faixa de inicialização ou a mensagem de direitos autorais.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="CleanCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -1932,11 +1927,6 @@ A ferramenta '{1}' (versão '{2}') foi instalada com êxito. A entrada foi adici
         <target state="translated">Empacotador de Pacotes NuGet do .NET Core</target>
         <note />
       </trans-unit>
-      <trans-unit id="PackCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Não exibe a faixa de inicialização ou a mensagem de direitos autorais.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PackCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -2480,11 +2470,6 @@ A ferramenta '{1}' (versão '{2}') foi instalada com êxito. A entrada foi adici
         <target state="translated">Editor para a Plataforma .NET</target>
         <note />
       </trans-unit>
-      <trans-unit id="PublishCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Não exibe a faixa de inicialização ou a mensagem de direitos autorais.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishConfigurationOptionDescription">
         <source>The configuration to publish for. The default is 'Release' for NET 8.0 projects and above, but 'Debug' for older projects.</source>
         <target state="translated">A configuração para a qual publicar. O padrão é 'Release' para projetos NET 8.0 e superiores, mas 'Debug' para projetos mais antigos.</target>
@@ -4128,4 +4113,4 @@ Para exibir um valor, especifique a opção de linha de comando correspondente s
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf
index 2629602a9145..285f17f59043 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf
@@ -92,7 +92,7 @@
         <target state="translated">Построитель .NET</target>
         <note />
       </trans-unit>
-      <trans-unit id="BuildCmdNoLogo">
+      <trans-unit id="NoLogoOptionDescription">
         <source>Do not display the startup banner or the copyright message.</source>
         <target state="translated">Не отображать начальный баннер или сообщение об авторских правах.</target>
         <note />
@@ -229,11 +229,6 @@ Paths searched: '{1}', '{2}'.</source>
         <target state="translated">Команда .NET Clean</target>
         <note />
       </trans-unit>
-      <trans-unit id="CleanCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Не отображать начальный баннер или сообщение об авторских правах.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="CleanCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -1932,11 +1927,6 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">Упаковщик пакетов NuGet .NET Core</target>
         <note />
       </trans-unit>
-      <trans-unit id="PackCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Не отображать начальный баннер или сообщение об авторских правах.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PackCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -2480,11 +2470,6 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">Издатель для платформы .NET</target>
         <note />
       </trans-unit>
-      <trans-unit id="PublishCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Не отображать начальный баннер или сообщение об авторских правах.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishConfigurationOptionDescription">
         <source>The configuration to publish for. The default is 'Release' for NET 8.0 projects and above, but 'Debug' for older projects.</source>
         <target state="translated">Конфигурация для публикации. Значение по умолчанию — "Release" для проектов NET 8.0 и более поздней версии, но "Debug" для более старых проектов.</target>
@@ -4129,4 +4114,4 @@ To display a value, specify the corresponding command-line option without provid
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf
index 3d5e0bbe96dc..15f4ee6866d1 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf
@@ -92,7 +92,7 @@
         <target state="translated">.NET Oluşturucusu</target>
         <note />
       </trans-unit>
-      <trans-unit id="BuildCmdNoLogo">
+      <trans-unit id="NoLogoOptionDescription">
         <source>Do not display the startup banner or the copyright message.</source>
         <target state="translated">Başlangıç bandını veya telif hakkı iletisini görüntüleme.</target>
         <note />
@@ -229,11 +229,6 @@ Aranan yollar: '{1}', '{2}'.</target>
         <target state="translated">.NET Clean Komutu</target>
         <note />
       </trans-unit>
-      <trans-unit id="CleanCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Başlangıç bandını veya telif hakkı iletisini görüntüleme.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="CleanCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -1932,11 +1927,6 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">.NET Core NuGet Paketi Paketleyicisi</target>
         <note />
       </trans-unit>
-      <trans-unit id="PackCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Başlangıç bandını veya telif hakkı iletisini görüntüleme.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PackCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -2480,11 +2470,6 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">.NET Platformunun yayımcısı.</target>
         <note />
       </trans-unit>
-      <trans-unit id="PublishCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">Başlangıç bandını veya telif hakkı iletisini görüntüleme.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishConfigurationOptionDescription">
         <source>The configuration to publish for. The default is 'Release' for NET 8.0 projects and above, but 'Debug' for older projects.</source>
         <target state="translated">Yayımlanacak yapılandırma. NET 8.0 projeleri ve üzeri için varsayılan değer 'Release' iken eski projeler için değer 'Debug' olmalıdır.</target>
@@ -3481,9 +3466,9 @@ and the corresponding package Ids for installed tools using the command
 'dotnet tool list'.</source>
         <target state="translated">'{0}' paket kimliğine sahip araç bulunamadı.
 
-Araçlar, aracı çağırırken kullandığınız araç adından farklı olabilen 
-paket kimlikleri kullanılarak kaldırılır. Yüklü araçların araç adlarını ve 
-karşılık gelen paket kimliklerini bulmak için 
+Araçlar, aracı çağırırken kullandığınız araç adından farklı olabilen
+paket kimlikleri kullanılarak kaldırılır. Yüklü araçların araç adlarını ve
+karşılık gelen paket kimliklerini bulmak için
 'dotnet tool list' komutunu kullanabilirsiniz.</target>
         <note />
       </trans-unit>
@@ -4128,4 +4113,4 @@ Bir değeri görüntülemek için, bir değer sağlamadan ilgili komut satırı
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf
index 42bc47df39af..5d926d853b92 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf
@@ -92,7 +92,7 @@
         <target state="translated">.NET 生成器</target>
         <note />
       </trans-unit>
-      <trans-unit id="BuildCmdNoLogo">
+      <trans-unit id="NoLogoOptionDescription">
         <source>Do not display the startup banner or the copyright message.</source>
         <target state="translated">不显示启动版权标志或版权消息。</target>
         <note />
@@ -229,11 +229,6 @@ Paths searched: '{1}', '{2}'.</source>
         <target state="translated">.NET 清理命令</target>
         <note />
       </trans-unit>
-      <trans-unit id="CleanCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">不显示启动版权标志或版权消息。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="CleanCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -1932,11 +1927,6 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">.NET Core NuGet 包打包程序</target>
         <note />
       </trans-unit>
-      <trans-unit id="PackCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">不显示启动版权标志或版权消息。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PackCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -2480,11 +2470,6 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">适用于 .NET 平台的发布服务器</target>
         <note />
       </trans-unit>
-      <trans-unit id="PublishCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">不显示启动版权标志或版权消息。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishConfigurationOptionDescription">
         <source>The configuration to publish for. The default is 'Release' for NET 8.0 projects and above, but 'Debug' for older projects.</source>
         <target state="translated">发布所对应的配置。对于 NET 8.0 及更高版本的项目，默认值为 "Release"，但对于较低版本的项目，默认值为 "Debug"。</target>
@@ -4128,4 +4113,4 @@ To display a value, specify the corresponding command-line option without provid
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf
index 93eab31cf6a2..12c8075de8b4 100644
--- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf
+++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf
@@ -92,7 +92,7 @@
         <target state="translated">.NET 產生器</target>
         <note />
       </trans-unit>
-      <trans-unit id="BuildCmdNoLogo">
+      <trans-unit id="NoLogoOptionDescription">
         <source>Do not display the startup banner or the copyright message.</source>
         <target state="translated">不顯示啟始資訊或著作權訊息。</target>
         <note />
@@ -229,11 +229,6 @@ Paths searched: '{1}', '{2}'.</source>
         <target state="translated">.NET 清除命令</target>
         <note />
       </trans-unit>
-      <trans-unit id="CleanCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">不顯示啟始資訊或著作權訊息。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="CleanCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -360,11 +355,11 @@ Example:
 
 根據其他設定，也可以收集擱置傾印或損毀傾印。
 
-範例: 
+範例:
   當測試所花的時間超過預設的 1 小時時，測試執行會逾時，當測試主機未預期地結束時，會收集損毀傾印。
   (損毀傾印需要其他設定，請參閱下文。)
   dotnet 測試 --blame-hang --blame-crash
-範例: 
+範例:
   當測試需要超過 20 分鐘並收集擱置傾印時，測試執行會逾時。
   dotnet 測試 --blame-hang-timeout 20min
 </target>
@@ -1220,7 +1215,7 @@ Make the profile names distinct.</source>
         <source>The following exception occurred when running the test module with RunCommand '{0}' and RunArguments '{1}':
 
 {2}</source>
-        <target state="translated">使用 RunCommand '{0}' 和 RunArguments '{1}' 執行測試模組時，發生以下例外狀況: 
+        <target state="translated">使用 RunCommand '{0}' 和 RunArguments '{1}' 執行測試模組時，發生以下例外狀況:
 
 {2}</target>
         <note>{Locked="RunCommand"}{Locked="RunArguments"}
@@ -1932,11 +1927,6 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">.NET Core NuGet 套件封裝器</target>
         <note />
       </trans-unit>
-      <trans-unit id="PackCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">不顯示啟始資訊或著作權訊息。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PackCmdOutputDir">
         <source>OUTPUT_DIR</source>
         <target state="translated">OUTPUT_DIR</target>
@@ -2316,11 +2306,11 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
     </source>
         <target state="translated">根據其引數，'dotnet workload search version' 有三個函式:
       1. 如果未指定引數，它會從此功能帶輸出最新發行工作負載版本的清單。使用 --take 選項來指定要提供多少個，以及使用 --format 來變更格式。
-         範例: 
+         範例:
            dotnet workload search version --take 2 --format json
            [{"workloadVersion":"9.0.201"},{"workloadVersion":"9.0.200.1"}]
       2. 如果提供工作負載版本做為引數，它會針對指定的工作負載版本輸出各種工作負載及其版本的表格。使用 --format 選項來變更輸出格式。
-         範例: 
+         範例:
            dotnet workload search version 9.0.201
            工作負載資訊清單識別碼                               資訊清單功能帶      資訊清單版本
            ------------------------------------------------------------------------------------------------
@@ -2339,7 +2329,7 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
            microsoft.net.workload.mono.toolchain.net7         9.0.100-rc.1               9.0.0-rc.1.24431.7
            microsoft.net.workload.mono.toolchain.net8         9.0.100-rc.1               9.0.0-rc.1.24431.7
       3. 如果提供一或多個工作負載及其版本 (使用 '@' 字元聯結它們)，它會輸出符合所提供版本的工作負載版本。使用 --take 選項來指定要提供多少個，以及使用 --format 來變更格式。
-         範例: 
+         範例:
            dotnet workload search version maui@9.0.0-rc.1.24453.9 ios@17.5.9270-net9-rc1
            9.0.201
     </target>
@@ -2480,11 +2470,6 @@ Tool '{1}' (version '{2}') was successfully installed. Entry is added to the man
         <target state="translated">.NET 平台的發行者</target>
         <note />
       </trans-unit>
-      <trans-unit id="PublishCmdNoLogo">
-        <source>Do not display the startup banner or the copyright message.</source>
-        <target state="translated">不顯示啟始資訊或著作權訊息。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="PublishConfigurationOptionDescription">
         <source>The configuration to publish for. The default is 'Release' for NET 8.0 projects and above, but 'Debug' for older projects.</source>
         <target state="translated">要發佈的設定。.NET 8.0 專案及更新版本的預設值為 'Release'，但較舊專案的預設值為 'Debug'。</target>
@@ -2697,7 +2682,7 @@ The default is to publish a framework-dependent application.</source>
       <trans-unit id="RunCommandExceptionCouldNotLocateALaunchSettingsFile">
         <source>Cannot use launch profile '{0}' because the launch settings file could not be located. Locations tried:
 {1}</source>
-        <target state="translated">無法使用啟動設定檔 '{0}'，因為找不到啟動設定檔檔案。嘗試的位置: 
+        <target state="translated">無法使用啟動設定檔 '{0}'，因為找不到啟動設定檔檔案。嘗試的位置:
 {1}</target>
         <note />
       </trans-unit>
@@ -4128,4 +4113,4 @@ To display a value, specify the corresponding command-line option without provid
       </trans-unit>
     </body>
   </file>
-</xliff>
\ No newline at end of file
+</xliff>
diff --git a/src/Cli/dotnet/CommonOptions.cs b/src/Cli/dotnet/CommonOptions.cs
index 33db8d587224..4547a00a730e 100644
--- a/src/Cli/dotnet/CommonOptions.cs
+++ b/src/Cli/dotnet/CommonOptions.cs
@@ -399,6 +399,28 @@ private static IReadOnlyDictionary<string, string> ParseEnvironmentVariables(Arg
 
     public static readonly Option<string[]> TestLoggerOption = new("--logger");
 
+    /// <summary>
+    /// Creates an implementation of the <c>--no-logo</c> option.
+    /// This option suppresses the display of the startup banner or logos for commands or products it is applied to.
+    /// The behavior of this option is influenced by the <c>DOTNET_NOLOGO</c> environment variable if it is set:
+    /// <list type="bullet">
+    /// <item>If the <c>--no-logo</c> option is not specified on the command line, the environment variable will be checked to determine
+    /// whether to suppress logos. Any truthy value - <c>true</c>, <c>1</c>, <c>yes</c>, <c>on</c> - will suppress logos, while any falsy value - <c>false</c>, <c>0</c>, <c>no</c>, <c>off</c> - will show logos.</item>
+    /// <item>If the option is specified on the command line, it takes precedence over the environment variable.</item>
+    /// </list>
+    /// Finally, if neither the option nor the environment variable is set, the option will default to the provided <paramref name="defaultValue"/>.
+    /// </summary>
+    public static Option<bool> NoLogoOption(bool defaultValue = true, string forwardAs = "--nologo", string? description = null)
+    {
+        return new Option<bool>("--no-logo", "--nologo", "-nologo", "/nologo")
+        {
+            Description = description ?? Commands.CliCommandStrings.NoLogoOptionDescription,
+            DefaultValueFactory = (ar) => Env.TryGetEnvironmentVariableAsBool("DOTNET_NOLOGO", out bool value) ? value : defaultValue,
+            CustomParser = (ar) => true,
+            Arity = ArgumentArity.Zero
+        }.ForwardIfEnabled(forwardAs);
+    }
+
     public static void ValidateSelfContainedOptions(bool hasSelfContainedOption, bool hasNoSelfContainedOption)
     {
         if (hasSelfContainedOption && hasNoSelfContainedOption)
diff --git a/test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs b/test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs
index 0c41f7ddb1b2..5ee29863abe7 100644
--- a/test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs
+++ b/test/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs
@@ -10,6 +10,7 @@
 using Microsoft.NET.Build.Containers.Resources;
 using System.Net.Sockets;
 using Moq;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.NET.Build.Containers.UnitTests;
 
@@ -687,5 +688,34 @@ public string GetCommandPathFromRootPath(string rootPath, string commandName, pa
 
         public string GetCommandPathFromRootPath(string rootPath, string commandName, IEnumerable<string> extensions)
             => throw new NotImplementedException();
+
+        public bool TryGetEnvironmentVariable(string name, [NotNullWhen(true)] out string? value) => _environmentVariables.TryGetValue(name, out value);
+        public bool TryGetEnvironmentVariableAsBool(string name, [NotNullWhen(true)] out bool value)
+        {
+            if (TryGetEnvironmentVariable(name, out string? strValue) && bool.TryParse(strValue, out bool boolValue))
+            {
+                value = boolValue;
+                return true;
+            }
+            else
+            {
+                value = false;
+                return false;
+            }
+        }
+
+        public bool TryGetEnvironmentVariableAsInt(string name, [NotNullWhen(true)] out int value)
+        {
+            if (TryGetEnvironmentVariable(name, out string? strValue) && int.TryParse(strValue, out int intValue))
+            {
+                value = intValue;
+                return true;
+            }
+            else
+            {
+                value = 0;
+                return false;
+            }
+        }
     }
 }
diff --git a/test/Microsoft.NET.TestFramework/Assertions/StringAssertionsExtensions.cs b/test/Microsoft.NET.TestFramework/Assertions/StringAssertionsExtensions.cs
index 83367ee3df6c..ce3f01f6c99c 100644
--- a/test/Microsoft.NET.TestFramework/Assertions/StringAssertionsExtensions.cs
+++ b/test/Microsoft.NET.TestFramework/Assertions/StringAssertionsExtensions.cs
@@ -35,7 +35,10 @@ public static AndConstraint<StringAssertions> BeVisuallyEquivalentTo(
             if (!areSame)
             {
                 var diff = UnidiffRenderer.GenerateUnidiff(oldText: normalizedExpected, newText: normalizedActual, oldFileName: "expected", newFileName: "actual", ignoreWhitespace: true);
-                areSame.Should().Be(true, because: string.IsNullOrEmpty(because) ? $"The input strings are not visually equivalent. Diff is:\n" + diff : because, becauseArgs: [.. becauseArgs, diff]);
+                // diff may contain braces which will be interpreted as format items in the because string,
+                // so we need to escape them.
+                var formatSafeDiff = diff.Replace("{", "{{").Replace("}", "}}");
+                areSame.Should().Be(true, because: string.IsNullOrEmpty(because) ? $"The input strings are not visually equivalent. Diff is:\n" + formatSafeDiff : because, becauseArgs: [.. becauseArgs, formatSafeDiff]);
             }
 
             return new AndConstraint<StringAssertions>(assertions);
diff --git a/test/dotnet-watch.Tests/CommandLine/CommandLineOptionsTests.cs b/test/dotnet-watch.Tests/CommandLine/CommandLineOptionsTests.cs
index 768eb47b262b..d98140e48889 100644
--- a/test/dotnet-watch.Tests/CommandLine/CommandLineOptionsTests.cs
+++ b/test/dotnet-watch.Tests/CommandLine/CommandLineOptionsTests.cs
@@ -481,16 +481,19 @@ public void ForwardedBuildOptions_Run(string[] args, string[] buildArgs, string[
         }
 
         [Theory]
-        [InlineData(new[] { "--property:b=1" }, new[] { "--property:b=1" }, Skip = "https://github.com/dotnet/sdk/issues/44655")]
-        [InlineData(new[] { "--property", "b=1" }, new[] { "--property", "b=1" }, Skip = "https://github.com/dotnet/sdk/issues/44655")]
-        [InlineData(new[] { "/p:b=1" }, new[] { "/p:b=1" }, Skip = "https://github.com/dotnet/sdk/issues/44655")]
+        [InlineData(new[] { "--property:b=1" }, new[] { "--property:b=1" })]
+        [InlineData(new[] { "--property", "b=1" }, new[] { "--property:b=1" })]
+        [InlineData(new[] { "/p:b=1" }, new[] { "--property:b=1" })]
         [InlineData(new[] { "/bl" }, new[] { "/bl" })]
         [InlineData(new[] { "--binaryLogger:LogFile=output.binlog;ProjectImports=None" }, new[] { "--binaryLogger:LogFile=output.binlog;ProjectImports=None" })]
         public void ForwardedBuildOptions_Test(string[] args, string[] commandArgs)
         {
+            var isProperty = args[0].Contains("-p") || args[0].Contains("/p");
             var runOptions = VerifyOptions(["test", .. args]);
-            AssertEx.SequenceEqual(["--property:NuGetInteractive=false", "--target:VSTest", .. commandArgs], runOptions.BuildArguments);
-            AssertEx.SequenceEqual(commandArgs, runOptions.CommandArguments);
+            string[] expected = isProperty
+                ? ["--property:VSTestNoLogo=true", "--property:NuGetInteractive=false", .. commandArgs, "--target:VSTest"]
+                : ["--property:VSTestNoLogo=true", "--property:NuGetInteractive=false", "--target:VSTest", .. commandArgs];
+            AssertEx.SequenceEqual(expected, runOptions.BuildArguments);
         }
 
         [Fact]
diff --git a/test/dotnet.Tests/CliSchemaTests.cs b/test/dotnet.Tests/CliSchemaTests.cs
index 18cccbd90296..78f3d668607e 100644
--- a/test/dotnet.Tests/CliSchemaTests.cs
+++ b/test/dotnet.Tests/CliSchemaTests.cs
@@ -182,12 +182,17 @@ public CliSchemaTests(ITestOutputHelper log) : base(log)
       "required": false,
       "recursive": false
     },
-    "--nologo": {
+    "--no-logo": {
       "description": "Do not display the startup banner or the copyright message.",
       "hidden": false,
+      "aliases": [
+         "--nologo",
+         "-nologo",
+         "/nologo"
+      ],
       "valueType": "System.Boolean",
       "hasDefaultValue": true,
-      "defaultValue": false,
+      "defaultValue": true,
       "arity": {
         "minimum": 0,
         "maximum": 0
@@ -964,12 +969,17 @@ public CliSchemaTests(ITestOutputHelper log) : base(log)
       "required": false,
       "recursive": false
     },
-    "--no-restore": {
-      "description": "Do not restore the project before building.",
+    "--no-logo": {
+      "description": "Do not display the startup banner or the copyright message.",
       "hidden": false,
+      "aliases": [
+        "--nologo",
+        "-nologo",
+        "/nologo"
+      ],
       "valueType": "System.Boolean",
       "hasDefaultValue": true,
-      "defaultValue": false,
+      "defaultValue": true,
       "arity": {
         "minimum": 0,
         "maximum": 0
@@ -977,8 +987,8 @@ public CliSchemaTests(ITestOutputHelper log) : base(log)
       "required": false,
       "recursive": false
     },
-    "--no-self-contained": {
-      "description": "Publish your application as a framework dependent application. A compatible .NET runtime must be installed on the target machine to run your application.",
+    "--no-restore": {
+      "description": "Do not restore the project before building.",
       "hidden": false,
       "valueType": "System.Boolean",
       "hasDefaultValue": true,
@@ -990,8 +1000,8 @@ public CliSchemaTests(ITestOutputHelper log) : base(log)
       "required": false,
       "recursive": false
     },
-    "--nologo": {
-      "description": "Do not display the startup banner or the copyright message.",
+    "--no-self-contained": {
+      "description": "Publish your application as a framework dependent application. A compatible .NET runtime must be installed on the target machine to run your application.",
       "hidden": false,
       "valueType": "System.Boolean",
       "hasDefaultValue": true,
diff --git a/test/dotnet.Tests/CommandTests/Build/GivenDotnetBuildBuildsCsproj.cs b/test/dotnet.Tests/CommandTests/Build/GivenDotnetBuildBuildsCsproj.cs
index 2660810b616b..1130d1471133 100644
--- a/test/dotnet.Tests/CommandTests/Build/GivenDotnetBuildBuildsCsproj.cs
+++ b/test/dotnet.Tests/CommandTests/Build/GivenDotnetBuildBuildsCsproj.cs
@@ -47,7 +47,7 @@ public void ItBuildsOnlyTheSpecifiedTarget()
                 .WithSource();
 
             new DotnetBuildCommand(Log, testInstance.Path)
-                .Execute("--no-restore", "--nologo", "/t:PrintMessage")
+                .Execute("--no-restore", "--no-logo", "/t:PrintMessage")
                 .Should()
                 .Pass()
                 .And
@@ -176,7 +176,7 @@ public void DotnetBuildDoesNotPrintCopyrightInfo()
 
             var cmd = new DotnetBuildCommand(Log)
                .WithWorkingDirectory(testInstance.Path)
-               .Execute("--nologo");
+               .Execute("--no-logo");
 
             cmd.Should().Pass();
 
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetBuildInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetBuildInvocation.cs
index 8b6c7de5b074..07218d519ca8 100644
--- a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetBuildInvocation.cs
+++ b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetBuildInvocation.cs
@@ -11,7 +11,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
     [Collection(TestConstants.UsesStaticTelemetryState)]
     public class GivenDotnetBuildInvocation : IClassFixture<NullCurrentSessionIdFixture>
     {
-        string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "-nologo"];
+        string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo"];
         public static string[] RestoreExpectedPrefixForImplicitRestore = [.. RestoringCommand.RestoreOptimizationProperties.Select(kvp => $"--restoreProperty:{kvp.Key}={kvp.Value}")];
         public static string[] RestoreExpectedPrefixForSeparateRestore = [.. RestoringCommand.RestoreOptimizationProperties.Select(kvp => $"--property:{kvp.Key}={kvp.Value}")];
 
@@ -92,7 +92,7 @@ public void NoRestoreMeansNoSeparateRestoreCommand()
             new string[] { "--target:Restore", "-tlp:verbosity=quiet", "--verbosity:diag", "--property:OutputPath=<cwd>myoutput", "--property:_CommandLineDefinedOutputPath=true", "/ArbitrarySwitchForMSBuild" },
             new string[] { "--property:TargetFramework=tfm", "--verbosity:diag", "--property:OutputPath=<cwd>myoutput", "--property:_CommandLineDefinedOutputPath=true", "/ArbitrarySwitchForMSBuild" })]
         [InlineData(new string[] { "-f", "tfm", "-getItem:Compile", "-getProperty:TargetFramework", "-getTargetResult:Build" },
-            new string[] { "--target:Restore", "-tlp:verbosity=quiet", "-nologo", "--verbosity:quiet" },
+            new string[] { "--target:Restore", "-tlp:verbosity=quiet", "--nologo", "--verbosity:quiet" },
             new string[] { "--property:TargetFramework=tfm", "--getItem:Compile", "--getProperty:TargetFramework", "--getTargetResult:Build" })]
         public void MsbuildInvocationIsCorrectForSeparateRestore(
             string[] args,
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetCleanInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetCleanInvocation.cs
index 270c2d49091b..2f0fc032a657 100644
--- a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetCleanInvocation.cs
+++ b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetCleanInvocation.cs
@@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
     public class GivenDotnetCleanInvocation : IClassFixture<NullCurrentSessionIdFixture>
     {
         private const string NugetInteractiveProperty = "--property:NuGetInteractive=false";
-        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "-nologo", "--verbosity:normal", "--target:Clean", NugetInteractiveProperty];
+        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo", "--verbosity:normal", "--target:Clean", NugetInteractiveProperty];
 
 
         private static readonly string WorkingDirectory =
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetMSBuildInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetMSBuildInvocation.cs
index 10df57407a78..5c79115e1dc3 100644
--- a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetMSBuildInvocation.cs
+++ b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetMSBuildInvocation.cs
@@ -8,23 +8,19 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
     [Collection(TestConstants.UsesStaticTelemetryState)]
     public class GivenDotnetMSBuildInvocation : IClassFixture<NullCurrentSessionIdFixture>
     {
-        private const string ExpectedPrefix = "-maxcpucount --verbosity:m -tlp:default=auto";
+        private static readonly string[] ExpectedPrefix = [ "-maxcpucount", "--verbosity:m", "-tlp:default=auto" ];
         private static readonly string WorkingDirectory = TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetPackInvocation));
 
         [Theory]
-        [InlineData(new string[] { "--disable-build-servers" }, "--property:UseRazorBuildServer=false --property:UseSharedCompilation=false /nodeReuse:false")]
-        public void MsbuildInvocationIsCorrect(string[] args, string expectedAdditionalArgs)
+        [InlineData(new string[] { "--disable-build-servers" }, new string[] { "--property:UseRazorBuildServer=false", "--property:UseSharedCompilation=false", "/nodeReuse:false" })]
+        public void MsbuildInvocationIsCorrect(string[] args, string[] expectedAdditionalArgs)
         {
             CommandDirectoryContext.PerformActionWithBasePath(WorkingDirectory, () =>
             {
-                expectedAdditionalArgs =
-                    (string.IsNullOrEmpty(expectedAdditionalArgs) ? "" : $" {expectedAdditionalArgs}")
-                    .Replace("<cwd>", WorkingDirectory);
-
                 var msbuildPath = "<msbuildpath>";
                 var command = MSBuildCommand.FromArgs(args, msbuildPath);
 
-                command.GetArgumentsToMSBuild().Should().Be($"{ExpectedPrefix}{expectedAdditionalArgs}");
+                command.GetArgumentTokensToMSBuild().Should().BeEquivalentTo([..ExpectedPrefix, ..expectedAdditionalArgs]);
             });
         }
     }
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetOsArchOptions.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetOsArchOptions.cs
index 4b98db3a7b58..e001863d51a6 100644
--- a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetOsArchOptions.cs
+++ b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetOsArchOptions.cs
@@ -14,7 +14,7 @@ public GivenDotnetOsArchOptions(ITestOutputHelper log) : base(log)
         {
         }
 
-        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "-nologo"];
+        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo"];
         private const string NugetInteractiveProperty = "--property:NuGetInteractive=false";
         private static readonly string[] DefaultArgs = ["-restore", "-consoleloggerparameters:Summary", NugetInteractiveProperty];
 
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetPackInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetPackInvocation.cs
index 7fd85cf6e177..073c66228a72 100644
--- a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetPackInvocation.cs
+++ b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetPackInvocation.cs
@@ -8,8 +8,8 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
     [Collection(TestConstants.UsesStaticTelemetryState)]
     public class GivenDotnetPackInvocation : IClassFixture<NullCurrentSessionIdFixture>
     {
-        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "-nologo", "-restore", "--target:Pack"];
-        private static readonly string[] ExpectedNoBuildPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "-nologo", "--target:Pack"];
+        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo", "-restore", "--target:Pack"];
+        private static readonly string[] ExpectedNoBuildPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo", "--target:Pack"];
         private readonly string[] ExpectedProperties = ["--property:_IsPacking=true", "--property:NuGetInteractive=false"];
 
         private static readonly string WorkingDirectory =
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetPublishInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetPublishInvocation.cs
index 3b08a994c3c9..31df36e59e74 100644
--- a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetPublishInvocation.cs
+++ b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetPublishInvocation.cs
@@ -17,7 +17,7 @@ public GivenDotnetPublishInvocation(ITestOutputHelper output)
             this.output = output;
         }
 
-        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "-nologo"];
+        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo"];
         private static readonly string[] ExpectedProperties = ["--property:_IsPublishing=true"];
         private static readonly string NuGetDisabledProperty = "--property:NuGetInteractive=false";
 
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetRestoreInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetRestoreInvocation.cs
index 89c9c3dbccc2..9b4dca228442 100644
--- a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetRestoreInvocation.cs
+++ b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetRestoreInvocation.cs
@@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
     [Collection(TestConstants.UsesStaticTelemetryState)]
     public class GivenDotnetRestoreInvocation : IClassFixture<NullCurrentSessionIdFixture>
     {
-        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "-nologo", "--target:Restore"];
+        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo", "--target:Restore"];
         private static readonly string NuGetDisabledProperty = "--property:NuGetInteractive=false";
         private static readonly string WorkingDirectory =
             TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetRestoreInvocation));
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetRunInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetRunInvocation.cs
index 36c8fe45bc19..0bd410308b59 100644
--- a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetRunInvocation.cs
+++ b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetRunInvocation.cs
@@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
     [Collection(TestConstants.UsesStaticTelemetryState)]
     public class GivenDotnetRunInvocation : IClassFixture<NullCurrentSessionIdFixture>
     {
-        private static readonly string[] ConstantRestoreArgs = ["-nologo", "--verbosity:quiet"];
+        private static readonly string[] ConstantRestoreArgs = ["--nologo", "--verbosity:quiet"];
         private static readonly string NuGetDisabledProperty = "--property:NuGetInteractive=false";
 
         public ITestOutputHelper Log { get; }
@@ -43,7 +43,7 @@ public void MsbuildInvocationIsCorrect(string[] args, string[] expectedArgs)
                     var command = RunCommand.FromArgs(args);
                     command.MSBuildArgs
                         .Should()
-                        .BeEquivalentTo(MSBuildArgs.AnalyzeMSBuildArguments([.. ConstantRestoreArgs, .. expectedArgs, NuGetDisabledProperty ], CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CommonOptions.MSBuildTargetOption(), RunCommandParser.VerbosityOption));
+                        .BeEquivalentTo(MSBuildArgs.AnalyzeMSBuildArguments([.. ConstantRestoreArgs, .. expectedArgs, NuGetDisabledProperty ], CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CommonOptions.MSBuildTargetOption(), RunCommandParser.VerbosityOption, CommonOptions.NoLogoOption()));
                 });
             }
             finally
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetStoreInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetStoreInvocation.cs
index f13c7258f291..c8e6f93bdbb9 100644
--- a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetStoreInvocation.cs
+++ b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetStoreInvocation.cs
@@ -8,7 +8,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
     [Collection(TestConstants.UsesStaticTelemetryState)]
     public class GivenDotnetStoreInvocation : IClassFixture<NullCurrentSessionIdFixture>
     {
-        string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "-nologo", "--target:ComposeStore", "<project>"];
+        string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo", "--target:ComposeStore", "<project>"];
         static readonly string[] ArgsPrefix = ["--manifest", "<project>"];
         private static readonly string WorkingDirectory =
             TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetStoreInvocation));
diff --git a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetTestInvocation.cs b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetTestInvocation.cs
index 601c1e5d2c0d..c017646949b0 100644
--- a/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetTestInvocation.cs
+++ b/test/dotnet.Tests/CommandTests/MSBuild/GivenDotnetTestInvocation.cs
@@ -8,7 +8,7 @@ namespace Microsoft.DotNet.Cli.MSBuild.Tests
     [Collection(TestConstants.UsesStaticTelemetryState)]
     public class GivenDotnetTestInvocation : IClassFixture<NullCurrentSessionIdFixture>
     {
-        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "-nologo", "-restore", "-nologo", "-target:VSTest", "-property:NuGetInteractive=false"];
+        private static readonly string[] ExpectedPrefix = ["-maxcpucount", "--verbosity:m", "-tlp:default=auto", "--nologo", "-restore", "-target:VSTest", "-property:NuGetInteractive=false"];
 
         private static readonly string WorkingDirectory =
             TestPathUtilities.FormatAbsolutePath(nameof(GivenDotnetTestInvocation));
diff --git a/test/dotnet.Tests/CompletionTests/snapshots/bash/DotnetCliSnapshotTests.VerifyCompletions.verified.sh b/test/dotnet.Tests/CompletionTests/snapshots/bash/DotnetCliSnapshotTests.VerifyCompletions.verified.sh
index c6b13b332377..653744929d21 100644
--- a/test/dotnet.Tests/CompletionTests/snapshots/bash/DotnetCliSnapshotTests.VerifyCompletions.verified.sh
+++ b/test/dotnet.Tests/CompletionTests/snapshots/bash/DotnetCliSnapshotTests.VerifyCompletions.verified.sh
@@ -144,7 +144,7 @@ _testhost_build() {
     prev="${COMP_WORDS[COMP_CWORD-1]}" 
     COMPREPLY=()
     
-    opts="--use-current-runtime --framework --configuration --runtime --version-suffix --no-restore --interactive --verbosity --debug --output --artifacts-path --no-incremental --no-dependencies --nologo --self-contained --no-self-contained --arch --os --disable-build-servers --help" 
+    opts="--use-current-runtime --framework --configuration --runtime --version-suffix --no-restore --interactive --verbosity --debug --output --artifacts-path --no-incremental --no-dependencies --no-logo --self-contained --no-self-contained --arch --os --disable-build-servers --help" 
     
     if [[ $COMP_CWORD == "$1" ]]; then
         COMPREPLY=( $(compgen -W "$opts" -- "$cur") )
@@ -229,7 +229,7 @@ _testhost_clean() {
     prev="${COMP_WORDS[COMP_CWORD-1]}" 
     COMPREPLY=()
     
-    opts="--framework --runtime --configuration --interactive --verbosity --output --artifacts-path --nologo --disable-build-servers --help" 
+    opts="--framework --runtime --configuration --interactive --verbosity --output --artifacts-path --no-logo --disable-build-servers --help" 
     
     if [[ $COMP_CWORD == "$1" ]]; then
         COMPREPLY=( $(compgen -W "$opts" -- "$cur") )
@@ -970,7 +970,7 @@ _testhost_pack() {
     prev="${COMP_WORDS[COMP_CWORD-1]}" 
     COMPREPLY=()
     
-    opts="--output --artifacts-path --no-build --include-symbols --include-source --serviceable --nologo --interactive --no-restore --verbosity --version-suffix --version --configuration --disable-build-servers --use-current-runtime --runtime --help" 
+    opts="--output --artifacts-path --no-build --include-symbols --include-source --serviceable --no-logo --interactive --no-restore --verbosity --version-suffix --version --configuration --disable-build-servers --use-current-runtime --runtime --help" 
     
     if [[ $COMP_CWORD == "$1" ]]; then
         COMPREPLY=( $(compgen -W "$opts" -- "$cur") )
@@ -1210,7 +1210,7 @@ _testhost_publish() {
     prev="${COMP_WORDS[COMP_CWORD-1]}" 
     COMPREPLY=()
     
-    opts="--use-current-runtime --output --artifacts-path --manifest --no-build --self-contained --no-self-contained --nologo --framework --runtime --configuration --version-suffix --interactive --no-restore --verbosity --arch --os --disable-build-servers --help" 
+    opts="--use-current-runtime --output --artifacts-path --manifest --no-build --self-contained --no-self-contained --no-logo --framework --runtime --configuration --version-suffix --interactive --no-restore --verbosity --arch --os --disable-build-servers --help" 
     
     if [[ $COMP_CWORD == "$1" ]]; then
         COMPREPLY=( $(compgen -W "$opts" -- "$cur") )
@@ -1347,7 +1347,7 @@ _testhost_restore() {
     prev="${COMP_WORDS[COMP_CWORD-1]}" 
     COMPREPLY=()
     
-    opts="--disable-build-servers --source --packages --use-current-runtime --disable-parallel --configfile --no-http-cache --ignore-failed-sources --force --runtime --no-dependencies --verbosity --interactive --artifacts-path --use-lock-file --locked-mode --lock-file-path --force-evaluate --arch --os --help" 
+    opts="--disable-build-servers --source --packages --use-current-runtime --disable-parallel --configfile --no-http-cache --ignore-failed-sources --force --runtime --no-dependencies --verbosity --interactive --artifacts-path --use-lock-file --locked-mode --lock-file-path --force-evaluate --no-logo --arch --os --help" 
     
     if [[ $COMP_CWORD == "$1" ]]; then
         COMPREPLY=( $(compgen -W "$opts" -- "$cur") )
@@ -1541,7 +1541,7 @@ _testhost_store() {
     prev="${COMP_WORDS[COMP_CWORD-1]}" 
     COMPREPLY=()
     
-    opts="--manifest --framework-version --output --working-dir --skip-optimization --skip-symbols --framework --runtime --verbosity --use-current-runtime --disable-build-servers --help" 
+    opts="--manifest --framework-version --output --working-dir --skip-optimization --skip-symbols --framework --runtime --verbosity --use-current-runtime --disable-build-servers --no-logo --help" 
     
     if [[ $COMP_CWORD == "$1" ]]; then
         COMPREPLY=( $(compgen -W "$opts" -- "$cur") )
@@ -1573,7 +1573,7 @@ _testhost_test() {
     prev="${COMP_WORDS[COMP_CWORD-1]}" 
     COMPREPLY=()
     
-    opts="--settings --list-tests --environment --filter --test-adapter-path --logger --output --artifacts-path --diag --no-build --results-directory --collect --blame --blame-crash --blame-crash-dump-type --blame-crash-collect-always --blame-hang --blame-hang-dump-type --blame-hang-timeout --nologo --configuration --framework --runtime --no-restore --interactive --verbosity --arch --os --disable-build-servers --help" 
+    opts="--settings --list-tests --environment --filter --test-adapter-path --logger --output --artifacts-path --diag --no-build --results-directory --collect --blame --blame-crash --blame-crash-dump-type --blame-crash-collect-always --blame-hang --blame-hang-dump-type --blame-hang-timeout --no-logo --configuration --framework --runtime --no-restore --interactive --verbosity --arch --os --disable-build-servers --help" 
     
     if [[ $COMP_CWORD == "$1" ]]; then
         COMPREPLY=( $(compgen -W "$opts" -- "$cur") )
@@ -2309,4 +2309,4 @@ _testhost_completions_script() {
 
 
 
-complete -F _testhost testhost
+complete -F _testhost testhost
\ No newline at end of file
diff --git a/test/dotnet.Tests/CompletionTests/snapshots/pwsh/DotnetCliSnapshotTests.VerifyCompletions.verified.ps1 b/test/dotnet.Tests/CompletionTests/snapshots/pwsh/DotnetCliSnapshotTests.VerifyCompletions.verified.ps1
index 6ba0ef97da25..53f2f30a816e 100644
--- a/test/dotnet.Tests/CompletionTests/snapshots/pwsh/DotnetCliSnapshotTests.VerifyCompletions.verified.ps1
+++ b/test/dotnet.Tests/CompletionTests/snapshots/pwsh/DotnetCliSnapshotTests.VerifyCompletions.verified.ps1
@@ -84,7 +84,10 @@ Register-ArgumentCompleter -Native -CommandName 'testhost' -ScriptBlock {
                 [CompletionResult]::new('--artifacts-path', '--artifacts-path', [CompletionResultType]::ParameterName, "The artifacts path. All output from the project, including build, publish, and pack output, will go in subfolders under the specified path.")
                 [CompletionResult]::new('--no-incremental', '--no-incremental', [CompletionResultType]::ParameterName, "Do not use incremental building.")
                 [CompletionResult]::new('--no-dependencies', '--no-dependencies', [CompletionResultType]::ParameterName, "Do not build project-to-project references and only build the specified project.")
-                [CompletionResult]::new('--nologo', '--nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '--no-logo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '--nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '-nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '/nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
                 [CompletionResult]::new('--self-contained', '--self-contained', [CompletionResultType]::ParameterName, "Publish the .NET runtime with your application so the runtime doesn`'t need to be installed on the target machine. The default is `'false.`' However, when targeting .NET 7 or lower, the default is `'true`' if a runtime identifier is specified.")
                 [CompletionResult]::new('--self-contained', '--sc', [CompletionResultType]::ParameterName, "Publish the .NET runtime with your application so the runtime doesn`'t need to be installed on the target machine. The default is `'false.`' However, when targeting .NET 7 or lower, the default is `'true`' if a runtime identifier is specified.")
                 [CompletionResult]::new('--no-self-contained', '--no-self-contained', [CompletionResultType]::ParameterName, "Publish your application as a framework dependent application. A compatible .NET runtime must be installed on the target machine to run your application.")
@@ -132,7 +135,10 @@ Register-ArgumentCompleter -Native -CommandName 'testhost' -ScriptBlock {
                 [CompletionResult]::new('--output', '--output', [CompletionResultType]::ParameterName, "The directory containing the build artifacts to clean.")
                 [CompletionResult]::new('--output', '-o', [CompletionResultType]::ParameterName, "The directory containing the build artifacts to clean.")
                 [CompletionResult]::new('--artifacts-path', '--artifacts-path', [CompletionResultType]::ParameterName, "The artifacts path. All output from the project, including build, publish, and pack output, will go in subfolders under the specified path.")
-                [CompletionResult]::new('--nologo', '--nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '--no-logo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '--nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '-nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '/nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
                 [CompletionResult]::new('--disable-build-servers', '--disable-build-servers', [CompletionResultType]::ParameterName, "Force the command to ignore any persistent build servers.")
                 [CompletionResult]::new('--help', '--help', [CompletionResultType]::ParameterName, "Show command line help.")
                 [CompletionResult]::new('--help', '-h', [CompletionResultType]::ParameterName, "Show command line help.")
@@ -550,7 +556,10 @@ Register-ArgumentCompleter -Native -CommandName 'testhost' -ScriptBlock {
                 [CompletionResult]::new('--include-source', '--include-source', [CompletionResultType]::ParameterName, "Include PDBs and source files. Source files go into the `'src`' folder in the resulting nuget package.")
                 [CompletionResult]::new('--serviceable', '--serviceable', [CompletionResultType]::ParameterName, "Set the serviceable flag in the package. See https://aka.ms/nupkgservicing for more information.")
                 [CompletionResult]::new('--serviceable', '-s', [CompletionResultType]::ParameterName, "Set the serviceable flag in the package. See https://aka.ms/nupkgservicing for more information.")
-                [CompletionResult]::new('--nologo', '--nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '--no-logo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '--nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '-nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '/nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
                 [CompletionResult]::new('--interactive', '--interactive', [CompletionResultType]::ParameterName, "Allows the command to stop and wait for user input or action (for example to complete authentication).")
                 [CompletionResult]::new('--no-restore', '--no-restore', [CompletionResultType]::ParameterName, "Do not restore the project before building.")
                 [CompletionResult]::new('--verbosity', '--verbosity', [CompletionResultType]::ParameterName, "Set the MSBuild verbosity level. Allowed values are q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic].")
@@ -715,7 +724,10 @@ Register-ArgumentCompleter -Native -CommandName 'testhost' -ScriptBlock {
                 [CompletionResult]::new('--self-contained', '--self-contained', [CompletionResultType]::ParameterName, "Publish the .NET runtime with your application so the runtime doesn`'t need to be installed on the target machine. The default is `'false.`' However, when targeting .NET 7 or lower, the default is `'true`' if a runtime identifier is specified.")
                 [CompletionResult]::new('--self-contained', '--sc', [CompletionResultType]::ParameterName, "Publish the .NET runtime with your application so the runtime doesn`'t need to be installed on the target machine. The default is `'false.`' However, when targeting .NET 7 or lower, the default is `'true`' if a runtime identifier is specified.")
                 [CompletionResult]::new('--no-self-contained', '--no-self-contained', [CompletionResultType]::ParameterName, "Publish your application as a framework dependent application. A compatible .NET runtime must be installed on the target machine to run your application.")
-                [CompletionResult]::new('--nologo', '--nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '--no-logo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '--nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '-nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '/nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
                 [CompletionResult]::new('--framework', '--framework', [CompletionResultType]::ParameterName, "The target framework to publish for. The target framework has to be specified in the project file.")
                 [CompletionResult]::new('--framework', '-f', [CompletionResultType]::ParameterName, "The target framework to publish for. The target framework has to be specified in the project file.")
                 [CompletionResult]::new('--runtime', '--runtime', [CompletionResultType]::ParameterName, "The target runtime to publish for. This is used when creating a self-contained deployment. The default is to publish a framework-dependent application.")
@@ -814,6 +826,10 @@ Register-ArgumentCompleter -Native -CommandName 'testhost' -ScriptBlock {
                 [CompletionResult]::new('--locked-mode', '--locked-mode', [CompletionResultType]::ParameterName, "Don`'t allow updating project lock file.")
                 [CompletionResult]::new('--lock-file-path', '--lock-file-path', [CompletionResultType]::ParameterName, "Output location where project lock file is written. By default, this is `'PROJECT_ROOT\packages.lock.json`'.")
                 [CompletionResult]::new('--force-evaluate', '--force-evaluate', [CompletionResultType]::ParameterName, "Forces restore to reevaluate all dependencies even if a lock file already exists.")
+                [CompletionResult]::new('--no-logo', '--no-logo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '--nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '-nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '/nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
                 [CompletionResult]::new('--arch', '--arch', [CompletionResultType]::ParameterName, "The target architecture.")
                 [CompletionResult]::new('--arch', '-a', [CompletionResultType]::ParameterName, "The target architecture.")
                 [CompletionResult]::new('--os', '--os', [CompletionResultType]::ParameterName, "The target operating system.")
@@ -935,6 +951,10 @@ Register-ArgumentCompleter -Native -CommandName 'testhost' -ScriptBlock {
                 [CompletionResult]::new('--use-current-runtime', '--use-current-runtime', [CompletionResultType]::ParameterName, "Use current runtime as the target runtime.")
                 [CompletionResult]::new('--use-current-runtime', '--ucr', [CompletionResultType]::ParameterName, "Use current runtime as the target runtime.")
                 [CompletionResult]::new('--disable-build-servers', '--disable-build-servers', [CompletionResultType]::ParameterName, "Force the command to ignore any persistent build servers.")
+                [CompletionResult]::new('--no-logo', '--no-logo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '--nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '-nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
+                [CompletionResult]::new('--no-logo', '/nologo', [CompletionResultType]::ParameterName, "Do not display the startup banner or the copyright message.")
                 [CompletionResult]::new('--help', '--help', [CompletionResultType]::ParameterName, "Show command line help.")
                 [CompletionResult]::new('--help', '-h', [CompletionResultType]::ParameterName, "Show command line help.")
             )
@@ -968,7 +988,10 @@ Register-ArgumentCompleter -Native -CommandName 'testhost' -ScriptBlock {
                 [CompletionResult]::new('--blame-hang', '--blame-hang', [CompletionResultType]::ParameterName, "Run the tests in blame mode and enables collecting hang dump when test exceeds the given timeout.")
                 [CompletionResult]::new('--blame-hang-dump-type', '--blame-hang-dump-type', [CompletionResultType]::ParameterName, "The type of crash dump to be collected. The supported values are full (default), mini, and none. When `'none`' is used then test host is terminated on timeout, but no dump is collected. Implies --blame-hang.")
                 [CompletionResult]::new('--blame-hang-timeout', '--blame-hang-timeout', [CompletionResultType]::ParameterName, "Per-test timeout, after which hang dump is triggered and the testhost process is terminated. Default is 1h. The timeout value is specified in the following format: 1.5h / 90m / 5400s / 5400000ms. When no unit is used (e.g. 5400000), the value is assumed to be in milliseconds. When used together with data driven tests, the timeout behavior depends on the test adapter used. For xUnit, NUnit and MSTest 2.2.4+ the timeout is renewed after every test case, For MSTest before 2.2.4, the timeout is used for all testcases.")
-                [CompletionResult]::new('--nologo', '--nologo', [CompletionResultType]::ParameterName, "Run test(s), without displaying Microsoft Testplatform banner")
+                [CompletionResult]::new('--no-logo', '--no-logo', [CompletionResultType]::ParameterName, "Run test(s), without displaying Microsoft Testplatform banner")
+                [CompletionResult]::new('--no-logo', '--nologo', [CompletionResultType]::ParameterName, "Run test(s), without displaying Microsoft Testplatform banner")
+                [CompletionResult]::new('--no-logo', '-nologo', [CompletionResultType]::ParameterName, "Run test(s), without displaying Microsoft Testplatform banner")
+                [CompletionResult]::new('--no-logo', '/nologo', [CompletionResultType]::ParameterName, "Run test(s), without displaying Microsoft Testplatform banner")
                 [CompletionResult]::new('--configuration', '--configuration', [CompletionResultType]::ParameterName, "The configuration to use for running tests. The default for most projects is `'Debug`'.")
                 [CompletionResult]::new('--configuration', '-c', [CompletionResultType]::ParameterName, "The configuration to use for running tests. The default for most projects is `'Debug`'.")
                 [CompletionResult]::new('--framework', '--framework', [CompletionResultType]::ParameterName, "The target framework to run tests for. The target framework must also be specified in the project file.")
diff --git a/test/dotnet.Tests/CompletionTests/snapshots/zsh/DotnetCliSnapshotTests.VerifyCompletions.verified.zsh b/test/dotnet.Tests/CompletionTests/snapshots/zsh/DotnetCliSnapshotTests.VerifyCompletions.verified.zsh
index cda65588f71a..3d0227a8cdf8 100644
--- a/test/dotnet.Tests/CompletionTests/snapshots/zsh/DotnetCliSnapshotTests.VerifyCompletions.verified.zsh
+++ b/test/dotnet.Tests/CompletionTests/snapshots/zsh/DotnetCliSnapshotTests.VerifyCompletions.verified.zsh
@@ -58,7 +58,10 @@ _testhost() {
                         '--artifacts-path=[The artifacts path. All output from the project, including build, publish, and pack output, will go in subfolders under the specified path.]:ARTIFACTS_DIR: ' \
                         '--no-incremental[Do not use incremental building.]' \
                         '--no-dependencies[Do not build project-to-project references and only build the specified project.]' \
+                        '--no-logo[Do not display the startup banner or the copyright message.]' \
                         '--nologo[Do not display the startup banner or the copyright message.]' \
+                        '-nologo[Do not display the startup banner or the copyright message.]' \
+                        '/nologo[Do not display the startup banner or the copyright message.]' \
                         '--self-contained=[Publish the .NET runtime with your application so the runtime doesn'\''t need to be installed on the target machine. The default is '\''false.'\'' However, when targeting .NET 7 or lower, the default is '\''true'\'' if a runtime identifier is specified.]: :((False\:"False" True\:"True" ))' \
                         '--sc=[Publish the .NET runtime with your application so the runtime doesn'\''t need to be installed on the target machine. The default is '\''false.'\'' However, when targeting .NET 7 or lower, the default is '\''true'\'' if a runtime identifier is specified.]: :((False\:"False" True\:"True" ))' \
                         '--no-self-contained[Publish your application as a framework dependent application. A compatible .NET runtime must be installed on the target machine to run your application.]' \
@@ -121,7 +124,10 @@ _testhost() {
                         '--output=[The directory containing the build artifacts to clean.]:OUTPUT_DIR: ' \
                         '-o=[The directory containing the build artifacts to clean.]:OUTPUT_DIR: ' \
                         '--artifacts-path=[The artifacts path. All output from the project, including build, publish, and pack output, will go in subfolders under the specified path.]:ARTIFACTS_DIR: ' \
+                        '--no-logo[Do not display the startup banner or the copyright message.]' \
                         '--nologo[Do not display the startup banner or the copyright message.]' \
+                        '-nologo[Do not display the startup banner or the copyright message.]' \
+                        '/nologo[Do not display the startup banner or the copyright message.]' \
                         '--disable-build-servers[Force the command to ignore any persistent build servers.]' \
                         '--help[Show command line help.]' \
                         '-h[Show command line help.]' \
@@ -538,7 +544,10 @@ _testhost() {
                         '--include-source[Include PDBs and source files. Source files go into the '\''src'\'' folder in the resulting nuget package.]' \
                         '--serviceable[Set the serviceable flag in the package. See https\://aka.ms/nupkgservicing for more information.]' \
                         '-s[Set the serviceable flag in the package. See https\://aka.ms/nupkgservicing for more information.]' \
+                        '--no-logo[Do not display the startup banner or the copyright message.]' \
                         '--nologo[Do not display the startup banner or the copyright message.]' \
+                        '-nologo[Do not display the startup banner or the copyright message.]' \
+                        '/nologo[Do not display the startup banner or the copyright message.]' \
                         '--interactive=[Allows the command to stop and wait for user input or action (for example to complete authentication).]: :((False\:"False" True\:"True" ))' \
                         '--no-restore[Do not restore the project before building.]' \
                         '--verbosity=[Set the MSBuild verbosity level. Allowed values are q\[uiet\], m\[inimal\], n\[ormal\], d\[etailed\], and diag\[nostic\].]:LEVEL:((d\:"d" detailed\:"detailed" diag\:"diag" diagnostic\:"diagnostic" m\:"m" minimal\:"minimal" n\:"n" normal\:"normal" q\:"q" quiet\:"quiet" ))' \
@@ -723,7 +732,10 @@ _testhost() {
                         '--self-contained=[Publish the .NET runtime with your application so the runtime doesn'\''t need to be installed on the target machine. The default is '\''false.'\'' However, when targeting .NET 7 or lower, the default is '\''true'\'' if a runtime identifier is specified.]: :((False\:"False" True\:"True" ))' \
                         '--sc=[Publish the .NET runtime with your application so the runtime doesn'\''t need to be installed on the target machine. The default is '\''false.'\'' However, when targeting .NET 7 or lower, the default is '\''true'\'' if a runtime identifier is specified.]: :((False\:"False" True\:"True" ))' \
                         '--no-self-contained[Publish your application as a framework dependent application. A compatible .NET runtime must be installed on the target machine to run your application.]' \
+                        '--no-logo[Do not display the startup banner or the copyright message.]' \
                         '--nologo[Do not display the startup banner or the copyright message.]' \
+                        '-nologo[Do not display the startup banner or the copyright message.]' \
+                        '/nologo[Do not display the startup banner or the copyright message.]' \
                         '--framework=[The target framework to publish for. The target framework has to be specified in the project file.]:FRAMEWORK:->dotnet_dynamic_complete' \
                         '-f=[The target framework to publish for. The target framework has to be specified in the project file.]:FRAMEWORK:->dotnet_dynamic_complete' \
                         '--runtime=[The target runtime to publish for. This is used when creating a self-contained deployment. The default is to publish a framework-dependent application.]:RUNTIME_IDENTIFIER:->dotnet_dynamic_complete' \
@@ -849,6 +861,10 @@ _testhost() {
                         '--locked-mode[Don'\''t allow updating project lock file.]' \
                         '--lock-file-path=[Output location where project lock file is written. By default, this is '\''PROJECT_ROOT\packages.lock.json'\''.]:LOCK_FILE_PATH: ' \
                         '--force-evaluate[Forces restore to reevaluate all dependencies even if a lock file already exists.]' \
+                        '--no-logo[Do not display the startup banner or the copyright message.]' \
+                        '--nologo[Do not display the startup banner or the copyright message.]' \
+                        '-nologo[Do not display the startup banner or the copyright message.]' \
+                        '/nologo[Do not display the startup banner or the copyright message.]' \
                         '--arch=[The target architecture.]:ARCH: ' \
                         '-a=[The target architecture.]:ARCH: ' \
                         '--os=[The target operating system.]:OS: ' \
@@ -989,6 +1005,10 @@ _testhost() {
                         '--use-current-runtime[Use current runtime as the target runtime.]' \
                         '--ucr[Use current runtime as the target runtime.]' \
                         '--disable-build-servers[Force the command to ignore any persistent build servers.]' \
+                        '--no-logo[Do not display the startup banner or the copyright message.]' \
+                        '--nologo[Do not display the startup banner or the copyright message.]' \
+                        '-nologo[Do not display the startup banner or the copyright message.]' \
+                        '/nologo[Do not display the startup banner or the copyright message.]' \
                         '--help[Show command line help.]' \
                         '-h[Show command line help.]' \
                         '*::argument: ' \
@@ -1031,7 +1051,10 @@ _testhost() {
                         '--blame-hang[Run the tests in blame mode and enables collecting hang dump when test exceeds the given timeout.]' \
                         '--blame-hang-dump-type=[The type of crash dump to be collected. The supported values are full (default), mini, and none. When '\''none'\'' is used then test host is terminated on timeout, but no dump is collected. Implies --blame-hang.]:DUMP_TYPE:((full\:"full" mini\:"mini" none\:"none" ))' \
                         '--blame-hang-timeout=[Per-test timeout, after which hang dump is triggered and the testhost process is terminated. Default is 1h. The timeout value is specified in the following format\: 1.5h / 90m / 5400s / 5400000ms. When no unit is used (e.g. 5400000), the value is assumed to be in milliseconds. When used together with data driven tests, the timeout behavior depends on the test adapter used. For xUnit, NUnit and MSTest 2.2.4+ the timeout is renewed after every test case, For MSTest before 2.2.4, the timeout is used for all testcases.]:TIMESPAN: ' \
+                        '--no-logo[Run test(s), without displaying Microsoft Testplatform banner]' \
                         '--nologo[Run test(s), without displaying Microsoft Testplatform banner]' \
+                        '-nologo[Run test(s), without displaying Microsoft Testplatform banner]' \
+                        '/nologo[Run test(s), without displaying Microsoft Testplatform banner]' \
                         '--configuration=[The configuration to use for running tests. The default for most projects is '\''Debug'\''.]:CONFIGURATION:->dotnet_dynamic_complete' \
                         '-c=[The configuration to use for running tests. The default for most projects is '\''Debug'\''.]:CONFIGURATION:->dotnet_dynamic_complete' \
                         '--framework=[The target framework to run tests for. The target framework must also be specified in the project file.]:FRAMEWORK:->dotnet_dynamic_complete' \
diff --git a/test/dotnet.Tests/ShellShimTests/WindowsEnvironmentPathTests.cs b/test/dotnet.Tests/ShellShimTests/WindowsEnvironmentPathTests.cs
index 482f1977d298..cbffb315f254 100644
--- a/test/dotnet.Tests/ShellShimTests/WindowsEnvironmentPathTests.cs
+++ b/test/dotnet.Tests/ShellShimTests/WindowsEnvironmentPathTests.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.DotNet.Cli;
 using Microsoft.DotNet.Cli.ShellShim;
 using Microsoft.DotNet.Cli.Utils;
@@ -190,6 +191,10 @@ private static string Expand(string path)
             {
                 return path?.Replace("%USERPROFILE%", @"C:\Users\username");
             }
+
+            public bool TryGetEnvironmentVariable(string name, [NotNullWhen(true)] out string value) => throw new NotImplementedException();
+            public bool TryGetEnvironmentVariableAsBool(string name, [NotNullWhen(true)] out bool value) => throw new NotImplementedException();
+        public bool TryGetEnvironmentVariableAsInt(string name, [NotNullWhen(true)] out int value) => throw new NotImplementedException();
         }
 
         private class MockEnvironmentPathEditor : IWindowsRegistryEnvironmentPathEditor