github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-23 06:36:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated GitVersioning, added a developer getting started to the README.md and removed an unused package.

Browse source
This commit is contained in:
Robin 2018-11-13 21:26:03 +01:00
commit 7a5ad9b30a
14 changed files with 36 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

15
README.md
View file

@ -6,7 +6,7 @@ Welcome to the source repository for Greenshot
What is Greenshot? What is Greenshot?
------------------ ------------------
Greenshot is a light-weight screenshot software tool for Windows with the following key features: Greenshot is an open source, light-weight screenshot software tool for Windows with the following key features:
* Quickly create screenshots of a selected region, window or fullscreen; you can even capture complete (scrolling) web pages from Internet Explorer. * Quickly create screenshots of a selected region, window or fullscreen; you can even capture complete (scrolling) web pages from Internet Explorer.
* Easily annotate, highlight or obfuscate parts of the screenshot. * Easily annotate, highlight or obfuscate parts of the screenshot.
@ -23,13 +23,23 @@ About this repository
--------------------- ---------------------
This repository is work in progress for the next Greenshot (2.0?). This repository is work in progress for the next Greenshot (2.0?).
Quick started for developers
----------------------------
* Download the latest dotnet core SDK from here: https://github.com/dotnet/core-sdk ([quick-link to download](https://dotnetcli.blob.core.windows.net/dotnet/Sdk/master/dotnet-sdk-latest-win-x64.exe))
* Make sure you have the latest Visual Studio 2017 (no need for previews)
* Clone the [repository](https://github.com/greenshot/greenshot/tree/feature/netcoreapp3.0), branch feature/netcoreapp3.0
* Open the solution from the src directory in Visual Studio 2017
* Rebuild and start...
For users the major changes since 1.2.x are: For users the major changes since 1.2.x are:
* dotnet core 3.0 support (why, read here: https://blogs.msdn.microsoft.com/dotnet/2018/10/04/update-on-net-core-3-0-and-net-framework-4-8/ ) * dotnet core 3.0 support (why, read here: https://blogs.msdn.microsoft.com/dotnet/2018/10/04/update-on-net-core-3-0-and-net-framework-4-8/ )
* A newer and more modern configuration UI, using MahApps.Metro * A newer and more modern configuration UI, using MahApps.Metro
* Due to the update of .NET 2.0 to .NET 4.7.1 a lot of bugs are solved * Due to the update of .NET 2.0 to .NET 4.7.1 a lot of bugs are solved
* Added Windows 10 destinations, OCR & share * Added Windows 10 destinations, OCR & share
* Better DPI support * Better DPI support
* Faster development, due to simplified code * Simplified code should make development easier and quicker
* Bug fixes * Bug fixes
@ -44,6 +54,7 @@ For developers, the major changes since 1.2.x are:
* Moved most native windows code to a separate project called [Dapplo.Windows](https://github.com/dapplo/Dapplo.Windows) which makes it easier to develop & test * Moved most native windows code to a separate project called [Dapplo.Windows](https://github.com/dapplo/Dapplo.Windows) which makes it easier to develop & test
* Moved graphics code to a separate project, where benchmark tests are possible. * Moved graphics code to a separate project, where benchmark tests are possible.
Currently known errors: Currently known errors:
* The old .greenshot files cannot be loaded * The old .greenshot files cannot be loaded
* Not all Addons are active, the way they are found needs to be fixed. * Not all Addons are active, the way they are found needs to be fixed.

3
src/Directory.Build.props
View file

@ -8,7 +8,6 @@
<PackageProjectUrl>https://github.com/greenshot/greenshot</PackageProjectUrl> <PackageProjectUrl>https://github.com/greenshot/greenshot</PackageProjectUrl>
<PackageLicenseUrl>https://www.gnu.org/licenses/gpl.html</PackageLicenseUrl> <PackageLicenseUrl>https://www.gnu.org/licenses/gpl.html</PackageLicenseUrl>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<!-- <DisableImplicitFrameworkReferences Condition="'$(TargetFramework)' == 'net471'">true</DisableImplicitFrameworkReferences> --> <!-- <DisableImplicitFrameworkReferences Condition="'$(TargetFramework)' == 'net471'">true</DisableImplicitFrameworkReferences> -->
<CopyLocalLockFileAssemblies Condition="'$(TargetFramework)' != 'net471'">true</CopyLocalLockFileAssemblies> <CopyLocalLockFileAssemblies Condition="'$(TargetFramework)' != 'net471'">true</CopyLocalLockFileAssemblies>
<Version>1.0.0</Version> <Version>1.0.0</Version>
@ -58,7 +57,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup Condition="!$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo'))"> <ItemGroup Condition="!$(MSBuildProjectName.Contains('Test')) And !$(MSBuildProjectName.Contains('Demo'))">
<PackageReference Include="Nerdbank.GitVersioning" Version="2.2.13"> <PackageReference Include="Nerdbank.GitVersioning" Version="2.2.33">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>

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

@ -60,7 +60,7 @@
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="Dapplo.Confluence" Version="0.8.12" /> <PackageReference Include="Dapplo.Confluence" Version="0.8.14" />
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

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

@ -58,7 +58,7 @@
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Utils" Version="1.1.9" /> <PackageReference Include="Dapplo.Utils" Version="1.1.9" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="Dapplo.Jira" Version="0.8.5" /> <PackageReference Include="Dapplo.Jira" Version="0.8.7" />
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

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

@ -44,9 +44,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="CommonServiceLocator">
<Version>2.0.4</Version>
</PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Configuration"> <PackageReference Include="Dapplo.CaliburnMicro.Configuration">
<Version>1.1.12-gbfc701fccd</Version> <Version>1.1.12-gbfc701fccd</Version>
</PackageReference> </PackageReference>

5
src/Greenshot.Gfx.Experimental/app.config
View file

@ -4,4 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
</startup>
</configuration>

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

@ -32,9 +32,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CommonServiceLocator">
<Version>2.0.4</Version>
</PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Translations"> <PackageReference Include="Dapplo.CaliburnMicro.Translations">
<Version>1.1.12-gbfc701fccd</Version> <Version>1.1.12-gbfc701fccd</Version>
</PackageReference> </PackageReference>

5
src/Greenshot.Gfx/app.config
View file

@ -4,4 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
</startup>
</configuration>

3
src/Greenshot.PerformanceTests/App.config
View file

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
</startup> </startup>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
</configuration> </configuration>

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

@ -5,6 +5,8 @@
<AssemblyName>Greenshot.PerformanceTests</AssemblyName> <AssemblyName>Greenshot.PerformanceTests</AssemblyName>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks> <TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup> </PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'"> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
@ -56,9 +58,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.11.1" /> <PackageReference Include="BenchmarkDotNet" Version="0.11.2.849" />
<PackageReference Include="CommandLineParser" Version="2.3.0" /> <PackageReference Include="CommandLineParser" Version="2.3.0" />
<PackageReference Include="CommonServiceLocator" Version="2.0.4" />
<PackageReference Include="JeremyAnsel.ColorQuant" Version="1.0.55" /> <PackageReference Include="JeremyAnsel.ColorQuant" Version="1.0.55" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers"> <PackageReference Include="Microsoft.CodeAnalysis.Analyzers">
<Version>2.6.2</Version> <Version>2.6.2</Version>

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

@ -68,9 +68,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.11.1" /> <PackageReference Include="BenchmarkDotNet" Version="0.11.2.849" />
<PackageReference Include="CommandLineParser" Version="2.3.0" /> <PackageReference Include="CommandLineParser" Version="2.3.0" />
<PackageReference Include="CommonServiceLocator" Version="2.0.4" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" /> <PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" />
@ -84,7 +83,7 @@
<PackageReference Include="xunit.abstractions" Version="2.0.3" /> <PackageReference Include="xunit.abstractions" Version="2.0.3" />
<PackageReference Include="xunit.analyzers" Version="0.10.0" /> <PackageReference Include="xunit.analyzers" Version="0.10.0" />
<PackageReference Include="xunit.core" Version="2.4.1" /> <PackageReference Include="xunit.core" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" > <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>

5
src/Greenshot.Tests/app.config
View file

@ -4,4 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
</assemblyBinding> </assemblyBinding>
</runtime> </runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" />
</startup>
</configuration>

1
src/Greenshot/Greenshot.csproj
View file

@ -9,6 +9,7 @@
<ApplicationManifest>greenshot.manifest</ApplicationManifest> <ApplicationManifest>greenshot.manifest</ApplicationManifest>
<AssemblyTitle>Greenshot</AssemblyTitle> <AssemblyTitle>Greenshot</AssemblyTitle>
<AssemblyName>Greenshot</AssemblyName> <AssemblyName>Greenshot</AssemblyName>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

1
src/NuGet.Config
View file

@ -8,6 +8,7 @@
<add key="Dapplo.Windows" value="https://ci.appveyor.com/nuget/dapplo-windows-pjnkjqjp7t6a" /> <add key="Dapplo.Windows" value="https://ci.appveyor.com/nuget/dapplo-windows-pjnkjqjp7t6a" />
<add key="myget.dotnetcore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" /> <add key="myget.dotnetcore" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="dotnet-core-latest" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" /> <add key="dotnet-core-latest" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="bdn-nightly" value="https://ci.appveyor.com/nuget/benchmarkdotnet" />
</packageSources> </packageSources>
<disabledPackageSources> <disabledPackageSources>
<add key="myget.dotnetcore" value="true" /> <add key="myget.dotnetcore" value="true" />