From bd1fad5a535391c0b0eccf0dfe26991cbc0fb29a Mon Sep 17 00:00:00 2001 From: Pirvu Doru Lucian Date: Mon, 14 Oct 2013 13:39:46 +0300 Subject: [PATCH 1/4] bf-7 added nuspec for core project --- Code/Core/BugFreak/BugFreak.nuspec | 16 ++++++++++++++++ Code/Core/BugFreak/Properties/AssemblyInfo.cs | 8 ++++---- 2 files changed, 20 insertions(+), 4 deletions(-) create mode 100644 Code/Core/BugFreak/BugFreak.nuspec diff --git a/Code/Core/BugFreak/BugFreak.nuspec b/Code/Core/BugFreak/BugFreak.nuspec new file mode 100644 index 0000000..0e439a5 --- /dev/null +++ b/Code/Core/BugFreak/BugFreak.nuspec @@ -0,0 +1,16 @@ + + + + $id$ + $version$ + $title$ + dev@omnipasteapp.com + $author$ + http://www.apache.org/licenses/LICENSE-2.0.txt + https://github.com/Agilefreaks/winbugfreak + false + $description$ + Copyright 2013 + error reporting exception handle + + \ No newline at end of file diff --git a/Code/Core/BugFreak/Properties/AssemblyInfo.cs b/Code/Core/BugFreak/Properties/AssemblyInfo.cs index 308f422..ba8fda2 100644 --- a/Code/Core/BugFreak/Properties/AssemblyInfo.cs +++ b/Code/Core/BugFreak/Properties/AssemblyInfo.cs @@ -6,9 +6,9 @@ // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("BugFreak")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("BugFreak. Easily track your applications errors. More info at https://bugfreak.co")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("AgileFreaks")] [assembly: AssemblyProduct("BugFreak")] [assembly: AssemblyCopyright("Copyright © 2013")] [assembly: AssemblyTrademark("")] @@ -32,5 +32,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.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.0.1.0")] +[assembly: AssemblyFileVersion("1.0.1.0")] From 3488bea71a7a06477161531c93cd9429c81c459a Mon Sep 17 00:00:00 2001 From: Pirvu Doru Lucian Date: Mon, 14 Oct 2013 13:40:19 +0300 Subject: [PATCH 2/4] bf-7 updated MVC integration to use the core project --- .../BugFreak.MVC3.Tests.csproj | 4 + .../RequestErrorDataProviderTests.cs | 2 +- .../SessionErrorDataProviderTests.cs | 2 +- .../Components/UserErrorDataProviderTests.cs | 2 +- Code/BugFreak.MVC3/BugFreak.MVC3.csproj | 105 ++---------------- Code/BugFreak.MVC3/BugFreak.MVC3.nuspec | 6 +- Code/BugFreak.MVC3/BugFreak.cs | 7 +- .../Components/RequestErrorDataProvider.cs | 11 +- .../Components/SessionErrorDataProvider.cs | 11 +- .../Components/UserErrorDataProvider.cs | 9 +- .../ReportErrorAttribute.cs | 7 +- Code/BugFreak.MVC3/Properties/AssemblyInfo.cs | 4 +- Code/BugFreak.MVC3/packages.config | 1 + 13 files changed, 41 insertions(+), 130 deletions(-) rename Code/BugFreak.MVC3/{Core => }/Components/RequestErrorDataProvider.cs (90%) rename Code/BugFreak.MVC3/{Core => }/Components/SessionErrorDataProvider.cs (85%) rename Code/BugFreak.MVC3/{Core => }/Components/UserErrorDataProvider.cs (87%) rename Code/BugFreak.MVC3/{ => Infrastructure}/ReportErrorAttribute.cs (79%) diff --git a/Code/BugFreak.MVC3.Tests/BugFreak.MVC3.Tests.csproj b/Code/BugFreak.MVC3.Tests/BugFreak.MVC3.Tests.csproj index d9224e2..0a90098 100644 --- a/Code/BugFreak.MVC3.Tests/BugFreak.MVC3.Tests.csproj +++ b/Code/BugFreak.MVC3.Tests/BugFreak.MVC3.Tests.csproj @@ -65,6 +65,10 @@ {5e6fc290-8b43-4e53-bb07-cc2abd839b75} BugFreak.MVC3 + + {6423cea7-9e46-48c4-b3c5-c0cfa5e5ff7a} + BugFreak + diff --git a/Code/BugFreak.MVC3.Tests/Components/RequestErrorDataProviderTests.cs b/Code/BugFreak.MVC3.Tests/Components/RequestErrorDataProviderTests.cs index de7b637..fd291b4 100644 --- a/Code/BugFreak.MVC3.Tests/Components/RequestErrorDataProviderTests.cs +++ b/Code/BugFreak.MVC3.Tests/Components/RequestErrorDataProviderTests.cs @@ -1,6 +1,6 @@ using System.Globalization; using System.Linq; -using BugFreak.Core.Components; +using BugFreak.Components; using FluentAssertions; using NUnit.Framework; diff --git a/Code/BugFreak.MVC3.Tests/Components/SessionErrorDataProviderTests.cs b/Code/BugFreak.MVC3.Tests/Components/SessionErrorDataProviderTests.cs index f8a26f3..4e50308 100644 --- a/Code/BugFreak.MVC3.Tests/Components/SessionErrorDataProviderTests.cs +++ b/Code/BugFreak.MVC3.Tests/Components/SessionErrorDataProviderTests.cs @@ -1,6 +1,6 @@ using System.Globalization; using System.Linq; -using BugFreak.Core.Components; +using BugFreak.Components; using FluentAssertions; using NUnit.Framework; diff --git a/Code/BugFreak.MVC3.Tests/Components/UserErrorDataProviderTests.cs b/Code/BugFreak.MVC3.Tests/Components/UserErrorDataProviderTests.cs index d1d23e8..07d7e79 100644 --- a/Code/BugFreak.MVC3.Tests/Components/UserErrorDataProviderTests.cs +++ b/Code/BugFreak.MVC3.Tests/Components/UserErrorDataProviderTests.cs @@ -1,7 +1,7 @@ using System.Linq; using System.Security.Principal; using System.Web; -using BugFreak.Core.Components; +using BugFreak.Components; using FluentAssertions; using Moq; using NUnit.Framework; diff --git a/Code/BugFreak.MVC3/BugFreak.MVC3.csproj b/Code/BugFreak.MVC3/BugFreak.MVC3.csproj index 90fb6e6..aa98820 100644 --- a/Code/BugFreak.MVC3/BugFreak.MVC3.csproj +++ b/Code/BugFreak.MVC3/BugFreak.MVC3.csproj @@ -32,6 +32,10 @@ 4 + + False + ..\packages\BugFreak.1.0.1.0\lib\net35-Client\BugFreak.dll + True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll @@ -71,105 +75,12 @@ - - Core\Collections\ObservableList.cs - - - Core\Components\ErrorHandler.cs - - - Core\Components\ErrorQueue.cs - - - Core\Components\ErrorReportSaveCompletedEventArgs.cs - - - Core\Components\FormErrorReportSerializer.cs - - - Core\Components\IErrorDataProvider.cs - - - Core\Components\IErrorHandler.cs - - - Core\Components\IErrorQueue.cs - - - Core\Components\IErrorReportSerializer.cs - - - Core\Components\IErrorReportStorage.cs - - - Core\Components\Initializer.cs - - - Core\Components\IReportRequestBuilder.cs - - - Core\Components\LocalErrorReportStorage.cs - - - Core\Components\PendingReport.cs - - - Core\Components\RemoteErrorReportStorage.cs - - - Core\Components\ReportRequestBuildCompletedEventArgs.cs - - - Core\Components\ReportRequestBuilder.cs - - - Core\Components\SimpleServiceContainer.cs - - - Core\Components\WebRequestFactory.cs - - - ErrorReport.cs - - - Core\Framework\ExecutionContext.cs - - - Core\Framework\IResult.cs - - - Core\Framework\IServiceLocator.cs - - - Core\Framework\ResultCompletionEventArgs.cs - - - Core\Framework\SequentialResult.cs - - - GlobalConfig.cs - - - IReportingService.cs - - - ReportingService.cs - - - Core\Results\ErrorReportSaveResult.cs - - - Core\Results\RequestBuildResult.cs - - - Core\Results\RequestExecutionResult.cs - - - - + + + - + diff --git a/Code/BugFreak.MVC3/BugFreak.MVC3.nuspec b/Code/BugFreak.MVC3/BugFreak.MVC3.nuspec index 66e16b5..d1a62d7 100644 --- a/Code/BugFreak.MVC3/BugFreak.MVC3.nuspec +++ b/Code/BugFreak.MVC3/BugFreak.MVC3.nuspec @@ -14,7 +14,7 @@ Copyright 2013 error reporting exception handle mvc - - - + + + \ No newline at end of file diff --git a/Code/BugFreak.MVC3/BugFreak.cs b/Code/BugFreak.MVC3/BugFreak.cs index 2d7776b..94848ac 100644 --- a/Code/BugFreak.MVC3/BugFreak.cs +++ b/Code/BugFreak.MVC3/BugFreak.cs @@ -1,10 +1,9 @@ -using BugFreak.Core.Components; -using BugFreak.MVC3; +using BugFreak.Components; +using BugFreak.Infrastructure; +using System.Web.Mvc; namespace BugFreak { - using System.Web.Mvc; - public class BugFreak { public static void Hook(string apiKey, string token) diff --git a/Code/BugFreak.MVC3/Core/Components/RequestErrorDataProvider.cs b/Code/BugFreak.MVC3/Components/RequestErrorDataProvider.cs similarity index 90% rename from Code/BugFreak.MVC3/Core/Components/RequestErrorDataProvider.cs rename to Code/BugFreak.MVC3/Components/RequestErrorDataProvider.cs index 094664b..d26e3cb 100644 --- a/Code/BugFreak.MVC3/Core/Components/RequestErrorDataProvider.cs +++ b/Code/BugFreak.MVC3/Components/RequestErrorDataProvider.cs @@ -1,10 +1,9 @@ -using System.Collections.Generic; -using System.Globalization; -using System.Web; -using BugFreak.Components; - -namespace BugFreak.Core.Components +namespace BugFreak.Components { + using System.Collections.Generic; + using System.Globalization; + using System.Web; + public class RequestErrorDataProvider : IErrorDataProvider { private HttpContext _httpContext; diff --git a/Code/BugFreak.MVC3/Core/Components/SessionErrorDataProvider.cs b/Code/BugFreak.MVC3/Components/SessionErrorDataProvider.cs similarity index 85% rename from Code/BugFreak.MVC3/Core/Components/SessionErrorDataProvider.cs rename to Code/BugFreak.MVC3/Components/SessionErrorDataProvider.cs index 3dd3e9c..13618f6 100644 --- a/Code/BugFreak.MVC3/Core/Components/SessionErrorDataProvider.cs +++ b/Code/BugFreak.MVC3/Components/SessionErrorDataProvider.cs @@ -1,10 +1,9 @@ -using System.Collections.Generic; -using System.Globalization; -using System.Web; -using BugFreak.Components; - -namespace BugFreak.Core.Components +namespace BugFreak.Components { + using System.Collections.Generic; + using System.Globalization; + using System.Web; + public class SessionErrorDataProvider : IErrorDataProvider { private HttpContext _httpContext; diff --git a/Code/BugFreak.MVC3/Core/Components/UserErrorDataProvider.cs b/Code/BugFreak.MVC3/Components/UserErrorDataProvider.cs similarity index 87% rename from Code/BugFreak.MVC3/Core/Components/UserErrorDataProvider.cs rename to Code/BugFreak.MVC3/Components/UserErrorDataProvider.cs index e9ef579..ee2adac 100644 --- a/Code/BugFreak.MVC3/Core/Components/UserErrorDataProvider.cs +++ b/Code/BugFreak.MVC3/Components/UserErrorDataProvider.cs @@ -1,9 +1,8 @@ -using System.Collections.Generic; -using System.Web; -using BugFreak.Components; - -namespace BugFreak.Core.Components +namespace BugFreak.Components { + using System.Collections.Generic; + using System.Web; + public class UserErrorDataProvider : IErrorDataProvider { private HttpContextBase _httpContext; diff --git a/Code/BugFreak.MVC3/ReportErrorAttribute.cs b/Code/BugFreak.MVC3/Infrastructure/ReportErrorAttribute.cs similarity index 79% rename from Code/BugFreak.MVC3/ReportErrorAttribute.cs rename to Code/BugFreak.MVC3/Infrastructure/ReportErrorAttribute.cs index 93e536f..acd14ff 100644 --- a/Code/BugFreak.MVC3/ReportErrorAttribute.cs +++ b/Code/BugFreak.MVC3/Infrastructure/ReportErrorAttribute.cs @@ -1,8 +1,7 @@ -using System.Web.Mvc; -using BugFreak; - -namespace BugFreak.MVC3 +namespace BugFreak.Infrastructure { + using System.Web.Mvc; + public class ReportErrorAttribute : HandleErrorAttribute { public override void OnException(ExceptionContext filterContext) diff --git a/Code/BugFreak.MVC3/Properties/AssemblyInfo.cs b/Code/BugFreak.MVC3/Properties/AssemblyInfo.cs index 779a8e1..e870e93 100644 --- a/Code/BugFreak.MVC3/Properties/AssemblyInfo.cs +++ b/Code/BugFreak.MVC3/Properties/AssemblyInfo.cs @@ -32,5 +32,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.0.1.0")] -[assembly: AssemblyFileVersion("1.0.1.0")] +[assembly: AssemblyVersion("1.0.1.2")] +[assembly: AssemblyFileVersion("1.0.1.2")] diff --git a/Code/BugFreak.MVC3/packages.config b/Code/BugFreak.MVC3/packages.config index 0b7e84c..f9f556a 100644 --- a/Code/BugFreak.MVC3/packages.config +++ b/Code/BugFreak.MVC3/packages.config @@ -1,6 +1,7 @@  + From fe7996c0c7e65915b84ba4f37a5e28dd6e4f2742 Mon Sep 17 00:00:00 2001 From: Pirvu Doru Lucian Date: Mon, 14 Oct 2013 13:46:42 +0300 Subject: [PATCH 3/4] bf-7 referenced core package from WPF integration project --- .../BugFreak.WPF.Tests.csproj | 4 + Code/BugFreak.WPF/BugFreak.WPF.csproj | 106 ++---------------- Code/BugFreak.WPF/Properties/AssemblyInfo.cs | 4 +- Code/BugFreak.WPF/packages.config | 4 + 4 files changed, 20 insertions(+), 98 deletions(-) create mode 100644 Code/BugFreak.WPF/packages.config diff --git a/Code/BugFreak.WPF.Tests/BugFreak.WPF.Tests.csproj b/Code/BugFreak.WPF.Tests/BugFreak.WPF.Tests.csproj index 5bf21f2..263da6c 100644 --- a/Code/BugFreak.WPF.Tests/BugFreak.WPF.Tests.csproj +++ b/Code/BugFreak.WPF.Tests/BugFreak.WPF.Tests.csproj @@ -58,6 +58,10 @@ {a27585f1-fcee-407a-aff0-f4d2300ca226} BugFreak.WPF + + {6423cea7-9e46-48c4-b3c5-c0cfa5e5ff7a} + BugFreak + diff --git a/Code/BugFreak.WPF/BugFreak.WPF.csproj b/Code/BugFreak.WPF/BugFreak.WPF.csproj index c823a55..467b472 100644 --- a/Code/BugFreak.WPF/BugFreak.WPF.csproj +++ b/Code/BugFreak.WPF/BugFreak.WPF.csproj @@ -12,6 +12,8 @@ v3.5 512 Client + ..\ + true true @@ -31,6 +33,10 @@ 4 + + False + ..\packages\BugFreak.1.0.1.0\lib\net35-Client\BugFreak.dll + @@ -42,107 +48,15 @@ - - Collections\ObservableList.cs - - - Components\EnvironmentErrorDataProvider.cs - - - Components\ErrorHandler.cs - - - Components\ErrorQueue.cs - - - Components\ErrorReportSaveCompletedEventArgs.cs - - - Components\FormErrorReportSerializer.cs - - - Components\IErrorDataProvider.cs - - - Components\IErrorHandler.cs - - - Components\IErrorQueue.cs - - - Components\IErrorReportSerializer.cs - - - Components\IErrorReportStorage.cs - - - Components\Initializer.cs - - - Components\IReportRequestBuilder.cs - - - Components\LocalErrorReportStorage.cs - - - Components\PendingReport.cs - - - Components\RemoteErrorReportStorage.cs - - - Components\ReportRequestBuildCompletedEventArgs.cs - - - Components\ReportRequestBuilder.cs - - - Components\SimpleServiceContainer.cs - - - Components\WebRequestFactory.cs - - - ErrorReport.cs - - - Framework\ExecutionContext.cs - - - Framework\IResult.cs - - - Framework\IServiceLocator.cs - - - Framework\ResultCompletionEventArgs.cs - - - Framework\SequentialResult.cs - - - GlobalConfig.cs - - - IReportingService.cs - - - ReportingService.cs - - - Results\ErrorReportSaveResult.cs - - - Results\RequestBuildResult.cs - - - Results\RequestExecutionResult.cs - + + + +