diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index 399310cb3..cdd728f2e 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -50,11 +50,11 @@ - - - + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index 33f90b4d5..5c8a8a9d3 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -57,11 +57,11 @@ - - + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index 58960d38f..a4609ea84 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -52,11 +52,11 @@ - - - + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index 1cdcb3553..0ebfe029a 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -46,7 +46,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index 4f35193c2..93b77200a 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -52,9 +52,9 @@ - + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 2ee26eb7f..0b0f5f8cc 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -52,9 +52,9 @@ - + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index 345d0dafb..3f790112f 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -52,10 +52,10 @@ - - + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index 97fc345d2..43e9157d7 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -54,12 +54,12 @@ - - + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index 172b4e143..bcacb4ed8 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -139,10 +139,10 @@ - + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index f9bd69d08..7c1ee5e8a 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -52,11 +52,11 @@ - - + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj index 4759b6953..7422617fd 100644 --- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj +++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj @@ -45,7 +45,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index ae78a8351..94254b48b 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -54,7 +54,7 @@ - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index b7a438bae..fdeb8a62a 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -52,11 +52,11 @@ - - + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index 1f3f9faad..ea66fd0c1 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -52,9 +52,9 @@ - + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index cd027fca4..9bee1be34 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -52,11 +52,11 @@ - - + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addons/Config/Impl/HttpConfigurationImpl.cs b/src/Greenshot.Addons/Config/Impl/HttpConfigurationImpl.cs index 879643888..a9cfce4d7 100644 --- a/src/Greenshot.Addons/Config/Impl/HttpConfigurationImpl.cs +++ b/src/Greenshot.Addons/Config/Impl/HttpConfigurationImpl.cs @@ -13,13 +13,6 @@ namespace Greenshot.Addons.Config.Impl { internal class HttpConfigurationImpl : IniSectionBase, 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(); + } } } diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index e3fe2b2c8..dfcda1537 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -57,13 +57,13 @@ 1.1.12-gbfc701fccd - 0.9.12 + 0.9.15 - 0.9.12 + 0.9.15 - 0.9.12 + 0.9.15 0.7.19 @@ -71,7 +71,7 @@ 0.7.19 - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 47b9f6fbe..decaac1cc 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -100,7 +100,7 @@ 1.1.12-gbfc701fccd - 0.9.12 + 0.9.15 diff --git a/src/Greenshot/Components/UpdateService.cs b/src/Greenshot/Components/UpdateService.cs index 312dd9968..a35369e59 100644 --- a/src/Greenshot/Components/UpdateService.cs +++ b/src/Greenshot/Components/UpdateService.cs @@ -21,8 +21,6 @@ #endregion -#if !NETCOREAPP3_0 - #region Usings using System; @@ -244,5 +242,4 @@ namespace Greenshot.Components } } } -} -#endif \ No newline at end of file +} \ No newline at end of file diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 3a4daf168..505d96caa 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -26,13 +26,14 @@ + - + @@ -84,14 +85,14 @@ - - + + - + all runtime; build; native; contentfiles; analyzers