From 59d00d817469578fe8409615ba77b44dede73402 Mon Sep 17 00:00:00 2001 From: Robin Krom Date: Thu, 5 Sep 2019 23:53:38 +0200 Subject: [PATCH] Added Microsoft App Center for tracking errors, upgraded dependencies. --- NuGet.Config | 5 ++--- azure-pipelines.yml | 6 +++--- src/Directory.Build.props | 2 +- .../Greenshot.Addon.Confluence.csproj | 2 +- .../Greenshot.Addon.InternetExplorer.csproj | 2 +- .../Greenshot.Addon.Jira.csproj | 4 ++-- src/Greenshot.Addons/Greenshot.Addons.csproj | 20 +++++++++---------- src/Greenshot.Core/Greenshot.Core.csproj | 2 +- src/Greenshot.Gfx/Greenshot.Gfx.csproj | 8 ++++---- src/Greenshot.Tests/Greenshot.Tests.csproj | 4 ++-- src/Greenshot/Greenshot.csproj | 15 ++++++++------ src/Greenshot/Startup.cs | 7 ++++--- 12 files changed, 40 insertions(+), 37 deletions(-) diff --git a/NuGet.Config b/NuGet.Config index ef15aa6a7..719944369 100644 --- a/NuGet.Config +++ b/NuGet.Config @@ -2,14 +2,13 @@ - + - - + \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fc6cbdfd0..09872eb52 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -15,12 +15,12 @@ steps: - task: DotNetCoreInstaller@0 displayName: 'Install .NET Core SDK 3.0' inputs: - version: '3.0.100-preview8-013393' + version: '3.0.100-rc1-014179' - task: NuGetToolInstaller@0 - displayName: 'Use NuGet 5.0.2' + displayName: 'Use NuGet 5.2.0' inputs: - versionSpec: 5.0.2 + versionSpec: 5.2.0 checkLatest: true - task: NuGetCommand@2 diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 1d5f95ec9..53f2f4d03 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -61,7 +61,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index 1d694a30d..d182906cd 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -24,6 +24,6 @@ - + diff --git a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj index fe46c7131..aa0f57071 100644 --- a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj +++ b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index 9c91a238a..19ac31afb 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -20,7 +20,7 @@ - - + + diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 049c5769c..85c52d911 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -20,16 +20,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/Greenshot.Core/Greenshot.Core.csproj b/src/Greenshot.Core/Greenshot.Core.csproj index 5a595ee9d..8f1ce9b7d 100644 --- a/src/Greenshot.Core/Greenshot.Core.csproj +++ b/src/Greenshot.Core/Greenshot.Core.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index 52a466b32..d72bfecdd 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -7,10 +7,10 @@ - - - - + + + + diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 6d565ab5f..15dc68d28 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -30,8 +30,8 @@ - - + + diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 73300f08d..2364cf9fb 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -36,12 +36,15 @@ - - - - - - + + + + + + + + + diff --git a/src/Greenshot/Startup.cs b/src/Greenshot/Startup.cs index a236ceff6..0eb519e71 100644 --- a/src/Greenshot/Startup.cs +++ b/src/Greenshot/Startup.cs @@ -20,7 +20,6 @@ using System; using System.Diagnostics; using System.Drawing; -using System.Globalization; using System.Text; using System.Windows; using System.Windows.Forms; @@ -44,6 +43,9 @@ using Dapplo.Windows.Kernel32; using Greenshot.Addons; using Greenshot.Addons.Resources; using Greenshot.Ui.Misc.ViewModels; +using Microsoft.AppCenter; +using Microsoft.AppCenter.Analytics; +using Microsoft.AppCenter.Crashes; namespace Greenshot { @@ -58,8 +60,7 @@ namespace Greenshot [STAThread] public static int Main(string[] arguments) { - // Workaround for https://github.com/dotnet/wpf/issues/684 & https://github.com/dotnet/wpf/issues/913 - CultureInfo.CurrentUICulture = CultureInfo.GetCultureInfo("en-US"); + AppCenter.Start("adcb4672-7ce0-4863-8407-729a0006e07f", typeof(Analytics), typeof(Crashes)); // TODO: Set via build StringEncryptionTypeConverter.RgbIv = "dlgjowejgogkklwj";