From 6552eeb32f9fa7ab00dc8603c8a623b6a30b0f13 Mon Sep 17 00:00:00 2001 From: Robin Krom Date: Tue, 28 May 2019 21:40:43 +0200 Subject: [PATCH] Updated dependencies and dotnet core 3.0 --- azure-pipelines.yml | 2 +- src/Directory.Build.props | 2 +- .../Greenshot.Addon.Box.csproj | 2 -- .../Greenshot.Addon.Confluence.csproj | 2 -- .../Greenshot.Addon.Dropbox.csproj | 2 -- .../Greenshot.Addon.ExternalCommand.csproj | 2 -- .../Greenshot.Addon.Flickr.csproj | 2 -- .../Greenshot.Addon.GooglePhotos.csproj | 2 -- .../Greenshot.Addon.Imgur.csproj | 4 +--- .../Greenshot.Addon.Jira.csproj | 2 -- .../Greenshot.Addon.LegacyEditor.csproj | 2 -- .../Greenshot.Addon.Lutim.csproj | 4 +--- .../Greenshot.Addon.Office.csproj | 2 -- .../Greenshot.Addon.OneDrive.csproj | 4 +--- .../Greenshot.Addon.Photobucket.csproj | 2 -- .../Greenshot.Addon.Tfs.csproj | 4 +--- .../Greenshot.Addon.Win10.csproj | 2 -- src/Greenshot.Addons/Greenshot.Addons.csproj | 6 +++--- src/Greenshot.Gfx/Greenshot.Gfx.csproj | 2 +- src/Greenshot.PerformanceTests/GfxPerformance.cs | 15 +++++++++++++++ src/Greenshot.Tests/CaptureTests.cs | 12 +++++++++++- src/Greenshot.Tests/Greenshot.Tests.csproj | 2 +- src/Greenshot/Greenshot.csproj | 10 +++++----- 23 files changed, 42 insertions(+), 47 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5b0720d5d..7e98ada48 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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' diff --git a/src/Directory.Build.props b/src/Directory.Build.props index b94870959..f18c2d178 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -54,7 +54,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index 5af1b17e8..860361e4d 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -25,8 +25,6 @@ - - diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index 89ce9ff4e..8bd0aa2e0 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -26,8 +26,6 @@ - - diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index 6a47a4825..233841e74 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -25,8 +25,6 @@ - - diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index 96b8a89e0..c0445c4ff 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -21,8 +21,6 @@ - - diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index 4d7dcc539..3c5e1250f 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -25,8 +25,6 @@ - - diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index a8ba2b4f1..c4a60bc96 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -25,8 +25,6 @@ - - diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index bd7dbdd29..e87bbd971 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -25,8 +25,6 @@ - - @@ -34,6 +32,6 @@ all runtime; build; native; contentfiles; analyzers - + diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index 3c081a4b8..7d5709fa4 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -22,8 +22,6 @@ - - diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index f48e2259b..02a92547e 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -112,8 +112,6 @@ - - diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index f7f2f1590..25a9de0b0 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -25,12 +25,10 @@ - - - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index 4b339a018..b61bc0e30 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -20,8 +20,6 @@ - - diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index f6dfceb38..a2794c951 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -25,12 +25,10 @@ - - - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index b2723a5a4..169829970 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -25,8 +25,6 @@ - - diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index 1284d7a35..0418c7765 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -24,12 +24,10 @@ - - - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj index 4bdafdb2f..2c1292792 100644 --- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj +++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj @@ -19,8 +19,6 @@ - - diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 9f77e99c0..8a6d424f4 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -23,13 +23,13 @@ - 1.2.26 + 1.2.28 - 1.2.26 + 1.2.28 - 1.2.26 + 1.2.28 0.9.18 diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index 1ac55e391..9b88f94a9 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -9,7 +9,7 @@ - 1.2.26 + 1.2.28 2.4.3 diff --git a/src/Greenshot.PerformanceTests/GfxPerformance.cs b/src/Greenshot.PerformanceTests/GfxPerformance.cs index 725572eb6..9cbf4bc25 100644 --- a/src/Greenshot.PerformanceTests/GfxPerformance.cs +++ b/src/Greenshot.PerformanceTests/GfxPerformance.cs @@ -108,6 +108,21 @@ namespace Greenshot.PerformanceTests } } + [Benchmark] + public void Blur_UnmanagedBitmapReference() + { + using (var unmanagedBitmap = new UnmanagedBitmap(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() diff --git a/src/Greenshot.Tests/CaptureTests.cs b/src/Greenshot.Tests/CaptureTests.cs index 96cd27071..d6412f7ef 100644 --- a/src/Greenshot.Tests/CaptureTests.cs +++ b/src/Greenshot.Tests/CaptureTests.cs @@ -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 /// public class CaptureTests { + + public CaptureTests() + { + // Make sure the tests work + Application.SetHighDpiMode(HighDpiMode.PerMonitorV2); + } + /// /// Test if a capture with the screen works /// @@ -113,7 +121,9 @@ namespace Greenshot.Tests var bounds = windowToCapture.GetInfo().Bounds; var captureFlow = new CaptureFlow { - Sources = { new DwmWindowSource(config, () => windowToCapture) } + Sources = { + new DwmWindowSource(config, () => windowToCapture) + } }; var capture = await captureFlow.Execute(); Assert.NotNull(capture); diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 21909d7e2..a57c547f3 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -43,7 +43,7 @@ - + diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 477bc00a1..da760690d 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -58,11 +58,11 @@ - - - - - + + + + +