github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-23 06:36:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Robin 2018-11-15 08:14:32 +01:00
commit a48d1b2061
57 changed files with 184 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Greenshot.Addon.Box/Configuration/Impl/BoxLanguageImpl.cs
View file

@ -21,10 +21,12 @@
#endregion #endregion
using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Addon.Box.Configuration.Impl namespace Greenshot.Addon.Box.Configuration.Impl
{ {
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
public class BoxLanguageImpl : LanguageBase<IBoxLanguage>, IBoxLanguage public class BoxLanguageImpl : LanguageBase<IBoxLanguage>, IBoxLanguage
{ {
#region Implementation of IBoxLanguage #region Implementation of IBoxLanguage

6
src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
View file

@ -48,12 +48,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

2
src/Greenshot.Addon.Confluence/Configuration/IConfluenceConfiguration.cs
View file

@ -29,7 +29,7 @@ using Greenshot.Core.Enums;
#endregion #endregion
namespace Greenshot.Addon.Confluence namespace Greenshot.Addon.Confluence.Configuration
{ {
/// <summary> /// <summary>
/// Description of ConfluenceConfiguration. /// Description of ConfluenceConfiguration.

3
src/Greenshot.Addon.Confluence/Configuration/IConfluenceLanguage.cs
View file

@ -21,10 +21,9 @@
#endregion #endregion
using System.ComponentModel;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Addon.Confluence namespace Greenshot.Addon.Confluence.Configuration
{ {
[Language("Confluence")] [Language("Confluence")]
public interface IConfluenceLanguage : ILanguage public interface IConfluenceLanguage : ILanguage

2
src/Greenshot.Addon.Confluence/Configuration/Impl/ConfluenceLanguageImpl.cs
View file

@ -21,10 +21,12 @@
#endregion #endregion
using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Addon.Confluence.Configuration.Impl namespace Greenshot.Addon.Confluence.Configuration.Impl
{ {
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
public class ConfluenceLanguageImpl : LanguageBase<IConfluenceLanguage>, IConfluenceLanguage public class ConfluenceLanguageImpl : LanguageBase<IConfluenceLanguage>, IConfluenceLanguage
{ {
#region Implementation of IConfluenceLanguage #region Implementation of IConfluenceLanguage

1
src/Greenshot.Addon.Confluence/ConfluenceAddonModule.cs
View file

@ -26,6 +26,7 @@ using Dapplo.Addons;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Dapplo.Config.Ini; using Dapplo.Config.Ini;
using Dapplo.Config.Language; using Dapplo.Config.Language;
using Greenshot.Addon.Confluence.Configuration;
using Greenshot.Addon.Confluence.Configuration.Impl; using Greenshot.Addon.Confluence.Configuration.Impl;
using Greenshot.Addon.Confluence.ViewModels; using Greenshot.Addon.Confluence.ViewModels;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;

1
src/Greenshot.Addon.Confluence/ConfluenceDestination.cs
View file

@ -33,6 +33,7 @@ using Autofac.Features.OwnedInstances;
using Dapplo.Confluence; using Dapplo.Confluence;
using Dapplo.Confluence.Entities; using Dapplo.Confluence.Entities;
using Dapplo.Log; using Dapplo.Log;
using Greenshot.Addon.Confluence.Configuration;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Components; using Greenshot.Addons.Components;
using Greenshot.Addons.Controls; using Greenshot.Addons.Controls;

6
src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
View file

@ -55,11 +55,11 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Dapplo.Confluence" Version="0.8.14" /> <PackageReference Include="Dapplo.Confluence" Version="0.8.14" />
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>

1
src/Greenshot.Addon.Confluence/ViewModels/ConfluenceConfigViewModel.cs
View file

@ -25,6 +25,7 @@ using System.Collections.Generic;
using System.Reactive.Disposables; using System.Reactive.Disposables;
using Dapplo.CaliburnMicro.Configuration; using Dapplo.CaliburnMicro.Configuration;
using Dapplo.CaliburnMicro.Extensions; using Dapplo.CaliburnMicro.Extensions;
using Greenshot.Addon.Confluence.Configuration;
using Greenshot.Addons; using Greenshot.Addons;
using Greenshot.Addons.Core.Enums; using Greenshot.Addons.Core.Enums;
using Greenshot.Addons.Extensions; using Greenshot.Addons.Extensions;

3
src/Greenshot.Addon.Dropbox/Configuration/IDropboxLanguage.cs
View file

@ -19,7 +19,6 @@
#region Usings #region Usings
using System.ComponentModel;
using Dapplo.Config.Language; using Dapplo.Config.Language;
#endregion #endregion
@ -27,7 +26,7 @@ using Dapplo.Config.Language;
namespace Greenshot.Addon.Dropbox.Configuration namespace Greenshot.Addon.Dropbox.Configuration
{ {
[Language("Dropbox")] [Language("Dropbox")]
public interface IDropboxLanguage : ILanguage, INotifyPropertyChanged public interface IDropboxLanguage : ILanguage
{ {
string CommunicationWait { get; } string CommunicationWait { get; }

2
src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxLanguageImpl.cs
View file

@ -17,10 +17,12 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Addon.Dropbox.Configuration.Impl namespace Greenshot.Addon.Dropbox.Configuration.Impl
{ {
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
public class DropboxLanguageImpl: LanguageBase<IDropboxLanguage>, IDropboxLanguage public class DropboxLanguageImpl: LanguageBase<IDropboxLanguage>, IDropboxLanguage
{ {
#region Implementation of IDropboxLanguage #region Implementation of IDropboxLanguage

6
src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
View file

@ -50,12 +50,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

3
src/Greenshot.Addon.ExternalCommand/Configuration/IExternalCommandLanguage.cs
View file

@ -21,13 +21,12 @@
#endregion #endregion
using System.ComponentModel;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Addon.ExternalCommand.Configuration namespace Greenshot.Addon.ExternalCommand.Configuration
{ {
[Language("ExternalCommand")] [Language("ExternalCommand")]
public interface IExternalCommandLanguage : ILanguage, INotifyPropertyChanged public interface IExternalCommandLanguage : ILanguage
{ {
string ContextmenuConfigure { get; } string ContextmenuConfigure { get; }
string SettingsEdit { get; } string SettingsEdit { get; }

2
src/Greenshot.Addon.ExternalCommand/Configuration/Impl/ExternalCommandLanguageImpl.cs
View file

@ -21,10 +21,12 @@
#endregion #endregion
using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Addon.ExternalCommand.Configuration.Impl namespace Greenshot.Addon.ExternalCommand.Configuration.Impl
{ {
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
public class ExternalCommandLanguageImpl : LanguageBase<IExternalCommandLanguage>, IExternalCommandLanguage public class ExternalCommandLanguageImpl : LanguageBase<IExternalCommandLanguage>, IExternalCommandLanguage
{ {
#region Implementation of IExternalCommandLanguage #region Implementation of IExternalCommandLanguage

6
src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj
View file

@ -42,9 +42,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="CliWrap" Version="2.1.0" /> <PackageReference Include="CliWrap" Version="2.1.0" />
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>

3
src/Greenshot.Addon.Flickr/Configuration/IFlickrLanguage.cs
View file

@ -19,7 +19,6 @@
#region Usings #region Usings
using System.ComponentModel;
using Dapplo.Config.Language; using Dapplo.Config.Language;
#endregion #endregion
@ -27,7 +26,7 @@ using Dapplo.Config.Language;
namespace Greenshot.Addon.Flickr.Configuration namespace Greenshot.Addon.Flickr.Configuration
{ {
[Language("Flickr")] [Language("Flickr")]
public interface IFlickrLanguage : ILanguage, INotifyPropertyChanged public interface IFlickrLanguage : ILanguage
{ {
string CommunicationWait { get; } string CommunicationWait { get; }

2
src/Greenshot.Addon.Flickr/Configuration/Impl/FlickrLanguageImpl.cs
View file

@ -21,10 +21,12 @@
#endregion #endregion
using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Addon.Flickr.Configuration.Impl namespace Greenshot.Addon.Flickr.Configuration.Impl
{ {
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
public class FlickrLanguageImpl : LanguageBase<IFlickrLanguage>, IFlickrLanguage public class FlickrLanguageImpl : LanguageBase<IFlickrLanguage>, IFlickrLanguage
{ {
#region Implementation of IFlickrLanguage #region Implementation of IFlickrLanguage

6
src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
View file

@ -50,10 +50,10 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

28
src/Greenshot.Addon.GooglePhotos/Configuration/IGooglePhotosLanguage.cs
View file

@ -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 <http://www.gnu.org/licenses/>.
#endregion
using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Addon.GooglePhotos.Configuration namespace Greenshot.Addon.GooglePhotos.Configuration
{ {
[Language("GooglePhotos")] [Language("GooglePhotos")]
public interface IGooglePhotosLanguage : ILanguage, INotifyPropertyChanged [SuppressMessage("ReSharper", "UnusedMember.Global")]
public interface IGooglePhotosLanguage : ILanguage
{ {
string CommunicationWait { get; } string CommunicationWait { get; }

2
src/Greenshot.Addon.GooglePhotos/Configuration/Impl/GooglePhotosLanguageImpl.cs
View file

@ -21,10 +21,12 @@
#endregion #endregion
using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Addon.GooglePhotos.Configuration.Impl namespace Greenshot.Addon.GooglePhotos.Configuration.Impl
{ {
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
public class GooglePhotosLanguageImpl : LanguageBase<IGooglePhotosLanguage>, IGooglePhotosLanguage public class GooglePhotosLanguageImpl : LanguageBase<IGooglePhotosLanguage>, IGooglePhotosLanguage
{ {
#region Implementation of IGooglePhotosLanguage #region Implementation of IGooglePhotosLanguage

6
src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
View file

@ -50,10 +50,10 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

5
src/Greenshot.Addon.Imgur/Configuration/IImgurLanguage.cs
View file

@ -19,7 +19,7 @@
#region Usings #region Usings
using System.ComponentModel; using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language; using Dapplo.Config.Language;
#endregion #endregion
@ -27,7 +27,8 @@ using Dapplo.Config.Language;
namespace Greenshot.Addon.Imgur.Configuration namespace Greenshot.Addon.Imgur.Configuration
{ {
[Language("Imgur")] [Language("Imgur")]
public interface IImgurLanguage : ILanguage, INotifyPropertyChanged [SuppressMessage("ReSharper", "UnusedMember.Global")]
public interface IImgurLanguage : ILanguage
{ {
string Cancel { get; } string Cancel { get; }

2
src/Greenshot.Addon.Imgur/Configuration/Impl/ImgurLanguageImpl.cs
View file

@ -21,10 +21,12 @@
#endregion #endregion
using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Addon.Imgur.Configuration.Impl namespace Greenshot.Addon.Imgur.Configuration.Impl
{ {
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
public class ImgurLanguageImpl : LanguageBase<IImgurLanguage>, IImgurLanguage public class ImgurLanguageImpl : LanguageBase<IImgurLanguage>, IImgurLanguage
{ {
#region Implementation of IImgurLanguage #region Implementation of IImgurLanguage

8
src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
View file

@ -50,15 +50,15 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0105" /> <PackageReference Include="MahApps.Metro" Version="1.6.5" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Greenshot.Addon.Imgur/ViewModels/ImgurHistoryViewModel.cs
View file

@ -88,7 +88,7 @@ namespace Greenshot.Addon.Imgur.ViewModels
{ {
ImgurLanguage.CreateDisplayNameBinding(this, nameof(IImgurLanguage.History)) ImgurLanguage.CreateDisplayNameBinding(this, nameof(IImgurLanguage.History))
}; };
var ignoringTask = LoadHistory(); _ = LoadHistory();
} }
protected override void OnDeactivate(bool close) protected override void OnDeactivate(bool close)

2
src/Greenshot.Addon.InternetExplorer/AccessibleHelper.cs
View file

@ -27,7 +27,6 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Accessibility; using Accessibility;
using Dapplo.Log;
#endregion #endregion
@ -43,7 +42,6 @@ namespace Greenshot.Addon.InternetExplorer
{ {
private const int IE_ACTIVE_TAB = 2097154; private const int IE_ACTIVE_TAB = 2097154;
private const int CHILDID_SELF = 0; private const int CHILDID_SELF = 0;
private static readonly LogSource Log = new LogSource();
private readonly IAccessible accessible; private readonly IAccessible accessible;
public Accessible(IntPtr hWnd) public Accessible(IntPtr hWnd)

4
src/Greenshot.Addon.InternetExplorer/Greenshot.Addon.InternetExplorer.csproj
View file

@ -34,10 +34,10 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapplo.Windows"> <PackageReference Include="Dapplo.Windows">
<Version>0.7.19</Version> <Version>0.7.21</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Windows.Com"> <PackageReference Include="Dapplo.Windows.Com">
<Version>0.7.19</Version> <Version>0.7.21</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" /> <PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" />
</ItemGroup> </ItemGroup>

2
src/Greenshot.Addon.Jira/Configuration/Impl/JiraLanguageImpl.cs
View file

@ -21,10 +21,12 @@
#endregion #endregion
using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Addon.Jira.Configuration.Impl namespace Greenshot.Addon.Jira.Configuration.Impl
{ {
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
public class JiraLanguageImpl : LanguageBase<IJiraLanguage>, IJiraLanguage public class JiraLanguageImpl : LanguageBase<IJiraLanguage>, IJiraLanguage
{ {
#region Implementation of IJiraLanguage #region Implementation of IJiraLanguage

6
src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
View file

@ -52,12 +52,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Utils" Version="1.1.9" /> <PackageReference Include="Dapplo.Utils" Version="1.1.9" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Dapplo.Jira" Version="0.8.7" /> <PackageReference Include="Dapplo.Jira" Version="0.8.7" />
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>

4
src/Greenshot.Addon.LegacyEditor/Configuration/Impl/EditorLanguageImpl.cs
View file

@ -1,7 +1,9 @@
using Dapplo.Config.Language; using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language;
namespace Greenshot.Addon.LegacyEditor.Configuration.Impl namespace Greenshot.Addon.LegacyEditor.Configuration.Impl
{ {
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
public class EditorLanguageImpl : LanguageBase<IEditorLanguage>, IEditorLanguage public class EditorLanguageImpl : LanguageBase<IEditorLanguage>, IEditorLanguage
{ {
#region Implementation of IEditorLanguage #region Implementation of IEditorLanguage

8
src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
View file

@ -137,11 +137,11 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="CommonServiceLocator" Version="2.0.4" /> <PackageReference Include="CommonServiceLocator" Version="2.0.4" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Dapplo.Windows.Icons" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Icons" Version="0.7.21" />
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

2
src/Greenshot.Addon.Lutim/Configuration/Impl/LutimLanguageImpl.cs
View file

@ -21,10 +21,12 @@
#endregion #endregion
using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Addon.Lutim.Configuration.Impl namespace Greenshot.Addon.Lutim.Configuration.Impl
{ {
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
public class LutimLanguageImpl : LanguageBase<ILutimLanguage>, ILutimLanguage public class LutimLanguageImpl : LanguageBase<ILutimLanguage>, ILutimLanguage
{ {
#region Implementation of ILutimLanguage #region Implementation of ILutimLanguage

8
src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
View file

@ -50,12 +50,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0105" /> <PackageReference Include="MahApps.Metro" Version="1.6.5" />
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

2
src/Greenshot.Addon.OCR/Configuration/Impl/OcrLanguageImpl.cs
View file

@ -21,10 +21,12 @@
#endregion #endregion
using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Addon.OCR.Configuration.Impl namespace Greenshot.Addon.OCR.Configuration.Impl
{ {
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
public class OcrLanguageImpl : LanguageBase<IOcrLanguage>, IOcrLanguage public class OcrLanguageImpl : LanguageBase<IOcrLanguage>, IOcrLanguage
{ {
#region Implementation of IOcrLanguage #region Implementation of IOcrLanguage

6
src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj
View file

@ -42,9 +42,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

2
src/Greenshot.Addon.Office/Configuration/Impl/OfficeLanguageImpl.cs
View file

@ -21,11 +21,13 @@
#endregion #endregion
using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Addon.Office.Configuration.Impl namespace Greenshot.Addon.Office.Configuration.Impl
{ {
#pragma warning disable CS1591 #pragma warning disable CS1591
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
public class OfficeLanguageImpl : LanguageBase<IOfficeLanguage>, IOfficeLanguage public class OfficeLanguageImpl : LanguageBase<IOfficeLanguage>, IOfficeLanguage
{ {
#region Implementation of IOfficeLanguage #region Implementation of IOfficeLanguage

9
src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj
View file

@ -3,7 +3,7 @@
<PropertyGroup> <PropertyGroup>
<RootNamespace>Greenshot.Addon.Office</RootNamespace> <RootNamespace>Greenshot.Addon.Office</RootNamespace>
<AssemblyName>Greenshot.Addon.Office</AssemblyName> <AssemblyName>Greenshot.Addon.Office</AssemblyName>
<TargetFrameworks>net471</TargetFrameworks> <TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -14,6 +14,7 @@
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'"> <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
<FrameworkReference Include="Microsoft.DesktopUI" /> <FrameworkReference Include="Microsoft.DesktopUI" />
<PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net471'"> <ItemGroup Condition="'$(TargetFramework)' == 'net471'">
@ -45,9 +46,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Interop.Microsoft.Office.Interop.OneNote" Version="1.1.0" /> <PackageReference Include="Interop.Microsoft.Office.Interop.OneNote" Version="1.1.0" />
<PackageReference Include="Microsoft.Office.Interop.Excel" Version="15.0.4795.1000" /> <PackageReference Include="Microsoft.Office.Interop.Excel" Version="15.0.4795.1000" />
<PackageReference Include="Microsoft.Office.Interop.Outlook" Version="15.0.4797.1003" /> <PackageReference Include="Microsoft.Office.Interop.Outlook" Version="15.0.4797.1003" />

6
src/Greenshot.Addon.Office/OfficeExport/ExcelExporter.cs
View file

@ -28,8 +28,8 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Com;
using Dapplo.Windows.Desktop; using Dapplo.Windows.Desktop;
using Dapplo.Windows.Interop;
using Greenshot.Addon.Office.OfficeInterop; using Greenshot.Addon.Office.OfficeInterop;
using Microsoft.Office.Core; using Microsoft.Office.Core;
using Microsoft.Office.Interop.Excel; using Microsoft.Office.Interop.Excel;
@ -56,14 +56,14 @@ namespace Greenshot.Addon.Office.OfficeExport
IDisposableCom<Application> excelApplication; IDisposableCom<Application> excelApplication;
try try
{ {
excelApplication = DisposableCom.Create((Application)Marshal.GetActiveObject("Excel.Application")); excelApplication = OleAut32Api.GetActiveObject<Application>("Excel.Application");
} }
catch catch
{ {
// Ignore, probably no excel running // Ignore, probably no excel running
return null; return null;
} }
if ((excelApplication != null) && (excelApplication.ComObject != null)) if (excelApplication?.ComObject != null)
{ {
InitializeVariables(excelApplication); InitializeVariables(excelApplication);
} }

4
src/Greenshot.Addon.Office/OfficeExport/OneNoteExporter.cs
View file

@ -29,7 +29,7 @@ using System.IO;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Xml; using System.Xml;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Interop; using Dapplo.Windows.Com;
using Greenshot.Addon.Office.OfficeExport.Entities; using Greenshot.Addon.Office.OfficeExport.Entities;
using Greenshot.Addons.Core; using Greenshot.Addons.Core;
using Greenshot.Addons.Interfaces; using Greenshot.Addons.Interfaces;
@ -135,7 +135,7 @@ namespace Greenshot.Addon.Office.OfficeExport
IDisposableCom<Application> oneNoteApplication; IDisposableCom<Application> oneNoteApplication;
try try
{ {
oneNoteApplication = DisposableCom.Create((Application)Marshal.GetActiveObject("OneNote.Application")); oneNoteApplication = OleAut32Api.GetActiveObject<Application>("OneNote.Application");
} }
catch catch
{ {

5
src/Greenshot.Addon.Office/OfficeExport/OutlookEmailExporter.cs
View file

@ -26,10 +26,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Runtime.InteropServices;
using System.Text; using System.Text;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Interop; using Dapplo.Windows.Com;
using Greenshot.Addon.Office.Configuration; using Greenshot.Addon.Office.Configuration;
using Greenshot.Addon.Office.OfficeInterop; using Greenshot.Addon.Office.OfficeInterop;
using mshtml; using mshtml;
@ -601,7 +600,7 @@ namespace Greenshot.Addon.Office.OfficeExport
IDisposableCom<Application> outlookApplication; IDisposableCom<Application> outlookApplication;
try try
{ {
outlookApplication = DisposableCom.Create((Application)Marshal.GetActiveObject("Outlook.Application")); outlookApplication = OleAut32Api.GetActiveObject<Application>("Outlook.Application");
} }
catch (Exception) catch (Exception)
{ {

5
src/Greenshot.Addon.Office/OfficeExport/PowerpointExporter.cs
View file

@ -27,9 +27,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using Dapplo.Config.Ini;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Interop; using Dapplo.Windows.Com;
using Greenshot.Addon.Office.Configuration; using Greenshot.Addon.Office.Configuration;
using Greenshot.Addon.Office.OfficeInterop; using Greenshot.Addon.Office.OfficeInterop;
using Microsoft.Office.Core; using Microsoft.Office.Core;
@ -276,7 +275,7 @@ namespace Greenshot.Addon.Office.OfficeExport
IDisposableCom<Application> powerPointApplication; IDisposableCom<Application> powerPointApplication;
try try
{ {
powerPointApplication = DisposableCom.Create((Application)Marshal.GetActiveObject("PowerPoint.Application")); powerPointApplication = OleAut32Api.GetActiveObject<Application>("PowerPoint.Application");
} }
catch (Exception) catch (Exception)
{ {

9
src/Greenshot.Addon.Office/OfficeExport/WordExporter.cs
View file

@ -21,9 +21,8 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.InteropServices;
using Dapplo.Log; using Dapplo.Log;
using Dapplo.Windows.Interop; using Dapplo.Windows.Com;
using Greenshot.Addon.Office.Configuration; using Greenshot.Addon.Office.Configuration;
using Greenshot.Addon.Office.OfficeInterop; using Greenshot.Addon.Office.OfficeInterop;
using Microsoft.Office.Core; using Microsoft.Office.Core;
@ -98,7 +97,7 @@ namespace Greenshot.Addon.Office.OfficeExport
IDisposableCom<Application> wordApplication; IDisposableCom<Application> wordApplication;
try try
{ {
wordApplication = DisposableCom.Create((Application)Marshal.GetActiveObject("Word.Application")); wordApplication = OleAut32Api.GetActiveObject<Application>("Word.Application");
} }
catch (Exception) catch (Exception)
{ {
@ -173,7 +172,7 @@ namespace Greenshot.Addon.Office.OfficeExport
/// </summary> /// </summary>
/// <param name="wordCaption"></param> /// <param name="wordCaption"></param>
/// <param name="tmpFile"></param> /// <param name="tmpFile"></param>
/// <returns></returns> /// <returns>bool</returns>
public bool InsertIntoExistingDocument(string wordCaption, string tmpFile) public bool InsertIntoExistingDocument(string wordCaption, string tmpFile)
{ {
using (var wordApplication = GetWordApplication()) using (var wordApplication = GetWordApplication())
@ -210,7 +209,7 @@ namespace Greenshot.Addon.Office.OfficeExport
/// <param name="tmpFile">string</param> /// <param name="tmpFile">string</param>
/// <param name="address">string</param> /// <param name="address">string</param>
/// <param name="tooltip">string with the tooltip of the image</param> /// <param name="tooltip">string with the tooltip of the image</param>
/// <returns></returns> /// <returns>bool</returns>
internal bool InsertIntoExistingDocument(IDisposableCom<Application> wordApplication, IDisposableCom<_Document> wordDocument, string tmpFile, string address, string tooltip) internal bool InsertIntoExistingDocument(IDisposableCom<Application> 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. // Bug #1517: image will be inserted into that document, where the focus was last. It will not inserted into the chosen one.

3
src/Greenshot.Addon.OneDrive/Configuration/Impl/OneDriveLanguageImpl.cs
View file

@ -20,10 +20,13 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#endregion #endregion
using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Addon.OneDrive.Configuration.Impl namespace Greenshot.Addon.OneDrive.Configuration.Impl
{ {
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
public class OneDriveLanguageImpl : LanguageBase<IOneDriveLanguage>, IOneDriveLanguage public class OneDriveLanguageImpl : LanguageBase<IOneDriveLanguage>, IOneDriveLanguage
{ {
#region Implementation of IOneDriveLanguage #region Implementation of IOneDriveLanguage

8
src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
View file

@ -50,12 +50,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0105" /> <PackageReference Include="MahApps.Metro" Version="1.6.5" />
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

2
src/Greenshot.Addon.Photobucket/Configuration/Impl/PhotobucketLanguageImpl.cs
View file

@ -21,10 +21,12 @@
#endregion #endregion
using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Addon.Photobucket.Configuration.Impl namespace Greenshot.Addon.Photobucket.Configuration.Impl
{ {
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
public class PhotobucketLanguageImpl : LanguageBase<IPhotobucketLanguage>, IPhotobucketLanguage public class PhotobucketLanguageImpl : LanguageBase<IPhotobucketLanguage>, IPhotobucketLanguage
{ {
#region Implementation of IPhotobucketLanguage #region Implementation of IPhotobucketLanguage

6
src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
View file

@ -50,10 +50,10 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

2
src/Greenshot.Addon.Tfs/Configuration/Impl/TfsLanguageImpl.cs
View file

@ -21,10 +21,12 @@
#endregion #endregion
using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Addon.Tfs.Configuration.Impl namespace Greenshot.Addon.Tfs.Configuration.Impl
{ {
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
public class TfsLanguageImpl : LanguageBase<ITfsLanguage>, ITfsLanguage public class TfsLanguageImpl : LanguageBase<ITfsLanguage>, ITfsLanguage
{ {
#region Implementation of ITfsLanguage #region Implementation of ITfsLanguage

8
src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
View file

@ -50,12 +50,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0105" /> <PackageReference Include="MahApps.Metro" Version="1.6.5" />
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

6
src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
View file

@ -54,8 +54,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
src/Greenshot.Addons/Config/Impl/GreenshotLanguageImpl.cs
View file

@ -1,7 +1,9 @@
using Dapplo.Config.Language; using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language;
namespace Greenshot.Addons.Config.Impl namespace Greenshot.Addons.Config.Impl
{ {
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
internal class GreenshotLanguageImpl : LanguageBase<IGreenshotLanguage>, IGreenshotLanguage internal class GreenshotLanguageImpl : LanguageBase<IGreenshotLanguage>, IGreenshotLanguage
{ {
#region Implementation of ICoreTranslations #region Implementation of ICoreTranslations

13
src/Greenshot.Addons/Greenshot.Addons.csproj
View file

@ -44,14 +44,15 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="ControlzEx" Version="3.0.2.4" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration"> <PackageReference Include="Dapplo.CaliburnMicro.Configuration">
<Version>1.1.12-gbfc701fccd</Version> <Version>1.1.14-g04dc0f1bab</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Toasts"> <PackageReference Include="Dapplo.CaliburnMicro.Toasts">
<Version>1.1.12-gbfc701fccd</Version> <Version>1.1.14-g04dc0f1bab</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Translations"> <PackageReference Include="Dapplo.CaliburnMicro.Translations">
<Version>1.1.12-gbfc701fccd</Version> <Version>1.1.14-g04dc0f1bab</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.HttpExtensions"> <PackageReference Include="Dapplo.HttpExtensions">
<Version>0.9.15</Version> <Version>0.9.15</Version>
@ -63,17 +64,17 @@
<Version>0.9.15</Version> <Version>0.9.15</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Windows.Clipboard"> <PackageReference Include="Dapplo.Windows.Clipboard">
<Version>0.7.19</Version> <Version>0.7.21</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Windows.Icons"> <PackageReference Include="Dapplo.Windows.Icons">
<Version>0.7.19</Version> <Version>0.7.21</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="MahApps.Metro.IconPacks"> <PackageReference Include="MahApps.Metro.IconPacks">
<Version>3.0.0-alpha0088</Version> <Version>2.3.0</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Svg"> <PackageReference Include="Svg">
<Version>2.3.0</Version> <Version>2.3.0</Version>

2
src/Greenshot.Core/Greenshot.Core.csproj
View file

@ -33,7 +33,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapplo.Windows.Icons"> <PackageReference Include="Dapplo.Windows.Icons">
<Version>0.7.19</Version> <Version>0.7.21</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>

2
src/Greenshot.Gfx/Greenshot.Gfx.csproj
View file

@ -33,7 +33,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Dapplo.CaliburnMicro.Translations"> <PackageReference Include="Dapplo.CaliburnMicro.Translations">
<Version>1.1.12-gbfc701fccd</Version> <Version>1.1.14-g04dc0f1bab</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Svg"> <PackageReference Include="Svg">
<Version>2.3.0</Version> <Version>2.3.0</Version>

2
src/Greenshot.Tests/Greenshot.Tests.csproj
View file

@ -70,7 +70,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.11.2.849" /> <PackageReference Include="BenchmarkDotNet" Version="0.11.2.849" />
<PackageReference Include="CommandLineParser" Version="2.3.0" /> <PackageReference Include="CommandLineParser" Version="2.3.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" /> <PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.2"> <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.2">

2
src/Greenshot/Configuration/Impl/ConfigTranslationsImpl.cs
View file

@ -21,10 +21,12 @@
#endregion #endregion
using System.Diagnostics.CodeAnalysis;
using Dapplo.Config.Language; using Dapplo.Config.Language;
namespace Greenshot.Configuration.Impl namespace Greenshot.Configuration.Impl
{ {
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
internal class ConfigTranslationsImpl : LanguageBase<IConfigTranslations>, IConfigTranslations internal class ConfigTranslationsImpl : LanguageBase<IConfigTranslations>, IConfigTranslations
{ {
public string Filter { get; } public string Filter { get; }

41
src/Greenshot/Greenshot.csproj
View file

@ -81,34 +81,49 @@
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="CommandLineParser" Version="2.3.0" /> <PackageReference Include="CommandLineParser" Version="2.3.0" />
<PackageReference Include="CommonServiceLocator" Version="2.0.4" /> <PackageReference Include="CommonServiceLocator" Version="2.0.4" />
<PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Log.LogFile" Version="1.3.11" /> <PackageReference Include="Dapplo.Log.LogFile" Version="1.3.11" />
<PackageReference Include="Dapplo.Log.Loggers" Version="1.3.11" /> <PackageReference Include="Dapplo.Log.Loggers" Version="1.3.11" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Dapplo.Windows.Icons" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Icons" Version="0.7.21" />
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Multimedia" Version="0.7.21" />
<PackageReference Include="Fody" Version="3.2.17"> <PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.0-alpha0099" /> <PackageReference Include="gong-wpf-dragdrop" Version="2.0.0-alpha0099" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0088" /> <PackageReference Include="MahApps.Metro.IconPacks" Version="2.3.0" />
<PackageReference Include="Svg" Version="2.3.0" /> <PackageReference Include="Svg" Version="2.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Greenshot.Addon.Box\Greenshot.Addon.Box.csproj" />
<ProjectReference Include="..\Greenshot.Addon.Dropbox\Greenshot.Addon.Dropbox.csproj" />
<ProjectReference Include="..\Greenshot.Addon.InternetExplorer\Greenshot.Addon.InternetExplorer.csproj" />
<ProjectReference Include="..\Greenshot.Addon.LegacyEditor\Greenshot.Addon.LegacyEditor.csproj" />
<ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj" /> <ProjectReference Include="..\Greenshot.Core\Greenshot.Core.csproj" />
<ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj" /> <ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj" />
<ProjectReference Include="..\Greenshot.Addons\Greenshot.Addons.csproj" /> <ProjectReference Include="..\Greenshot.Addons\Greenshot.Addons.csproj" />
<ProjectReference Include="..\Greenshot.Addon.Box\Greenshot.Addon.Box.csproj" />
<ProjectReference Include="..\Greenshot.Addon.Confluence\Greenshot.Addon.Confluence.csproj" />
<ProjectReference Include="..\Greenshot.Addon.Dropbox\Greenshot.Addon.Dropbox.csproj" />
<ProjectReference Include="..\Greenshot.Addon.ExternalCommand\Greenshot.Addon.ExternalCommand.csproj" />
<ProjectReference Include="..\Greenshot.Addon.Flickr\Greenshot.Addon.Flickr.csproj" />
<ProjectReference Include="..\Greenshot.Addon.GooglePhotos\Greenshot.Addon.GooglePhotos.csproj" />
<ProjectReference Include="..\Greenshot.Addon.Imgur\Greenshot.Addon.Imgur.csproj" />
<ProjectReference Include="..\Greenshot.Addon.InternetExplorer\Greenshot.Addon.InternetExplorer.csproj" />
<ProjectReference Include="..\Greenshot.Addon.LegacyEditor\Greenshot.Addon.LegacyEditor.csproj" />
<ProjectReference Include="..\Greenshot.Addon.Lutim\Greenshot.Addon.Lutim.csproj" />
<ProjectReference Include="..\Greenshot.Addon.OCR\Greenshot.Addon.OCR.csproj" />
<ProjectReference Include="..\Greenshot.Addon.OneDrive\Greenshot.Addon.OneDrive.csproj" />
<ProjectReference Include="..\Greenshot.Addon.Photobucket\Greenshot.Addon.Photobucket.csproj" />
<ProjectReference Include="..\Greenshot.Addon.Tfs\Greenshot.Addon.Tfs.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net471' ">
<ProjectReference Include="..\Greenshot.Addon.Jira\Greenshot.Addon.Jira.csproj" />
<ProjectReference Include="..\Greenshot.Addon.Office\Greenshot.Addon.Office.csproj" />
<!--ProjectReference Include="..\Greenshot.Addon.Win10\Greenshot.Addon.Win10.csproj" /-->
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Greenshot/Startup.cs
View file

@ -95,7 +95,7 @@ namespace Greenshot
return -1; return -1;
} }
RegisterErrorHandlers(application); //RegisterErrorHandlers(application);
application.Run(); application.Run();
return 0; return 0;