From 88df91d79248569cfe58a06c4af01b54bc67a85c Mon Sep 17 00:00:00 2001 From: Nikolay Date: Mon, 8 Nov 2021 17:08:05 +0300 Subject: [PATCH 1/4] migrate to net5.0-windows --- .../ReportGenerator.cs | 7 ++++--- .../ExceptionReporter.WinForms.csproj | 20 +++++++++++-------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/ExceptionReporter.Shared/ReportGenerator.cs b/src/ExceptionReporter.Shared/ReportGenerator.cs index f17614d8..20f40a82 100644 --- a/src/ExceptionReporter.Shared/ReportGenerator.cs +++ b/src/ExceptionReporter.Shared/ReportGenerator.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; -using System.Deployment.Application; using System.Reflection; using ExceptionReporting.Core; using ExceptionReporting.Report; @@ -46,8 +45,10 @@ public ReportGenerator(ExceptionReportInfo reportInfo) private string GetAppVersion() { - return ApplicationDeployment.IsNetworkDeployed ? - ApplicationDeployment.CurrentDeployment.CurrentVersion.ToString() : _info.AppAssembly.GetName().Version.ToString(); + return _info.AppAssembly.GetName().Version.ToString(); + // lost during migration to net5.0 + //return ApplicationDeployment.IsNetworkDeployed ? + // ApplicationDeployment.CurrentDeployment.CurrentVersion.ToString() : _info.AppAssembly.GetName().Version.ToString(); } /// diff --git a/src/ExceptionReporter.WinForms/ExceptionReporter.WinForms.csproj b/src/ExceptionReporter.WinForms/ExceptionReporter.WinForms.csproj index 614179bc..6058f3ac 100644 --- a/src/ExceptionReporter.WinForms/ExceptionReporter.WinForms.csproj +++ b/src/ExceptionReporter.WinForms/ExceptionReporter.WinForms.csproj @@ -4,7 +4,8 @@ ExceptionReporter.NET ExceptionReporter true - net40 + net40;net5.0-windows + true 5.0 https://github.com/PandaWood/ExceptionReporter.NET @@ -13,10 +14,17 @@ - + + - + + + + + + + @@ -29,14 +37,10 @@ - - - - - 5.0 + 5.0.1 5.0.0.0 Peter van der Woude, Simon Cropp ExceptionReporter is a .NET UserControl/Dialog that gathers detailed information on an Exception and the application/system running it. It allows the user to copy, save or email a report to the developer From 20b2081c2a7bbc0900b294cf8a13901a92f5c306 Mon Sep 17 00:00:00 2001 From: Nikolay Date: Mon, 8 Nov 2021 17:08:26 +0300 Subject: [PATCH 2/4] migrate Tests to net5.0-windows --- .gitignore | 1 + src/Tests/Tests.ExceptionReporter.NET.csproj | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 18a24f08..eabbb582 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ packages/ .vscode *.orig MigrationBackup +/src/ExceptionReporter.WinForms/Properties/PublishProfiles/FolderProfile.pubxml diff --git a/src/Tests/Tests.ExceptionReporter.NET.csproj b/src/Tests/Tests.ExceptionReporter.NET.csproj index 09edb584..87132a03 100644 --- a/src/Tests/Tests.ExceptionReporter.NET.csproj +++ b/src/Tests/Tests.ExceptionReporter.NET.csproj @@ -1,6 +1,6 @@ - + - net472 + net5.0-windows Tests.ExceptionReporting 4.0.3 From 391fcb0fda760ba20f4baa59694cfce8a3f8db30 Mon Sep 17 00:00:00 2001 From: Nikolay Date: Tue, 9 Nov 2021 05:30:31 +0300 Subject: [PATCH 3/4] rollback to Handlebars 2.0.2 ( there were many bugs ) --- .../ExceptionReporter.WinForms.csproj | 3 ++- src/Tests/AssemblyDigger_Tests.cs | 4 ++- src/Tests/ReportBuilder_Tests.cs | 4 +++ src/Tests/Tests.ExceptionReporter.NET.csproj | 25 ++++++++++++------- 4 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/ExceptionReporter.WinForms/ExceptionReporter.WinForms.csproj b/src/ExceptionReporter.WinForms/ExceptionReporter.WinForms.csproj index 6058f3ac..1b423da0 100644 --- a/src/ExceptionReporter.WinForms/ExceptionReporter.WinForms.csproj +++ b/src/ExceptionReporter.WinForms/ExceptionReporter.WinForms.csproj @@ -6,6 +6,7 @@ true net40;net5.0-windows true + true 5.0 https://github.com/PandaWood/ExceptionReporter.NET @@ -22,7 +23,7 @@ - + diff --git a/src/Tests/AssemblyDigger_Tests.cs b/src/Tests/AssemblyDigger_Tests.cs index 73768997..2ef99ac9 100644 --- a/src/Tests/AssemblyDigger_Tests.cs +++ b/src/Tests/AssemblyDigger_Tests.cs @@ -13,7 +13,9 @@ public void Can_Dig_Assembly_Refs_By_Name() var digger = new AssemblyDigger(Assembly.Load("ExceptionReporter.NET")); var refs = digger.GetAssemblyRefs().ToList(); - Assert.That(refs.Select(r => r.Name), Is.SupersetOf(new [] {"System.Core", "DotNetZip", "SimpleMapi.NET"})); + //TODO: is "System.Core" necessesary here? + //Assert.That(refs.Select(r => r.Name), Is.SupersetOf(new [] {"System.Core", "DotNetZip", "SimpleMapi.NET"}));// + Assert.That(refs.Select(r => r.Name), Is.SupersetOf(new [] {"DotNetZip", "SimpleMapi.NET", "Handlebars" })); } [Test] diff --git a/src/Tests/ReportBuilder_Tests.cs b/src/Tests/ReportBuilder_Tests.cs index e48432d5..2f7a1c58 100644 --- a/src/Tests/ReportBuilder_Tests.cs +++ b/src/Tests/ReportBuilder_Tests.cs @@ -1,6 +1,10 @@ using System.Collections.Generic; using System.Linq; +#if !NETCOREAPP using AutoMoq; +#else +using AutoMoqCore; +#endif using ExceptionReporting; using ExceptionReporting.Report; using ExceptionReporting.SystemInfo; diff --git a/src/Tests/Tests.ExceptionReporter.NET.csproj b/src/Tests/Tests.ExceptionReporter.NET.csproj index 87132a03..5779003f 100644 --- a/src/Tests/Tests.ExceptionReporter.NET.csproj +++ b/src/Tests/Tests.ExceptionReporter.NET.csproj @@ -1,16 +1,24 @@ - net5.0-windows + net472;net5.0-windows Tests.ExceptionReporting 4.0.3 - - - - - - - + + + + + + + + + + + + + + + @@ -18,7 +26,6 @@ - From dd684b55c57a91cea35fbd81b3a2a065998f3612 Mon Sep 17 00:00:00 2001 From: Nikolay Date: Sun, 2 Jan 2022 07:58:24 +0300 Subject: [PATCH 4/4] ReportGenerator GetAppVersion() - keep ApplicationDeployment for NETFRAMEWORK --- src/ExceptionReporter.Shared/ReportGenerator.cs | 15 ++++++++++----- .../ExceptionReporter.WinForms.csproj | 3 ++- src/Tests/AssemblyDigger_Tests.cs | 2 -- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/ExceptionReporter.Shared/ReportGenerator.cs b/src/ExceptionReporter.Shared/ReportGenerator.cs index 20f40a82..403af09a 100644 --- a/src/ExceptionReporter.Shared/ReportGenerator.cs +++ b/src/ExceptionReporter.Shared/ReportGenerator.cs @@ -4,6 +4,9 @@ using System; using System.Collections.Generic; +#if NETFRAMEWORK +using System.Deployment.Application; +#endif using System.Reflection; using ExceptionReporting.Core; using ExceptionReporting.Report; @@ -41,16 +44,18 @@ public ReportGenerator(ExceptionReportInfo reportInfo) _info.AppName = _info.AppName.IsEmpty() ? _info.AppAssembly.GetName().Name: _info.AppName; _info.AppVersion = _info.AppVersion.IsEmpty() ? GetAppVersion() : _info.AppVersion; _info.ExceptionDate = _info.ExceptionDateKind != DateTimeKind.Local ? DateTime.UtcNow : DateTime.Now; - } + } private string GetAppVersion() { +#if NETFRAMEWORK + return ApplicationDeployment.IsNetworkDeployed ? + ApplicationDeployment.CurrentDeployment.CurrentVersion.ToString() : _info.AppAssembly.GetName().Version.ToString(); +#else return _info.AppAssembly.GetName().Version.ToString(); - // lost during migration to net5.0 - //return ApplicationDeployment.IsNetworkDeployed ? - // ApplicationDeployment.CurrentDeployment.CurrentVersion.ToString() : _info.AppAssembly.GetName().Version.ToString(); +#endif } - + /// /// Generate the exception report /// diff --git a/src/ExceptionReporter.WinForms/ExceptionReporter.WinForms.csproj b/src/ExceptionReporter.WinForms/ExceptionReporter.WinForms.csproj index 1b423da0..f223ba37 100644 --- a/src/ExceptionReporter.WinForms/ExceptionReporter.WinForms.csproj +++ b/src/ExceptionReporter.WinForms/ExceptionReporter.WinForms.csproj @@ -16,6 +16,7 @@ + @@ -23,7 +24,7 @@ - + diff --git a/src/Tests/AssemblyDigger_Tests.cs b/src/Tests/AssemblyDigger_Tests.cs index 2ef99ac9..4cd3866b 100644 --- a/src/Tests/AssemblyDigger_Tests.cs +++ b/src/Tests/AssemblyDigger_Tests.cs @@ -13,8 +13,6 @@ public void Can_Dig_Assembly_Refs_By_Name() var digger = new AssemblyDigger(Assembly.Load("ExceptionReporter.NET")); var refs = digger.GetAssemblyRefs().ToList(); - //TODO: is "System.Core" necessesary here? - //Assert.That(refs.Select(r => r.Name), Is.SupersetOf(new [] {"System.Core", "DotNetZip", "SimpleMapi.NET"}));// Assert.That(refs.Select(r => r.Name), Is.SupersetOf(new [] {"DotNetZip", "SimpleMapi.NET", "Handlebars" })); }