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

Updated dependencies and dotnet core 3.0

Browse source
This commit is contained in:
Robin Krom 2019-05-28 21:40:43 +02:00
commit 6552eeb32f
23 changed files with 42 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
azure-pipelines.yml
View file

@ -15,7 +15,7 @@ steps:
- task: DotNetCoreInstaller@0
displayName: 'Install .NET Core SDK 3.0'
inputs:
version: '3.0.100-preview6-012067'
version: '3.0.100-preview6-012096'
- task: NuGetToolInstaller@0
displayName: 'Use NuGet 5.0.0'

2
src/Directory.Build.props
View file

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

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

@ -25,8 +25,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.26" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.18" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />

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

@ -26,8 +26,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.26" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />

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

@ -25,8 +25,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.26" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.18" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />

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

@ -21,8 +21,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.26" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
<PackageReference Include="CliWrap" Version="2.2.2" />
<PackageReference Include="Fody" Version="4.2.1">

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

@ -25,8 +25,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.26" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
<PackageReference Include="Fody" Version="4.2.1">

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

@ -25,8 +25,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.26" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
<PackageReference Include="Fody" Version="4.2.1">

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

@ -25,8 +25,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.26" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
@ -34,6 +32,6 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0262" />
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0316" />
</ItemGroup>
</Project>

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

@ -22,8 +22,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.26" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
<PackageReference Include="Dapplo.Utils" Version="1.1.18" />

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

@ -112,8 +112,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="CommonServiceLocator" Version="2.0.4" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.26" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.18" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
<PackageReference Include="Dapplo.Windows.Icons" Version="0.8.28" />

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

@ -25,12 +25,10 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.26" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0262" />
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0316" />
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

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

@ -20,8 +20,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.26" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
<PackageReference Include="Interop.Microsoft.Office.Interop.OneNote" Version="1.1.0" />
<PackageReference Include="Microsoft.Office.Interop.Excel" Version="15.0.4795.1000" />

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

@ -25,12 +25,10 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.26" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0262" />
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0316" />
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

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

@ -25,8 +25,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.26" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
<PackageReference Include="Fody" Version="4.2.1">

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

@ -24,12 +24,10 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.26" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0262" />
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0316" />
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

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

@ -19,8 +19,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.26" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.18362.2002-preview" />
<PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0-preview4.19212.13" />

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

@ -23,13 +23,13 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration">
<Version>1.2.26</Version>
<Version>1.2.28</Version>
</PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Toasts">
<Version>1.2.26</Version>
<Version>1.2.28</Version>
</PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Translations">
<Version>1.2.26</Version>
<Version>1.2.28</Version>
</PackageReference>
<PackageReference Include="Dapplo.HttpExtensions">
<Version>0.9.18</Version>

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

@ -9,7 +9,7 @@
<ItemGroup>
<PackageReference Include="Dapplo.CaliburnMicro.Translations">
<Version>1.2.26</Version>
<Version>1.2.28</Version>
</PackageReference>
<PackageReference Include="Svg">
<Version>2.4.3</Version>

15
src/Greenshot.PerformanceTests/GfxPerformance.cs
View file

@ -108,6 +108,21 @@ namespace Greenshot.PerformanceTests
}
}
[Benchmark]
public void Blur_UnmanagedBitmapReference()
{
using (var unmanagedBitmap = new UnmanagedBitmap<Bgr32>(400, 400))
{
unmanagedBitmap.Span.Fill(new Bgr32 { B = 255, G = 255, R = 255 });
using (var graphics = Graphics.FromImage(unmanagedBitmap.NativeBitmap))
using (var pen = new SolidBrush(Color.Blue))
{
graphics.FillRectangle(pen, new Rectangle(30, 30, 340, 340));
}
unmanagedBitmap.ApplyBoxBlurReference(10);
}
}
[Benchmark]
public void Blur_Old()

12
src/Greenshot.Tests/CaptureTests.cs
View file

@ -21,6 +21,7 @@ using System.Drawing.Imaging;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Windows.Media.Imaging;
using Dapplo.CaliburnMicro.Extensions;
using Dapplo.Windows.Desktop;
@ -40,6 +41,13 @@ namespace Greenshot.Tests
/// </summary>
public class CaptureTests
{
public CaptureTests()
{
// Make sure the tests work
Application.SetHighDpiMode(HighDpiMode.PerMonitorV2);
}
/// <summary>
/// Test if a capture with the screen works
/// </summary>
@ -113,7 +121,9 @@ namespace Greenshot.Tests
var bounds = windowToCapture.GetInfo().Bounds;
var captureFlow = new CaptureFlow<BitmapSource>
{
Sources = { new DwmWindowSource(config, () => windowToCapture) }
Sources = {
new DwmWindowSource(config, () => windowToCapture)
}
};
var capture = await captureFlow.Execute();
Assert.NotNull(capture);

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

@ -43,7 +43,7 @@
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
<PackageReference Include="CommandLineParser" Version="2.5.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.28" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
<PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" />
<PackageReference Include="Dapplo.Windows" Version="0.8.28" />

10
src/Greenshot/Greenshot.csproj
View file

@ -58,11 +58,11 @@
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="CommandLineParser" Version="2.5.0" />
<PackageReference Include="CommonServiceLocator" Version="2.0.4" />
<PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.26" />
<PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.2.28" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.28" />
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.2.28" />
<PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.2.28" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.28" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.18" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.18" />
<PackageReference Include="Dapplo.Log.LogFile" Version="1.3.11" />