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

Work in progress [skip ci]

Browse source
This commit is contained in:
Robin 2019-05-29 16:17:59 +02:00
commit e320744bf0
No known key found for this signature in database
GPG key ID: CBBB6557491B1140
23 changed files with 18 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

6
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-012096'
version: '3.0.100-preview6-012102'
- task: NuGetToolInstaller@0
displayName: 'Use NuGet 5.0.0'
@ -35,7 +35,7 @@ steps:
command: 'publish'
publishWebProjects: false
projects: 'src\Greenshot\Greenshot.csproj'
arguments: '-f netcoreapp3.0 -c Release /p:PublishSingleFile=true /p:UseAppHost=true /p:RuntimeIdentifier=win-x64 /p:PublishReadyToRun=true'
arguments: '-f netcoreapp3.0 -c Release /p:PublishSingleFile=true /p:UseAppHost=true /p:RuntimeIdentifier=win-x64 /p:PublishReadyToRun=true /p:PublishTrimmed=true'
zipAfterPublish: false
- task: CmdLine@2
@ -49,7 +49,7 @@ steps:
command: 'publish'
publishWebProjects: false
projects: 'src\Greenshot\Greenshot.csproj'
arguments: '-f netcoreapp3.0 -c Release /p:PublishSingleFile=true /p:UseAppHost=true /p:RuntimeIdentifier=win-x86 /p:PublishReadyToRun=true'
arguments: '-f netcoreapp3.0 -c Release /p:PublishSingleFile=true /p:UseAppHost=true /p:RuntimeIdentifier=win-x86 /p:PublishReadyToRun=true /p:PublishTrimmed=true'
zipAfterPublish: false
- task: CmdLine@2

4
src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
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>

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

@ -26,9 +26,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="Dapplo.Confluence" Version="0.8.16" />
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>

4
src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
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>

3
src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
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>

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

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

3
src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
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>

5
src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
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.30</Version>
</PackageReference>
<PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" />
</ItemGroup>

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

@ -22,10 +22,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.Utils" Version="1.1.18" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.8.28" />
<PackageReference Include="Dapplo.Jira" Version="0.8.9" />
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>

3
src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
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>

3
src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
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>

1
src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
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" />

4
src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
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>

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

3
src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
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>

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

@ -19,7 +19,6 @@
</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="Microsoft.Toolkit.Forms.UI.Controls" Version="6.0.0-preview4.1" />

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

@ -23,13 +23,14 @@
<ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.21.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration">
<Version>1.2.28</Version>
<Version>1.2.29</Version>
</PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.2.29" />
<PackageReference Include="Dapplo.CaliburnMicro.Toasts">
<Version>1.2.28</Version>
<Version>1.2.29</Version>
</PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Translations">
<Version>1.2.28</Version>
<Version>1.2.29</Version>
</PackageReference>
<PackageReference Include="Dapplo.HttpExtensions">
<Version>0.9.18</Version>
@ -40,14 +41,15 @@
<PackageReference Include="Dapplo.HttpExtensions.OAuth">
<Version>0.9.18</Version>
</PackageReference>
<PackageReference Include="Dapplo.Windows" Version="0.8.30" />
<PackageReference Include="Dapplo.Windows.Clipboard">
<Version>0.8.28</Version>
<Version>0.8.30</Version>
</PackageReference>
<PackageReference Include="Dapplo.Windows.Dpi">
<Version>0.8.28</Version>
<Version>0.8.30</Version>
</PackageReference>
<PackageReference Include="Dapplo.Windows.Icons">
<Version>0.8.28</Version>
<Version>0.8.30</Version>
</PackageReference>
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>

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

@ -6,12 +6,6 @@
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Dapplo.Windows.Icons">
<Version>0.8.28</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj" />
</ItemGroup>

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

@ -1,16 +1,14 @@
<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="Dapplo.Windows.Common" Version="0.8.30" />
<PackageReference Include="Svg">
<Version>2.4.3</Version>
</PackageReference>

16
src/Greenshot.PerformanceTests/GfxPerformance.cs
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()
{

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

@ -43,12 +43,9 @@
<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="Dapplo.Windows" Version="0.8.30" />
<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="xunit" Version="2.4.1" />
<PackageReference Include="xunit.abstractions" Version="2.0.3" />

13
src/Greenshot/Greenshot.csproj
View file

@ -58,24 +58,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.CaliburnMicro.Dapp" Version="1.2.29" />
<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.Windows.Multimedia" Version="0.8.30" />
<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" />