github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-22 22:34:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added Microsoft App Center for tracking errors, upgraded dependencies.

Browse source
This commit is contained in:
Robin Krom 2019-09-05 23:53:38 +02:00
commit 59d00d8174
12 changed files with 40 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

3
NuGet.Config
View file

@ -9,7 +9,6 @@
<add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
<add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
<add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
<add key="bdn-nightly" value="https://ci.appveyor.com/nuget/benchmarkdotnet" />
<add key="dotnet-core-myget" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="gRPC repository" value="https://grpc.jfrog.io/grpc/api/nuget/v3/grpc-nuget-dev" />
</packageSources>
</configuration>

6
azure-pipelines.yml
View file

@ -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

2
src/Directory.Build.props
View file

@ -61,7 +61,7 @@
</PropertyGroup>
<ItemGroup Condition="!$(MSBuildProjectName.Contains('Tests')) And $(MSBuildProjectName.StartsWith('Greenshot'))">
<PackageReference Include="Nerdbank.GitVersioning" Version="2.3.183">
<PackageReference Include="Nerdbank.GitVersioning" Version="3.0.25">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

2
src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
View file

@ -24,6 +24,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Dapplo.Confluence" Version="0.8.22" />
<PackageReference Include="Dapplo.Confluence" Version="0.8.23" />
</ItemGroup>
</Project>

2
src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
View file

@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dapplo.Windows.Com" Version="0.9.7" />
<PackageReference Include="Dapplo.Windows.Com" Version="0.9.14" />
<PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" />
</ItemGroup>

4
src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
View file

@ -20,7 +20,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Dapplo.Jira" Version="0.8.19" />
<PackageReference Include="DynamicData" Version="6.12.9" />
<PackageReference Include="Dapplo.Jira" Version="0.8.20" />
<PackageReference Include="DynamicData" Version="6.13.1" />
</ItemGroup>
</Project>

20
src/Greenshot.Addons/Greenshot.Addons.csproj
View file

@ -20,16 +20,16 @@
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="2.0.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="2.0.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="2.0.2" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.24" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.24" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.24" />
<PackageReference Include="Dapplo.Windows" Version="0.9.7" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.9.7" />
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.9.7" />
<PackageReference Include="Dapplo.Windows.Icons" Version="0.9.7" />
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.4" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0189" />
<PackageReference Include="Svg" Version="2.4.3" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.26" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.26" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.26" />
<PackageReference Include="Dapplo.Windows" Version="0.9.14" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.9.14" />
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.9.14" />
<PackageReference Include="Dapplo.Windows.Icons" Version="0.9.14" />
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.5" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0206" />
<PackageReference Include="Svg" Version="3.0.49" />
</ItemGroup>
<ItemGroup>

2
src/Greenshot.Core/Greenshot.Core.csproj
View file

@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dapplo.Windows.Icons" Version="0.9.7" />
<PackageReference Include="Dapplo.Windows.Icons" Version="0.9.14" />
</ItemGroup>
<ItemGroup>

8
src/Greenshot.Gfx/Greenshot.Gfx.csproj
View file

@ -7,10 +7,10 @@
<ItemGroup>
<PackageReference Include="Dapplo.Addons" Version="1.2.17" />
<PackageReference Include="Dapplo.Log" Version="1.3.21" />
<PackageReference Include="Dapplo.Windows" Version="0.9.7" />
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.9.7" />
<PackageReference Include="Svg" Version="2.4.3" />
<PackageReference Include="Dapplo.Log" Version="1.3.26" />
<PackageReference Include="Dapplo.Windows" Version="0.9.14" />
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.9.14" />
<PackageReference Include="Svg" Version="3.0.49" />
<PackageReference Include="System.Memory" Version="4.5.3" />
</ItemGroup>
</Project>

4
src/Greenshot.Tests/Greenshot.Tests.csproj
View file

@ -30,8 +30,8 @@
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
<PackageReference Include="CommandLineParser" Version="2.5.0" />
<PackageReference Include="Dapplo.Log.XUnit" Version="1.3.21" />
<PackageReference Include="Dapplo.Windows" Version="0.9.7" />
<PackageReference Include="Dapplo.Log.XUnit" Version="1.3.26" />
<PackageReference Include="Dapplo.Windows" Version="0.9.14" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
<PackageReference Include="xunit.analyzers" Version="0.10.0" />

13
src/Greenshot/Greenshot.csproj
View file

@ -36,11 +36,14 @@
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.5.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="2.0.2" />
<PackageReference Include="Dapplo.Log.LogFile" Version="1.3.21" />
<PackageReference Include="Dapplo.Log.Loggers" Version="1.3.21" />
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.9.7" />
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.4" />
<PackageReference Include="Svg" Version="2.4.3" />
<PackageReference Include="Dapplo.Log.LogFile" Version="1.3.26" />
<PackageReference Include="Dapplo.Log.Loggers" Version="1.3.26" />
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.9.14" />
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.5" />
<PackageReference Include="sqlite-net-pcl" Version="1.5.231" />
<PackageReference Include="Svg" Version="3.0.49" />
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="2.3.0-preview" />
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="2.3.0-preview" />
<TrimmerRootAssembly Include="System.Diagnostics.Debug" />
</ItemGroup>

7
src/Greenshot/Startup.cs
View file

@ -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";