Merge branch 'master' of https://github.com/coderrapp/codeRR.Client.WinForms

jgauffin · jgauffin · commit d888cb4daf46 · 2018-12-04T20:48:24.000+01:00
diff --git a/src/Coderr.Client.WinForms.Demo/Coderr.Client.WinForms.Demo.csproj b/src/Coderr.Client.WinForms.Demo/Coderr.Client.WinForms.Demo.csproj
@@ -7,7 +7,7 @@
     <ProjectGuid>{4C041172-985C-4D05-BCB7-0E3C706C3A1C}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>codeRR.Client.WinForms.Demo</RootNamespace>
+    <RootNamespace>Coderr.Client.WinForms.Demo</RootNamespace>
     <AssemblyName>Coderr.Client.WinForms.Demo</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
@@ -33,8 +33,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Coderr.Client, Version=1.0.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Coderr.Client.1.0.6\lib\net451\Coderr.Client.dll</HintPath>
+    <Reference Include="Coderr.Client, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Coderr.Client.1.1.0\lib\net452\Coderr.Client.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
diff --git a/src/Coderr.Client.WinForms.Demo/CreateUserForm.Designer.cs b/src/Coderr.Client.WinForms.Demo/CreateUserForm.Designer.cs
diff --git a/src/Coderr.Client.WinForms.Demo/CreateUserForm.cs b/src/Coderr.Client.WinForms.Demo/CreateUserForm.cs
@@ -2,7 +2,7 @@
 using System.Data;
 using System.Windows.Forms;
 
-namespace codeRR.Client.WinForms.Demo
+namespace Coderr.Client.WinForms.Demo
 {
     public partial class CreateUserForm : Form
     {
diff --git a/src/Coderr.Client.WinForms.Demo/Program.cs b/src/Coderr.Client.WinForms.Demo/Program.cs
@@ -1,7 +1,8 @@
 ﻿using System;
 using System.Windows.Forms;
+using Coderr.Client;
 
-namespace codeRR.Client.WinForms.Demo
+namespace Coderr.Client.WinForms.Demo
 {
     internal static class Program
     {
diff --git a/src/Coderr.Client.WinForms.Demo/Properties/Resources.Designer.cs b/src/Coderr.Client.WinForms.Demo/Properties/Resources.Designer.cs
diff --git a/src/Coderr.Client.WinForms.Demo/Properties/Settings.Designer.cs b/src/Coderr.Client.WinForms.Demo/Properties/Settings.Designer.cs
diff --git a/src/Coderr.Client.WinForms.Demo/packages.config b/src/Coderr.Client.WinForms.Demo/packages.config
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Coderr.Client" version="1.0.6" targetFramework="net452" />
+  <package id="Coderr.Client" version="1.1.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
 </packages>
diff --git a/src/Coderr.Client.WinForms.Tests/Class1.cs b/src/Coderr.Client.WinForms.Tests/Class1.cs
@@ -1,4 +1,4 @@
-﻿namespace codeRR.Client.WinForms.Tests
+﻿namespace Coderr.Client.WinForms.Tests
 {
     public class Class1
     {
diff --git a/src/Coderr.Client.WinForms.Tests/Coderr.Client.WinForms.Tests.csproj b/src/Coderr.Client.WinForms.Tests/Coderr.Client.WinForms.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net452</TargetFramework>
-    <RootNamespace>codeRR.Client.WinForms.Tests</RootNamespace>
+    <RootNamespace>Coderr.Client.WinForms.Tests</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,7 +11,7 @@
     <PackageReference Include="NSubstitute" Version="2.0.3" />
     <PackageReference Include="xunit" Version="2.3.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0" />
-    <PackageReference Include="Coderr.Client" Version="1.0.6" />
+    <PackageReference Include="Coderr.Client" Version="1.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Coderr.Client.WinForms/Coderr.Client.WinForms.csproj b/src/Coderr.Client.WinForms/Coderr.Client.WinForms.csproj
@@ -1,18 +1,18 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net451</TargetFramework>
-    <Version>1.0.5.0</Version>
+    <Version>1.1.1.0</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <RootNamespace>codeRR.Client.WinForms</RootNamespace>
+    <RootNamespace>Coderr.Client.WinForms</RootNamespace>
     <DocumentationFile>bin\$(Configuration)\$(Platform)\Coderr.Client.WinForms.xml</DocumentationFile>
   </PropertyGroup>
   
   <PropertyGroup>
+    <PackageReleaseNotes>Error dialog can now be hidden.</PackageReleaseNotes>
     <PackageId>Coderr.Client.WinForms</PackageId>
     <Authors>1TCompany AB</Authors>
     <Description>Automated exception handling for WinForms-based applications</Description>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <PackageReleaseNotes>Converted to vstudio 2017 csproj format</PackageReleaseNotes>
     <Copyright>© 2017 1TCompany AB. All rights reserved.</Copyright>
     <PackageTags>logger exceptions analysis winforms</PackageTags>
     <PackageIconUrl>https://coderrapp.com/images/nuget_icon.png</PackageIconUrl>
@@ -23,7 +23,7 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <PackageReference Include="Coderr.Client" Version="1.0.6" />
+    <PackageReference Include="Coderr.Client" Version="1.1.0" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
diff --git a/src/Coderr.Client.WinForms/ConfigExtensions.cs b/src/Coderr.Client.WinForms/ConfigExtensions.cs
@@ -1,14 +1,14 @@
 ﻿using System;
 using System.Windows.Forms;
-using codeRR.Client.Config;
-using codeRR.Client.WinForms;
-using codeRR.Client.WinForms.ContextProviders;
+using Coderr.Client;
+using Coderr.Client.Config;
+using Coderr.Client.WinForms.ContextProviders;
 
 // Keeps in the root namespace to get IntelliSense
 
 // ReSharper disable once CheckNamespace
 
-namespace codeRR.Client
+namespace Coderr.Client.WinForms
 {
     /// <summary>
     ///     Use <c>Err.Configuration.CatchWinFormsExceptions()</c> to get started.
diff --git a/src/Coderr.Client.WinForms/ContextProviders/NamespaceDoc.cs b/src/Coderr.Client.WinForms/ContextProviders/NamespaceDoc.cs
@@ -1,6 +1,6 @@
 ﻿using System.Runtime.CompilerServices;
 
-namespace codeRR.Client.WinForms.ContextProviders
+namespace Coderr.Client.WinForms.ContextProviders
 {
     /// <summary>
     ///     Context providers for WinForms and WPF.
diff --git a/src/Coderr.Client.WinForms/ContextProviders/OpenFormsCollector.cs b/src/Coderr.Client.WinForms/ContextProviders/OpenFormsCollector.cs
@@ -3,11 +3,11 @@
 using System.Reflection;
 using System.Text;
 using System.Windows.Forms;
-using codeRR.Client.ContextProviders;
-using codeRR.Client.Contracts;
-using codeRR.Client.Reporters;
+using Coderr.Client.ContextProviders;
+using Coderr.Client.Contracts;
+using Coderr.Client.Reporters;
 
-namespace codeRR.Client.WinForms.ContextProviders
+namespace Coderr.Client.WinForms.ContextProviders
 {
     /// <summary>
     ///     Serializes all open forms into the context collection named <c>"OpenForms"</c>
diff --git a/src/Coderr.Client.WinForms/ContextProviders/ScreenshotProvider.cs b/src/Coderr.Client.WinForms/ContextProviders/ScreenshotProvider.cs
@@ -1,11 +1,11 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Threading;
-using codeRR.Client.ContextProviders;
-using codeRR.Client.Contracts;
-using codeRR.Client.Reporters;
+using Coderr.Client.ContextProviders;
+using Coderr.Client.Contracts;
+using Coderr.Client.Reporters;
 
-namespace codeRR.Client.WinForms.ContextProviders
+namespace Coderr.Client.WinForms.ContextProviders
 {
     /// <summary>
     ///     Can capture a screen-shot of all open forms
diff --git a/src/Coderr.Client.WinForms/ErrorDescription.Designer.cs b/src/Coderr.Client.WinForms/ErrorDescription.Designer.cs
diff --git a/src/Coderr.Client.WinForms/ErrorDescription.cs b/src/Coderr.Client.WinForms/ErrorDescription.cs
@@ -1,6 +1,6 @@
 ﻿using System.Windows.Forms;
 
-namespace codeRR.Client.WinForms
+namespace Coderr.Client.WinForms
 {
     internal partial class ErrorDescription : UserControl
     {
diff --git a/src/Coderr.Client.WinForms/FormFactoryContext.cs b/src/Coderr.Client.WinForms/FormFactoryContext.cs
@@ -1,6 +1,6 @@
-﻿using codeRR.Client.Contracts;
+﻿using Coderr.Client.Contracts;
 
-namespace codeRR.Client.WinForms
+namespace Coderr.Client.WinForms
 {
     /// <summary>
     ///     Allows us to pass information to the delegate that is used to create a new error reporting dialog
diff --git a/src/Coderr.Client.WinForms/FormScreenshooter.cs b/src/Coderr.Client.WinForms/FormScreenshooter.cs
@@ -4,10 +4,10 @@
 using System.Drawing.Imaging;
 using System.IO;
 using System.Windows.Forms;
-using codeRR.Client.Contracts;
-using codeRR.Client.WinForms.ContextProviders;
+using Coderr.Client.Contracts;
+using Coderr.Client.WinForms.ContextProviders;
 
-namespace codeRR.Client.WinForms
+namespace Coderr.Client.WinForms
 {
     /// <summary>
     ///     Used to capture a screenshot from forms
diff --git a/src/Coderr.Client.WinForms/NamespaceDoc.cs b/src/Coderr.Client.WinForms/NamespaceDoc.cs
@@ -1,6 +1,6 @@
 ﻿using System.Runtime.CompilerServices;
 
-namespace codeRR.Client.WinForms
+namespace Coderr.Client.WinForms
 {
     /// <summary>
     ///     <para>
diff --git a/src/Coderr.Client.WinForms/NotificationControl.Designer.cs b/src/Coderr.Client.WinForms/NotificationControl.Designer.cs
diff --git a/src/Coderr.Client.WinForms/NotificationControl.cs b/src/Coderr.Client.WinForms/NotificationControl.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Windows.Forms;
 
-namespace codeRR.Client.WinForms
+namespace Coderr.Client.WinForms
 {
     internal partial class NotificationControl : UserControl
     {
diff --git a/src/Coderr.Client.WinForms/ReportDialog.Designer.cs b/src/Coderr.Client.WinForms/ReportDialog.Designer.cs
diff --git a/src/Coderr.Client.WinForms/ReportDialog.cs b/src/Coderr.Client.WinForms/ReportDialog.cs
@@ -2,10 +2,11 @@
 using System.Drawing;
 using System.Reflection;
 using System.Windows.Forms;
-using codeRR.Client.ContextCollections;
-using codeRR.Client.Contracts;
+using Coderr.Client;
+using Coderr.Client.ContextCollections;
+using Coderr.Client.Contracts;
 
-namespace codeRR.Client.WinForms
+namespace Coderr.Client.WinForms
 {
     /// <summary>
     ///     Default dialog which is shown when an error has been caught
diff --git a/src/Coderr.Client.WinForms/WinformsErrorReportContext.cs b/src/Coderr.Client.WinForms/WinformsErrorReportContext.cs
@@ -1,7 +1,7 @@
 ﻿using System;
-using codeRR.Client.Reporters;
+using Coderr.Client.Reporters;
 
-namespace codeRR.Client.WinForms
+namespace Coderr.Client.WinForms
 {
     /// <summary>
     ///     Customization for WinForms/WPF applications
diff --git a/src/Coderr.Client.WinForms/WinformsErrorReporter.cs b/src/Coderr.Client.WinForms/WinformsErrorReporter.cs
@@ -1,8 +1,9 @@
 ﻿using System;
 using System.Threading;
 using System.Windows.Forms;
+using Coderr.Client;
 
-namespace codeRR.Client.WinForms
+namespace Coderr.Client.WinForms
 {
     /// <summary>
     ///     Class that processes unhandled exceptions that WinForms/WPF applications throw.
@@ -41,6 +42,14 @@ private static void OnException(object sender, ThreadExceptionEventArgs e)
             var context = new WinformsErrorReportContext(_instance, e.Exception);
 
             var dto = Err.GenerateReport(context);
+            if (!Err.Configuration.UserInteraction.AskUserForDetails
+                && !Err.Configuration.UserInteraction.AskForEmailAddress
+                && !Err.Configuration.UserInteraction.AskUserForPermission)
+            {
+                Err.UploadReport(dto);
+                return;
+            }
+
             if (!Err.Configuration.UserInteraction.AskUserForPermission)
                 Err.UploadReport(dto);
 

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.Data;`
`3`	`3`	`using System.Windows.Forms;`
`4`	`4`
`5`		`-namespace codeRR.Client.WinForms.Demo`
	`5`	`+namespace Coderr.Client.WinForms.Demo`
`6`	`6`	`{`
`7`	`7`	`public partial class CreateUserForm : Form`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Windows.Forms;`
	`3`	`+using Coderr.Client;`
`3`	`4`
`4`		`-namespace codeRR.Client.WinForms.Demo`
	`5`	`+namespace Coderr.Client.WinForms.Demo`
`5`	`6`	`{`
`6`	`7`	`internal static class Program`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace codeRR.Client.WinForms.Tests`
	`1`	`+namespace Coderr.Client.WinForms.Tests`
`2`	`2`	`{`
`3`	`3`	`public class Class1`
`4`	`4`	`{`