Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,12 @@ public override Task<ValidationResult> ValidateOptionArgumentsAsync(CommandLineO

public override Task<ValidationResult> ValidateCommandLineOptionsAsync(ICommandLineOptions commandLineOptions)
=> IsCrashDumpMainOptionMissing(commandLineOptions)
? ValidationResult.InvalidTask(CrashDumpResources.MissingCrashDumpMainOption)
: AreCrashReportOptionsMutuallyExclusive(commandLineOptions)
? ValidationResult.InvalidTask(CrashDumpResources.CrashReportAndIfSupportedAreMutuallyExclusiveErrorMessage)
: IsCrashReportUnsupportedOnCurrentPlatform(commandLineOptions)
? ValidationResult.InvalidTask(CrashDumpResources.CrashReportNotSupportedOnWindowsErrorMessage)
: ValidationResult.ValidTask;
? ValidationResult.InvalidTask(CrashDumpResources.MissingCrashDumpMainOption)
: AreCrashReportOptionsMutuallyExclusive(commandLineOptions)
? ValidationResult.InvalidTask(CrashDumpResources.CrashReportAndIfSupportedAreMutuallyExclusiveErrorMessage)
: IsCrashReportUnsupportedOnCurrentPlatform(commandLineOptions)
? ValidationResult.InvalidTask(CrashDumpResources.CrashReportNotSupportedOnWindowsErrorMessage)
: ValidationResult.ValidTask;

private static bool AreCrashReportOptionsMutuallyExclusive(ICommandLineOptions commandLineOptions)
=> commandLineOptions.IsOptionSet(CrashDumpCommandLineOptions.CrashReportOptionName) &&
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,11 @@ public async Task BeforeTestHostProcessStartAsync(CancellationToken cancellation
// supported value (see MapToSupportedDumpType) and emit a single informational
// message so the CI log makes the substitution visible without breaking the run.
string requested = dumpTypeIfSupported[0];
string mapped = HangDumpCommandLineProvider.MapToSupportedDumpType(requested);
_dumpType = mapped;
if (!string.Equals(mapped, requested, StringComparison.OrdinalIgnoreCase))
_dumpType = HangDumpCommandLineProvider.MapToSupportedDumpType(requested);
if (!string.Equals(_dumpType, requested, StringComparison.OrdinalIgnoreCase))
{
await _outputDisplay.DisplayAsync(
new FormattedTextOutputDeviceData(string.Format(CultureInfo.InvariantCulture, ExtensionResources.HangDumpTypeIfSupportedFallbackInfoMessage, requested, mapped)),
new FormattedTextOutputDeviceData(string.Format(CultureInfo.InvariantCulture, ExtensionResources.HangDumpTypeIfSupportedFallbackInfoMessage, requested, _dumpType)),
cancellationToken).ConfigureAwait(false);
}
}
Expand Down
Loading