From a48d1b206103a1c2478f3a54a009f5fa44a4ce45 Mon Sep 17 00:00:00 2001 From: Robin Date: Thu, 15 Nov 2018 08:14:32 +0100 Subject: [PATCH] Downgraded Mahapps.Metro as this was causing some issues, waiting for dotnet core 3.0 support which is being worked on. Upgraded other dependencies, which should potentially (untested) make the office addon work on dotnet core 3.0 --- .../Configuration/Impl/BoxLanguageImpl.cs | 2 + .../Greenshot.Addon.Box.csproj | 6 +-- .../Configuration/IConfluenceConfiguration.cs | 2 +- .../Configuration/IConfluenceLanguage.cs | 3 +- .../Impl/ConfluenceLanguageImpl.cs | 2 + .../ConfluenceAddonModule.cs | 1 + .../ConfluenceDestination.cs | 1 + .../Greenshot.Addon.Confluence.csproj | 6 +-- .../ViewModels/ConfluenceConfigViewModel.cs | 1 + .../Configuration/IDropboxLanguage.cs | 3 +- .../Configuration/Impl/DropboxLanguageImpl.cs | 2 + .../Greenshot.Addon.Dropbox.csproj | 6 +-- .../Configuration/IExternalCommandLanguage.cs | 3 +- .../Impl/ExternalCommandLanguageImpl.cs | 2 + .../Greenshot.Addon.ExternalCommand.csproj | 6 +-- .../Configuration/IFlickrLanguage.cs | 3 +- .../Configuration/Impl/FlickrLanguageImpl.cs | 2 + .../Greenshot.Addon.Flickr.csproj | 6 +-- .../Configuration/IGooglePhotosLanguage.cs | 28 ++++++++++++- .../Impl/GooglePhotosLanguageImpl.cs | 2 + .../Greenshot.Addon.GooglePhotos.csproj | 6 +-- .../Configuration/IImgurLanguage.cs | 5 ++- .../Configuration/Impl/ImgurLanguageImpl.cs | 2 + .../Greenshot.Addon.Imgur.csproj | 8 ++-- .../ViewModels/ImgurHistoryViewModel.cs | 2 +- .../AccessibleHelper.cs | 2 - .../Greenshot.Addon.InternetExplorer.csproj | 4 +- .../Configuration/Impl/JiraLanguageImpl.cs | 2 + .../Greenshot.Addon.Jira.csproj | 6 +-- .../Configuration/Impl/EditorLanguageImpl.cs | 4 +- .../Greenshot.Addon.LegacyEditor.csproj | 8 ++-- .../Configuration/Impl/LutimLanguageImpl.cs | 2 + .../Greenshot.Addon.Lutim.csproj | 8 ++-- .../Configuration/Impl/OcrLanguageImpl.cs | 2 + .../Greenshot.Addon.OCR.csproj | 6 +-- .../Configuration/Impl/OfficeLanguageImpl.cs | 2 + .../Greenshot.Addon.Office.csproj | 9 ++-- .../OfficeExport/ExcelExporter.cs | 6 +-- .../OfficeExport/OneNoteExporter.cs | 4 +- .../OfficeExport/OutlookEmailExporter.cs | 5 +-- .../OfficeExport/PowerpointExporter.cs | 5 +-- .../OfficeExport/WordExporter.cs | 9 ++-- .../Impl/OneDriveLanguageImpl.cs | 3 ++ .../Greenshot.Addon.OneDrive.csproj | 8 ++-- .../Impl/PhotobucketLanguageImpl.cs | 2 + .../Greenshot.Addon.Photobucket.csproj | 6 +-- .../Configuration/Impl/TfsLanguageImpl.cs | 2 + .../Greenshot.Addon.Tfs.csproj | 8 ++-- .../Greenshot.Addon.Win10.csproj | 6 +-- .../Config/Impl/GreenshotLanguageImpl.cs | 4 +- src/Greenshot.Addons/Greenshot.Addons.csproj | 13 +++--- src/Greenshot.Core/Greenshot.Core.csproj | 2 +- src/Greenshot.Gfx/Greenshot.Gfx.csproj | 2 +- src/Greenshot.Tests/Greenshot.Tests.csproj | 2 +- .../Impl/ConfigTranslationsImpl.cs | 2 + src/Greenshot/Greenshot.csproj | 41 +++++++++++++------ src/Greenshot/Startup.cs | 2 +- 57 files changed, 184 insertions(+), 113 deletions(-) diff --git a/src/Greenshot.Addon.Box/Configuration/Impl/BoxLanguageImpl.cs b/src/Greenshot.Addon.Box/Configuration/Impl/BoxLanguageImpl.cs index f39727e7f..bf8a9f42f 100644 --- a/src/Greenshot.Addon.Box/Configuration/Impl/BoxLanguageImpl.cs +++ b/src/Greenshot.Addon.Box/Configuration/Impl/BoxLanguageImpl.cs @@ -21,10 +21,12 @@ #endregion +using System.Diagnostics.CodeAnalysis; using Dapplo.Config.Language; namespace Greenshot.Addon.Box.Configuration.Impl { + [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")] public class BoxLanguageImpl : LanguageBase, IBoxLanguage { #region Implementation of IBoxLanguage diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index cdd728f2e..e382d5714 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -48,12 +48,12 @@ - - + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Confluence/Configuration/IConfluenceConfiguration.cs b/src/Greenshot.Addon.Confluence/Configuration/IConfluenceConfiguration.cs index 910197c68..0137f54d9 100644 --- a/src/Greenshot.Addon.Confluence/Configuration/IConfluenceConfiguration.cs +++ b/src/Greenshot.Addon.Confluence/Configuration/IConfluenceConfiguration.cs @@ -29,7 +29,7 @@ using Greenshot.Core.Enums; #endregion -namespace Greenshot.Addon.Confluence +namespace Greenshot.Addon.Confluence.Configuration { /// /// Description of ConfluenceConfiguration. diff --git a/src/Greenshot.Addon.Confluence/Configuration/IConfluenceLanguage.cs b/src/Greenshot.Addon.Confluence/Configuration/IConfluenceLanguage.cs index c515f2597..dc9ed6b7d 100644 --- a/src/Greenshot.Addon.Confluence/Configuration/IConfluenceLanguage.cs +++ b/src/Greenshot.Addon.Confluence/Configuration/IConfluenceLanguage.cs @@ -21,10 +21,9 @@ #endregion -using System.ComponentModel; using Dapplo.Config.Language; -namespace Greenshot.Addon.Confluence +namespace Greenshot.Addon.Confluence.Configuration { [Language("Confluence")] public interface IConfluenceLanguage : ILanguage diff --git a/src/Greenshot.Addon.Confluence/Configuration/Impl/ConfluenceLanguageImpl.cs b/src/Greenshot.Addon.Confluence/Configuration/Impl/ConfluenceLanguageImpl.cs index b0c57963a..9229ac878 100644 --- a/src/Greenshot.Addon.Confluence/Configuration/Impl/ConfluenceLanguageImpl.cs +++ b/src/Greenshot.Addon.Confluence/Configuration/Impl/ConfluenceLanguageImpl.cs @@ -21,10 +21,12 @@ #endregion +using System.Diagnostics.CodeAnalysis; using Dapplo.Config.Language; namespace Greenshot.Addon.Confluence.Configuration.Impl { + [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")] public class ConfluenceLanguageImpl : LanguageBase, IConfluenceLanguage { #region Implementation of IConfluenceLanguage diff --git a/src/Greenshot.Addon.Confluence/ConfluenceAddonModule.cs b/src/Greenshot.Addon.Confluence/ConfluenceAddonModule.cs index d2663d22e..8ccfdf5bc 100644 --- a/src/Greenshot.Addon.Confluence/ConfluenceAddonModule.cs +++ b/src/Greenshot.Addon.Confluence/ConfluenceAddonModule.cs @@ -26,6 +26,7 @@ using Dapplo.Addons; using Dapplo.CaliburnMicro.Configuration; using Dapplo.Config.Ini; using Dapplo.Config.Language; +using Greenshot.Addon.Confluence.Configuration; using Greenshot.Addon.Confluence.Configuration.Impl; using Greenshot.Addon.Confluence.ViewModels; using Greenshot.Addons.Components; diff --git a/src/Greenshot.Addon.Confluence/ConfluenceDestination.cs b/src/Greenshot.Addon.Confluence/ConfluenceDestination.cs index a93daddf0..a3bbc75ae 100644 --- a/src/Greenshot.Addon.Confluence/ConfluenceDestination.cs +++ b/src/Greenshot.Addon.Confluence/ConfluenceDestination.cs @@ -33,6 +33,7 @@ using Autofac.Features.OwnedInstances; using Dapplo.Confluence; using Dapplo.Confluence.Entities; using Dapplo.Log; +using Greenshot.Addon.Confluence.Configuration; using Greenshot.Addons; using Greenshot.Addons.Components; using Greenshot.Addons.Controls; diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index ea6fb74f4..cc086e0ff 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -55,11 +55,11 @@ - - + + - + all diff --git a/src/Greenshot.Addon.Confluence/ViewModels/ConfluenceConfigViewModel.cs b/src/Greenshot.Addon.Confluence/ViewModels/ConfluenceConfigViewModel.cs index e18288339..88a69aa84 100644 --- a/src/Greenshot.Addon.Confluence/ViewModels/ConfluenceConfigViewModel.cs +++ b/src/Greenshot.Addon.Confluence/ViewModels/ConfluenceConfigViewModel.cs @@ -25,6 +25,7 @@ using System.Collections.Generic; using System.Reactive.Disposables; using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Extensions; +using Greenshot.Addon.Confluence.Configuration; using Greenshot.Addons; using Greenshot.Addons.Core.Enums; using Greenshot.Addons.Extensions; diff --git a/src/Greenshot.Addon.Dropbox/Configuration/IDropboxLanguage.cs b/src/Greenshot.Addon.Dropbox/Configuration/IDropboxLanguage.cs index f3766e7d3..a69f8c071 100644 --- a/src/Greenshot.Addon.Dropbox/Configuration/IDropboxLanguage.cs +++ b/src/Greenshot.Addon.Dropbox/Configuration/IDropboxLanguage.cs @@ -19,7 +19,6 @@ #region Usings -using System.ComponentModel; using Dapplo.Config.Language; #endregion @@ -27,7 +26,7 @@ using Dapplo.Config.Language; namespace Greenshot.Addon.Dropbox.Configuration { [Language("Dropbox")] - public interface IDropboxLanguage : ILanguage, INotifyPropertyChanged + public interface IDropboxLanguage : ILanguage { string CommunicationWait { get; } diff --git a/src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxLanguageImpl.cs b/src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxLanguageImpl.cs index e891806cb..e8f2a11fb 100644 --- a/src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxLanguageImpl.cs +++ b/src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxLanguageImpl.cs @@ -17,10 +17,12 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . +using System.Diagnostics.CodeAnalysis; using Dapplo.Config.Language; namespace Greenshot.Addon.Dropbox.Configuration.Impl { + [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")] public class DropboxLanguageImpl: LanguageBase, IDropboxLanguage { #region Implementation of IDropboxLanguage diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index a4609ea84..fb3f1df7f 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -50,12 +50,12 @@ - - + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.ExternalCommand/Configuration/IExternalCommandLanguage.cs b/src/Greenshot.Addon.ExternalCommand/Configuration/IExternalCommandLanguage.cs index 6da773915..9f23a612d 100644 --- a/src/Greenshot.Addon.ExternalCommand/Configuration/IExternalCommandLanguage.cs +++ b/src/Greenshot.Addon.ExternalCommand/Configuration/IExternalCommandLanguage.cs @@ -21,13 +21,12 @@ #endregion -using System.ComponentModel; using Dapplo.Config.Language; namespace Greenshot.Addon.ExternalCommand.Configuration { [Language("ExternalCommand")] - public interface IExternalCommandLanguage : ILanguage, INotifyPropertyChanged + public interface IExternalCommandLanguage : ILanguage { string ContextmenuConfigure { get; } string SettingsEdit { get; } diff --git a/src/Greenshot.Addon.ExternalCommand/Configuration/Impl/ExternalCommandLanguageImpl.cs b/src/Greenshot.Addon.ExternalCommand/Configuration/Impl/ExternalCommandLanguageImpl.cs index fce8fa3c3..7a156c3ad 100644 --- a/src/Greenshot.Addon.ExternalCommand/Configuration/Impl/ExternalCommandLanguageImpl.cs +++ b/src/Greenshot.Addon.ExternalCommand/Configuration/Impl/ExternalCommandLanguageImpl.cs @@ -21,10 +21,12 @@ #endregion +using System.Diagnostics.CodeAnalysis; using Dapplo.Config.Language; namespace Greenshot.Addon.ExternalCommand.Configuration.Impl { + [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")] public class ExternalCommandLanguageImpl : LanguageBase, IExternalCommandLanguage { #region Implementation of IExternalCommandLanguage diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index 0ebfe029a..ae5754c90 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -42,9 +42,9 @@ - - - + + + all diff --git a/src/Greenshot.Addon.Flickr/Configuration/IFlickrLanguage.cs b/src/Greenshot.Addon.Flickr/Configuration/IFlickrLanguage.cs index 316a4fb9a..9e3af70ec 100644 --- a/src/Greenshot.Addon.Flickr/Configuration/IFlickrLanguage.cs +++ b/src/Greenshot.Addon.Flickr/Configuration/IFlickrLanguage.cs @@ -19,7 +19,6 @@ #region Usings -using System.ComponentModel; using Dapplo.Config.Language; #endregion @@ -27,7 +26,7 @@ using Dapplo.Config.Language; namespace Greenshot.Addon.Flickr.Configuration { [Language("Flickr")] - public interface IFlickrLanguage : ILanguage, INotifyPropertyChanged + public interface IFlickrLanguage : ILanguage { string CommunicationWait { get; } diff --git a/src/Greenshot.Addon.Flickr/Configuration/Impl/FlickrLanguageImpl.cs b/src/Greenshot.Addon.Flickr/Configuration/Impl/FlickrLanguageImpl.cs index 8490fb58f..c7c9f2c61 100644 --- a/src/Greenshot.Addon.Flickr/Configuration/Impl/FlickrLanguageImpl.cs +++ b/src/Greenshot.Addon.Flickr/Configuration/Impl/FlickrLanguageImpl.cs @@ -21,10 +21,12 @@ #endregion +using System.Diagnostics.CodeAnalysis; using Dapplo.Config.Language; namespace Greenshot.Addon.Flickr.Configuration.Impl { + [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")] public class FlickrLanguageImpl : LanguageBase, IFlickrLanguage { #region Implementation of IFlickrLanguage diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index 93b77200a..8687de001 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -50,10 +50,10 @@ - - + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.GooglePhotos/Configuration/IGooglePhotosLanguage.cs b/src/Greenshot.Addon.GooglePhotos/Configuration/IGooglePhotosLanguage.cs index ba998c941..d80abff88 100644 --- a/src/Greenshot.Addon.GooglePhotos/Configuration/IGooglePhotosLanguage.cs +++ b/src/Greenshot.Addon.GooglePhotos/Configuration/IGooglePhotosLanguage.cs @@ -1,10 +1,34 @@ -using System.ComponentModel; +#region Greenshot GNU General Public License + +// Greenshot - a free and open source screenshot tool +// Copyright (C) 2007-2018 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 . + +#endregion + +using System.Diagnostics.CodeAnalysis; using Dapplo.Config.Language; namespace Greenshot.Addon.GooglePhotos.Configuration { [Language("GooglePhotos")] - public interface IGooglePhotosLanguage : ILanguage, INotifyPropertyChanged + [SuppressMessage("ReSharper", "UnusedMember.Global")] + public interface IGooglePhotosLanguage : ILanguage { string CommunicationWait { get; } diff --git a/src/Greenshot.Addon.GooglePhotos/Configuration/Impl/GooglePhotosLanguageImpl.cs b/src/Greenshot.Addon.GooglePhotos/Configuration/Impl/GooglePhotosLanguageImpl.cs index 52220ba00..e2e15bc7c 100644 --- a/src/Greenshot.Addon.GooglePhotos/Configuration/Impl/GooglePhotosLanguageImpl.cs +++ b/src/Greenshot.Addon.GooglePhotos/Configuration/Impl/GooglePhotosLanguageImpl.cs @@ -21,10 +21,12 @@ #endregion +using System.Diagnostics.CodeAnalysis; using Dapplo.Config.Language; namespace Greenshot.Addon.GooglePhotos.Configuration.Impl { + [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")] public class GooglePhotosLanguageImpl : LanguageBase, IGooglePhotosLanguage { #region Implementation of IGooglePhotosLanguage diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 0b0f5f8cc..33eba865e 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -50,10 +50,10 @@ - - + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Imgur/Configuration/IImgurLanguage.cs b/src/Greenshot.Addon.Imgur/Configuration/IImgurLanguage.cs index d740058c7..84611849a 100644 --- a/src/Greenshot.Addon.Imgur/Configuration/IImgurLanguage.cs +++ b/src/Greenshot.Addon.Imgur/Configuration/IImgurLanguage.cs @@ -19,7 +19,7 @@ #region Usings -using System.ComponentModel; +using System.Diagnostics.CodeAnalysis; using Dapplo.Config.Language; #endregion @@ -27,7 +27,8 @@ using Dapplo.Config.Language; namespace Greenshot.Addon.Imgur.Configuration { [Language("Imgur")] - public interface IImgurLanguage : ILanguage, INotifyPropertyChanged + [SuppressMessage("ReSharper", "UnusedMember.Global")] + public interface IImgurLanguage : ILanguage { string Cancel { get; } diff --git a/src/Greenshot.Addon.Imgur/Configuration/Impl/ImgurLanguageImpl.cs b/src/Greenshot.Addon.Imgur/Configuration/Impl/ImgurLanguageImpl.cs index 6623cc5ce..2203e4ecc 100644 --- a/src/Greenshot.Addon.Imgur/Configuration/Impl/ImgurLanguageImpl.cs +++ b/src/Greenshot.Addon.Imgur/Configuration/Impl/ImgurLanguageImpl.cs @@ -21,10 +21,12 @@ #endregion +using System.Diagnostics.CodeAnalysis; using Dapplo.Config.Language; namespace Greenshot.Addon.Imgur.Configuration.Impl { + [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")] public class ImgurLanguageImpl : LanguageBase, IImgurLanguage { #region Implementation of IImgurLanguage diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index 3f790112f..7660fc91b 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -50,15 +50,15 @@ - - + + - + all runtime; build; native; contentfiles; analyzers - + diff --git a/src/Greenshot.Addon.Imgur/ViewModels/ImgurHistoryViewModel.cs b/src/Greenshot.Addon.Imgur/ViewModels/ImgurHistoryViewModel.cs index 6df2c0892..f3b2b6f76 100644 --- a/src/Greenshot.Addon.Imgur/ViewModels/ImgurHistoryViewModel.cs +++ b/src/Greenshot.Addon.Imgur/ViewModels/ImgurHistoryViewModel.cs @@ -88,7 +88,7 @@ namespace Greenshot.Addon.Imgur.ViewModels { ImgurLanguage.CreateDisplayNameBinding(this, nameof(IImgurLanguage.History)) }; - var ignoringTask = LoadHistory(); + _ = LoadHistory(); } protected override void OnDeactivate(bool close) diff --git a/src/Greenshot.Addon.InternetExplorer/AccessibleHelper.cs b/src/Greenshot.Addon.InternetExplorer/AccessibleHelper.cs index 9b6617e76..b60a391e1 100644 --- a/src/Greenshot.Addon.InternetExplorer/AccessibleHelper.cs +++ b/src/Greenshot.Addon.InternetExplorer/AccessibleHelper.cs @@ -27,7 +27,6 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; using Accessibility; -using Dapplo.Log; #endregion @@ -43,7 +42,6 @@ namespace Greenshot.Addon.InternetExplorer { private const int IE_ACTIVE_TAB = 2097154; private const int CHILDID_SELF = 0; - private static readonly LogSource Log = new LogSource(); private readonly IAccessible accessible; public Accessible(IntPtr hWnd) diff --git a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj index ed8467a6b..318f07b0f 100644 --- a/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj +++ b/src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj @@ -34,10 +34,10 @@ - 0.7.19 + 0.7.21 - 0.7.19 + 0.7.21 diff --git a/src/Greenshot.Addon.Jira/Configuration/Impl/JiraLanguageImpl.cs b/src/Greenshot.Addon.Jira/Configuration/Impl/JiraLanguageImpl.cs index d87092338..5b17325df 100644 --- a/src/Greenshot.Addon.Jira/Configuration/Impl/JiraLanguageImpl.cs +++ b/src/Greenshot.Addon.Jira/Configuration/Impl/JiraLanguageImpl.cs @@ -21,10 +21,12 @@ #endregion +using System.Diagnostics.CodeAnalysis; using Dapplo.Config.Language; namespace Greenshot.Addon.Jira.Configuration.Impl { + [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")] public class JiraLanguageImpl : LanguageBase, IJiraLanguage { #region Implementation of IJiraLanguage diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index 0ec0f0a64..5652ab2ac 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -52,12 +52,12 @@ - - + + - + all diff --git a/src/Greenshot.Addon.LegacyEditor/Configuration/Impl/EditorLanguageImpl.cs b/src/Greenshot.Addon.LegacyEditor/Configuration/Impl/EditorLanguageImpl.cs index 08dfb556f..006c1aac9 100644 --- a/src/Greenshot.Addon.LegacyEditor/Configuration/Impl/EditorLanguageImpl.cs +++ b/src/Greenshot.Addon.LegacyEditor/Configuration/Impl/EditorLanguageImpl.cs @@ -1,7 +1,9 @@ -using Dapplo.Config.Language; +using System.Diagnostics.CodeAnalysis; +using Dapplo.Config.Language; namespace Greenshot.Addon.LegacyEditor.Configuration.Impl { + [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")] public class EditorLanguageImpl : LanguageBase, IEditorLanguage { #region Implementation of IEditorLanguage diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index bcacb4ed8..41c173bfe 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -137,11 +137,11 @@ - - + + - - + + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Lutim/Configuration/Impl/LutimLanguageImpl.cs b/src/Greenshot.Addon.Lutim/Configuration/Impl/LutimLanguageImpl.cs index f4a1016f5..4789135bf 100644 --- a/src/Greenshot.Addon.Lutim/Configuration/Impl/LutimLanguageImpl.cs +++ b/src/Greenshot.Addon.Lutim/Configuration/Impl/LutimLanguageImpl.cs @@ -21,10 +21,12 @@ #endregion +using System.Diagnostics.CodeAnalysis; using Dapplo.Config.Language; namespace Greenshot.Addon.Lutim.Configuration.Impl { + [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")] public class LutimLanguageImpl : LanguageBase, ILutimLanguage { #region Implementation of ILutimLanguage diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index 7c1ee5e8a..73db94ab8 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -50,12 +50,12 @@ - - + + - - + + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.OCR/Configuration/Impl/OcrLanguageImpl.cs b/src/Greenshot.Addon.OCR/Configuration/Impl/OcrLanguageImpl.cs index 5dadd4fd3..221ee3604 100644 --- a/src/Greenshot.Addon.OCR/Configuration/Impl/OcrLanguageImpl.cs +++ b/src/Greenshot.Addon.OCR/Configuration/Impl/OcrLanguageImpl.cs @@ -21,10 +21,12 @@ #endregion +using System.Diagnostics.CodeAnalysis; using Dapplo.Config.Language; namespace Greenshot.Addon.OCR.Configuration.Impl { + [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")] public class OcrLanguageImpl : LanguageBase, IOcrLanguage { #region Implementation of IOcrLanguage diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj index 7422617fd..5890ff581 100644 --- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj +++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj @@ -42,9 +42,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Office/Configuration/Impl/OfficeLanguageImpl.cs b/src/Greenshot.Addon.Office/Configuration/Impl/OfficeLanguageImpl.cs index 25237ec1c..42cc6932c 100644 --- a/src/Greenshot.Addon.Office/Configuration/Impl/OfficeLanguageImpl.cs +++ b/src/Greenshot.Addon.Office/Configuration/Impl/OfficeLanguageImpl.cs @@ -21,11 +21,13 @@ #endregion +using System.Diagnostics.CodeAnalysis; using Dapplo.Config.Language; namespace Greenshot.Addon.Office.Configuration.Impl { #pragma warning disable CS1591 + [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")] public class OfficeLanguageImpl : LanguageBase, IOfficeLanguage { #region Implementation of IOfficeLanguage diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index 94254b48b..68511777b 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 - net471 + netcoreapp3.0;net471 @@ -14,6 +14,7 @@ + @@ -45,9 +46,9 @@ - - - + + + diff --git a/src/Greenshot.Addon.Office/OfficeExport/ExcelExporter.cs b/src/Greenshot.Addon.Office/OfficeExport/ExcelExporter.cs index 0e6f439d4..0b586b2dc 100644 --- a/src/Greenshot.Addon.Office/OfficeExport/ExcelExporter.cs +++ b/src/Greenshot.Addon.Office/OfficeExport/ExcelExporter.cs @@ -28,8 +28,8 @@ using System.Collections.Generic; using System.Drawing; using System.Runtime.InteropServices; using Dapplo.Log; +using Dapplo.Windows.Com; using Dapplo.Windows.Desktop; -using Dapplo.Windows.Interop; using Greenshot.Addon.Office.OfficeInterop; using Microsoft.Office.Core; using Microsoft.Office.Interop.Excel; @@ -56,14 +56,14 @@ namespace Greenshot.Addon.Office.OfficeExport IDisposableCom excelApplication; try { - excelApplication = DisposableCom.Create((Application)Marshal.GetActiveObject("Excel.Application")); + excelApplication = OleAut32Api.GetActiveObject("Excel.Application"); } catch { // Ignore, probably no excel running return null; } - if ((excelApplication != null) && (excelApplication.ComObject != null)) + if (excelApplication?.ComObject != null) { InitializeVariables(excelApplication); } diff --git a/src/Greenshot.Addon.Office/OfficeExport/OneNoteExporter.cs b/src/Greenshot.Addon.Office/OfficeExport/OneNoteExporter.cs index 5651201b5..6a3333f55 100644 --- a/src/Greenshot.Addon.Office/OfficeExport/OneNoteExporter.cs +++ b/src/Greenshot.Addon.Office/OfficeExport/OneNoteExporter.cs @@ -29,7 +29,7 @@ using System.IO; using System.Runtime.InteropServices; using System.Xml; using Dapplo.Log; -using Dapplo.Windows.Interop; +using Dapplo.Windows.Com; using Greenshot.Addon.Office.OfficeExport.Entities; using Greenshot.Addons.Core; using Greenshot.Addons.Interfaces; @@ -135,7 +135,7 @@ namespace Greenshot.Addon.Office.OfficeExport IDisposableCom oneNoteApplication; try { - oneNoteApplication = DisposableCom.Create((Application)Marshal.GetActiveObject("OneNote.Application")); + oneNoteApplication = OleAut32Api.GetActiveObject("OneNote.Application"); } catch { diff --git a/src/Greenshot.Addon.Office/OfficeExport/OutlookEmailExporter.cs b/src/Greenshot.Addon.Office/OfficeExport/OutlookEmailExporter.cs index 31ca74bb5..3917a510e 100644 --- a/src/Greenshot.Addon.Office/OfficeExport/OutlookEmailExporter.cs +++ b/src/Greenshot.Addon.Office/OfficeExport/OutlookEmailExporter.cs @@ -26,10 +26,9 @@ using System; using System.Collections.Generic; using System.IO; -using System.Runtime.InteropServices; using System.Text; using Dapplo.Log; -using Dapplo.Windows.Interop; +using Dapplo.Windows.Com; using Greenshot.Addon.Office.Configuration; using Greenshot.Addon.Office.OfficeInterop; using mshtml; @@ -601,7 +600,7 @@ namespace Greenshot.Addon.Office.OfficeExport IDisposableCom outlookApplication; try { - outlookApplication = DisposableCom.Create((Application)Marshal.GetActiveObject("Outlook.Application")); + outlookApplication = OleAut32Api.GetActiveObject("Outlook.Application"); } catch (Exception) { diff --git a/src/Greenshot.Addon.Office/OfficeExport/PowerpointExporter.cs b/src/Greenshot.Addon.Office/OfficeExport/PowerpointExporter.cs index b82a1e378..c506fb4b1 100644 --- a/src/Greenshot.Addon.Office/OfficeExport/PowerpointExporter.cs +++ b/src/Greenshot.Addon.Office/OfficeExport/PowerpointExporter.cs @@ -27,9 +27,8 @@ using System; using System.Collections.Generic; using System.Drawing; using System.Runtime.InteropServices; -using Dapplo.Config.Ini; using Dapplo.Log; -using Dapplo.Windows.Interop; +using Dapplo.Windows.Com; using Greenshot.Addon.Office.Configuration; using Greenshot.Addon.Office.OfficeInterop; using Microsoft.Office.Core; @@ -276,7 +275,7 @@ namespace Greenshot.Addon.Office.OfficeExport IDisposableCom powerPointApplication; try { - powerPointApplication = DisposableCom.Create((Application)Marshal.GetActiveObject("PowerPoint.Application")); + powerPointApplication = OleAut32Api.GetActiveObject("PowerPoint.Application"); } catch (Exception) { diff --git a/src/Greenshot.Addon.Office/OfficeExport/WordExporter.cs b/src/Greenshot.Addon.Office/OfficeExport/WordExporter.cs index ea8d528e7..6a577073b 100644 --- a/src/Greenshot.Addon.Office/OfficeExport/WordExporter.cs +++ b/src/Greenshot.Addon.Office/OfficeExport/WordExporter.cs @@ -21,9 +21,8 @@ using System; using System.Collections.Generic; -using System.Runtime.InteropServices; using Dapplo.Log; -using Dapplo.Windows.Interop; +using Dapplo.Windows.Com; using Greenshot.Addon.Office.Configuration; using Greenshot.Addon.Office.OfficeInterop; using Microsoft.Office.Core; @@ -98,7 +97,7 @@ namespace Greenshot.Addon.Office.OfficeExport IDisposableCom wordApplication; try { - wordApplication = DisposableCom.Create((Application)Marshal.GetActiveObject("Word.Application")); + wordApplication = OleAut32Api.GetActiveObject("Word.Application"); } catch (Exception) { @@ -173,7 +172,7 @@ namespace Greenshot.Addon.Office.OfficeExport /// /// /// - /// + /// bool public bool InsertIntoExistingDocument(string wordCaption, string tmpFile) { using (var wordApplication = GetWordApplication()) @@ -210,7 +209,7 @@ namespace Greenshot.Addon.Office.OfficeExport /// string /// string /// string with the tooltip of the image - /// + /// bool internal bool InsertIntoExistingDocument(IDisposableCom wordApplication, IDisposableCom<_Document> wordDocument, string tmpFile, string address, string tooltip) { // Bug #1517: image will be inserted into that document, where the focus was last. It will not inserted into the chosen one. diff --git a/src/Greenshot.Addon.OneDrive/Configuration/Impl/OneDriveLanguageImpl.cs b/src/Greenshot.Addon.OneDrive/Configuration/Impl/OneDriveLanguageImpl.cs index 54f4e0799..fe3ef980d 100644 --- a/src/Greenshot.Addon.OneDrive/Configuration/Impl/OneDriveLanguageImpl.cs +++ b/src/Greenshot.Addon.OneDrive/Configuration/Impl/OneDriveLanguageImpl.cs @@ -20,10 +20,13 @@ // along with this program. If not, see . #endregion + +using System.Diagnostics.CodeAnalysis; using Dapplo.Config.Language; namespace Greenshot.Addon.OneDrive.Configuration.Impl { + [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")] public class OneDriveLanguageImpl : LanguageBase, IOneDriveLanguage { #region Implementation of IOneDriveLanguage diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index fdeb8a62a..ee7f9f91c 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -50,12 +50,12 @@ - - + + - - + + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Photobucket/Configuration/Impl/PhotobucketLanguageImpl.cs b/src/Greenshot.Addon.Photobucket/Configuration/Impl/PhotobucketLanguageImpl.cs index 06cea88c3..a12fd741c 100644 --- a/src/Greenshot.Addon.Photobucket/Configuration/Impl/PhotobucketLanguageImpl.cs +++ b/src/Greenshot.Addon.Photobucket/Configuration/Impl/PhotobucketLanguageImpl.cs @@ -21,10 +21,12 @@ #endregion +using System.Diagnostics.CodeAnalysis; using Dapplo.Config.Language; namespace Greenshot.Addon.Photobucket.Configuration.Impl { + [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")] public class PhotobucketLanguageImpl : LanguageBase, IPhotobucketLanguage { #region Implementation of IPhotobucketLanguage diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index ea66fd0c1..a26f6b244 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -50,10 +50,10 @@ - - + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Tfs/Configuration/Impl/TfsLanguageImpl.cs b/src/Greenshot.Addon.Tfs/Configuration/Impl/TfsLanguageImpl.cs index 956671f2e..3c9086273 100644 --- a/src/Greenshot.Addon.Tfs/Configuration/Impl/TfsLanguageImpl.cs +++ b/src/Greenshot.Addon.Tfs/Configuration/Impl/TfsLanguageImpl.cs @@ -21,10 +21,12 @@ #endregion +using System.Diagnostics.CodeAnalysis; using Dapplo.Config.Language; namespace Greenshot.Addon.Tfs.Configuration.Impl { + [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")] public class TfsLanguageImpl : LanguageBase, ITfsLanguage { #region Implementation of ITfsLanguage diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index 9bee1be34..bbd3c767e 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -50,12 +50,12 @@ - - + + - - + + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj index f043f4c6f..2ccb64b02 100644 --- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj +++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj @@ -54,8 +54,8 @@ - - - + + + \ No newline at end of file diff --git a/src/Greenshot.Addons/Config/Impl/GreenshotLanguageImpl.cs b/src/Greenshot.Addons/Config/Impl/GreenshotLanguageImpl.cs index dfa60b1cc..56caba176 100644 --- a/src/Greenshot.Addons/Config/Impl/GreenshotLanguageImpl.cs +++ b/src/Greenshot.Addons/Config/Impl/GreenshotLanguageImpl.cs @@ -1,7 +1,9 @@ -using Dapplo.Config.Language; +using System.Diagnostics.CodeAnalysis; +using Dapplo.Config.Language; namespace Greenshot.Addons.Config.Impl { + [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")] internal class GreenshotLanguageImpl : LanguageBase, IGreenshotLanguage { #region Implementation of ICoreTranslations diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index cfb3ad08a..e67fc7177 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -44,14 +44,15 @@ + - 1.1.12-gbfc701fccd + 1.1.14-g04dc0f1bab - 1.1.12-gbfc701fccd + 1.1.14-g04dc0f1bab - 1.1.12-gbfc701fccd + 1.1.14-g04dc0f1bab 0.9.15 @@ -63,17 +64,17 @@ 0.9.15 - 0.7.19 + 0.7.21 - 0.7.19 + 0.7.21 all runtime; build; native; contentfiles; analyzers - 3.0.0-alpha0088 + 2.3.0 2.3.0 diff --git a/src/Greenshot.Core/Greenshot.Core.csproj b/src/Greenshot.Core/Greenshot.Core.csproj index 1369d0971..49ac8d643 100644 --- a/src/Greenshot.Core/Greenshot.Core.csproj +++ b/src/Greenshot.Core/Greenshot.Core.csproj @@ -33,7 +33,7 @@ - 0.7.19 + 0.7.21 diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index 9cd16aef7..007bde5e9 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -33,7 +33,7 @@ - 1.1.12-gbfc701fccd + 1.1.14-g04dc0f1bab 2.3.0 diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 515669ae5..93658e92b 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -70,7 +70,7 @@ - + diff --git a/src/Greenshot/Configuration/Impl/ConfigTranslationsImpl.cs b/src/Greenshot/Configuration/Impl/ConfigTranslationsImpl.cs index 0d4ace26c..e7fad1a45 100644 --- a/src/Greenshot/Configuration/Impl/ConfigTranslationsImpl.cs +++ b/src/Greenshot/Configuration/Impl/ConfigTranslationsImpl.cs @@ -21,10 +21,12 @@ #endregion +using System.Diagnostics.CodeAnalysis; using Dapplo.Config.Language; namespace Greenshot.Configuration.Impl { + [SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")] internal class ConfigTranslationsImpl : LanguageBase, IConfigTranslations { public string Filter { get; } diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 209b9dbf7..6e596f5f7 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -81,34 +81,49 @@ - - - - - + + + + + - - - + + + all runtime; build; native; contentfiles; analyzers - + - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Greenshot/Startup.cs b/src/Greenshot/Startup.cs index 5a985c4cf..902a989ce 100644 --- a/src/Greenshot/Startup.cs +++ b/src/Greenshot/Startup.cs @@ -95,7 +95,7 @@ namespace Greenshot return -1; } - RegisterErrorHandlers(application); + //RegisterErrorHandlers(application); application.Run(); return 0;