From 7a5ad9b30ac8a0207116d2067d5264fb805143e5 Mon Sep 17 00:00:00 2001 From: Robin Date: Tue, 13 Nov 2018 21:26:03 +0100 Subject: [PATCH] Updated GitVersioning, added a developer getting started to the README.md and removed an unused package. --- README.md | 15 +++++++++++++-- src/Directory.Build.props | 3 +-- .../Greenshot.Addon.Confluence.csproj | 2 +- .../Greenshot.Addon.Jira.csproj | 2 +- src/Greenshot.Addons/Greenshot.Addons.csproj | 3 --- src/Greenshot.Gfx.Experimental/app.config | 5 ++++- src/Greenshot.Gfx/Greenshot.Gfx.csproj | 3 --- src/Greenshot.Gfx/app.config | 5 ++++- src/Greenshot.PerformanceTests/App.config | 3 +-- .../Greenshot.PerformanceTests.csproj | 5 +++-- src/Greenshot.Tests/Greenshot.Tests.csproj | 5 ++--- src/Greenshot.Tests/app.config | 5 ++++- src/Greenshot/Greenshot.csproj | 1 + src/NuGet.Config | 1 + 14 files changed, 36 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 043035f1c..5ff29dcb5 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Welcome to the source repository for 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. * 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?). + +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: * 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 * 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 * Better DPI support -* Faster development, due to simplified code +* Simplified code should make development easier and quicker * 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 graphics code to a separate project, where benchmark tests are possible. + Currently known errors: * The old .greenshot files cannot be loaded * Not all Addons are active, the way they are found needs to be fixed. diff --git a/src/Directory.Build.props b/src/Directory.Build.props index e51fb46d1..e950679e1 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -8,7 +8,6 @@ https://github.com/greenshot/greenshot https://www.gnu.org/licenses/gpl.html latest - true true 1.0.0 @@ -58,7 +57,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index 5c8a8a9d3..ea6fb74f4 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -60,7 +60,7 @@ - + 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 43e9157d7..0ec0f0a64 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -58,7 +58,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index dfcda1537..cfb3ad08a 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -44,9 +44,6 @@ - - 2.0.4 - 1.1.12-gbfc701fccd diff --git a/src/Greenshot.Gfx.Experimental/app.config b/src/Greenshot.Gfx.Experimental/app.config index b98217257..b3e5dcbbe 100644 --- a/src/Greenshot.Gfx.Experimental/app.config +++ b/src/Greenshot.Gfx.Experimental/app.config @@ -4,4 +4,7 @@ - + + + + diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index 82c5195ba..9cd16aef7 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -32,9 +32,6 @@ - - 2.0.4 - 1.1.12-gbfc701fccd diff --git a/src/Greenshot.Gfx/app.config b/src/Greenshot.Gfx/app.config index b98217257..b3e5dcbbe 100644 --- a/src/Greenshot.Gfx/app.config +++ b/src/Greenshot.Gfx/app.config @@ -4,4 +4,7 @@ - + + + + diff --git a/src/Greenshot.PerformanceTests/App.config b/src/Greenshot.PerformanceTests/App.config index 46b242b0e..320e26190 100644 --- a/src/Greenshot.PerformanceTests/App.config +++ b/src/Greenshot.PerformanceTests/App.config @@ -1,11 +1,10 @@  - + - diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj index ca7760e3b..07efa33b6 100644 --- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj +++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj @@ -5,6 +5,8 @@ Greenshot.PerformanceTests Exe netcoreapp3.0;net471 + true + win-x64 @@ -56,9 +58,8 @@ - + - 2.6.2 diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 230ab2fb3..515669ae5 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -68,9 +68,8 @@ - + - @@ -84,7 +83,7 @@ - + runtime; build; native; contentfiles; analyzers all diff --git a/src/Greenshot.Tests/app.config b/src/Greenshot.Tests/app.config index b98217257..b3e5dcbbe 100644 --- a/src/Greenshot.Tests/app.config +++ b/src/Greenshot.Tests/app.config @@ -4,4 +4,7 @@ - + + + + diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 505d96caa..209b9dbf7 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -9,6 +9,7 @@ greenshot.manifest Greenshot Greenshot + win-x64 diff --git a/src/NuGet.Config b/src/NuGet.Config index 15e441775..ecbde646b 100644 --- a/src/NuGet.Config +++ b/src/NuGet.Config @@ -8,6 +8,7 @@ +