From 4f123a01bccd1c2b6b40c79e5035e7b750a2a8bc Mon Sep 17 00:00:00 2001 From: Robin Date: Sun, 18 Nov 2018 21:09:41 +0100 Subject: [PATCH] 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. --- .../Greenshot.Addon.Box.csproj | 6 ++--- .../Greenshot.Addon.Confluence.csproj | 4 ++-- .../Greenshot.Addon.Dropbox.csproj | 6 ++--- .../Greenshot.Addon.Flickr.csproj | 2 +- .../Greenshot.Addon.GooglePhotos.csproj | 2 +- .../Greenshot.Addon.Imgur.csproj | 4 ++-- .../Greenshot.Addon.Jira.csproj | 4 ++-- .../Greenshot.Addon.LegacyEditor.csproj | 2 +- .../Greenshot.Addon.Lutim.csproj | 4 ++-- .../Greenshot.Addon.OneDrive.csproj | 4 ++-- .../Greenshot.Addon.Photobucket.csproj | 2 +- .../Greenshot.Addon.Tfs.csproj | 4 ++-- src/Greenshot.Addons/Greenshot.Addons.csproj | 6 ++--- src/Greenshot.Tests/Greenshot.Tests.csproj | 2 +- src/Greenshot/Components/UpdateService.cs | 5 ++--- src/Greenshot/Greenshot.csproj | 4 ++-- src/version.json | 22 +++++++++++++++++++ 17 files changed, 52 insertions(+), 31 deletions(-) create mode 100644 src/version.json diff --git a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj index d3cdb8695..435046911 100644 --- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj +++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj @@ -46,9 +46,9 @@ - - - + + + all diff --git a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj index 23bfb8a48..0f3583112 100644 --- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj +++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj @@ -53,8 +53,8 @@ - - + + diff --git a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj index 8e3b61c34..acf0fe394 100644 --- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj +++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj @@ -48,9 +48,9 @@ - - - + + + all diff --git a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj index cd3848308..4e2799d7a 100644 --- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj +++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj @@ -48,7 +48,7 @@ - + all diff --git a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj index c593e5d88..2631d2298 100644 --- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj +++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj @@ -48,7 +48,7 @@ - + all diff --git a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj index 1200a05c0..44cb8fd63 100644 --- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj +++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj @@ -48,8 +48,8 @@ - - + + all diff --git a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj index 3a8b7b6ca..e65d203c0 100644 --- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj +++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj @@ -50,8 +50,8 @@ - - + + diff --git a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj index 846d7fb2c..776eb1272 100644 --- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj +++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj @@ -135,7 +135,7 @@ - + diff --git a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj index 9da6b1d88..76035d435 100644 --- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj +++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj @@ -48,8 +48,8 @@ - - + + diff --git a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj index 596209c87..3e2550780 100644 --- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj +++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj @@ -48,8 +48,8 @@ - - + + diff --git a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj index 5a6467858..af0f86905 100644 --- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj +++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj @@ -48,7 +48,7 @@ - + all diff --git a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj index a6829fcae..ce371c381 100644 --- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj +++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj @@ -48,8 +48,8 @@ - - + + diff --git a/src/Greenshot.Addons/Greenshot.Addons.csproj b/src/Greenshot.Addons/Greenshot.Addons.csproj index acb753936..7d3796cc3 100644 --- a/src/Greenshot.Addons/Greenshot.Addons.csproj +++ b/src/Greenshot.Addons/Greenshot.Addons.csproj @@ -53,13 +53,13 @@ 1.2.5 - 0.9.15 + 0.9.16 - 0.9.15 + 0.9.16 - 0.9.15 + 0.9.16 0.7.24 diff --git a/src/Greenshot.Tests/Greenshot.Tests.csproj b/src/Greenshot.Tests/Greenshot.Tests.csproj index df3e00d78..c2fb8fe7c 100644 --- a/src/Greenshot.Tests/Greenshot.Tests.csproj +++ b/src/Greenshot.Tests/Greenshot.Tests.csproj @@ -70,7 +70,7 @@ - + runtime; build; native; contentfiles; analyzers diff --git a/src/Greenshot/Components/UpdateService.cs b/src/Greenshot/Components/UpdateService.cs index a35369e59..7055a1e72 100644 --- a/src/Greenshot/Components/UpdateService.cs +++ b/src/Greenshot/Components/UpdateService.cs @@ -97,9 +97,8 @@ namespace Greenshot.Components /// public void Startup() { - //var ignore = BackgroundTask(() => TimeSpan.FromDays(_coreConfiguration.UpdateCheckInterval), UpdateCheck, _cancellationTokenSource.Token); - var ignore = BackgroundTask(() => TimeSpan.FromSeconds(20), UpdateCheck, _cancellationTokenSource.Token); - } + var ignore = BackgroundTask(() => TimeSpan.FromDays(_coreConfiguration.UpdateCheckInterval), UpdateCheck, _cancellationTokenSource.Token); + } /// public void Shutdown() diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj index 2cc9058ff..176d07794 100644 --- a/src/Greenshot/Greenshot.csproj +++ b/src/Greenshot/Greenshot.csproj @@ -85,8 +85,8 @@ - - + + diff --git a/src/version.json b/src/version.json new file mode 100644 index 000000000..25bf59dda --- /dev/null +++ b/src/version.json @@ -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 +} \ No newline at end of file