From fc5bf534aa5846b01efe1d04674fcdf8ee12669b Mon Sep 17 00:00:00 2001 From: Robin Date: Tue, 27 Nov 2018 21:38:31 +0100 Subject: [PATCH] Switched TargetFrameworks with net471 first, this should allow us to use the designer. --- src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj | 2 +- .../Greenshot.Addon.Confluence.csproj | 2 +- src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj | 2 +- .../Greenshot.Addon.ExternalCommand.csproj | 2 +- src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj | 2 +- .../Greenshot.Addon.GooglePhotos.csproj | 2 +- src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj | 2 +- .../Greenshot.Addon.InternetExplorer.csproj | 2 +- .../Greenshot.Addon.LegacyEditor.csproj | 2 +- src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj | 2 +- src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj | 2 +- src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj | 2 +- src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj | 2 +- .../Greenshot.Addon.Photobucket.csproj | 2 +- src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj | 2 +- src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj | 2 +- src/Greenshot.Addon.Win10/Win10ShareDestination.cs | 1 + src/Greenshot.Addons/Greenshot.Addons.csproj | 2 +- src/Greenshot.Core/Greenshot.Core.csproj | 2 +- .../Greenshot.Gfx.Experimental.csproj | 2 +- src/Greenshot.Gfx/Greenshot.Gfx.csproj | 2 +- .../Greenshot.PerformanceTests.csproj | 2 +- src/Greenshot.Tests/Greenshot.Tests.csproj | 2 +- src/Greenshot/Greenshot.csproj | 2 +- 24 files changed, 24 insertions(+), 23 deletions(-) diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index 435046911..08972e624 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;net471 + net471;netcoreapp3.0 diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index 19e4cd8dc..37e4da5cc 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;net471 + net471;netcoreapp3.0 diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index acf0fe394..f3c1ea92e 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;net471 + net471;netcoreapp3.0 diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index c4918d830..e27407f2d 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;net471 + net471;netcoreapp3.0 diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index 4e2799d7a..9a540490b 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;net471 + net471;netcoreapp3.0 diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 2631d2298..92552e9fc 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;net471 + net471;netcoreapp3.0 diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index 44cb8fd63..90963345e 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;net471 + net471;netcoreapp3.0 diff --git a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj index 8a42ccd19..5a8a2ce0d 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;net471 + net471;netcoreapp3.0 true diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index 776eb1272..3a193b2ee 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;net471 + net471;netcoreapp3.0 true diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index 76035d435..a9f7f11e9 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;net471 + net471;netcoreapp3.0 diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj index 8f9aa2db0..3e8c552a8 100644 --- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj +++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj @@ -3,7 +3,7 @@ Greenshot.Addon.OCR Greenshot.Addon.OCR - netcoreapp3.0;net471 + net471;netcoreapp3.0 diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index 11faf18d1..32b36b071 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;net471 + net471;netcoreapp3.0 diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index 3e2550780..85deb1895 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;net471 + net471;netcoreapp3.0 diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index af0f86905..470ba72d9 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;net471 + net471;netcoreapp3.0 diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index ce371c381..bac388eb6 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;net471 + net471;netcoreapp3.0 diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj index f222b387e..6a7e6bd44 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;net471 + net471;netcoreapp3.0 diff --git a/src/Greenshot.Addon.Win10/Win10ShareDestination.cs b/src/Greenshot.Addon.Win10/Win10ShareDestination.cs index f9d7451d5..5a6f23402 100644 --- a/src/Greenshot.Addon.Win10/Win10ShareDestination.cs +++ b/src/Greenshot.Addon.Win10/Win10ShareDestination.cs @@ -216,6 +216,7 @@ namespace Greenshot.Addon.Win10 } // Signal that the stream is ready streamedFileDataRequest.Dispose(); + // Signal that the action is ready, bitmap was exported shareInfo.ShareTask.TrySetResult(true); } catch (Exception) diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 7d3796cc3..7a62706f7 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net471 + net471;netcoreapp3.0 true diff --git a/src/Greenshot.Core/Greenshot.Core.csproj b/src/Greenshot.Core/Greenshot.Core.csproj index 6bdc5ec70..83484e4f4 100644 --- a/src/Greenshot.Core/Greenshot.Core.csproj +++ b/src/Greenshot.Core/Greenshot.Core.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net471 + net471;netcoreapp3.0 true diff --git a/src/Greenshot.Gfx.Experimental/Greenshot.Gfx.Experimental.csproj b/src/Greenshot.Gfx.Experimental/Greenshot.Gfx.Experimental.csproj index 5183b1859..d991ba5e9 100644 --- a/src/Greenshot.Gfx.Experimental/Greenshot.Gfx.Experimental.csproj +++ b/src/Greenshot.Gfx.Experimental/Greenshot.Gfx.Experimental.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net471 + net471;netcoreapp3.0 true diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index 817f65404..e1ff163a6 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net471 + net471;netcoreapp3.0 true diff --git a/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj b/src/Greenshot.PerformanceTests/Greenshot.PerformanceTests.csproj index e0b994b84..6cf44ac36 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;net471 + net471;netcoreapp3.0 true win-x64 diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index e8e5b21c8..3f4e7286e 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0;net471 + net471;netcoreapp3.0 true diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index d7d68cc36..ce6516673 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -2,7 +2,7 @@ WinExe - netcoreapp3.0;net471 + net471;netcoreapp3.0 latest icons\applicationIcon\icon.ico True