Skip to content

vstest.console: CommandLineOptions: preserve stacktrace on re-throw (CA2200) #2606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Haplois merged 3 commits into from
Jan 26, 2021
Merged

vstest.console: CommandLineOptions: preserve stacktrace on re-throw (CA2200) #2606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ceafda
vstest.console: CommandLineOptions: preserve stacktrace on re-throw (…
tmds Oct 26, 2020
40e5c2a
Merge remote-tracking branch 'upstream/master' into rethrow
tmds Jan 26, 2021
5e422a3
PR feedback
tmds Jan 26, 2021
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
10 changes: 3 additions & 7 deletions src/vstest.console/CommandLine/CommandLineOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,14 +295,10 @@ public void AddSource(string source)
// Get matching files from file pattern parser
matchingFiles = FilePatternParser.GetMatchingFiles(source);
}
catch(TestSourceException ex)
catch(TestSourceException ex) when (source.StartsWith("-") || source.StartsWith("/"))
{
if(source.StartsWith("-") || source.StartsWith("/"))
{
throw new TestSourceException(
string.Format(CultureInfo.CurrentUICulture, CommandLineResources.InvalidArgument, source));
}
throw ex;
throw new TestSourceException(
string.Format(CultureInfo.CurrentUICulture, CommandLineResources.InvalidArgument, source), ex);
}
// Add the matching files to source list
this.sources = this.sources.Union(matchingFiles).ToList();
Expand Down
12 changes: 11 additions & 1 deletion src/vstest.console/CommandLine/TestSourceException.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,17 @@ public TestSourceException()
/// </summary>
/// <param name="message">Message for the exception.</param>
public TestSourceException(string message)
: base(message)
: this(message, innerException: null)
{
}

/// <summary>
/// Initializes with the message and innerException.
/// </summary>
/// <param name="message">Message for the exception.</param>
/// <param name="innerException">The exception that is the cause of the current exception, or a null reference.</param>
public TestSourceException(string message, Exception innerException)
: base(message, innerException)
{
}

Expand Down