Fixed issue where crash report from Windows 8.1 and Windows 10 was reported as coming from Windows 8 in DoctorDump crash report.

Author: ravibpatel

CrashReporter.NET.sln

@@ -1,50 +1,32 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.26403.7
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrashReporter.NET", "CrashReporter.NET\CrashReporter.NET.csproj", "{67912BDA-1572-46B0-8623-5872D9DADBC8}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CrashReporterTest", "CrashReporterTest\CrashReporterTest.csproj", "{895AE503-6920-4BFF-9D47-3A91F90E8606}"
 EndProject
 Global
-	GlobalSection(SubversionScc) = preSolution
-		Svn-Managed = True
-		Manager = AnkhSVN - Subversion Support for Visual Studio
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{67912BDA-1572-46B0-8623-5872D9DADBC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{67912BDA-1572-46B0-8623-5872D9DADBC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{67912BDA-1572-46B0-8623-5872D9DADBC8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{67912BDA-1572-46B0-8623-5872D9DADBC8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{67912BDA-1572-46B0-8623-5872D9DADBC8}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{67912BDA-1572-46B0-8623-5872D9DADBC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{67912BDA-1572-46B0-8623-5872D9DADBC8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{67912BDA-1572-46B0-8623-5872D9DADBC8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{67912BDA-1572-46B0-8623-5872D9DADBC8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{67912BDA-1572-46B0-8623-5872D9DADBC8}.Release|x86.ActiveCfg = Release|Any CPU
 		{895AE503-6920-4BFF-9D47-3A91F90E8606}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{895AE503-6920-4BFF-9D47-3A91F90E8606}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{895AE503-6920-4BFF-9D47-3A91F90E8606}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{895AE503-6920-4BFF-9D47-3A91F90E8606}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{895AE503-6920-4BFF-9D47-3A91F90E8606}.Debug|x86.ActiveCfg = Debug|x86
-		{895AE503-6920-4BFF-9D47-3A91F90E8606}.Debug|x86.Build.0 = Debug|x86
 		{895AE503-6920-4BFF-9D47-3A91F90E8606}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{895AE503-6920-4BFF-9D47-3A91F90E8606}.Release|Any CPU.Build.0 = Release|Any CPU
-		{895AE503-6920-4BFF-9D47-3A91F90E8606}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{895AE503-6920-4BFF-9D47-3A91F90E8606}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{895AE503-6920-4BFF-9D47-3A91F90E8606}.Release|x86.ActiveCfg = Release|x86
-		{895AE503-6920-4BFF-9D47-3A91F90E8606}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(SubversionScc) = preSolution
+		Svn-Managed = True
+		Manager = AnkhSVN - Subversion Support for Visual Studio
+	EndGlobalSection
 EndGlobal

CrashReporter.NET/CrashReport.cs

@@ -44,7 +44,7 @@ public CrashReport(ReportCrash reportCrashObject)
                 SendAnonymousReport();
         }
 
-        public override sealed string Text
+        public sealed override string Text
         {
             get { return base.Text; }
             set { base.Text = value; }
@@ -59,8 +59,7 @@ private void CrashReportLoad(object sender, EventArgs e)
             textBoxMessage.Text = _reportCrash.Exception.Message;
             textBoxTime.Text = DateTime.Now.ToString(CultureInfo.InvariantCulture);
             textBoxSource.Text = _reportCrash.Exception.Source;
-            textBoxStackTrace.Text = string.Format("{0}\n{1}", _reportCrash.Exception.InnerException,
-                _reportCrash.Exception.StackTrace);
+            textBoxStackTrace.Text = $@"{_reportCrash.Exception.InnerException}\n{_reportCrash.Exception.StackTrace}";
         }
 
         private void CrashReport_Shown(object sender, EventArgs e)
@@ -93,9 +92,9 @@ private void ButtonSendReportClick(object sender, EventArgs e)
             var fromAddress = !string.IsNullOrEmpty(_reportCrash.FromEmail) ? new MailAddress(_reportCrash.FromEmail) : null;
             var toAddress = new MailAddress(_reportCrash.ToEmail);
 
-            const string r0_255 = @"([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])";
+            const string r0To255 = @"([0-1]?[0-9]{1,2}|25[0-5]|2[0-4][0-9])";
             var regexEmail = new Regex(@"^(([\w-]+\.)+[\w-]+|([a-zA-Z]{1}|[\w-]{2,}))@"
-                                       + @"((" + r0_255 + @"\." + r0_255 + @"\." + r0_255 + @"\." + r0_255 + @"){1}|"
+                                       + @"((" + r0To255 + @"\." + r0To255 + @"\." + r0To255 + @"\." + r0To255 + @"){1}|"
                                        + @"([a-zA-Z]+[\w-]+\.)+[a-zA-Z]{2,4})$");
             var subject = "";
 
@@ -122,14 +121,13 @@ private void ButtonSendReportClick(object sender, EventArgs e)
                 {
                     errorProviderEmail.SetError(textBoxEmail, "");
                     fromAddress = new MailAddress(textBoxEmail.Text.Trim());
-                    subject = string.Format("{0} {1} Crash Report by {2}", _reportCrash.ApplicationTitle,
-                        _reportCrash.ApplicationVersion, textBoxEmail.Text.Trim());
+                    subject =
+                        $"{_reportCrash.ApplicationTitle} {_reportCrash.ApplicationVersion} Crash Report by {textBoxEmail.Text.Trim()}";
                 }
             }
             if (string.IsNullOrEmpty(subject.Trim()))
             {
-                subject = string.Format("{0} {1} Crash Report", _reportCrash.ApplicationTitle,
-                    _reportCrash.ApplicationVersion);
+                subject = $"{_reportCrash.ApplicationTitle} {_reportCrash.ApplicationVersion} Crash Report";
             }
 
             if (_reportCrash.AnalyzeWithDoctorDump)
@@ -282,81 +280,80 @@ private string HtmlReport()
                     CreateReport(_reportCrash.Exception));
             if (!String.IsNullOrEmpty(textBoxUserMessage.Text.Trim()))
             {
-                report += string.Format(@"<br/>
+                report += $@"<br/>
                             <div class=""content"">
                             <div class=""title"" style=""background-color: #66FF99;"">
                             <h3>User Comment</h3>
                             </div>
                             <div class=""message"">
-                            <p>{0}</p>
+                            <p>{HttpUtility.HtmlEncode(textBoxUserMessage.Text.Trim())}</p>
                             </div>
-                            </div>", HttpUtility.HtmlEncode(textBoxUserMessage.Text.Trim()));
+                            </div>";
             }
             if (!String.IsNullOrEmpty(_reportCrash.DeveloperMessage.Trim()))
             {
-                report += string.Format(@"<br/>
+                report += $@"<br/>
                             <div class=""content"">
                             <div class=""title"" style=""background-color: #66FF99;"">
                             <h3>Developer Message</h3>
                             </div>
                             <div class=""message"">
-                            <p>{0}</p>
+                            <p>{HttpUtility.HtmlEncode(_reportCrash.DeveloperMessage.Trim())}</p>
                             </div>
-                            </div>", HttpUtility.HtmlEncode(_reportCrash.DeveloperMessage.Trim()));
+                            </div>";
             }
             report += "</body></html>";
             return report;
         }
 
         private string CreateReport(Exception exception)
         {
-            string report = string.Format(@"<br/>
+            string report = $@"<br/>
                         <div class=""content"">
                         <div class=""title"" style=""background-color: #66CCFF;"">
                         <h3>Exception Type</h3>
                         </div>
                         <div class=""message"">
-                        <p>{0}</p>
+                        <p>{HttpUtility.HtmlEncode(exception.GetType().ToString())}</p>
                         </div>
                         </div><br/>
                         <div class=""content"">
                         <div class=""title"" style=""background-color: #66CCFF;"">
                         <h3>Error Message</h3>
                         </div>
                         <div class=""message"">
-                        <p>{1}</p>
+                        <p>{HttpUtility.HtmlEncode(exception.Message)}</p>
                         </div>
                         </div><br/>
                         <div class=""content"">
                         <div class=""title"" style=""background-color: #66CCFF;"">
                         <h3>Source</h3>
                         </div>
                         <div class=""message"">
-                        <p>{2}</p>
+                        <p>{HttpUtility.HtmlEncode(exception.Source ?? "No source")}</p>
                         </div>
                         </div><br/>
                         <div class=""content"">
                         <div class=""title"" style=""background-color: #66CCFF;"">
                         <h3>Stack Trace</h3>
                         </div>
                         <div class=""message"">
-                        <p>{3}</p>
+                        <p>{
+                    HttpUtility.HtmlEncode(exception.StackTrace ?? "No stack trace").Replace("\r\n", "<br/>")
+                }</p>
                         </div>
-                        </div>", HttpUtility.HtmlEncode(exception.GetType().ToString()),
-                HttpUtility.HtmlEncode(exception.Message),
-                HttpUtility.HtmlEncode(exception.Source ?? "No source"),
-                HttpUtility.HtmlEncode(exception.StackTrace ?? "No stack trace").Replace("\r\n", "<br/>"));
+                        </div>";
             if (exception.InnerException != null)
             {
-                report += string.Format(@"<br/>
+                report += $@"<br/>
                         <div class=""content"">
                         <div class=""title"" style=""background-color: #66CCFF;"">
                         <h3>Inner Exception</h3>
                         </div>
                         <div class=""message"">
-                        {0}
+                        {CreateReport(exception.InnerException)}
                         </div>
-                        </div>", CreateReport(exception.InnerException));
+                        </div>";
             }
             report += "<br/>";
             return report;

CrashReporter.NET/DrDump/SendRequestState.cs

@@ -13,7 +13,7 @@ internal class SendRequestState
 
         public SendAnonymousReportCompletedEventArgs SendAnonymousReportResult { get; set; }
 
-        static private ExceptionInfo ConvertToExceptionInfo(Exception e, bool anonymous)
+        private static ExceptionInfo ConvertToExceptionInfo(Exception e, bool anonymous)
         {
             if (e == null)
                 return null;
@@ -28,7 +28,7 @@ static private ExceptionInfo ConvertToExceptionInfo(Exception e, bool anonymous)
             };
         }
 
-        static private System.Net.NetworkInformation.PhysicalAddress GetMacAddress()
+        private static System.Net.NetworkInformation.PhysicalAddress GetMacAddress()
         {
             var googleDns = new System.Net.Sockets.UdpClient("8.8.8.8", 53);
             IPAddress localAddress = ((IPEndPoint)googleDns.Client.LocalEndPoint).Address;
@@ -62,6 +62,8 @@ internal DetailedExceptionDescription GetDetailedExceptionDescription()
             };
         }
 
+
+
         internal ExceptionDescription GetExceptionDescription(bool anonymous)
         {
             var oldCulture = System.Threading.Thread.CurrentThread.CurrentCulture;
@@ -70,7 +72,7 @@ internal ExceptionDescription GetExceptionDescription(bool anonymous)
             System.Threading.Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
 
             var osVersion = Environment.OSVersion;
-            var os = string.Format("os={0};v={1};spname={2}", osVersion.Platform, osVersion.Version, osVersion.ServicePack);
+            var os = $"os={osVersion.Platform};v={HelperMethods.GetOSVersion()};spname={osVersion.ServicePack}";
 
             var exceptionDescription = new ExceptionDescription
             {
@@ -104,7 +106,7 @@ internal Application GetApplication()
 
             return new Application
             {
-                ApplicationGUID = AnonymousData.ApplicationID.HasValue ? AnonymousData.ApplicationID.Value.ToString("D") : null,
+                ApplicationGUID = AnonymousData.ApplicationID?.ToString("D"),
                 AppName = appTitle,
                 CompanyName = appCompany,
                 Email = AnonymousData.ToEmail,
@@ -116,7 +118,7 @@ internal Application GetApplication()
             };
         }
 
-        static internal ClientLib GetClientLib()
+        internal static ClientLib GetClientLib()
         {
             var clientVersion = typeof(CrashReport).Assembly.GetName().Version;
             return new ClientLib

CrashReporter.NET/HelperMethods.cs

@@ -63,9 +63,17 @@ private static string HKLM_GetString(string key, string value)
             {
                 RegistryKey registryKey = Registry.LocalMachine.OpenSubKey(key);
                 if (registryKey == null) return "";
-                return (string)registryKey.GetValue(value);
+                return registryKey.GetValue(value).ToString();
             }
-            catch { return ""; }
+            catch
+            {
+                return "";
+            }
+        }
+
+        public static string GetOSVersion()
+        {
+            return $"{HKLM_GetString(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion", "CurrentMajorVersionNumber")}.{HKLM_GetString(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion", "CurrentMinorVersionNumber")}.{HKLM_GetString(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion", "CurrentBuildNumber")}.0";
         }
 
         private delegate bool IsWow64ProcessDelegate([In] IntPtr handle, [Out] out bool isWow64Process);
@@ -86,7 +94,8 @@ public static string GetWindowsVersion()
             string currentBuild = HKLM_GetString(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion", "CurrentBuild");
             if (productName != "")
             {
-                return string.Format("{0}{1}{2}{3} (OS Build {4})", (productName.StartsWith("Microsoft") ? "" : "Microsoft "), productName, (csdVersion != "" ? " " + csdVersion : ""), osArchitecture, currentBuild);
+                return
+                    $"{(productName.StartsWith("Microsoft") ? "" : "Microsoft ")}{productName}{(csdVersion != "" ? " " + csdVersion : "")} {osArchitecture} (OS Build {currentBuild})";
             }
             return "";
         }

CrashReporter.NET/Properties/AssemblyInfo.cs

@@ -11,7 +11,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("RBSoft")]
 [assembly: AssemblyProduct("CrashReporter.NET")]
-[assembly: AssemblyCopyright("Copyright © 2012-2016  RBSoft")]
+[assembly: AssemblyCopyright("Copyright © 2012-2017  RBSoft")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -36,6 +36,6 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("1.5.1.0")]
-[assembly: AssemblyFileVersion("1.5.1.0")]
+[assembly: AssemblyVersion("1.5.2.0")]
+[assembly: AssemblyFileVersion("1.5.2.0")]
 [assembly: NeutralResourcesLanguageAttribute("en")]

CrashReporter.NET/ReportCrash.cs

@@ -77,7 +77,7 @@ public class ReportCrash
         /// Gets or Sets the current culture to use by the library.
         /// </summary>
         public CultureInfo CurrentCulture = CultureInfo.CreateSpecificCulture("en-US");
-        
+
         /// <summary>
         /// Specify whether CrashReporter.NET should send crash reports only for new problems (duplicates detected by Doctor Dump free cloud service).
         /// </summary>
@@ -125,8 +125,7 @@ public void Send(Exception exception)
 
             try
             {
-                ScreenShot = string.Format(@"{0}\{1} Crash Screenshot.png", Path.GetTempPath(),
-                                           ApplicationTitle);
+                ScreenShot = $@"{Path.GetTempPath()}\{ApplicationTitle} Crash Screenshot.png";
                 if (CaptureScreen)
                     CaptureScreenshot.CaptureScreen(ScreenShot, ImageFormat.Png);
                 else
@@ -139,19 +138,16 @@ public void Send(Exception exception)
             if (String.IsNullOrEmpty(ToEmail) || !AnalyzeWithDoctorDump && (String.IsNullOrEmpty(FromEmail) || String.IsNullOrEmpty(SmtpHost)))
                 return;
 
-            var parameterizedThreadStart = new ParameterizedThreadStart(ShowUI);
-            var thread = new Thread(parameterizedThreadStart) {IsBackground = false};
-            thread.CurrentCulture = thread.CurrentUICulture = CurrentCulture ?? System.Windows.Forms.Application.CurrentCulture;
+            var parameterizedThreadStart = new ParameterizedThreadStart(delegate
+            {
+                new CrashReport(this).ShowDialog();
+            });
+            var thread = new Thread(parameterizedThreadStart) { IsBackground = false };
+            thread.CurrentCulture = thread.CurrentUICulture = CurrentCulture ?? Thread.CurrentThread.CurrentCulture;
             thread.SetApartmentState(ApartmentState.STA);
             thread.Start(this);
             thread.Join();
         }
-
-        private static void ShowUI(object reportCrash)
-        {
-            var crashReport = new CrashReport((ReportCrash) reportCrash);
-            crashReport.ShowDialog();
-        }
     }
 
     /// <summary>

CrashReporterTest/CrashReporterTest.csproj

@@ -13,25 +13,6 @@
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\Debug\</OutputPath>

CrashReporterTest/Properties/AssemblyInfo.cs

@@ -9,7 +9,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("RBSoft")]
 [assembly: AssemblyProduct("CrashReporterTest")]
-[assembly: AssemblyCopyright("Copyright © 2012-2016  RBSoft")]
+[assembly: AssemblyCopyright("Copyright © 2012-2017  RBSoft")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -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.1.0")]
-[assembly: AssemblyFileVersion("1.5.1.0")]
+[assembly: AssemblyVersion("1.5.2.0")]
+[assembly: AssemblyFileVersion("1.5.2.0")]