Skip to content

Commit e08348f

Browse files
baronfelbaronfel
committed
ensure that nologo is flowed through in all calls to parse msbuild args
1 parent 4ac3b77 commit e08348f

File tree

11 files changed

+17
-13
lines changed

11 files changed

+17
-13
lines changed

‎src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -385,7 +385,7 @@ internal void GenerateDepsJsonFile(
385385
string? stdOut;
386386
string? stdErr;
387387

388-
var msbuildArgs = MSBuildArgs.AnalyzeMSBuildArguments([..args], CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, BuildCommandParser.TargetOption, BuildCommandParser.VerbosityOption);
388+
var msbuildArgs = MSBuildArgs.AnalyzeMSBuildArguments([..args], CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, BuildCommandParser.TargetOption, BuildCommandParser.VerbosityOption, BuildCommandParser.NoLogoOption);
389389
var forwardingAppWithoutLogging = new MSBuildForwardingAppWithoutLogging(msbuildArgs, msBuildExePath);
390390
if (forwardingAppWithoutLogging.ExecuteMSBuildOutOfProc)
391391
{

‎src/Cli/dotnet/Commands/Build/BuildCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public static CommandBase FromParseResult(ParseResult parseResult, string? msbui
4242
noRestore: noRestore,
4343
msbuildPath: msbuildPath
4444
),
45-
[CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, BuildCommandParser.TargetOption, BuildCommandParser.VerbosityOption],
45+
[CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, BuildCommandParser.TargetOption, BuildCommandParser.VerbosityOption, BuildCommandParser.NoLogoOption],
4646
parseResult,
4747
msbuildPath
4848
);

‎src/Cli/dotnet/Commands/Clean/CleanCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static CommandBase FromParseResult(ParseResult result, string? msbuildPat
3333
NoWriteBuildMarkers = true,
3434
},
3535
static (msbuildArgs, msbuildPath) => new CleanCommand(msbuildArgs, msbuildPath),
36-
[ CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CleanCommandParser.TargetOption, CleanCommandParser.VerbosityOption ],
36+
[ CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CleanCommandParser.TargetOption, CleanCommandParser.VerbosityOption, CleanCommandParser.NoLogoOption],
3737
result,
3838
msbuildPath
3939
);

‎src/Cli/dotnet/Commands/CommandFactory.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ internal static CommandBase CreateVirtualOrPhysicalCommand(
3232
CommonOptions.GetItemOption,
3333
CommonOptions.GetTargetResultOption,
3434
CommonOptions.GetResultOutputFileOption,
35+
CommonOptions.NoLogoOption()
3536
]);
3637
msbuildArgs = transformer?.Invoke(msbuildArgs) ?? msbuildArgs;
3738
return configureVirtualCommand(msbuildArgs, Path.GetFullPath(arg));

‎src/Cli/dotnet/Commands/Pack/PackCommand.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public static CommandBase FromParseResult(ParseResult parseResult, string? msbui
5959
CommonOptions.RestorePropertiesOption,
6060
PackCommandParser.TargetOption,
6161
PackCommandParser.VerbosityOption,
62+
PackCommandParser.NoLogoOption
6263
],
6364
parseResult,
6465
msbuildPath,
@@ -92,14 +93,14 @@ public static int RunPackCommand(ParseResult parseResult)
9293

9394
if (args.Count != 1)
9495
{
95-
Console.Error.WriteLine(CliStrings.PackCmd_OneNuspecAllowed);
96+
Console.Error.WriteLine(CliStrings.PackCmd_OneNuspecAllowed);
9697
return 1;
9798
}
9899

99100
var nuspecPath = args[0];
100101

101102
var packArgs = new PackArgs()
102-
{
103+
{
103104
Logger = new NuGetConsoleLogger(),
104105
Exclude = new List<string>(),
105106
OutputDirectory = parseResult.GetValue(PackCommandParser.OutputOption),

‎src/Cli/dotnet/Commands/Publish/PublishCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public static CommandBase FromParseResult(ParseResult parseResult, string? msbui
5757
noRestore: noRestore,
5858
msbuildPath: msbuildPath
5959
),
60-
[CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, PublishCommandParser.TargetOption, PublishCommandParser.VerbosityOption],
60+
[CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, PublishCommandParser.TargetOption, PublishCommandParser.VerbosityOption, PublishCommandParser.NoLogoOption],
6161
parseResult,
6262
msbuildPath,
6363
(msbuildArgs) =>

‎src/Cli/dotnet/Commands/Restore/RestoreCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public static CommandBase FromParseResult(ParseResult result, string? msbuildPat
4040
{
4141
return CreateForwarding(msbuildArgs, msbuildPath);
4242
},
43-
[CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, RestoreCommandParser.TargetOption, RestoreCommandParser.VerbosityOption],
43+
[CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, RestoreCommandParser.TargetOption, RestoreCommandParser.VerbosityOption, RestoreCommandParser.NoLogoOption],
4444
result,
4545
msbuildPath
4646
);

‎src/Cli/dotnet/Commands/Restore/RestoreCommandParser.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ internal static class RestoreCommandParser
2626

2727
public static readonly Option<string[]> TargetOption = CommonOptions.RequiredMSBuildTargetOption("Restore");
2828
public static readonly Option<Utils.VerbosityOptions> VerbosityOption = CommonOptions.VerbosityOption(Utils.VerbosityOptions.minimal);
29+
public static readonly Option<bool> NoLogoOption = CommonOptions.NoLogoOption();
2930

3031
private static IEnumerable<Option> FullRestoreOptions() =>
3132
ImplicitRestoreOptions(true, true, true, true).Concat(

‎src/Cli/dotnet/Commands/Test/MTP/MSBuildUtility.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static (IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModul
3535

3636
FacadeLogger? logger = LoggerUtility.DetermineBinlogger([.. buildOptions.MSBuildArgs], dotnetTestVerb);
3737

38-
var msbuildArgs = MSBuildArgs.AnalyzeMSBuildArguments(buildOptions.MSBuildArgs, CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CommonOptions.MSBuildTargetOption(), CommonOptions.VerbosityOption());
38+
var msbuildArgs = MSBuildArgs.AnalyzeMSBuildArguments(buildOptions.MSBuildArgs, CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CommonOptions.MSBuildTargetOption(), CommonOptions.VerbosityOption(), CommonOptions.NoLogoOption());
3939

4040
using var collection = new ProjectCollection(globalProperties: CommonRunHelpers.GetGlobalPropertiesFromArgs(msbuildArgs), loggers: logger is null ? null : [logger], toolsetDefinitionLocations: ToolsetDefinitionLocations.Default);
4141
var evaluationContext = EvaluationContext.Create(EvaluationContext.SharingPolicy.Shared);
@@ -57,7 +57,7 @@ public static (IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModul
5757

5858
FacadeLogger? logger = LoggerUtility.DetermineBinlogger([.. buildOptions.MSBuildArgs], dotnetTestVerb);
5959

60-
var msbuildArgs = MSBuildArgs.AnalyzeMSBuildArguments(buildOptions.MSBuildArgs, CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CommonOptions.MSBuildTargetOption(), CommonOptions.VerbosityOption());
60+
var msbuildArgs = MSBuildArgs.AnalyzeMSBuildArguments(buildOptions.MSBuildArgs, CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CommonOptions.MSBuildTargetOption(), CommonOptions.VerbosityOption(), CommonOptions.NoLogoOption());
6161

6262
using var collection = new ProjectCollection(globalProperties: CommonRunHelpers.GetGlobalPropertiesFromArgs(msbuildArgs), logger is null ? null : [logger], toolsetDefinitionLocations: ToolsetDefinitionLocations.Default);
6363
var evaluationContext = EvaluationContext.Create(EvaluationContext.SharingPolicy.Shared);
@@ -123,7 +123,7 @@ private static bool BuildOrRestoreProjectOrSolution(string filePath, BuildOption
123123
msbuildArgs.Add($"-verbosity:quiet");
124124
}
125125

126-
var parsedMSBuildArgs = MSBuildArgs.AnalyzeMSBuildArguments(msbuildArgs, CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, TestCommandParser.MTPTargetOption, TestCommandParser.VerbosityOption);
126+
var parsedMSBuildArgs = MSBuildArgs.AnalyzeMSBuildArguments(msbuildArgs, CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, TestCommandParser.MTPTargetOption, TestCommandParser.VerbosityOption, CommonOptions.NoLogoOption());
127127

128128
int result = new RestoringCommand(parsedMSBuildArgs, buildOptions.HasNoRestore).Execute();
129129

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,8 @@ private static TestCommand FromParseResult(ParseResult result, string[] settings
244244
CommonOptions.PropertiesOption,
245245
CommonOptions.RestorePropertiesOption,
246246
TestCommandParser.VsTestTargetOption,
247-
TestCommandParser.VerbosityOption);
247+
TestCommandParser.VerbosityOption,
248+
CommonOptions.NoLogoOption());
248249

249250
TestCommand testCommand = new(
250251
parsedMSBuildArgs,
@@ -260,7 +261,7 @@ private static TestCommand FromParseResult(ParseResult result, string[] settings
260261
}
261262
}
262263

263-
264+
264265
Dictionary<string, string> variables = VSTestForwardingApp.GetVSTestRootVariables();
265266
foreach (var (rootVariableName, rootValue) in variables) {
266267
testCommand.EnvironmentVariable(rootVariableName, rootValue);

0 commit comments

Comments
 (0)