Merge pull request #496 from OpenCover/master

a couple of drdump issues
OpenCover · Jan 19, 2016 · e5ee1c6 · e5ee1c6
2 parents cfe5959 + a055eab
commit e5ee1c6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/default.build b/default.build
@@ -82,6 +82,12 @@
 
   </target>
 
+  <target name="sonarqube-build-release" depends="clean-all, build-environment, build-release-platforms" />
+
+  <target name="sonarqube-build-debug" depends="clean-all, build-environment, build-debug-platforms" />
+
+  <target name="quick-build-release" depends="clean, build-environment, build-release-platforms, test, test-cpp" />
+
   <target name="set-rc-property" >
     <property name="buildnumber.ci" value="-rc" />
   </target>

diff --git a/main/OpenCover.Console/Program.cs b/main/OpenCover.Console/Program.cs
@@ -98,12 +98,15 @@ static int Main(string[] args)
         private static void CurrentDomainOnUnhandledException(object sender, UnhandledExceptionEventArgs unhandledExceptionEventArgs)
         {
             var ex = (Exception)unhandledExceptionEventArgs.ExceptionObject;
-            Logger.Fatal("At: CurrentDomainOnUnhandledException");
-            Logger.FatalFormat("An {0} occured: {1}", ex.GetType(), ex.Message);
-            Logger.FatalFormat("stack: {0}", ex.StackTrace);
-            Logger.FatalFormat("A report has been sent to the OpenCover development team...");
+            //if (!(ex is ExitApplicationWithoutReportingException))
+            {
+                Logger.Fatal("At: CurrentDomainOnUnhandledException");
+                Logger.FatalFormat("An {0} occured: {1}", ex.GetType(), ex.Message);
+                Logger.FatalFormat("stack: {0}", ex.StackTrace);
+                Logger.FatalFormat("A report has been sent to the OpenCover development team...");
 
-            ReportCrash((Exception)unhandledExceptionEventArgs.ExceptionObject);
+                ReportCrash((Exception)unhandledExceptionEventArgs.ExceptionObject);
+            }
 
             Environment.Exit(0);
         }
@@ -124,7 +127,7 @@ private static void ReportCrash(Exception exception)
                         }
                     };
 
-                    uploader.SendAnonymousReport(SendRequestState.GetClientLib(), state.GetApplication(), state.GetExceptionDescription(true));
+                    uploader.SendAnonymousReport(SendRequestState.GetClientLib(), state.GetApplication(), state.GetExceptionDescription(false));
                 }
             }
             catch (Exception)
@@ -375,10 +378,9 @@ private static int RunProcess(CommandLineParser parser, Action<StringDictionary>
             }
             catch (Exception ex)
             {
-                ex.InformUser();
                 Logger.ErrorFormat("Failed to execute the following command '{0} {1}'", startInfo.FileName, startInfo.Arguments);
-                throw new ExitApplicationWithoutReportingException();
             }
+            return 1;
         }
 
         private static void DisplayResults(CoverageSession coverageSession, ICommandLine parser, ILog logger)

diff --git a/main/OpenCover.Framework/Manager/ProfilerManager.cs b/main/OpenCover.Framework/Manager/ProfilerManager.cs
@@ -126,10 +126,11 @@ private WaitCallback SetProfilerAttributes(Action<Action<StringDictionary>> proc
                 {
                     process(dictionary =>
                     {
-                        if (dictionary == null) return;
-                        SetProfilerAttributesOnDictionary(profilerKey, profilerNamespace, dictionary);
-
-                        environmentKeyRead.Set();
+                        if (dictionary != null)
+                        {
+                            SetProfilerAttributesOnDictionary(profilerKey, profilerNamespace, dictionary);
+                            environmentKeyRead.Set();
+                        }
                     });
                 }
                 finally

diff --git a/main/OpenCover.Framework/Persistance/BasePersistance.cs b/main/OpenCover.Framework/Persistance/BasePersistance.cs
@@ -663,7 +663,7 @@ private static void TransformSequences_RemoveCompilerGeneratedBranches (IEnumera
                         var sourceLineOrderedSps = method.SequencePoints.OrderBy(sp => sp.StartLine).ThenBy(sp => sp.StartColumn).Where(sp => sp.FileId == method.FileRef.UniqueId).ToArray();
 
                         // find getter/setter/static-method "{" offset
-                        if (sourceRepository.IsLeftCurlyBraceSequencePoint(sourceLineOrderedSps[0])) {
+                        if (sourceLineOrderedSps.Length > 0 && sourceRepository.IsLeftCurlyBraceSequencePoint(sourceLineOrderedSps[0])) {
                             startOffset = sourceLineOrderedSps[0].Offset;
                             // find method "}" offset
                             if (sourceLineOrderedSps.Length > 1 && sourceRepository.IsRightCurlyBraceSequencePoint(sourceLineOrderedSps.Last())) {