Updated assembly version to 1.5.5.

ravibpatel · ravibpatel · commit e7a2f71119d5 · 2018-06-20T18:17:56.000+05:30
diff --git a/CrashReporter.NET/CrashReport.cs b/CrashReporter.NET/CrashReport.cs
@@ -34,6 +34,7 @@ public CrashReport(ReportCrash reportCrashObject)
                 pictureBoxScreenshot.ImageLocation = _reportCrash.ScreenShot;
                 pictureBoxScreenshot.Show();
             }
+
             if (_reportCrash.DoctorDumpSettings != null &&
                 _reportCrash.DoctorDumpSettings.SendAnonymousReportSilently)
                 _reportCrash.SendAnonymousReport(SendRequestCompleted);
@@ -87,7 +88,6 @@ private void ButtonSendReportClick(object sender, EventArgs e)
             var regexEmail = new Regex(
                 @"^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$");
             string from = String.Empty;
-            string subject = String.Empty;
 
             if (string.IsNullOrEmpty(textBoxEmail.Text.Trim()))
             {
@@ -99,26 +99,24 @@ private void ButtonSendReportClick(object sender, EventArgs e)
             }
             else
             {
-                errorProviderEmail.SetError(textBoxEmail, "");
-                if (!regexEmail.IsMatch(textBoxEmail.Text.Trim()))
+                if (regexEmail.IsMatch(textBoxEmail.Text.Trim()))
+                {
+                    errorProviderEmail.SetError(textBoxEmail, "");
+                    from = textBoxEmail.Text.Trim();
+                }
+                else
                 {
                     if (_reportCrash.EmailRequired)
                     {
                         errorProviderEmail.SetError(textBoxEmail, Resources.InvalidEmailAddressError);
                         return;
                     }
                 }
-                else
-                {
-                    errorProviderEmail.SetError(textBoxEmail, "");
-                    from = textBoxEmail.Text.Trim();
-                    subject =
-                        $"{_reportCrash.ApplicationTitle} {_reportCrash.ApplicationVersion} Crash Report by {textBoxEmail.Text.Trim()}";
-                }
             }
 
-            _reportCrash.SendReport(checkBoxIncludeScreenshot.Checked, SendRequestCompleted, SmtpClientSendCompleted, this, from, subject, textBoxUserMessage.Text.Trim());
-            
+            _reportCrash.SendReport(checkBoxIncludeScreenshot.Checked, SendRequestCompleted, SmtpClientSendCompleted,
+                this, from, textBoxUserMessage.Text.Trim());
+
             _progressDialog = new ProgressDialog();
             _progressDialog.ShowDialog();
         }
diff --git a/CrashReporter.NET/Properties/AssemblyInfo.cs b/CrashReporter.NET/Properties/AssemblyInfo.cs
@@ -36,6 +36,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.5.4.0")]
-[assembly: AssemblyFileVersion("1.5.4.0")]
+[assembly: AssemblyVersion("1.5.5.0")]
+[assembly: AssemblyFileVersion("1.5.5.0")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
diff --git a/CrashReporter.NET/ReportCrash.cs b/CrashReporter.NET/ReportCrash.cs
@@ -150,6 +150,7 @@ public void Send(Exception exception)
                 {
                     throw new ArgumentNullException(@"FromEmail");
                 }
+
                 if (string.IsNullOrEmpty(SmtpHost))
                 {
                     throw new ArgumentNullException("SmtpHost");
@@ -160,6 +161,7 @@ public void Send(Exception exception)
             {
                 Application.EnableVisualStyles();
             }
+
             if (Silent)
             {
                 SendReport(IncludeScreenshot);
@@ -184,14 +186,19 @@ public void Send(Exception exception)
         internal void SendReport(bool includeScreenshot,
             DrDumpService.SendRequestCompletedEventHandler sendRequestCompleted = null,
             SendCompletedEventHandler smtpClientSendCompleted = null, Control form = null, string from = "",
-            string subject = "", string userMessage = "")
+            string userMessage = "")
         {
+            string subject = String.Empty;
             if (string.IsNullOrEmpty(from))
             {
                 from = !string.IsNullOrEmpty(FromEmail)
                     ? FromEmail
                     : null;
             }
+            else
+            {
+                subject = $"{ApplicationTitle} {ApplicationVersion} Crash Report by {from}";
+            }
 
             if (AnalyzeWithDoctorDump)
             {
@@ -205,7 +212,8 @@ internal void SendReport(bool includeScreenshot,
 
         #region Send Email Using SMTP
 
-        private void SendEmail(bool includeScreenshot, SendCompletedEventHandler smtpClientSendCompleted, string from, string subject, string userMessage)
+        private void SendEmail(bool includeScreenshot, SendCompletedEventHandler smtpClientSendCompleted, string from,
+            string subject, string userMessage)
         {
             if (string.IsNullOrEmpty(subject))
             {
diff --git a/CrashReporter.NET/build/CrashReporter.NET.Official.nuspec b/CrashReporter.NET/build/CrashReporter.NET.Official.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>CrashReporter.NET.Official</id>
-        <version>1.5.4</version>
+        <version>1.5.5</version>
         <title>CrashReporter.NET</title>
         <authors>RBSoft</authors>
         <owners>rbsoft</owners>
diff --git a/CrashReporterTest/Properties/AssemblyInfo.cs b/CrashReporterTest/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.2.0")]
-[assembly: AssemblyFileVersion("1.5.2.0")]
+[assembly: AssemblyVersion("1.5.5.0")]
+[assembly: AssemblyFileVersion("1.5.5.0")]
diff --git a/README.md b/README.md
@@ -39,16 +39,16 @@ internal static class Program
 
     private static void CurrentDomainOnUnhandledException(object sender, UnhandledExceptionEventArgs unhandledExceptionEventArgs)
     {
-        ReportCrash((Exception)unhandledExceptionEventArgs.ExceptionObject);
+        SendReport((Exception)unhandledExceptionEventArgs.ExceptionObject);
         Environment.Exit(0);
     }
 
     private static void ApplicationThreadException(object sender, ThreadExceptionEventArgs e)
     {
-        ReportCrash(e.Exception);
+        SendReport(e.Exception);
     }
 
-    public static void ReportCrash(Exception exception,  string developerMessage = "")
+    public static void SendReport(Exception exception,  string developerMessage = "")
     {
         var reportCrash = new ReportCrash("Email where you want to receive crash reports.")
         {
@@ -76,7 +76,7 @@ try
 }
 catch (Exception exception)
 {
-    Program.ReportCrash(exception, "Value of path variable is " + path);
+    Program.SendReport(exception, "Value of path variable is " + path);
 }
 ````
 
@@ -97,23 +97,23 @@ public partial class App : Application
 
     private void TaskSchedulerOnUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs unobservedTaskExceptionEventArgs)
     {
-        ReportCrash(unobservedTaskExceptionEventArgs.Exception);
+        SendReport(unobservedTaskExceptionEventArgs.Exception);
         Environment.Exit(0);
     }
 
     private void DispatcherOnUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs dispatcherUnhandledExceptionEventArgs)
     {
-        ReportCrash(dispatcherUnhandledExceptionEventArgs.Exception);
+        SendReport(dispatcherUnhandledExceptionEventArgs.Exception);
         Environment.Exit(0);
     }
 
     private static void CurrentDomainOnUnhandledException(object sender, UnhandledExceptionEventArgs unhandledExceptionEventArgs)
     {
-        ReportCrash((Exception)unhandledExceptionEventArgs.ExceptionObject);
+        SendReport((Exception)unhandledExceptionEventArgs.ExceptionObject);
         Environment.Exit(0);
     }
 
-    public static void ReportCrash(Exception exception, string developerMessage = "")
+    public static void SendReport(Exception exception, string developerMessage = "")
     {
         var reportCrash = new ReportCrash("Email where you want to receive crash reports.")
         {
@@ -140,7 +140,7 @@ try
 }
 catch (Exception exception)
 {
-    App.ReportCrash(exception, "Value of path variable is " + path);
+    App.SendReport(exception, "Value of path variable is " + path);
 }
 ````
 
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,6 +1,6 @@
-version: 1.5.4.{build}
+version: 1.5.5.{build}
 environment:
-  my_version: 1.5.4
+  my_version: 1.5.5
   my_secret:
     secure: eXAIysIG8npt2tVMYQpGwTLj47CK9lUB/NyEfVGgc90=
 skip_branch_with_pr: true

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public CrashReport(ReportCrash reportCrashObject)`
`34`	`34`	`pictureBoxScreenshot.ImageLocation = _reportCrash.ScreenShot;`
`35`	`35`	`pictureBoxScreenshot.Show();`
`36`	`36`	`}`
	`37`	`+`
`37`	`38`	`if (_reportCrash.DoctorDumpSettings != null &&`
`38`	`39`	`_reportCrash.DoctorDumpSettings.SendAnonymousReportSilently)`
`39`	`40`	`_reportCrash.SendAnonymousReport(SendRequestCompleted);`
`@@ -87,7 +88,6 @@ private void ButtonSendReportClick(object sender, EventArgs e)`
`87`	`88`	`var regexEmail = new Regex(`
`88`	`89`	@"^((([a-z]\|\d\|[!#\$%&'\\+\-\/=\?\^_`{\\|}~]\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]\|\d\|[!#\$%&'\\+\-\/=\?\^_`{\\|}~]\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+))\|((\x22)((((\x20\|\x09)(\x0d\x0a))?(\x20\|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]\|\x21\|[\x23-\x5b]\|[\x5d-\x7e]\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))(((\x20\|\x09)(\x0d\x0a))?(\x20\|\x09)+)?(\x22)))@((([a-z]\|\d\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\|(([a-z]\|\d\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]\|\d\|-\|\.\|_\|~\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]\|\d\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\|(([a-z]\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]\|\d\|-\|\.\|_\|~\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]\|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$");
`89`	`90`	`string from = String.Empty;`
`90`		`- string subject = String.Empty;`
`91`	`91`
`92`	`92`	`if (string.IsNullOrEmpty(textBoxEmail.Text.Trim()))`
`93`	`93`	`{`
`@@ -99,26 +99,24 @@ private void ButtonSendReportClick(object sender, EventArgs e)`
`99`	`99`	`}`
`100`	`100`	`else`
`101`	`101`	`{`
`102`		`- errorProviderEmail.SetError(textBoxEmail, "");`
`103`		`- if (!regexEmail.IsMatch(textBoxEmail.Text.Trim()))`
	`102`	`+ if (regexEmail.IsMatch(textBoxEmail.Text.Trim()))`
	`103`	`+ {`
	`104`	`+ errorProviderEmail.SetError(textBoxEmail, "");`
	`105`	`+ from = textBoxEmail.Text.Trim();`
	`106`	`+ }`
	`107`	`+ else`
`104`	`108`	`{`
`105`	`109`	`if (_reportCrash.EmailRequired)`
`106`	`110`	`{`
`107`	`111`	`errorProviderEmail.SetError(textBoxEmail, Resources.InvalidEmailAddressError);`
`108`	`112`	`return;`
`109`	`113`	`}`
`110`	`114`	`}`
`111`		`- else`
`112`		`- {`
`113`		`- errorProviderEmail.SetError(textBoxEmail, "");`
`114`		`- from = textBoxEmail.Text.Trim();`
`115`		`- subject =`
`116`		`- $"{_reportCrash.ApplicationTitle} {_reportCrash.ApplicationVersion} Crash Report by {textBoxEmail.Text.Trim()}";`
`117`		`- }`
`118`	`115`	`}`
`119`	`116`
`120`		`- _reportCrash.SendReport(checkBoxIncludeScreenshot.Checked, SendRequestCompleted, SmtpClientSendCompleted, this, from, subject, textBoxUserMessage.Text.Trim());`
`121`		`-`
	`117`	`+ _reportCrash.SendReport(checkBoxIncludeScreenshot.Checked, SendRequestCompleted, SmtpClientSendCompleted,`
	`118`	`+ this, from, textBoxUserMessage.Text.Trim());`
	`119`	`+`
`122`	`120`	`_progressDialog = new ProgressDialog();`
`123`	`121`	`_progressDialog.ShowDialog();`
`124`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,7 @@ public void Send(Exception exception)`
`150`	`150`	`{`
`151`	`151`	`throw new ArgumentNullException(@"FromEmail");`
`152`	`152`	`}`
	`153`	`+`
`153`	`154`	`if (string.IsNullOrEmpty(SmtpHost))`
`154`	`155`	`{`
`155`	`156`	`throw new ArgumentNullException("SmtpHost");`
`@@ -160,6 +161,7 @@ public void Send(Exception exception)`
`160`	`161`	`{`
`161`	`162`	`Application.EnableVisualStyles();`
`162`	`163`	`}`
	`164`	`+`
`163`	`165`	`if (Silent)`
`164`	`166`	`{`
`165`	`167`	`SendReport(IncludeScreenshot);`
`@@ -184,14 +186,19 @@ public void Send(Exception exception)`
`184`	`186`	`internal void SendReport(bool includeScreenshot,`
`185`	`187`	`DrDumpService.SendRequestCompletedEventHandler sendRequestCompleted = null,`
`186`	`188`	`SendCompletedEventHandler smtpClientSendCompleted = null, Control form = null, string from = "",`
`187`		`- string subject = "", string userMessage = "")`
	`189`	`+ string userMessage = "")`
`188`	`190`	`{`
	`191`	`+ string subject = String.Empty;`
`189`	`192`	`if (string.IsNullOrEmpty(from))`
`190`	`193`	`{`
`191`	`194`	`from = !string.IsNullOrEmpty(FromEmail)`
`192`	`195`	`? FromEmail`
`193`	`196`	`: null;`
`194`	`197`	`}`
	`198`	`+ else`
	`199`	`+ {`
	`200`	`+ subject = $"{ApplicationTitle} {ApplicationVersion} Crash Report by {from}";`
	`201`	`+ }`
`195`	`202`
`196`	`203`	`if (AnalyzeWithDoctorDump)`
`197`	`204`	`{`
`@@ -205,7 +212,8 @@ internal void SendReport(bool includeScreenshot,`
`205`	`212`
`206`	`213`	`#region Send Email Using SMTP`
`207`	`214`
`208`		`- private void SendEmail(bool includeScreenshot, SendCompletedEventHandler smtpClientSendCompleted, string from, string subject, string userMessage)`
	`215`	`+ private void SendEmail(bool includeScreenshot, SendCompletedEventHandler smtpClientSendCompleted, string from,`
	`216`	`+ string subject, string userMessage)`
`209`	`217`	`{`
`210`	`218`	`if (string.IsNullOrEmpty(subject))`
`211`	`219`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,16 +39,16 @@ internal static class Program`
`39`	`39`
`40`	`40`	`private static void CurrentDomainOnUnhandledException(object sender, UnhandledExceptionEventArgs unhandledExceptionEventArgs)`
`41`	`41`	`{`
`42`		`- ReportCrash((Exception)unhandledExceptionEventArgs.ExceptionObject);`
	`42`	`+ SendReport((Exception)unhandledExceptionEventArgs.ExceptionObject);`
`43`	`43`	`Environment.Exit(0);`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`private static void ApplicationThreadException(object sender, ThreadExceptionEventArgs e)`
`47`	`47`	`{`
`48`		`- ReportCrash(e.Exception);`
	`48`	`+ SendReport(e.Exception);`
`49`	`49`	`}`
`50`	`50`
`51`		`- public static void ReportCrash(Exception exception, string developerMessage = "")`
	`51`	`+ public static void SendReport(Exception exception, string developerMessage = "")`
`52`	`52`	`{`
`53`	`53`	`var reportCrash = new ReportCrash("Email where you want to receive crash reports.")`
`54`	`54`	`{`
`@@ -76,7 +76,7 @@ try`
`76`	`76`	`}`
`77`	`77`	`catch (Exception exception)`
`78`	`78`	`{`
`79`		`- Program.ReportCrash(exception, "Value of path variable is " + path);`
	`79`	`+ Program.SendReport(exception, "Value of path variable is " + path);`
`80`	`80`	`}`
`81`	`81`	````
`82`	`82`
`@@ -97,23 +97,23 @@ public partial class App : Application`
`97`	`97`
`98`	`98`	`private void TaskSchedulerOnUnobservedTaskException(object sender, UnobservedTaskExceptionEventArgs unobservedTaskExceptionEventArgs)`
`99`	`99`	`{`
`100`		`- ReportCrash(unobservedTaskExceptionEventArgs.Exception);`
	`100`	`+ SendReport(unobservedTaskExceptionEventArgs.Exception);`
`101`	`101`	`Environment.Exit(0);`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`private void DispatcherOnUnhandledException(object sender, DispatcherUnhandledExceptionEventArgs dispatcherUnhandledExceptionEventArgs)`
`105`	`105`	`{`
`106`		`- ReportCrash(dispatcherUnhandledExceptionEventArgs.Exception);`
	`106`	`+ SendReport(dispatcherUnhandledExceptionEventArgs.Exception);`
`107`	`107`	`Environment.Exit(0);`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`private static void CurrentDomainOnUnhandledException(object sender, UnhandledExceptionEventArgs unhandledExceptionEventArgs)`
`111`	`111`	`{`
`112`		`- ReportCrash((Exception)unhandledExceptionEventArgs.ExceptionObject);`
	`112`	`+ SendReport((Exception)unhandledExceptionEventArgs.ExceptionObject);`
`113`	`113`	`Environment.Exit(0);`
`114`	`114`	`}`
`115`	`115`
`116`		`- public static void ReportCrash(Exception exception, string developerMessage = "")`
	`116`	`+ public static void SendReport(Exception exception, string developerMessage = "")`
`117`	`117`	`{`
`118`	`118`	`var reportCrash = new ReportCrash("Email where you want to receive crash reports.")`
`119`	`119`	`{`
`@@ -140,7 +140,7 @@ try`
`140`	`140`	`}`
`141`	`141`	`catch (Exception exception)`
`142`	`142`	`{`
`143`		`- App.ReportCrash(exception, "Value of path variable is " + path);`
	`143`	`+ App.SendReport(exception, "Value of path variable is " + path);`
`144`	`144`	`}`
`145`	`145`	````
`146`	`146`