accept all msbuild variants

Author: baronfel

src/Cli/dotnet/Commands/CommandFactory.cs

@@ -32,7 +32,6 @@ internal static CommandBase CreateVirtualOrPhysicalCommand(
                 CommonOptions.GetItemOption,
                 CommonOptions.GetTargetResultOption,
                 CommonOptions.GetResultOutputFileOption,
-                CommonOptions.NoLogoOption()
             ]);
             msbuildArgs = transformer?.Invoke(msbuildArgs) ?? msbuildArgs;
             return configureVirtualCommand(msbuildArgs, Path.GetFullPath(arg));

src/Cli/dotnet/Commands/Package/Add/PackageAddCommand.cs

@@ -89,7 +89,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"

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");
             }
         }

src/Cli/dotnet/Commands/Run/RunCommand.cs

@@ -364,7 +364,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)
         {

src/Cli/dotnet/Commands/Store/StoreCommandParser.cs

@@ -89,6 +89,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);
 

src/Cli/dotnet/Commands/Test/VSTest/TestCommand.cs

@@ -204,12 +204,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,8 @@ private static TestCommand FromParseResult(ParseResult result, string[] settings
             CommonOptions.RestorePropertiesOption,
             TestCommandParser.VsTestTargetOption,
             TestCommandParser.VerbosityOption,
-            CommonOptions.NoLogoOption());
+            CommonOptions.NoLogoOption())
+            .CloneWithNoLogo(true);
 
         TestCommand testCommand = new(
             parsedMSBuildArgs,

src/Cli/dotnet/Commands/Test/VSTest/VSTestArgumentConverter.cs

@@ -73,7 +73,7 @@ private static readonly ImmutableHashSet<string> s_switchArguments
             StringComparer.OrdinalIgnoreCase,
             // Arguments
             "--listtests",
-            "--nologo",
+            "---nologo",
 
             // Ignored arguments
             "--no-build",

src/Cli/dotnet/CommonOptions.cs

@@ -405,9 +405,9 @@ private static IReadOnlyDictionary<string, string> ParseEnvironmentVariables(Arg
     /// </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)
+    public static Option<bool> NoLogoOption(bool defaultValue = true, string forwardAs = "--nologo", string? description = null)
     {
-        return new ForwardedOption<bool>("--nologo")
+        return new ForwardedOption<bool>("--nologo", "-nologo", "/nologo")
         {
             Description = description ?? Commands.CliCommandStrings.NoLogoOptionDescription,
             DefaultValueFactory = (ar) => Env.TryGetEnvironmentVariableAsBool("DOTNET_NOLOGO", out bool value) ? value : defaultValue,

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,

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 =