mirror of
https://github.com/greenshot/greenshot
synced 2025-08-22 22:34:27 -07:00
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
This commit is contained in:
Robin
parent
8d8aa6888c
commit
a48d1b2061
57 changed files with 184 additions and 113 deletions
|
|
@ -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>, IBoxLanguage
|
||||
{
|
||||
#region Implementation of IBoxLanguage
|
||||
|
|
|
|||
|
|
@ -48,12 +48,12 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions" 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.Windows.Clipboard" Version="0.7.19" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
|
||||
<PackageReference Include="Fody" Version="3.2.17">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ using Greenshot.Core.Enums;
|
|||
|
||||
#endregion
|
||||
|
||||
namespace Greenshot.Addon.Confluence
|
||||
namespace Greenshot.Addon.Confluence.Configuration
|
||||
{
|
||||
/// <summary>
|
||||
/// Description of ConfluenceConfiguration.
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>, IConfluenceLanguage
|
||||
{
|
||||
#region Implementation of IConfluenceLanguage
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -55,11 +55,11 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" 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="Fody" Version="3.2.17">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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; }
|
||||
|
||||
|
|
|
|||
|
|
@ -17,10 +17,12 @@
|
|||
// You should have received a copy of the GNU General Public License
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using Dapplo.Config.Language;
|
||||
|
||||
namespace Greenshot.Addon.Dropbox.Configuration.Impl
|
||||
{
|
||||
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
|
||||
public class DropboxLanguageImpl: LanguageBase<IDropboxLanguage>, IDropboxLanguage
|
||||
{
|
||||
#region Implementation of IDropboxLanguage
|
||||
|
|
|
|||
|
|
@ -50,12 +50,12 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions" 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.Windows.Clipboard" Version="0.7.19" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
|
||||
<PackageReference Include="Fody" Version="3.2.17">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
|
|
|
|||
|
|
@ -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; }
|
||||
|
|
|
|||
|
|
@ -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>, IExternalCommandLanguage
|
||||
{
|
||||
#region Implementation of IExternalCommandLanguage
|
||||
|
|
|
|||
|
|
@ -42,9 +42,9 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
|
||||
<PackageReference Include="CliWrap" Version="2.1.0" />
|
||||
<PackageReference Include="Fody" Version="3.2.17">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
|
|
|
|||
|
|
@ -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; }
|
||||
|
||||
|
|
|
|||
|
|
@ -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>, IFlickrLanguage
|
||||
{
|
||||
#region Implementation of IFlickrLanguage
|
||||
|
|
|
|||
|
|
@ -50,10 +50,10 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
|
||||
<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">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
namespace Greenshot.Addon.GooglePhotos.Configuration
|
||||
{
|
||||
[Language("GooglePhotos")]
|
||||
public interface IGooglePhotosLanguage : ILanguage, INotifyPropertyChanged
|
||||
[SuppressMessage("ReSharper", "UnusedMember.Global")]
|
||||
public interface IGooglePhotosLanguage : ILanguage
|
||||
{
|
||||
string CommunicationWait { get; }
|
||||
|
||||
|
|
|
|||
|
|
@ -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>, IGooglePhotosLanguage
|
||||
{
|
||||
#region Implementation of IGooglePhotosLanguage
|
||||
|
|
|
|||
|
|
@ -50,10 +50,10 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
|
||||
<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">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
|
|
|
|||
|
|
@ -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; }
|
||||
|
||||
|
|
|
|||
|
|
@ -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>, IImgurLanguage
|
||||
{
|
||||
#region Implementation of IImgurLanguage
|
||||
|
|
|
|||
|
|
@ -50,15 +50,15 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" 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">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0105" />
|
||||
<PackageReference Include="MahApps.Metro" Version="1.6.5" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -34,10 +34,10 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapplo.Windows">
|
||||
<Version>0.7.19</Version>
|
||||
<Version>0.7.21</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.Windows.Com">
|
||||
<Version>0.7.19</Version>
|
||||
<Version>0.7.21</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" />
|
||||
</ItemGroup>
|
||||
|
|
|
|||
|
|
@ -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>, IJiraLanguage
|
||||
{
|
||||
#region Implementation of IJiraLanguage
|
||||
|
|
|
|||
|
|
@ -52,12 +52,12 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
|
||||
<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="Fody" Version="3.2.17">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
|
|
|
|||
|
|
@ -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>, IEditorLanguage
|
||||
{
|
||||
#region Implementation of IEditorLanguage
|
||||
|
|
|
|||
|
|
@ -137,11 +137,11 @@
|
|||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="CommonServiceLocator" Version="2.0.4" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
|
||||
<PackageReference Include="Dapplo.Windows.Icons" Version="0.7.19" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
|
||||
<PackageReference Include="Dapplo.Windows.Icons" Version="0.7.21" />
|
||||
<PackageReference Include="Fody" Version="3.2.17">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
|
|
|
|||
|
|
@ -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>, ILutimLanguage
|
||||
{
|
||||
#region Implementation of ILutimLanguage
|
||||
|
|
|
|||
|
|
@ -50,12 +50,12 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
|
||||
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0105" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
|
||||
<PackageReference Include="MahApps.Metro" Version="1.6.5" />
|
||||
<PackageReference Include="Fody" Version="3.2.17">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
|
|
|
|||
|
|
@ -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>, IOcrLanguage
|
||||
{
|
||||
#region Implementation of IOcrLanguage
|
||||
|
|
|
|||
|
|
@ -42,9 +42,9 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
|
||||
<PackageReference Include="Fody" Version="3.2.17">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
|
|
|
|||
|
|
@ -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>, IOfficeLanguage
|
||||
{
|
||||
#region Implementation of IOfficeLanguage
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<PropertyGroup>
|
||||
<RootNamespace>Greenshot.Addon.Office</RootNamespace>
|
||||
<AssemblyName>Greenshot.Addon.Office</AssemblyName>
|
||||
<TargetFrameworks>net471</TargetFrameworks>
|
||||
<TargetFrameworks>netcoreapp3.0;net471</TargetFrameworks>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -14,6 +14,7 @@
|
|||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
|
||||
<FrameworkReference Include="Microsoft.DesktopUI" />
|
||||
<PackageReference Include="Unofficial.Microsoft.mshtml" Version="7.0.3300" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'net471'">
|
||||
|
|
@ -45,9 +46,9 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
|
||||
<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.Outlook" Version="15.0.4797.1003" />
|
||||
|
|
|
|||
|
|
@ -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<Application> excelApplication;
|
||||
try
|
||||
{
|
||||
excelApplication = DisposableCom.Create((Application)Marshal.GetActiveObject("Excel.Application"));
|
||||
excelApplication = OleAut32Api.GetActiveObject<Application>("Excel.Application");
|
||||
}
|
||||
catch
|
||||
{
|
||||
// Ignore, probably no excel running
|
||||
return null;
|
||||
}
|
||||
if ((excelApplication != null) && (excelApplication.ComObject != null))
|
||||
if (excelApplication?.ComObject != null)
|
||||
{
|
||||
InitializeVariables(excelApplication);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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<Application> oneNoteApplication;
|
||||
try
|
||||
{
|
||||
oneNoteApplication = DisposableCom.Create((Application)Marshal.GetActiveObject("OneNote.Application"));
|
||||
oneNoteApplication = OleAut32Api.GetActiveObject<Application>("OneNote.Application");
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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<Application> outlookApplication;
|
||||
try
|
||||
{
|
||||
outlookApplication = DisposableCom.Create((Application)Marshal.GetActiveObject("Outlook.Application"));
|
||||
outlookApplication = OleAut32Api.GetActiveObject<Application>("Outlook.Application");
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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<Application> powerPointApplication;
|
||||
try
|
||||
{
|
||||
powerPointApplication = DisposableCom.Create((Application)Marshal.GetActiveObject("PowerPoint.Application"));
|
||||
powerPointApplication = OleAut32Api.GetActiveObject<Application>("PowerPoint.Application");
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -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<Application> wordApplication;
|
||||
try
|
||||
{
|
||||
wordApplication = DisposableCom.Create((Application)Marshal.GetActiveObject("Word.Application"));
|
||||
wordApplication = OleAut32Api.GetActiveObject<Application>("Word.Application");
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
|
|
@ -173,7 +172,7 @@ namespace Greenshot.Addon.Office.OfficeExport
|
|||
/// </summary>
|
||||
/// <param name="wordCaption"></param>
|
||||
/// <param name="tmpFile"></param>
|
||||
/// <returns></returns>
|
||||
/// <returns>bool</returns>
|
||||
public bool InsertIntoExistingDocument(string wordCaption, string tmpFile)
|
||||
{
|
||||
using (var wordApplication = GetWordApplication())
|
||||
|
|
@ -210,7 +209,7 @@ namespace Greenshot.Addon.Office.OfficeExport
|
|||
/// <param name="tmpFile">string</param>
|
||||
/// <param name="address">string</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)
|
||||
{
|
||||
// Bug #1517: image will be inserted into that document, where the focus was last. It will not inserted into the chosen one.
|
||||
|
|
|
|||
|
|
@ -20,10 +20,13 @@
|
|||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#endregion
|
||||
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
using Dapplo.Config.Language;
|
||||
|
||||
namespace Greenshot.Addon.OneDrive.Configuration.Impl
|
||||
{
|
||||
[SuppressMessage("ReSharper", "UnassignedGetOnlyAutoProperty")]
|
||||
public class OneDriveLanguageImpl : LanguageBase<IOneDriveLanguage>, IOneDriveLanguage
|
||||
{
|
||||
#region Implementation of IOneDriveLanguage
|
||||
|
|
|
|||
|
|
@ -50,12 +50,12 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
|
||||
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0105" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
|
||||
<PackageReference Include="MahApps.Metro" Version="1.6.5" />
|
||||
<PackageReference Include="Fody" Version="3.2.17">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
|
|
|
|||
|
|
@ -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>, IPhotobucketLanguage
|
||||
{
|
||||
#region Implementation of IPhotobucketLanguage
|
||||
|
|
|
|||
|
|
@ -50,10 +50,10 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
|
||||
<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">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
|
|
|
|||
|
|
@ -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>, ITfsLanguage
|
||||
{
|
||||
#region Implementation of ITfsLanguage
|
||||
|
|
|
|||
|
|
@ -50,12 +50,12 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
|
||||
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0105" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
|
||||
<PackageReference Include="MahApps.Metro" Version="1.6.5" />
|
||||
<PackageReference Include="Fody" Version="3.2.17">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -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>, IGreenshotLanguage
|
||||
{
|
||||
#region Implementation of ICoreTranslations
|
||||
|
|
|
|||
|
|
@ -44,14 +44,15 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="ControlzEx" Version="3.0.2.4" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration">
|
||||
<Version>1.1.12-gbfc701fccd</Version>
|
||||
<Version>1.1.14-g04dc0f1bab</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Toasts">
|
||||
<Version>1.1.12-gbfc701fccd</Version>
|
||||
<Version>1.1.14-g04dc0f1bab</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations">
|
||||
<Version>1.1.12-gbfc701fccd</Version>
|
||||
<Version>1.1.14-g04dc0f1bab</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.HttpExtensions">
|
||||
<Version>0.9.15</Version>
|
||||
|
|
@ -63,17 +64,17 @@
|
|||
<Version>0.9.15</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard">
|
||||
<Version>0.7.19</Version>
|
||||
<Version>0.7.21</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Dapplo.Windows.Icons">
|
||||
<Version>0.7.19</Version>
|
||||
<Version>0.7.21</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Fody" Version="3.2.17">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="MahApps.Metro.IconPacks">
|
||||
<Version>3.0.0-alpha0088</Version>
|
||||
<Version>2.3.0</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Svg">
|
||||
<Version>2.3.0</Version>
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapplo.Windows.Icons">
|
||||
<Version>0.7.19</Version>
|
||||
<Version>0.7.21</Version>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations">
|
||||
<Version>1.1.12-gbfc701fccd</Version>
|
||||
<Version>1.1.14-g04dc0f1bab</Version>
|
||||
</PackageReference>
|
||||
<PackageReference Include="Svg">
|
||||
<Version>2.3.0</Version>
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@
|
|||
<ItemGroup>
|
||||
<PackageReference Include="BenchmarkDotNet" Version="0.11.2.849" />
|
||||
<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.Log.XUnit" Version="1.3.11" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.2">
|
||||
|
|
|
|||
|
|
@ -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>, IConfigTranslations
|
||||
{
|
||||
public string Filter { get; }
|
||||
|
|
|
|||
|
|
@ -81,34 +81,49 @@
|
|||
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
|
||||
<PackageReference Include="CommandLineParser" Version="2.3.0" />
|
||||
<PackageReference Include="CommonServiceLocator" Version="2.0.4" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.14-g04dc0f1bab" />
|
||||
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" 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.Loggers" Version="1.3.11" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
|
||||
<PackageReference Include="Dapplo.Windows.Icons" Version="0.7.19" />
|
||||
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.7.19" />
|
||||
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
|
||||
<PackageReference Include="Dapplo.Windows.Icons" Version="0.7.21" />
|
||||
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.7.21" />
|
||||
<PackageReference Include="Fody" Version="3.2.17">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
|
||||
</PackageReference>
|
||||
<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" />
|
||||
</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.Gfx\Greenshot.Gfx.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>
|
||||
</Project>
|
||||
|
|
@ -95,7 +95,7 @@ namespace Greenshot
|
|||
return -1;
|
||||
}
|
||||
|
||||
RegisterErrorHandlers(application);
|
||||
//RegisterErrorHandlers(application);
|
||||
|
||||
application.Run();
|
||||
return 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue