github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-22 22:34:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the update check, by supporting netstandard 2.0 in Dapplo.HttpExtensions

Browse source
This commit is contained in:
Robin 2018-11-12 09:45:06 +01:00
commit 2848a0ec36
20 changed files with 64 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -50,11 +50,11 @@
<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.HttpExtensions" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.12" />
<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="Fody" Version="3.2.16">
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

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

@ -57,11 +57,11 @@
<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.HttpExtensions.JsonNet" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<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.Confluence" Version="0.8.12" />
<PackageReference Include="Fody" Version="3.2.16">
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

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

@ -52,11 +52,11 @@
<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.HttpExtensions" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.12" />
<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="Fody" Version="3.2.16">
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

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

@ -46,7 +46,7 @@
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="CliWrap" Version="2.1.0" />
<PackageReference Include="Fody" Version="3.2.16">
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

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

@ -52,9 +52,9 @@
<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.HttpExtensions.OAuth" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="Fody" Version="3.2.16">
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

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

@ -52,9 +52,9 @@
<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.HttpExtensions.OAuth" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="Fody" Version="3.2.16">
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

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

@ -52,10 +52,10 @@
<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.HttpExtensions.JsonNet" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<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="Fody" Version="3.2.16">
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

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

@ -54,12 +54,12 @@
<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.HttpExtensions.JsonNet" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<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.Jira" Version="0.8.5" />
<PackageReference Include="Fody" Version="3.2.16">
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

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

@ -139,10 +139,10 @@
<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.HttpExtensions" Version="0.9.12" />
<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="Fody" Version="3.2.16">
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

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

@ -52,11 +52,11 @@
<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.HttpExtensions.JsonNet" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<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="Fody" Version="3.2.16">
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

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

@ -45,7 +45,7 @@
<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="Fody" Version="3.2.16">
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

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

@ -54,7 +54,7 @@
<PackageReference Include="Microsoft.Office.Interop.PowerPoint" Version="15.0.4420.1017" />
<PackageReference Include="Microsoft.Office.Interop.Word" Version="15.0.4797.1003" />
<PackageReference Include="MicrosoftOfficeCore" Version="15.0.0" />
<PackageReference Include="Fody" Version="3.2.16">
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

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

@ -52,11 +52,11 @@
<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.HttpExtensions.JsonNet" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<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="Fody" Version="3.2.16">
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

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

@ -52,9 +52,9 @@
<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.HttpExtensions.OAuth" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="Fody" Version="3.2.16">
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

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

@ -52,11 +52,11 @@
<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.HttpExtensions.JsonNet" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<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="Fody" Version="3.2.16">
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

34
src/Greenshot.Addons/Config/Impl/HttpConfigurationImpl.cs
View file

@ -13,13 +13,6 @@ namespace Greenshot.Addons.Config.Impl
{
internal class HttpConfigurationImpl : IniSectionBase<IHttpConfiguration>, IHttpConfiguration
{
#region Implementation of IHttpSettings
public IHttpSettings ShallowClone()
{
throw new NotImplementedException();
}
public bool AllowAutoRedirect { get; set; }
public ICredentials Credentials { get; set; }
public ClientCertificateOption ClientCertificateOptions { get; set; }
@ -32,24 +25,29 @@ namespace Greenshot.Addons.Config.Impl
public TimeSpan RequestTimeout { get; set; }
public bool UseCookies { get; set; }
public bool UseDefaultCredentials { get; set; }
public bool AllowPipelining { get; set; }
public AuthenticationLevel AuthenticationLevel { get; set; }
public X509CertificateCollection ClientCertificates { get; set; }
public TimeSpan ContinueTimeout { get; set; }
public TokenImpersonationLevel ImpersonationLevel { get; set; }
public long MaxRequestContentBufferSize { get; set; }
public int MaxResponseHeadersLength { get; set; }
public int ReadWriteTimeout { get; set; }
public RequestCacheLevel RequestCacheLevel { get; set; }
public bool UseProxy { get; set; }
public bool IgnoreSslCertificateErrors { get; set; }
public int MaxConnectionsPerServer { get; set; }
public Uri ProxyUri { get; set; }
public string[] ProxyBypassList { get; set; }
public bool ProxyBypassOnLocal { get; set; }
public ICredentials ProxyCredentials { get; set; }
public Uri ProxyUri { get; set; }
public long MaxRequestContentBufferSize { get; set; }
public int MaxResponseHeadersLength { get; set; }
public bool UseProxy { get; set; }
public bool IgnoreSslCertificateErrors { get; set; }
public bool UseDefaultCredentialsForProxy { get; set; }
public bool UseDefaultProxy { get; set; }
public TimeSpan ContinueTimeout { get; set; }
public bool AllowPipelining { get; set; }
#endregion
public TokenImpersonationLevel ImpersonationLevel { get; set; }
public RequestCacheLevel RequestCacheLevel { get; set; }
public int ReadWriteTimeout { get; set; }
IHttpSettings IHttpSettings.ShallowClone()
{
throw new NotImplementedException();
}
}
}

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

@ -57,13 +57,13 @@
<Version>1.1.12-gbfc701fccd</Version>
</PackageReference>
<PackageReference Include="Dapplo.HttpExtensions">
<Version>0.9.12</Version>
<Version>0.9.15</Version>
</PackageReference>
<PackageReference Include="Dapplo.HttpExtensions.JsonNet">
<Version>0.9.12</Version>
<Version>0.9.15</Version>
</PackageReference>
<PackageReference Include="Dapplo.HttpExtensions.OAuth">
<Version>0.9.12</Version>
<Version>0.9.15</Version>
</PackageReference>
<PackageReference Include="Dapplo.Windows.Clipboard">
<Version>0.7.19</Version>
@ -71,7 +71,7 @@
<PackageReference Include="Dapplo.Windows.Icons">
<Version>0.7.19</Version>
</PackageReference>
<PackageReference Include="Fody" Version="3.2.16">
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>

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

@ -100,7 +100,7 @@
<Version>1.1.12-gbfc701fccd</Version>
</PackageReference>
<PackageReference Include="Dapplo.HttpExtensions.OAuth">
<Version>0.9.12</Version>
<Version>0.9.15</Version>
</PackageReference>
<PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers">

5
src/Greenshot/Components/UpdateService.cs
View file

@ -21,8 +21,6 @@
#endregion
#if !NETCOREAPP3_0
#region Usings
using System;
@ -244,5 +242,4 @@ namespace Greenshot.Components
}
}
}
}
#endif
}

9
src/Greenshot/Greenshot.csproj
View file

@ -26,13 +26,14 @@
<PackageReference Include="System.IO" Version="4.3.0" />
<PackageReference Include="System.Linq" Version="4.3.0" />
<PackageReference Include="System.Linq.Expressions" Version="4.3.0" />
<PackageReference Include="System.Management" Version="4.5.0" />
<PackageReference Include="System.Reflection" Version="4.3.0" />
<PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
<PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" />
<PackageReference Include="System.Runtime" Version="4.3.0" />
<PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
<PackageReference Include="System.Management" Version="4.5.0" />
<PackageReference Include="System.ServiceModel.Syndication" Version="4.5.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net471' ">
@ -84,14 +85,14 @@
<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.HttpExtensions.JsonNet" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<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="Fody" Version="3.2.16">
<PackageReference Include="Fody" Version="3.2.17">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>