diff --git a/src/Greenshot.Addon.Box/Configuration/Impl/BoxConfigurationImpl.cs b/src/Greenshot.Addon.Box/Configuration/Impl/BoxConfigurationImpl.cs index e937520ba..ddc78a1bd 100644 --- a/src/Greenshot.Addon.Box/Configuration/Impl/BoxConfigurationImpl.cs +++ b/src/Greenshot.Addon.Box/Configuration/Impl/BoxConfigurationImpl.cs @@ -22,7 +22,9 @@ #endregion using System; +using System.ComponentModel; using Dapplo.Config.Ini; +using Dapplo.Config.Ini.Converters; using Greenshot.Core.Enums; namespace Greenshot.Addon.Box.Configuration.Impl @@ -54,8 +56,12 @@ namespace Greenshot.Addon.Box.Configuration.Impl #region Implementation of IOAuth2Token + [TypeConverter(typeof(StringEncryptionTypeConverter))] public string OAuth2AccessToken { get; set; } + public DateTimeOffset OAuth2AccessTokenExpires { get; set; } + + [TypeConverter(typeof(StringEncryptionTypeConverter))] public string OAuth2RefreshToken { get; set; } #endregion diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index 265e82f09..399310cb3 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -48,11 +48,11 @@ - - - - - + + + + + all diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index 66d173e0b..33f90b4d5 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -55,10 +55,10 @@ - - - - + + + + diff --git a/src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxConfigurationImpl.cs b/src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxConfigurationImpl.cs index c4374da9f..6a7726621 100644 --- a/src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxConfigurationImpl.cs +++ b/src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxConfigurationImpl.cs @@ -18,7 +18,9 @@ // along with this program. If not, see . using System; +using System.ComponentModel; using Dapplo.Config.Ini; +using Dapplo.Config.Ini.Converters; using Greenshot.Core.Enums; namespace Greenshot.Addon.Dropbox.Configuration.Impl @@ -50,8 +52,12 @@ namespace Greenshot.Addon.Dropbox.Configuration.Impl #region Implementation of IOAuth2Token + [TypeConverter(typeof(StringEncryptionTypeConverter))] public string OAuth2AccessToken { get; set; } + public DateTimeOffset OAuth2AccessTokenExpires { get; set; } + + [TypeConverter(typeof(StringEncryptionTypeConverter))] public string OAuth2RefreshToken { get; set; } #endregion diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index be6284a84..58960d38f 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -50,11 +50,11 @@ - - - - - + + + + + all diff --git a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj index 0e66eeb2e..1cdcb3553 100644 --- a/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj +++ b/src/Greenshot.Addon.ExternalCommand/Greenshot.Addon.ExternalCommand.csproj @@ -42,8 +42,8 @@ - - + + diff --git a/src/Greenshot.Addon.Flickr/Configuration/Impl/FlickrConfigurationImpl.cs b/src/Greenshot.Addon.Flickr/Configuration/Impl/FlickrConfigurationImpl.cs index 002261d41..404531ee3 100644 --- a/src/Greenshot.Addon.Flickr/Configuration/Impl/FlickrConfigurationImpl.cs +++ b/src/Greenshot.Addon.Flickr/Configuration/Impl/FlickrConfigurationImpl.cs @@ -21,7 +21,9 @@ #endregion +using System.ComponentModel; using Dapplo.Config.Ini; +using Dapplo.Config.Ini.Converters; using Greenshot.Core.Enums; namespace Greenshot.Addon.Flickr.Configuration.Impl @@ -53,8 +55,13 @@ namespace Greenshot.Addon.Flickr.Configuration.Impl #region Implementation of IOAuth1Token + [TypeConverter(typeof(StringEncryptionTypeConverter))] public string OAuthToken { get; set; } + + [TypeConverter(typeof(StringEncryptionTypeConverter))] public string OAuthTokenSecret { get; set; } + + [TypeConverter(typeof(StringEncryptionTypeConverter))] public string OAuthTokenVerifier { get; set; } #endregion diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index b1d8a2cf3..4f35193c2 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -50,9 +50,9 @@ - - - + + + all diff --git a/src/Greenshot.Addon.GooglePhotos/Configuration/Impl/GooglePhotosConfigurationImpl.cs b/src/Greenshot.Addon.GooglePhotos/Configuration/Impl/GooglePhotosConfigurationImpl.cs index db4418dcf..1d122826c 100644 --- a/src/Greenshot.Addon.GooglePhotos/Configuration/Impl/GooglePhotosConfigurationImpl.cs +++ b/src/Greenshot.Addon.GooglePhotos/Configuration/Impl/GooglePhotosConfigurationImpl.cs @@ -22,7 +22,9 @@ #endregion using System; +using System.ComponentModel; using Dapplo.Config.Ini; +using Dapplo.Config.Ini.Converters; using Greenshot.Core.Enums; namespace Greenshot.Addon.GooglePhotos.Configuration.Impl @@ -54,8 +56,12 @@ namespace Greenshot.Addon.GooglePhotos.Configuration.Impl #region Implementation of IOAuth2Token + [TypeConverter(typeof(StringEncryptionTypeConverter))] public string OAuth2AccessToken { get; set; } + public DateTimeOffset OAuth2AccessTokenExpires { get; set; } + + [TypeConverter(typeof(StringEncryptionTypeConverter))] public string OAuth2RefreshToken { get; set; } #endregion diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index 27b2eda3c..2ee26eb7f 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -50,9 +50,9 @@ - - - + + + all diff --git a/src/Greenshot.Addon.Imgur/Configuration/Impl/ImgurConfigurationImpl.cs b/src/Greenshot.Addon.Imgur/Configuration/Impl/ImgurConfigurationImpl.cs index 3e9dfde17..bc0c805e1 100644 --- a/src/Greenshot.Addon.Imgur/Configuration/Impl/ImgurConfigurationImpl.cs +++ b/src/Greenshot.Addon.Imgur/Configuration/Impl/ImgurConfigurationImpl.cs @@ -23,7 +23,9 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using Dapplo.Config.Ini; +using Dapplo.Config.Ini.Converters; using Greenshot.Addon.Imgur.Entities; using Greenshot.Core.Enums; @@ -56,8 +58,12 @@ namespace Greenshot.Addon.Imgur.Configuration.Impl #region Implementation of IOAuth2Token + [TypeConverter(typeof(StringEncryptionTypeConverter))] public string OAuth2AccessToken { get; set; } + public DateTimeOffset OAuth2AccessTokenExpires { get; set; } + + [TypeConverter(typeof(StringEncryptionTypeConverter))] public string OAuth2RefreshToken { get; set; } #endregion diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index 5bf040da5..345d0dafb 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -50,15 +50,15 @@ - - - - + + + + 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 fc9b0d6cf..97fc345d2 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -52,10 +52,10 @@ - - - - + + + + diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index 9b4ccc381..172b4e143 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -137,9 +137,9 @@ - - - + + + diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index 73cdc19d9..f9bd69d08 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -50,12 +50,12 @@ - - - - + + + + - + 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 3d0112c98..4759b6953 100644 --- a/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj +++ b/src/Greenshot.Addon.OCR/Greenshot.Addon.OCR.csproj @@ -42,8 +42,8 @@ - - + + all diff --git a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj index 9a52b8553..ae78a8351 100644 --- a/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj +++ b/src/Greenshot.Addon.Office/Greenshot.Addon.Office.csproj @@ -45,8 +45,8 @@ - - + + diff --git a/src/Greenshot.Addon.OneDrive/Configuration/Impl/OneDriveConfigurationImpl.cs b/src/Greenshot.Addon.OneDrive/Configuration/Impl/OneDriveConfigurationImpl.cs index d940ceaae..98fa47bac 100644 --- a/src/Greenshot.Addon.OneDrive/Configuration/Impl/OneDriveConfigurationImpl.cs +++ b/src/Greenshot.Addon.OneDrive/Configuration/Impl/OneDriveConfigurationImpl.cs @@ -22,7 +22,9 @@ #endregion using System; +using System.ComponentModel; using Dapplo.Config.Ini; +using Dapplo.Config.Ini.Converters; using Greenshot.Core.Enums; namespace Greenshot.Addon.OneDrive.Configuration.Impl @@ -54,8 +56,12 @@ namespace Greenshot.Addon.OneDrive.Configuration.Impl #region Implementation of IOAuth2Token + [TypeConverter(typeof(StringEncryptionTypeConverter))] public string OAuth2AccessToken { get; set; } + public DateTimeOffset OAuth2AccessTokenExpires { get; set; } + + [TypeConverter(typeof(StringEncryptionTypeConverter))] public string OAuth2RefreshToken { get; set; } #endregion diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index 93262161b..b7a438bae 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -50,12 +50,12 @@ - - - - + + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Photobucket/Configuration/Impl/PhotobucketConfigurationImpl.cs b/src/Greenshot.Addon.Photobucket/Configuration/Impl/PhotobucketConfigurationImpl.cs index 66711f6f8..15ee02729 100644 --- a/src/Greenshot.Addon.Photobucket/Configuration/Impl/PhotobucketConfigurationImpl.cs +++ b/src/Greenshot.Addon.Photobucket/Configuration/Impl/PhotobucketConfigurationImpl.cs @@ -21,7 +21,9 @@ #endregion +using System.ComponentModel; using Dapplo.Config.Ini; +using Dapplo.Config.Ini.Converters; using Greenshot.Core.Enums; namespace Greenshot.Addon.Photobucket.Configuration.Impl @@ -53,8 +55,13 @@ namespace Greenshot.Addon.Photobucket.Configuration.Impl #region Implementation of IOAuth1Token + [TypeConverter(typeof(StringEncryptionTypeConverter))] public string OAuthToken { get; set; } + + [TypeConverter(typeof(StringEncryptionTypeConverter))] public string OAuthTokenSecret { get; set; } + + [TypeConverter(typeof(StringEncryptionTypeConverter))] public string OAuthTokenVerifier { get; set; } #endregion diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index ab6b91230..1f3f9faad 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -50,9 +50,9 @@ - - - + + + all diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index 8cdf8cfa1..cd027fca4 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -50,12 +50,12 @@ - - - - + + + + - + all runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj index eb942fdfe..f043f4c6f 100644 --- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj +++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj @@ -54,13 +54,8 @@ - - - + + - - all - runtime; build; native; contentfiles; analyzers - \ No newline at end of file diff --git a/src/Greenshot.Addon.Win10/Win10ShareDestination.cs b/src/Greenshot.Addon.Win10/Win10ShareDestination.cs index b912265b7..cdfef62a6 100644 --- a/src/Greenshot.Addon.Win10/Win10ShareDestination.cs +++ b/src/Greenshot.Addon.Win10/Win10ShareDestination.cs @@ -41,6 +41,7 @@ using Greenshot.Addons.Interfaces.Plugin; using Greenshot.Core.Enums; using Greenshot.Gfx; using Color = Windows.UI.Color; +using Greenshot.Addons.Resources; namespace Greenshot.Addon.Win10 { @@ -180,7 +181,7 @@ namespace Greenshot.Addon.Win10 // Create logo RandomAccessStreamReference logoRandomAccessStreamReference; - using (var logo = GreenshotResources.GetGreenshotIcon().ToBitmap()) + using (var logo = GreenshotResources.Instance.GetGreenshotIcon().ToBitmap()) using (var logoThumbnail = logo.CreateThumbnail(30, 30)) { ImageOutput.SaveToStream(logoThumbnail, null, logoStream, outputSettings); diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index 28d235d51..e3fe2b2c8 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -48,22 +48,22 @@ 2.0.4 - 1.1.11-gd26115c7d3 + 1.1.12-gbfc701fccd - 1.1.11-gd26115c7d3 + 1.1.12-gbfc701fccd - 1.1.11-gd26115c7d3 + 1.1.12-gbfc701fccd - 0.9.11 + 0.9.12 - 0.9.11 + 0.9.12 - 0.9.11 + 0.9.12 0.7.19 @@ -76,7 +76,7 @@ runtime; build; native; contentfiles; analyzers - 3.0.0-alpha0086 + 3.0.0-alpha0088 2.3.0 diff --git a/src/Greenshot.Gfx/Greenshot.Gfx.csproj b/src/Greenshot.Gfx/Greenshot.Gfx.csproj index dbb209fa0..82c5195ba 100644 --- a/src/Greenshot.Gfx/Greenshot.Gfx.csproj +++ b/src/Greenshot.Gfx/Greenshot.Gfx.csproj @@ -36,7 +36,7 @@ 2.0.4 - 1.1.11-gd26115c7d3 + 1.1.12-gbfc701fccd 2.3.0 diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index 6b702e045..47b9f6fbe 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -97,10 +97,10 @@ 2.0.4 - 1.1.11-gd26115c7d3 + 1.1.12-gbfc701fccd - 0.9.11 + 0.9.12 diff --git a/src/Greenshot.sln b/src/Greenshot.sln index 86641d7ea..b493f13c7 100644 --- a/src/Greenshot.sln +++ b/src/Greenshot.sln @@ -29,13 +29,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Office", "G EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Photobucket", "Greenshot.Addon.Photobucket\Greenshot.Addon.Photobucket.csproj", "{9C0ECC4C-7807-4111-916A-4F57BB29788A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.Addon.Win10", "Greenshot.Addon.Win10\Greenshot.Addon.Win10.csproj", "{9801F62C-540F-4BFE-9211-6405DEDE563B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Win10", "Greenshot.Addon.Win10\Greenshot.Addon.Win10.csproj", "{9801F62C-540F-4BFE-9211-6405DEDE563B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Lutim", "Greenshot.Addon.Lutim\Greenshot.Addon.Lutim.csproj", "{D106F86C-CD3D-44FF-B151-2A5D47268B5C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Gfx", "Greenshot.Gfx\Greenshot.Gfx.csproj", "{F041C685-EB96-4ED1-9ACE-0F5BD836610F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Greenshot.PerformanceTests", "Greenshot.PerformanceTests\Greenshot.PerformanceTests.csproj", "{5D594C8A-2137-46E1-8D01-B83662825C7B}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.PerformanceTests", "Greenshot.PerformanceTests\Greenshot.PerformanceTests.csproj", "{5D594C8A-2137-46E1-8D01-B83662825C7B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Tests", "Greenshot.Tests\Greenshot.Tests.csproj", "{9B162E60-12D8-44FD-8093-7D40392F23FA}" EndProject @@ -166,6 +166,7 @@ Global {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.ActiveCfg = Release|Any CPU {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.Build.0 = Release|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|Any CPU.Build.0 = Debug|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x86.ActiveCfg = Debug|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x86.Build.0 = Debug|Any CPU {9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index ec1fb2fae..3a4daf168 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -32,6 +32,7 @@ + @@ -78,13 +79,13 @@ - - - - - - - + + + + + + + @@ -94,8 +95,8 @@ all runtime; build; native; contentfiles; analyzers - - + +