github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-23 06:36:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Making event more work with netcoreapp 3.0, the about doesn't work as the UpdateService is not available in that target yet!

Browse source
This commit is contained in:
Robin 2018-11-09 23:34:23 +01:00
commit 6e850bc6eb
29 changed files with 127 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Greenshot.Addon.Box/Configuration/Impl/BoxConfigurationImpl.cs
View file

@ -22,7 +22,9 @@
#endregion #endregion
using System; using System;
using System.ComponentModel;
using Dapplo.Config.Ini; using Dapplo.Config.Ini;
using Dapplo.Config.Ini.Converters;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;
namespace Greenshot.Addon.Box.Configuration.Impl namespace Greenshot.Addon.Box.Configuration.Impl
@ -54,8 +56,12 @@ namespace Greenshot.Addon.Box.Configuration.Impl
#region Implementation of IOAuth2Token #region Implementation of IOAuth2Token
[TypeConverter(typeof(StringEncryptionTypeConverter))]
public string OAuth2AccessToken { get; set; } public string OAuth2AccessToken { get; set; }
public DateTimeOffset OAuth2AccessTokenExpires { get; set; } public DateTimeOffset OAuth2AccessTokenExpires { get; set; }
[TypeConverter(typeof(StringEncryptionTypeConverter))]
public string OAuth2RefreshToken { get; set; } public string OAuth2RefreshToken { get; set; }
#endregion #endregion

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

@ -48,11 +48,11 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.12" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="Fody" Version="3.2.16"> <PackageReference Include="Fody" Version="3.2.16">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>

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

@ -55,10 +55,10 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="Dapplo.Confluence" Version="0.8.12" /> <PackageReference Include="Dapplo.Confluence" Version="0.8.12" />
<PackageReference Include="Fody" Version="3.2.16"> <PackageReference Include="Fody" Version="3.2.16">

6
src/Greenshot.Addon.Dropbox/Configuration/Impl/DropboxConfigurationImpl.cs
View file

@ -18,7 +18,9 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
using System; using System;
using System.ComponentModel;
using Dapplo.Config.Ini; using Dapplo.Config.Ini;
using Dapplo.Config.Ini.Converters;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;
namespace Greenshot.Addon.Dropbox.Configuration.Impl namespace Greenshot.Addon.Dropbox.Configuration.Impl
@ -50,8 +52,12 @@ namespace Greenshot.Addon.Dropbox.Configuration.Impl
#region Implementation of IOAuth2Token #region Implementation of IOAuth2Token
[TypeConverter(typeof(StringEncryptionTypeConverter))]
public string OAuth2AccessToken { get; set; } public string OAuth2AccessToken { get; set; }
public DateTimeOffset OAuth2AccessTokenExpires { get; set; } public DateTimeOffset OAuth2AccessTokenExpires { get; set; }
[TypeConverter(typeof(StringEncryptionTypeConverter))]
public string OAuth2RefreshToken { get; set; } public string OAuth2RefreshToken { get; set; }
#endregion #endregion

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

@ -50,11 +50,11 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.12" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="Fody" Version="3.2.16"> <PackageReference Include="Fody" Version="3.2.16">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>

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

@ -42,8 +42,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="CliWrap" Version="2.1.0" /> <PackageReference Include="CliWrap" Version="2.1.0" />
<PackageReference Include="Fody" Version="3.2.16"> <PackageReference Include="Fody" Version="3.2.16">

7
src/Greenshot.Addon.Flickr/Configuration/Impl/FlickrConfigurationImpl.cs
View file

@ -21,7 +21,9 @@
#endregion #endregion
using System.ComponentModel;
using Dapplo.Config.Ini; using Dapplo.Config.Ini;
using Dapplo.Config.Ini.Converters;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;
namespace Greenshot.Addon.Flickr.Configuration.Impl namespace Greenshot.Addon.Flickr.Configuration.Impl
@ -53,8 +55,13 @@ namespace Greenshot.Addon.Flickr.Configuration.Impl
#region Implementation of IOAuth1Token #region Implementation of IOAuth1Token
[TypeConverter(typeof(StringEncryptionTypeConverter))]
public string OAuthToken { get; set; } public string OAuthToken { get; set; }
[TypeConverter(typeof(StringEncryptionTypeConverter))]
public string OAuthTokenSecret { get; set; } public string OAuthTokenSecret { get; set; }
[TypeConverter(typeof(StringEncryptionTypeConverter))]
public string OAuthTokenVerifier { get; set; } public string OAuthTokenVerifier { get; set; }
#endregion #endregion

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

@ -50,9 +50,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="Fody" Version="3.2.16"> <PackageReference Include="Fody" Version="3.2.16">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>

6
src/Greenshot.Addon.GooglePhotos/Configuration/Impl/GooglePhotosConfigurationImpl.cs
View file

@ -22,7 +22,9 @@
#endregion #endregion
using System; using System;
using System.ComponentModel;
using Dapplo.Config.Ini; using Dapplo.Config.Ini;
using Dapplo.Config.Ini.Converters;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;
namespace Greenshot.Addon.GooglePhotos.Configuration.Impl namespace Greenshot.Addon.GooglePhotos.Configuration.Impl
@ -54,8 +56,12 @@ namespace Greenshot.Addon.GooglePhotos.Configuration.Impl
#region Implementation of IOAuth2Token #region Implementation of IOAuth2Token
[TypeConverter(typeof(StringEncryptionTypeConverter))]
public string OAuth2AccessToken { get; set; } public string OAuth2AccessToken { get; set; }
public DateTimeOffset OAuth2AccessTokenExpires { get; set; } public DateTimeOffset OAuth2AccessTokenExpires { get; set; }
[TypeConverter(typeof(StringEncryptionTypeConverter))]
public string OAuth2RefreshToken { get; set; } public string OAuth2RefreshToken { get; set; }
#endregion #endregion

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

@ -50,9 +50,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="Fody" Version="3.2.16"> <PackageReference Include="Fody" Version="3.2.16">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>

6
src/Greenshot.Addon.Imgur/Configuration/Impl/ImgurConfigurationImpl.cs
View file

@ -23,7 +23,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using Dapplo.Config.Ini; using Dapplo.Config.Ini;
using Dapplo.Config.Ini.Converters;
using Greenshot.Addon.Imgur.Entities; using Greenshot.Addon.Imgur.Entities;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;
@ -56,8 +58,12 @@ namespace Greenshot.Addon.Imgur.Configuration.Impl
#region Implementation of IOAuth2Token #region Implementation of IOAuth2Token
[TypeConverter(typeof(StringEncryptionTypeConverter))]
public string OAuth2AccessToken { get; set; } public string OAuth2AccessToken { get; set; }
public DateTimeOffset OAuth2AccessTokenExpires { get; set; } public DateTimeOffset OAuth2AccessTokenExpires { get; set; }
[TypeConverter(typeof(StringEncryptionTypeConverter))]
public string OAuth2RefreshToken { get; set; } public string OAuth2RefreshToken { get; set; }
#endregion #endregion

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

@ -50,15 +50,15 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="Fody" Version="3.2.16"> <PackageReference Include="Fody" Version="3.2.16">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="MahApps.Metro" Version="1.6.5" /> <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0105" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@ -52,10 +52,10 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<PackageReference Include="Dapplo.Utils" Version="1.1.9" /> <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.19" />
<PackageReference Include="Dapplo.Jira" Version="0.8.5" /> <PackageReference Include="Dapplo.Jira" Version="0.8.5" />

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

@ -137,9 +137,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="CommonServiceLocator" Version="2.0.4" /> <PackageReference Include="CommonServiceLocator" Version="2.0.4" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.12" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="Dapplo.Windows.Icons" 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.16">

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

@ -50,12 +50,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="MahApps.Metro" Version="1.6.5" /> <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0105" />
<PackageReference Include="Fody" Version="3.2.16"> <PackageReference Include="Fody" Version="3.2.16">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

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

@ -42,8 +42,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="Fody" Version="3.2.16"> <PackageReference Include="Fody" Version="3.2.16">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>

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

@ -45,8 +45,8 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="Interop.Microsoft.Office.Interop.OneNote" Version="1.1.0" /> <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.Excel" Version="15.0.4795.1000" />

6
src/Greenshot.Addon.OneDrive/Configuration/Impl/OneDriveConfigurationImpl.cs
View file

@ -22,7 +22,9 @@
#endregion #endregion
using System; using System;
using System.ComponentModel;
using Dapplo.Config.Ini; using Dapplo.Config.Ini;
using Dapplo.Config.Ini.Converters;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;
namespace Greenshot.Addon.OneDrive.Configuration.Impl namespace Greenshot.Addon.OneDrive.Configuration.Impl
@ -54,8 +56,12 @@ namespace Greenshot.Addon.OneDrive.Configuration.Impl
#region Implementation of IOAuth2Token #region Implementation of IOAuth2Token
[TypeConverter(typeof(StringEncryptionTypeConverter))]
public string OAuth2AccessToken { get; set; } public string OAuth2AccessToken { get; set; }
public DateTimeOffset OAuth2AccessTokenExpires { get; set; } public DateTimeOffset OAuth2AccessTokenExpires { get; set; }
[TypeConverter(typeof(StringEncryptionTypeConverter))]
public string OAuth2RefreshToken { get; set; } public string OAuth2RefreshToken { get; set; }
#endregion #endregion

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

@ -50,12 +50,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="MahApps.Metro" Version="1.6.5" /> <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0105" />
<PackageReference Include="Fody" Version="3.2.16"> <PackageReference Include="Fody" Version="3.2.16">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

7
src/Greenshot.Addon.Photobucket/Configuration/Impl/PhotobucketConfigurationImpl.cs
View file

@ -21,7 +21,9 @@
#endregion #endregion
using System.ComponentModel;
using Dapplo.Config.Ini; using Dapplo.Config.Ini;
using Dapplo.Config.Ini.Converters;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;
namespace Greenshot.Addon.Photobucket.Configuration.Impl namespace Greenshot.Addon.Photobucket.Configuration.Impl
@ -53,8 +55,13 @@ namespace Greenshot.Addon.Photobucket.Configuration.Impl
#region Implementation of IOAuth1Token #region Implementation of IOAuth1Token
[TypeConverter(typeof(StringEncryptionTypeConverter))]
public string OAuthToken { get; set; } public string OAuthToken { get; set; }
[TypeConverter(typeof(StringEncryptionTypeConverter))]
public string OAuthTokenSecret { get; set; } public string OAuthTokenSecret { get; set; }
[TypeConverter(typeof(StringEncryptionTypeConverter))]
public string OAuthTokenVerifier { get; set; } public string OAuthTokenVerifier { get; set; }
#endregion #endregion

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

@ -50,9 +50,9 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="Fody" Version="3.2.16"> <PackageReference Include="Fody" Version="3.2.16">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>

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

@ -50,12 +50,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="MahApps.Metro" Version="1.6.5" /> <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0105" />
<PackageReference Include="Fody" Version="3.2.16"> <PackageReference Include="Fody" Version="3.2.16">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

9
src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
View file

@ -54,13 +54,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.19" />
<PackageReference Include="Fody" Version="3.2.16">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup> </ItemGroup>
</Project> </Project>

3
src/Greenshot.Addon.Win10/Win10ShareDestination.cs
View file

@ -41,6 +41,7 @@ using Greenshot.Addons.Interfaces.Plugin;
using Greenshot.Core.Enums; using Greenshot.Core.Enums;
using Greenshot.Gfx; using Greenshot.Gfx;
using Color = Windows.UI.Color; using Color = Windows.UI.Color;
using Greenshot.Addons.Resources;
namespace Greenshot.Addon.Win10 namespace Greenshot.Addon.Win10
{ {
@ -180,7 +181,7 @@ namespace Greenshot.Addon.Win10
// Create logo // Create logo
RandomAccessStreamReference logoRandomAccessStreamReference; RandomAccessStreamReference logoRandomAccessStreamReference;
using (var logo = GreenshotResources.GetGreenshotIcon().ToBitmap()) using (var logo = GreenshotResources.Instance.GetGreenshotIcon().ToBitmap())
using (var logoThumbnail = logo.CreateThumbnail(30, 30)) using (var logoThumbnail = logo.CreateThumbnail(30, 30))
{ {
ImageOutput.SaveToStream(logoThumbnail, null, logoStream, outputSettings); ImageOutput.SaveToStream(logoThumbnail, null, logoStream, outputSettings);

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

@ -48,22 +48,22 @@
<Version>2.0.4</Version> <Version>2.0.4</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Configuration"> <PackageReference Include="Dapplo.CaliburnMicro.Configuration">
<Version>1.1.11-gd26115c7d3</Version> <Version>1.1.12-gbfc701fccd</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Toasts"> <PackageReference Include="Dapplo.CaliburnMicro.Toasts">
<Version>1.1.11-gd26115c7d3</Version> <Version>1.1.12-gbfc701fccd</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Translations"> <PackageReference Include="Dapplo.CaliburnMicro.Translations">
<Version>1.1.11-gd26115c7d3</Version> <Version>1.1.12-gbfc701fccd</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.HttpExtensions"> <PackageReference Include="Dapplo.HttpExtensions">
<Version>0.9.11</Version> <Version>0.9.12</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.HttpExtensions.JsonNet"> <PackageReference Include="Dapplo.HttpExtensions.JsonNet">
<Version>0.9.11</Version> <Version>0.9.12</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.HttpExtensions.OAuth"> <PackageReference Include="Dapplo.HttpExtensions.OAuth">
<Version>0.9.11</Version> <Version>0.9.12</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Windows.Clipboard"> <PackageReference Include="Dapplo.Windows.Clipboard">
<Version>0.7.19</Version> <Version>0.7.19</Version>
@ -76,7 +76,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="MahApps.Metro.IconPacks"> <PackageReference Include="MahApps.Metro.IconPacks">
<Version>3.0.0-alpha0086</Version> <Version>3.0.0-alpha0088</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Svg"> <PackageReference Include="Svg">
<Version>2.3.0</Version> <Version>2.3.0</Version>

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

@ -36,7 +36,7 @@
<Version>2.0.4</Version> <Version>2.0.4</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Translations"> <PackageReference Include="Dapplo.CaliburnMicro.Translations">
<Version>1.1.11-gd26115c7d3</Version> <Version>1.1.12-gbfc701fccd</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Svg"> <PackageReference Include="Svg">
<Version>2.3.0</Version> <Version>2.3.0</Version>

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

@ -97,10 +97,10 @@
<Version>2.0.4</Version> <Version>2.0.4</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.CaliburnMicro.Translations"> <PackageReference Include="Dapplo.CaliburnMicro.Translations">
<Version>1.1.11-gd26115c7d3</Version> <Version>1.1.12-gbfc701fccd</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.HttpExtensions.OAuth"> <PackageReference Include="Dapplo.HttpExtensions.OAuth">
<Version>0.9.11</Version> <Version>0.9.12</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" /> <PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers"> <PackageReference Include="Microsoft.CodeAnalysis.Analyzers">

5
src/Greenshot.sln
View file

@ -29,13 +29,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Office", "G
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Photobucket", "Greenshot.Addon.Photobucket\Greenshot.Addon.Photobucket.csproj", "{9C0ECC4C-7807-4111-916A-4F57BB29788A}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Photobucket", "Greenshot.Addon.Photobucket\Greenshot.Addon.Photobucket.csproj", "{9C0ECC4C-7807-4111-916A-4F57BB29788A}"
EndProject 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 EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Lutim", "Greenshot.Addon.Lutim\Greenshot.Addon.Lutim.csproj", "{D106F86C-CD3D-44FF-B151-2A5D47268B5C}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Addon.Lutim", "Greenshot.Addon.Lutim\Greenshot.Addon.Lutim.csproj", "{D106F86C-CD3D-44FF-B151-2A5D47268B5C}"
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Gfx", "Greenshot.Gfx\Greenshot.Gfx.csproj", "{F041C685-EB96-4ED1-9ACE-0F5BD836610F}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Gfx", "Greenshot.Gfx\Greenshot.Gfx.csproj", "{F041C685-EB96-4ED1-9ACE-0F5BD836610F}"
EndProject 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 EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Tests", "Greenshot.Tests\Greenshot.Tests.csproj", "{9B162E60-12D8-44FD-8093-7D40392F23FA}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Greenshot.Tests", "Greenshot.Tests\Greenshot.Tests.csproj", "{9B162E60-12D8-44FD-8093-7D40392F23FA}"
EndProject EndProject
@ -166,6 +166,7 @@ Global
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.ActiveCfg = Release|Any CPU {9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.ActiveCfg = Release|Any CPU
{9C0ECC4C-7807-4111-916A-4F57BB29788A}.Release|x86.Build.0 = 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.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.ActiveCfg = Debug|Any CPU
{9801F62C-540F-4BFE-9211-6405DEDE563B}.Debug|x86.Build.0 = 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 {9801F62C-540F-4BFE-9211-6405DEDE563B}.Release|Any CPU.ActiveCfg = Release|Any CPU

19
src/Greenshot/Greenshot.csproj
View file

@ -32,6 +32,7 @@
<PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" /> <PackageReference Include="System.Resources.ResourceManager" Version="4.3.0" />
<PackageReference Include="System.Runtime" Version="4.3.0" /> <PackageReference Include="System.Runtime" Version="4.3.0" />
<PackageReference Include="System.Runtime.Extensions" Version="4.3.0" /> <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
<PackageReference Include="System.Management" Version="4.5.0" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net471' "> <ItemGroup Condition="'$(TargetFramework)' == 'net471' ">
@ -78,13 +79,13 @@
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="CommandLineParser" Version="2.3.0" /> <PackageReference Include="CommandLineParser" Version="2.3.0" />
<PackageReference Include="CommonServiceLocator" Version="2.0.4" /> <PackageReference Include="CommonServiceLocator" Version="2.0.4" />
<PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Dapp" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.11-gd26115c7d3" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.1.12-gbfc701fccd" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.12" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.11" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.12" />
<PackageReference Include="Dapplo.Log.LogFile" Version="1.3.11" /> <PackageReference Include="Dapplo.Log.LogFile" Version="1.3.11" />
<PackageReference Include="Dapplo.Log.Loggers" 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.Clipboard" Version="0.7.19" />
@ -94,8 +95,8 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="gong-wpf-dragdrop" Version="2.0.0-alpha0098" /> <PackageReference Include="gong-wpf-dragdrop" Version="2.0.0-alpha0099" />
<PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0086" /> <PackageReference Include="MahApps.Metro.IconPacks" Version="3.0.0-alpha0088" />
<PackageReference Include="Svg" Version="2.3.0" /> <PackageReference Include="Svg" Version="2.3.0" />
</ItemGroup> </ItemGroup>