Fixed some nuget dependencies, and made the next step to get the rest services running.

This commit is contained in:
Robin 2018-11-16 22:32:03 +01:00
commit 43d7ebffc3
37 changed files with 112 additions and 43 deletions

View file

@ -29,7 +29,7 @@ using Greenshot.Core.Enums;
namespace Greenshot.Addon.Box.Configuration.Impl
{
public class BoxConfigurationImpl : IniSectionBase<IBoxConfiguration>, IBoxConfiguration
internal class BoxConfigurationImpl : IniSectionBase<IBoxConfiguration>, IBoxConfiguration
{
#region Implementation of IFileConfiguration

View file

@ -49,7 +49,7 @@
<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.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -26,7 +26,7 @@ using Greenshot.Core.Enums;
namespace Greenshot.Addon.Confluence.Configuration.Impl
{
public class ConfluenceConfigurationImpl : IniSectionBase<IConfluenceConfiguration>, IConfluenceConfiguration
internal class ConfluenceConfigurationImpl : IniSectionBase<IConfluenceConfiguration>, IConfluenceConfiguration
{
#region Implementation of IConfluenceConfiguration

View file

@ -55,7 +55,7 @@
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<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.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Dapplo.Confluence" Version="0.8.14" />
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>

View file

@ -51,7 +51,7 @@
<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.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -28,7 +28,7 @@ using Greenshot.Core.Enums;
namespace Greenshot.Addon.ExternalCommand.Configuration.Impl
{
public class ExternalCommandConfigurationImpl : IniSectionBase<IExternalCommandConfiguration>, IExternalCommandConfiguration
internal class ExternalCommandConfigurationImpl : IniSectionBase<IExternalCommandConfiguration>, IExternalCommandConfiguration
{
#region Overrides of IniSectionBase<IExternalCommandConfiguration>

View file

@ -40,7 +40,7 @@
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="CliWrap" Version="2.1.0" />
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>

View file

@ -28,7 +28,7 @@ using Greenshot.Core.Enums;
namespace Greenshot.Addon.Flickr.Configuration.Impl
{
public class FlickrConfigurationImpl : IniSectionBase<IFlickrConfiguration>, IFlickrConfiguration
internal class FlickrConfigurationImpl : IniSectionBase<IFlickrConfiguration>, IFlickrConfiguration
{
#region Implementation of IFileConfiguration

View file

@ -49,7 +49,7 @@
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -29,7 +29,7 @@ using Greenshot.Core.Enums;
namespace Greenshot.Addon.GooglePhotos.Configuration.Impl
{
public class GooglePhotosConfigurationImpl : IniSectionBase<IGooglePhotosConfiguration>, IGooglePhotosConfiguration
internal class GooglePhotosConfigurationImpl : IniSectionBase<IGooglePhotosConfiguration>, IGooglePhotosConfiguration
{
#region Implementation of IFileConfiguration

View file

@ -49,7 +49,7 @@
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -31,7 +31,7 @@ using Greenshot.Core.Enums;
namespace Greenshot.Addon.Imgur.Configuration.Impl
{
public class ImgurConfigurationImpl : IniSectionBase<IImgurConfiguration>, IImgurConfiguration
internal class ImgurConfigurationImpl : IniSectionBase<IImgurConfiguration>, IImgurConfiguration
{
#region Implementation of IFileConfiguration

View file

@ -50,7 +50,7 @@
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<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.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

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

View file

@ -26,7 +26,7 @@ using Greenshot.Core.Enums;
namespace Greenshot.Addon.Jira.Configuration.Impl
{
public class JiraConfigurationImpl : IniSectionBase<IJiraConfiguration>, IJiraConfiguration
internal class JiraConfigurationImpl : IniSectionBase<IJiraConfiguration>, IJiraConfiguration
{
#region Implementation of IFileConfiguration

View file

@ -53,7 +53,7 @@
<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.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Dapplo.Jira" Version="0.8.7" />
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>

View file

@ -136,8 +136,8 @@
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Dapplo.Windows.Icons" Version="0.7.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Dapplo.Windows.Icons" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -28,7 +28,7 @@ using Greenshot.Core.Enums;
namespace Greenshot.Addon.Lutim.Configuration.Impl
{
public class LutimConfigurationImpl : IniSectionBase<ILutimConfiguration>, ILutimConfiguration
internal class LutimConfigurationImpl : IniSectionBase<ILutimConfiguration>, ILutimConfiguration
{
#region Implementation of IFileConfiguration

View file

@ -50,7 +50,7 @@
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<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.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="MahApps.Metro" Version="1.6.5" />
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>

View file

@ -25,7 +25,7 @@ using Dapplo.Config.Ini;
namespace Greenshot.Addon.OCR.Configuration.Impl
{
public class OcrConfigurationImpl : IniSectionBase<IOcrConfiguration>, IOcrConfiguration
internal class OcrConfigurationImpl : IniSectionBase<IOcrConfiguration>, IOcrConfiguration
{
#region Implementation of IOcrConfiguration

View file

@ -40,7 +40,7 @@
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -31,7 +31,7 @@ namespace Greenshot.Addon.Office.Configuration.Impl
/// This implements IOfficeConfiguration and takes care of storing, all setters are replaced via AutoProperties.Fody
/// </summary>
#pragma warning disable CS1591
public class OfficeConfigurationImpl : IniSectionBase<IOfficeConfiguration>, IOfficeConfiguration
internal class OfficeConfigurationImpl : IniSectionBase<IOfficeConfiguration>, IOfficeConfiguration
{
#region Implementation of IOfficeConfiguration

View file

@ -47,7 +47,7 @@
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<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" />

View file

@ -29,7 +29,7 @@ using Greenshot.Core.Enums;
namespace Greenshot.Addon.OneDrive.Configuration.Impl
{
public class OneDriveConfigurationImpl : IniSectionBase<IOneDriveConfiguration>, IOneDriveConfiguration
internal class OneDriveConfigurationImpl : IniSectionBase<IOneDriveConfiguration>, IOneDriveConfiguration
{
#region Implementation of IFileConfiguration

View file

@ -50,7 +50,7 @@
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<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.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="MahApps.Metro" Version="1.6.5" />
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>

View file

@ -28,7 +28,7 @@ using Greenshot.Core.Enums;
namespace Greenshot.Addon.Photobucket.Configuration.Impl
{
public class PhotobucketConfigurationImpl : IniSectionBase<IPhotobucketConfiguration>, IPhotobucketConfiguration
internal class PhotobucketConfigurationImpl : IniSectionBase<IPhotobucketConfiguration>, IPhotobucketConfiguration
{
#region Implementation of IFileConfiguration

View file

@ -49,7 +49,7 @@
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

View file

@ -27,7 +27,7 @@ using Greenshot.Core.Enums;
namespace Greenshot.Addon.Tfs.Configuration.Impl
{
public class TfsConfigurationImpl : IniSectionBase<ITfsConfiguration>, ITfsConfiguration
internal class TfsConfigurationImpl : IniSectionBase<ITfsConfiguration>, ITfsConfiguration
{
#region Implementation of IFileConfiguration

View file

@ -50,7 +50,7 @@
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<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.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="MahApps.Metro" Version="1.6.5" />
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>

View file

@ -52,6 +52,6 @@
<ItemGroup>
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.2" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
</ItemGroup>
</Project>

View file

@ -1,4 +1,27 @@
using System;
#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;
using System.Collections.Generic;
using System.Drawing;
using System.Windows;

View file

@ -1,4 +1,27 @@
using System.Diagnostics.CodeAnalysis;
#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.Addons.Config.Impl

View file

@ -1,4 +1,27 @@
using System;
#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;
using System.Net;
using System.Net.Cache;
using System.Net.Http;
@ -47,7 +70,7 @@ namespace Greenshot.Addons.Config.Impl
IHttpSettings IHttpSettings.ShallowClone()
{
throw new NotImplementedException();
return ShallowClone() as IHttpSettings;
}
}
}

View file

@ -63,10 +63,10 @@
<Version>0.9.15</Version>
</PackageReference>
<PackageReference Include="Dapplo.Windows.Clipboard">
<Version>0.7.21</Version>
<Version>0.7.24</Version>
</PackageReference>
<PackageReference Include="Dapplo.Windows.Icons">
<Version>0.7.21</Version>
<Version>0.7.24</Version>
</PackageReference>
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>

View file

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

View file

@ -67,7 +67,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.11.2.849" />
<PackageReference Include="BenchmarkDotNet" Version="0.11.2" />
<PackageReference Include="CommandLineParser" Version="2.3.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.2" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />

View file

@ -89,9 +89,9 @@
<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.21" />
<PackageReference Include="Dapplo.Windows.Icons" Version="0.7.21" />
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.7.21" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Dapplo.Windows.Icons" Version="0.7.24" />
<PackageReference Include="Dapplo.Windows.Multimedia" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>