diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
index 9d4a5f12a..1be3c4c73 100644
--- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
+++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
@@ -23,6 +23,6 @@
-
+
diff --git a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
index 6da44a991..fe46c7131 100644
--- a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
+++ b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
@@ -1,4 +1,4 @@
-
+
netcoreapp3.0
@@ -6,7 +6,7 @@
-
+
diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
index 764525ff0..5699992f8 100644
--- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
+++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
@@ -23,6 +23,6 @@
-
+
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
index 62a5f60f9..d7a02bfc9 100644
--- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
+++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
@@ -22,6 +22,6 @@
-
+
\ No newline at end of file
diff --git a/src/Greenshot.Addon.Win10/Win10FormEnhancer.cs b/src/Greenshot.Addon.Win10/Win10FormEnhancer.cs
deleted file mode 100644
index 4b0736053..000000000
--- a/src/Greenshot.Addon.Win10/Win10FormEnhancer.cs
+++ /dev/null
@@ -1,91 +0,0 @@
-// Greenshot - a free and open source screenshot tool
-// Copyright (C) 2007-2019 Thomas Braun, Jens Klingen, Robin Krom
-//
-// For more information see: http://getgreenshot.org/
-// The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 1 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see .
-
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-using Greenshot.Addons.Interfaces;
-using Microsoft.Toolkit.Forms.UI.XamlHost;
-
-namespace Greenshot.Addon.Win10
-{
- public class Win10FormEnhancer : IFormEnhancer
- {
- private WindowsXamlHost _inkCanvasHost;
- private WindowsXamlHost _inkToolbarHost;
- private Windows.UI.Xaml.Controls.InkCanvas _inkCanvas;
- private Windows.UI.Xaml.Controls.InkToolbar _inkToolbar;
-
- public void InitializeComponent(Form target)
- {
- if (target is null)
- {
- return;
- }
- // InkCanvas
- _inkCanvasHost = new WindowsXamlHost
- {
- InitialTypeName = "Windows.UI.Xaml.Controls.InkCanvas",
- Dock = DockStyle.Fill,
- BackColor = Color.Transparent,
-
- };
- _inkCanvasHost.ChildChanged += InkCanvas_ChildChanged;
-
- // InkToolbar
- _inkToolbarHost = new WindowsXamlHost
- {
- InitialTypeName = "Windows.UI.Xaml.Controls.InkToolbar",
- // Layout
- Top = 0,
- Left = 0,
- Height = 50,
- Dock = DockStyle.Top,
- BackColor = Color.Transparent
- };
- _inkToolbarHost.ChildChanged += InkToolbar_ChildChanged;
-
- // Add to Window
- target.Controls.Add(_inkToolbarHost);
- target.Controls.Add(_inkCanvasHost);
- }
-
- private void InkToolbar_ChildChanged(object sender, EventArgs e)
- {
- _inkToolbar = ((WindowsXamlHost)sender).Child as Windows.UI.Xaml.Controls.InkToolbar;
- InitializeUwpControls();
- }
-
- private void InkCanvas_ChildChanged(object sender, EventArgs e)
- {
- _inkCanvas = ((WindowsXamlHost)sender).Child as Windows.UI.Xaml.Controls.InkCanvas;
- InitializeUwpControls();
- }
-
- private void InitializeUwpControls()
- {
- if (_inkToolbar == null || _inkCanvas == null)
- {
- return;
- }
-
- _inkToolbar.TargetInkCanvas = _inkCanvas;
- }
- }
-}
\ No newline at end of file
diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj
index 932d0fb1c..049c5769c 100644
--- a/src/Greenshot.Addons/Greenshot.Addons.csproj
+++ b/src/Greenshot.Addons/Greenshot.Addons.csproj
@@ -23,12 +23,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/Greenshot.Core/Greenshot.Core.csproj b/src/Greenshot.Core/Greenshot.Core.csproj
index 6bfaa2ed7..5a595ee9d 100644
--- a/src/Greenshot.Core/Greenshot.Core.csproj
+++ b/src/Greenshot.Core/Greenshot.Core.csproj
@@ -1,4 +1,4 @@
-
+
netcoreapp3.0
@@ -6,7 +6,7 @@
-
+
diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj
index 114fcd57e..52a466b32 100644
--- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj
+++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj
@@ -1,4 +1,4 @@
-
+
netcoreapp3.0
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj
index 31f7a7dc9..6d565ab5f 100644
--- a/src/Greenshot.Tests/Greenshot.Tests.csproj
+++ b/src/Greenshot.Tests/Greenshot.Tests.csproj
@@ -1,4 +1,4 @@
-
+
netcoreapp3.0
@@ -31,7 +31,7 @@
-
+
diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj
index 720b83c3e..73300f08d 100644
--- a/src/Greenshot/Greenshot.csproj
+++ b/src/Greenshot/Greenshot.csproj
@@ -38,8 +38,8 @@
-
-
+
+