diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 157c2a636..b4c3a30dd 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -15,10 +15,10 @@ steps:
- task: NuGetToolInstaller@1
- task: UseDotNet@2
- displayName: 'Use .NET Core sdk 3.0'
+ displayName: 'Use .NET Core sdk 3.1'
inputs:
packageType: sdk
- version: 3.0.100
+ version: 3.1.100
- task: NuGetCommand@2
displayName: NuGet restore
@@ -32,7 +32,7 @@ steps:
command: 'publish'
publishWebProjects: false
projects: 'src\Greenshot\Greenshot.csproj'
- arguments: '-f netcoreapp3.0 -c Release /p:PublishSingleFile=true /p:RuntimeIdentifier=win-x64'
+ arguments: '-f netcoreapp3.1 -c Release /p:PublishSingleFile=true /p:RuntimeIdentifier=win-x64'
zipAfterPublish: false
- task: CmdLine@2
@@ -46,7 +46,7 @@ steps:
command: 'publish'
publishWebProjects: false
projects: 'src\Greenshot\Greenshot.csproj'
- arguments: '-f netcoreapp3.0 -c Release /p:PublishSingleFile=true /p:RuntimeIdentifier=win-x86'
+ arguments: '-f netcoreapp3.1 -c Release /p:PublishSingleFile=true /p:RuntimeIdentifier=win-x86'
zipAfterPublish: false
- task: CmdLine@2
diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
index 845ccf5dd..a12fa328c 100644
--- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
+++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
@@ -3,7 +3,7 @@
Greenshot.Addon.Box
Greenshot.Addon.Box
- netcoreapp3.0
+ netcoreapp3.1
diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
index 69041ec9c..fb894a931 100644
--- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
+++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
@@ -3,7 +3,7 @@
Greenshot.Addon.Confluence
Greenshot.Addon.Confluence
- netcoreapp3.0
+ netcoreapp3.1
@@ -24,6 +24,6 @@
-
+
diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
index 13b2ff738..21115167d 100644
--- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
+++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
@@ -3,7 +3,7 @@
Greenshot.Addon.Dropbox
Greenshot.Addon.Dropbox
- netcoreapp3.0
+ netcoreapp3.1
diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
index bffe7afa6..f2ee34a38 100644
--- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
+++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
@@ -3,7 +3,7 @@
Greenshot.Addon.ExternalCommand
Greenshot.Addon.ExternalCommand
- netcoreapp3.0
+ netcoreapp3.1
diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
index 9602cbe9e..1a9d670a8 100644
--- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
+++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
@@ -3,7 +3,7 @@
Greenshot.Addon.Flickr
Greenshot.Addon.Flickr
- netcoreapp3.0
+ netcoreapp3.1
diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
index 410a81740..9620c21e6 100644
--- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
+++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
@@ -3,7 +3,7 @@
Greenshot.Addon.GooglePhotos
Greenshot.Addon.GooglePhotos
- netcoreapp3.0
+ netcoreapp3.1
diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
index 9d4a5f12a..e27c74de9 100644
--- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
+++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
@@ -3,7 +3,7 @@
Greenshot.Addon.Imgur
Greenshot.Addon.Imgur
- netcoreapp3.0
+ netcoreapp3.1
diff --git a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
index d7aaf9016..02fd2b4ef 100644
--- a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
+++ b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
@@ -1,7 +1,7 @@
- netcoreapp3.0
+ netcoreapp3.1
true
diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
index 57ad64414..b2e379f8c 100644
--- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
+++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
@@ -3,7 +3,7 @@
Greenshot.Addon.Jira
Greenshot.Addon.Jira
- netcoreapp3.0
+ netcoreapp3.1
@@ -21,6 +21,6 @@
-
+
diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
index 3a8f63973..adf6831bf 100644
--- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
+++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
@@ -3,7 +3,7 @@
Greenshot.Addon.LegacyEditor
Greenshot.Addon.LegacyEditor
- netcoreapp3.0
+ netcoreapp3.1
true
diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
index 764525ff0..46e86ea24 100644
--- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
+++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
@@ -3,7 +3,7 @@
Greenshot.Addon.Lutim
Greenshot.Addon.Lutim
- netcoreapp3.0
+ netcoreapp3.1
diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
index 33567f36d..5c064eece 100644
--- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
+++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
@@ -3,7 +3,7 @@
Greenshot.Addon.Office
Greenshot.Addon.Office
- netcoreapp3.0
+ netcoreapp3.1
diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
index 0b5e132fa..27b5fe929 100644
--- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
+++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
@@ -3,7 +3,7 @@
Greenshot.Addon.OneDrive
Greenshot.Addon.OneDrive
- netcoreapp3.0
+ netcoreapp3.1
diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
index 7b1f1dd07..d45afa862 100644
--- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
+++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
@@ -3,7 +3,7 @@
Greenshot.Addon.Photobucket
Greenshot.Addon.Photobucket
- netcoreapp3.0
+ netcoreapp3.1
diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
index 62a5f60f9..c8204fcb8 100644
--- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
+++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
@@ -3,7 +3,7 @@
Greenshot.Addon.Tfs
Greenshot.Addon.Tfs
- netcoreapp3.0
+ netcoreapp3.1
diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
index 0f1400907..246fd4616 100644
--- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
+++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
@@ -3,7 +3,7 @@
Greenshot.Addon.Win10
Greenshot.Addon.Win10
- netcoreapp3.0
+ netcoreapp3.1
diff --git a/src/Greenshot.Addons/Controls/HotkeyControl.cs b/src/Greenshot.Addons/Controls/HotkeyControl.cs
index 6828d5560..48aafb65c 100644
--- a/src/Greenshot.Addons/Controls/HotkeyControl.cs
+++ b/src/Greenshot.Addons/Controls/HotkeyControl.cs
@@ -1,19 +1,19 @@
// 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 .
@@ -80,7 +80,7 @@ namespace Greenshot.Addons.Controls
private static int _hotKeyCounter = 1;
private static IntPtr _hotkeyHwnd;
- private readonly ContextMenu _dummy = new ContextMenu();
+ private readonly ContextMenuStrip _dummy = new ContextMenuStrip();
private readonly IList _needNonAltGrModifier = new List();
// ArrayLists used to enforce the use of proper modifiers.
@@ -96,7 +96,7 @@ namespace Greenshot.Addons.Controls
///
public HotkeyControl()
{
- ContextMenu = _dummy; // Disable right-clicking
+ ContextMenuStrip = _dummy; // Disable right-clicking
Text = "None";
// Handle events that occurs when keys are pressed
@@ -110,10 +110,10 @@ namespace Greenshot.Addons.Controls
///
/// Used to make sure that there is no right-click menu available
///
- public override ContextMenu ContextMenu
- {
+ public override ContextMenuStrip ContextMenuStrip
+ {
get { return _dummy; }
- set { base.ContextMenu = _dummy; }
+ set { base.ContextMenuStrip = _dummy; }
}
///
diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj
index 85b346335..c8b6c68c8 100644
--- a/src/Greenshot.Addons/Greenshot.Addons.csproj
+++ b/src/Greenshot.Addons/Greenshot.Addons.csproj
@@ -1,7 +1,7 @@
- netcoreapp3.0
+ netcoreapp3.1
true
@@ -28,7 +28,7 @@
-
+
diff --git a/src/Greenshot.Addons/Interfaces/IGreenshotContract.cs b/src/Greenshot.Addons/Interfaces/IGreenshotContract.cs
index 0ecb7600c..7f214ae6c 100644
--- a/src/Greenshot.Addons/Interfaces/IGreenshotContract.cs
+++ b/src/Greenshot.Addons/Interfaces/IGreenshotContract.cs
@@ -1,23 +1,23 @@
// 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 .
-#if !NETCOREAPP3_0
+#if !NETCOREAPP3_1
using System.ServiceModel;
diff --git a/src/Greenshot.Core/Greenshot.Core.csproj b/src/Greenshot.Core/Greenshot.Core.csproj
index 2907d9093..c40dd1263 100644
--- a/src/Greenshot.Core/Greenshot.Core.csproj
+++ b/src/Greenshot.Core/Greenshot.Core.csproj
@@ -1,7 +1,7 @@
- netcoreapp3.0
+ netcoreapp3.1
true
diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj
index 4e34b5572..1fbb618ed 100644
--- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj
+++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj
@@ -1,7 +1,7 @@
- netcoreapp3.0
+ netcoreapp3.1
true
diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj
index a19b8b02b..458a9b471 100644
--- a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj
+++ b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj
@@ -4,7 +4,7 @@
Greenshot.PerformanceTests
Greenshot.PerformanceTests
Exe
- netcoreapp3.0
+ netcoreapp3.1
true
@@ -17,7 +17,7 @@
-
+
diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj
index 3a58c080c..1f14fa29b 100644
--- a/src/Greenshot.Tests/Greenshot.Tests.csproj
+++ b/src/Greenshot.Tests/Greenshot.Tests.csproj
@@ -1,7 +1,7 @@
- netcoreapp3.0
+ netcoreapp3.1
true
@@ -29,7 +29,7 @@
-
+
diff --git a/src/Greenshot/Components/GreenshotClient.cs b/src/Greenshot/Components/GreenshotClient.cs
index 1bbe54f97..ba75d110c 100644
--- a/src/Greenshot/Components/GreenshotClient.cs
+++ b/src/Greenshot/Components/GreenshotClient.cs
@@ -17,7 +17,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-#if !NETCOREAPP3_0
+#if !NETCOREAPP3_1
using System.Collections.Generic;
using System.ServiceModel;
diff --git a/src/Greenshot/Components/GreenshotServer.cs b/src/Greenshot/Components/GreenshotServer.cs
index b3aac4117..635a484cd 100644
--- a/src/Greenshot/Components/GreenshotServer.cs
+++ b/src/Greenshot/Components/GreenshotServer.cs
@@ -17,7 +17,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see .
-#if !NETCOREAPP3_0
+#if !NETCOREAPP3_1
using System;
using System.IO;
diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj
index 82ab3931d..377eabf1b 100644
--- a/src/Greenshot/Greenshot.csproj
+++ b/src/Greenshot/Greenshot.csproj
@@ -2,7 +2,7 @@
WinExe
- netcoreapp3.0
+ netcoreapp3.1
latest
icons\applicationIcon\icon.ico
True
@@ -34,7 +34,7 @@
-
+
diff --git a/src/global.json b/src/global.json
index d2a827a50..f0601466b 100644
--- a/src/global.json
+++ b/src/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "3.0.100"
+ "version": "3.1.100"
}
}
\ No newline at end of file