vstest.console: CommandLineOptions: preserve stacktrace on re-throw (…

…CA2200) (#2606) * vstest.console: CommandLineOptions: preserve stacktrace on re-throw (CA2200)
microsoft · Jan 26, 2021 · c7fa186 · c7fa186
1 parent 0338fd2
commit c7fa186
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/vstest.console/CommandLine/CommandLineOptions.cs b/src/vstest.console/CommandLine/CommandLineOptions.cs
@@ -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();

diff --git a/src/vstest.console/CommandLine/TestSourceException.cs b/src/vstest.console/CommandLine/TestSourceException.cs
@@ -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)
         {
         }