Skip to content

Commit 0547b6c

Browse files
Merge main into darc-main-3179108c-c6b8-45ea-ab29-d26b162530ec
2 parents 954fdcd + 90e525a commit 0547b6c

File tree

81 files changed

+104
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+104
-87
lines changed

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

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,12 @@ public class RunCommand
6969
public string? LaunchProfile { get; }
7070
public bool NoLaunchProfile { get; }
7171

72+
/// <summary>
73+
/// The verbosity of the run-portion of this command specifically. If implicit builds are performed, they will always happen
74+
/// at a quiet verbosity by default, but it's important that we enable separate verbosity for the run command itself.
75+
/// </summary>
76+
public VerbosityOptions RunCommandVerbosity { get; private set; }
77+
7278
/// <summary>
7379
/// True to ignore command line arguments specified by launch profile.
7480
/// </summary>
@@ -208,7 +214,7 @@ internal bool TryGetLaunchProfileSettingsIfNeeded(out ProjectLaunchSettingsModel
208214
return true;
209215
}
210216

211-
if (MSBuildArgs.Verbosity?.IsQuiet() != true)
217+
if (!RunCommandVerbosity.IsQuiet())
212218
{
213219
Reporter.Output.WriteLine(string.Format(CliCommandStrings.UsingLaunchSettingsFromMessage, launchSettingsPath));
214220
}
@@ -339,11 +345,20 @@ private MSBuildArgs SetupSilentBuildArgs(MSBuildArgs msbuildArgs)
339345
{
340346
msbuildArgs = msbuildArgs.CloneWithAdditionalArgs("-nologo");
341347

342-
if (msbuildArgs.Verbosity is null)
348+
if (msbuildArgs.Verbosity is VerbosityOptions userVerbosity)
349+
{
350+
// if the user had a desired verbosity, we use that for the run command
351+
RunCommandVerbosity = userVerbosity;
352+
return msbuildArgs;
353+
}
354+
else
343355
{
356+
// Apply defaults if the user didn't expressly set the verbosity.
357+
// Setting RunCommandVerbosity to minimal ensures that we keep the previous launchsettings
358+
// and related diagnostics messages on by default.
359+
RunCommandVerbosity = VerbosityOptions.minimal;
344360
return msbuildArgs.CloneWithVerbosity(VerbosityOptions.quiet);
345361
}
346-
return msbuildArgs;
347362
}
348363

349364
internal ICommand GetTargetCommand(Func<ProjectCollection, ProjectInstance>? projectFactory)
@@ -356,7 +371,7 @@ internal ICommand GetTargetCommand(Func<ProjectCollection, ProjectInstance>? pro
356371
return CreateCommandForCscBuiltProgram(EntryPointFileFullPath);
357372
}
358373

359-
FacadeLogger? logger = LoggerUtility.DetermineBinlogger([..MSBuildArgs.OtherMSBuildArgs], "dotnet-run");
374+
FacadeLogger? logger = LoggerUtility.DetermineBinlogger([.. MSBuildArgs.OtherMSBuildArgs], "dotnet-run");
360375
var project = EvaluateProject(ProjectFileFullPath, projectFactory, MSBuildArgs, logger);
361376
ValidatePreconditions(project);
362377
InvokeRunArgumentsTarget(project, NoBuild, logger, MSBuildArgs);
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)",
3-
"name": "Testovací položka NUnit",
3+
"name": "NUnit Test Item",
44
"description": "Vytvoří novou testovací třídu NUnit.",
55
"postActions/openInEditor/description": "Otevře vytvořenou třídu testovacího přípravku v editoru."
66
}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)",
3-
"name": "NUnit-Testelement",
3+
"name": "NUnit Test Item",
44
"description": "Erstellt eine neue NUnit-Testklasse",
55
"postActions/openInEditor/description": "Öffnet die erstellte Testfixture-Klasse im Editor."
66
}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)",
3-
"name": "Elemento de prueba de NUnit",
3+
"name": "NUnit Test Item",
44
"description": "Crea una nueva clase de prueba NUnit",
55
"postActions/openInEditor/description": "Abrir la clase de accesorio de prueba creada en el editor"
66
}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Aleksei Kharlov alias halex2005 (codeofclimber.ru)",
3-
"name": "Élément de test NUnit",
3+
"name": "NUnit Test Item",
44
"description": "Crée une classe de test NUnit.",
55
"postActions/openInEditor/description": "Ouvre la classe de fixture de test créée dans l’éditeur"
66
}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)",
3-
"name": "Elemento di test NUnit",
3+
"name": "NUnit Test Item",
44
"description": "Crea una nuova classe di test NUnit",
55
"postActions/openInEditor/description": "Apre la classe di fixture di test creata nell'editor"
66
}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)",
3-
"name": "NUnit テスト項目",
3+
"name": "NUnit Test Item",
44
"description": "新しい NUnit テスト クラスを作成します",
55
"postActions/openInEditor/description": "作成されたテスト フィクスチャ クラスをエディターで開きます"
66
}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)",
3-
"name": "NUnit 테스트 항목",
3+
"name": "NUnit Test Item",
44
"description": "새 NUnit 테스트 클래스를 만듭니다.",
55
"postActions/openInEditor/description": "편집기에서 만든 테스트 픽스쳐 클래스 열기"
66
}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Aleksei Kharlov aka halex2005 (codeofclimber.ru)",
3-
"name": "NUnit — element testowy",
3+
"name": "NUnit Test Item",
44
"description": "Tworzy nową klasę testu NUnit",
55
"postActions/openInEditor/description": "Otwiera utworzoną klasę warunków początkowych w edytorze"
66
}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"author": "Aleksei Kharlov, também conhecido como halex2005 (codeofclimber.ru)",
3-
"name": "Item de Teste NUnit",
3+
"name": "NUnit Test Item",
44
"description": "Cria uma nova classe de teste NUnit",
55
"postActions/openInEditor/description": "Abre a classe de acessório de teste criada no editor"
66
}

0 commit comments

Comments
 (0)