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

Updated dependencies, this should fix an issue with OAuth. Added git version, fixed the update check to use real values so it doesn't popup all the time.

Browse source
This commit is contained in:
Robin 2018-11-18 21:09:41 +01:00
commit 4f123a01bc
17 changed files with 52 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -46,9 +46,9 @@
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.16" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.3.0"> <PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>

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

@ -53,8 +53,8 @@
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Dapplo.Confluence" Version="0.8.14" /> <PackageReference Include="Dapplo.Confluence" Version="0.8.14" />
<PackageReference Include="Fody" Version="3.3.0"> <PackageReference Include="Fody" Version="3.3.0">

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

@ -48,9 +48,9 @@
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.16" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.3.0"> <PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>

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

@ -48,7 +48,7 @@
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.3.0"> <PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>

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

@ -48,7 +48,7 @@
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.3.0"> <PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>

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

@ -48,8 +48,8 @@
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.3.0"> <PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>

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

@ -50,8 +50,8 @@
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
<PackageReference Include="Dapplo.Utils" Version="1.1.9" /> <PackageReference Include="Dapplo.Utils" Version="1.1.9" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Dapplo.Jira" Version="0.8.7" /> <PackageReference Include="Dapplo.Jira" Version="0.8.7" />

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

@ -135,7 +135,7 @@
<PackageReference Include="CommonServiceLocator" Version="2.0.4" /> <PackageReference Include="CommonServiceLocator" Version="2.0.4" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.16" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Dapplo.Windows.Icons" Version="0.7.24" /> <PackageReference Include="Dapplo.Windows.Icons" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.3.0"> <PackageReference Include="Fody" Version="3.3.0">

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

@ -48,8 +48,8 @@
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" /> <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
<PackageReference Include="Fody" Version="3.3.0"> <PackageReference Include="Fody" Version="3.3.0">

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

@ -48,8 +48,8 @@
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" /> <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
<PackageReference Include="Fody" Version="3.3.0"> <PackageReference Include="Fody" Version="3.3.0">

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

@ -48,7 +48,7 @@
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="Fody" Version="3.3.0"> <PackageReference Include="Fody" Version="3.3.0">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>

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

@ -48,8 +48,8 @@
<PackageReference Include="AutoProperties.Fody" Version="1.19.0" /> <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Configuration" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
<PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" /> <PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
<PackageReference Include="Fody" Version="3.3.0"> <PackageReference Include="Fody" Version="3.3.0">

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

@ -53,13 +53,13 @@
<Version>1.2.5</Version> <Version>1.2.5</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.HttpExtensions"> <PackageReference Include="Dapplo.HttpExtensions">
<Version>0.9.15</Version> <Version>0.9.16</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.HttpExtensions.JsonNet"> <PackageReference Include="Dapplo.HttpExtensions.JsonNet">
<Version>0.9.15</Version> <Version>0.9.16</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.HttpExtensions.OAuth"> <PackageReference Include="Dapplo.HttpExtensions.OAuth">
<Version>0.9.15</Version> <Version>0.9.16</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Dapplo.Windows.Clipboard"> <PackageReference Include="Dapplo.Windows.Clipboard">
<Version>0.7.24</Version> <Version>0.7.24</Version>

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

@ -70,7 +70,7 @@
<PackageReference Include="BenchmarkDotNet" Version="0.11.2" /> <PackageReference Include="BenchmarkDotNet" Version="0.11.2" />
<PackageReference Include="CommandLineParser" Version="2.3.0" /> <PackageReference Include="CommandLineParser" Version="2.3.0" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
<PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" /> <PackageReference Include="Dapplo.Log.XUnit" Version="1.3.11" />
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.2"> <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="2.6.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

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

@ -97,8 +97,7 @@ namespace Greenshot.Components
/// <inheritdoc /> /// <inheritdoc />
public void Startup() public void Startup()
{ {
//var ignore = BackgroundTask(() => TimeSpan.FromDays(_coreConfiguration.UpdateCheckInterval), UpdateCheck, _cancellationTokenSource.Token); var ignore = BackgroundTask(() => TimeSpan.FromDays(_coreConfiguration.UpdateCheckInterval), UpdateCheck, _cancellationTokenSource.Token);
var ignore = BackgroundTask(() => TimeSpan.FromSeconds(20), UpdateCheck, _cancellationTokenSource.Token);
} }
/// <inheritdoc /> /// <inheritdoc />

4
src/Greenshot/Greenshot.csproj
View file

@ -85,8 +85,8 @@
<PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Metro" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Toasts" Version="1.2.5" />
<PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" /> <PackageReference Include="Dapplo.CaliburnMicro.Translations" Version="1.2.5" />
<PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
<PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" /> <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
<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.24" /> <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />

22
src/version.json Normal file
View file

@ -0,0 +1,22 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "2.0",
"publicReleaseRefSpec": [
".*/master$", // we release out of master
".*/develop$" // we release out of develop
],
"nugetPackageVersion": {
"semVer": 2 // optional. Set to either 1 or 2 to control how the NuGet package version string is generated. Default is 1.
},
"cloudBuild": {
"setVersionVariables": true,
"buildNumber": {
"enabled": true,
"includeCommitId": {
"when": "nonPublicReleaseOnly",
"where": "buildMetadata"
}
}
},
"inherit": false
}