Updating dependencies and removed a lot of them where there are no needed.

This commit is contained in:
Robin 2019-06-03 09:12:48 +02:00
commit 27905cabda
No known key found for this signature in database
GPG key ID: CBBB6557491B1140
25 changed files with 34 additions and 180 deletions

View file

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

View file

@ -25,10 +25,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<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" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -26,10 +26,7 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<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="Dapplo.Confluence" Version="0.8.16" />
<PackageReference Include="Dapplo.Confluence" Version="0.8.19" />
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -25,10 +25,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<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" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -21,8 +21,7 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
<PackageReference Include="CliWrap" Version="2.2.2" />
<PackageReference Include="CliWrap" Version="2.3.0" />
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -25,8 +25,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<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">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -25,8 +25,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<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">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -25,9 +25,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<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="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -7,11 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dapplo.Windows">
<Version>0.8.28</Version>
</PackageReference>
<PackageReference Include="Dapplo.Windows.Com">
<Version>0.8.28</Version>
<Version>0.8.33</Version>
</PackageReference>
<PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" />
</ItemGroup>

View file

@ -22,11 +22,7 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<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" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
<PackageReference Include="Dapplo.Jira" Version="0.8.9" />
<PackageReference Include="Dapplo.Jira" Version="0.8.15" />
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -112,9 +112,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="CommonServiceLocator" Version="2.0.4" />
<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" />
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -25,9 +25,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<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-alpha0316" />
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>

View file

@ -20,7 +20,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<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" />
<PackageReference Include="Microsoft.Office.Interop.Outlook" Version="15.0.4797.1003" />

View file

@ -25,10 +25,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<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-alpha0316" />
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -25,8 +25,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<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">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -24,9 +24,6 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<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-alpha0316" />
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>

View file

@ -19,9 +19,8 @@
</ItemGroup>
<ItemGroup>
<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" />
<PackageReference Include="System.Runtime.WindowsRuntime" Version="4.6.0-preview4.19212.13" />
<PackageReference Include="Microsoft.Toolkit.Forms.UI.Controls" Version="6.0.0-preview4.1" />
</ItemGroup>
</Project>

View file

@ -5,10 +5,6 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' ">
<PackageReference Include="System.ComponentModel.Composition" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Checkerboard.Image.png" />
@ -22,43 +18,23 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration">
<Version>1.2.28</Version>
</PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Toasts">
<Version>1.2.28</Version>
</PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Translations">
<Version>1.2.28</Version>
</PackageReference>
<PackageReference Include="Dapplo.HttpExtensions">
<Version>0.9.18</Version>
</PackageReference>
<PackageReference Include="Dapplo.HttpExtensions.JsonNet">
<Version>0.9.18</Version>
</PackageReference>
<PackageReference Include="Dapplo.HttpExtensions.OAuth">
<Version>0.9.18</Version>
</PackageReference>
<PackageReference Include="Dapplo.Windows.Clipboard">
<Version>0.8.28</Version>
</PackageReference>
<PackageReference Include="Dapplo.Windows.Dpi">
<Version>0.8.28</Version>
</PackageReference>
<PackageReference Include="Dapplo.Windows.Icons">
<Version>0.8.28</Version>
</PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.31" />
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.2.31" />
<PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.2.31" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.31" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.21" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.21" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.21" />
<PackageReference Include="Dapplo.Windows" Version="0.8.33" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.33" />
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.8.33" />
<PackageReference Include="Dapplo.Windows.Icons" Version="0.8.33" />
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="MahApps.Metro.IconPacks">
<Version>3.0.0-alpha0146</Version>
</PackageReference>
<PackageReference Include="Svg">
<Version>2.4.3</Version>
</PackageReference>
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0146" />
<PackageReference Include="Svg" Version="2.4.3" />
</ItemGroup>
<ItemGroup>

View file

@ -5,11 +5,9 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dapplo.Windows.Icons">
<Version>0.8.28</Version>
</PackageReference>
<PackageReference Include="Dapplo.Windows.Icons" Version="0.8.33" />
</ItemGroup>
<ItemGroup>

View file

@ -19,7 +19,6 @@
using Autofac;
using Dapplo.Addons;
using Greenshot.Gfx;
using Greenshot.Gfx.Formats;
namespace Greenshot.Gfx

View file

@ -1,21 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework><!-- net472;netcoreapp3.0 -->
<TargetFramework>netcoreapp3.0</TargetFramework>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>8</LangVersion>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dapplo.CaliburnMicro.Translations">
<Version>1.2.28</Version>
</PackageReference>
<PackageReference Include="Svg">
<Version>2.4.3</Version>
</PackageReference>
<PackageReference Include="System.Memory">
<Version>4.5.3</Version>
</PackageReference>
<PackageReference Include="Dapplo.Addons" Version="1.2.14" />
<PackageReference Include="Dapplo.Log" Version="1.3.20" />
<PackageReference Include="Dapplo.Windows" Version="0.8.33" />
<PackageReference Include="Dapplo.Windows.Dpi" Version="0.8.33" />
<PackageReference Include="Svg" Version="2.4.3" />
<PackageReference Include="System.Memory" Version="4.5.3" />
</ItemGroup>
</Project>

View file

@ -108,22 +108,6 @@ 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()
{

View file

@ -9,18 +9,6 @@
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<PackageReference Include="System.Console" Version="4.3.1" />
<PackageReference Include="System.IO" Version="4.3.0" />
<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" />
<PackageReference Include="System.Xml.ReaderWriter" Version="4.3.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Greenshot.Addons\Greenshot.Addons.csproj" />
<ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj" />
@ -35,6 +23,5 @@
<PackageReference Include="SharpAvi" Version="2.1.1" />
<PackageReference Include="System.Memory" Version="4.5.3" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
</ItemGroup>
</Project>

View file

@ -6,18 +6,6 @@
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' ">
<PackageReference Include="System.Console" Version="4.3.1" />
<PackageReference Include="System.IO" Version="4.3.0" />
<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.0" />
<PackageReference Include="System.Xml.ReaderWriter" Version="4.3.1" />
</ItemGroup>
<ItemGroup>
<None Include="TestFiles\scroll0.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
@ -43,13 +31,8 @@
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
<PackageReference Include="CommandLineParser" Version="2.5.0" />
<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" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0006" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
<PackageReference Include="Dapplo.Log.XUnit" Version="1.3.20" />
<PackageReference Include="Dapplo.Windows" Version="0.8.33" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
<PackageReference Include="xunit.analyzers" Version="0.10.0" />

View file

@ -19,24 +19,6 @@
</None>
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0' ">
<PackageReference Include="System.Collections" Version="4.3.0" />
<PackageReference Include="System.Console" Version="4.3.1" />
<PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
<PackageReference Include="System.Globalization" Version="4.3.0" />
<PackageReference Include="System.IO" Version="4.3.0" />
<PackageReference Include="System.Linq" Version="4.3.0" />
<PackageReference Include="System.Linq.Expressions" Version="4.3.0" />
<PackageReference Include="System.Management" Version="4.5.0" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
<PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" />
<PackageReference Include="System.Runtime" Version="4.3.0" />
<PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
<PackageReference Include="System.ServiceModel.Syndication" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\camera.wav" />
<EmbeddedResource Include="Resources\contextmenu_capturearea.Image.png" />
@ -58,24 +40,15 @@
<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.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" />
<PackageReference Include="Dapplo.Log.Loggers" Version="1.3.11" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
<PackageReference Include="Dapplo.Windows.Icons" Version="0.8.28" />
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.8.28" />
<PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.2.31" />
<PackageReference Include="Dapplo.Log.LogFile" Version="1.3.20" />
<PackageReference Include="Dapplo.Log.Loggers" Version="1.3.20" />
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.8.33" />
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.1" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0146" />
<PackageReference Include="Svg" Version="2.4.3" />
<PackageReference Include="System.Runtime" Version="4.3.1" />
<PackageReference Include="System.Runtime.Extensions" Version="4.3.1" />