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.

2025-08-22 22:34:27 -07:00 · 2018-11-18 21:09:41 +01:00 · 2018-11-18 21:09:41 +01:00 · 4f123a01bc
commit 4f123a01bc
parent 5ab1ece38b
17 changed files with 52 additions and 31 deletions
--- a/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
+++ b/src/Greenshot.Addon.Box/Greenshot.Addon.Box.csproj
@ -46,9 +46,9 @@
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" 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.OAuth" Version="0.9.15" />
-    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
+    <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.16" />
+    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
+    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
    <PackageReference Include="Fody" Version="3.3.0">
      <PrivateAssets>all</PrivateAssets>
--- a/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
+++ b/src/Greenshot.Addon.Confluence/Greenshot.Addon.Confluence.csproj
@ -53,8 +53,8 @@
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" 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.OAuth" Version="0.9.15" />
+    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
+    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
    <PackageReference Include="Dapplo.Confluence" Version="0.8.14" />
    <PackageReference Include="Fody" Version="3.3.0">
--- a/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
+++ b/src/Greenshot.Addon.Dropbox/Greenshot.Addon.Dropbox.csproj
@ -48,9 +48,9 @@
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" 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.OAuth" Version="0.9.15" />
-    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.15" />
+    <PackageReference Include="Dapplo.HttpExtensions" Version="0.9.16" />
+    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
+    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
    <PackageReference Include="Fody" Version="3.3.0">
      <PrivateAssets>all</PrivateAssets>
--- a/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
+++ b/src/Greenshot.Addon.Flickr/Greenshot.Addon.Flickr.csproj
@ -48,7 +48,7 @@
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" 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="Fody" Version="3.3.0">
      <PrivateAssets>all</PrivateAssets>
--- a/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
+++ b/src/Greenshot.Addon.GooglePhotos/Greenshot.Addon.GooglePhotos.csproj
@ -48,7 +48,7 @@
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" 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="Fody" Version="3.3.0">
      <PrivateAssets>all</PrivateAssets>
--- a/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
+++ b/src/Greenshot.Addon.Imgur/Greenshot.Addon.Imgur.csproj
@ -48,8 +48,8 @@
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" 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.OAuth" Version="0.9.15" />
+    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
+    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
    <PackageReference Include="Fody" Version="3.3.0">
      <PrivateAssets>all</PrivateAssets>
--- a/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
+++ b/src/Greenshot.Addon.Jira/Greenshot.Addon.Jira.csproj
@ -50,8 +50,8 @@
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" 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.OAuth" Version="0.9.15" />
+    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
+    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
    <PackageReference Include="Dapplo.Utils" Version="1.1.9" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
 	<PackageReference Include="Dapplo.Jira" Version="0.8.7" />
--- a/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
+++ b/src/Greenshot.Addon.LegacyEditor/Greenshot.Addon.LegacyEditor.csproj
@ -135,7 +135,7 @@
    <PackageReference Include="CommonServiceLocator" Version="2.0.4" />
    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" 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.Icons" Version="0.7.24" />
    <PackageReference Include="Fody" Version="3.3.0">
--- a/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
+++ b/src/Greenshot.Addon.Lutim/Greenshot.Addon.Lutim.csproj
@ -48,8 +48,8 @@
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" 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.OAuth" Version="0.9.15" />
+    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
+    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
 	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
    <PackageReference Include="Fody" Version="3.3.0">
--- a/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
+++ b/src/Greenshot.Addon.OneDrive/Greenshot.Addon.OneDrive.csproj
@ -48,8 +48,8 @@
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" 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.OAuth" Version="0.9.15" />
+    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
+    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
 	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
    <PackageReference Include="Fody" Version="3.3.0">
--- a/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
+++ b/src/Greenshot.Addon.Photobucket/Greenshot.Addon.Photobucket.csproj
@ -48,7 +48,7 @@
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" 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="Fody" Version="3.3.0">
      <PrivateAssets>all</PrivateAssets>
--- a/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
+++ b/src/Greenshot.Addon.Tfs/Greenshot.Addon.Tfs.csproj
@ -48,8 +48,8 @@
    <PackageReference Include="AutoProperties.Fody" Version="1.19.0" />
    <PackageReference Include="Dapplo.CaliburnMicro.Configuration" 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.OAuth" Version="0.9.15" />
+    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
+    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
 	<PackageReference Include="MahApps.Metro" Version="2.0.0-alpha0121" />
    <PackageReference Include="Fody" Version="3.3.0">
--- a/src/Greenshot.Addons/Greenshot.Addons.csproj
+++ b/src/Greenshot.Addons/Greenshot.Addons.csproj
@ -53,13 +53,13 @@
      <Version>1.2.5</Version>
    </PackageReference>
    <PackageReference Include="Dapplo.HttpExtensions">
-      <Version>0.9.15</Version>
+      <Version>0.9.16</Version>
    </PackageReference>
    <PackageReference Include="Dapplo.HttpExtensions.JsonNet">
-      <Version>0.9.15</Version>
+      <Version>0.9.16</Version>
    </PackageReference>
    <PackageReference Include="Dapplo.HttpExtensions.OAuth">
-      <Version>0.9.15</Version>
+      <Version>0.9.16</Version>
    </PackageReference>
    <PackageReference Include="Dapplo.Windows.Clipboard">
      <Version>0.7.24</Version>
--- a/src/Greenshot.Tests/Greenshot.Tests.csproj
+++ b/src/Greenshot.Tests/Greenshot.Tests.csproj
@ -70,7 +70,7 @@
    <PackageReference Include="BenchmarkDotNet" Version="0.11.2" />
    <PackageReference Include="CommandLineParser" Version="2.3.0" />
    <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="Microsoft.CodeAnalysis.Analyzers" Version="2.6.2">
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
--- a/src/Greenshot/Components/UpdateService.cs
+++ b/src/Greenshot/Components/UpdateService.cs
@ -97,9 +97,8 @@ namespace Greenshot.Components
 	    /// <inheritdoc />
 	    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);
+	    }

        /// <inheritdoc />
        public void Shutdown()
--- a/src/Greenshot/Greenshot.csproj
+++ b/src/Greenshot/Greenshot.csproj
@ -85,8 +85,8 @@
    <PackageReference Include="Dapplo.CaliburnMicro.Metro" 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.HttpExtensions.JsonNet" Version="0.9.15" />
-    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.15" />
+    <PackageReference Include="Dapplo.HttpExtensions.JsonNet" Version="0.9.16" />
+    <PackageReference Include="Dapplo.HttpExtensions.OAuth" Version="0.9.16" />
    <PackageReference Include="Dapplo.Log.LogFile" Version="1.3.11" />
    <PackageReference Include="Dapplo.Log.Loggers" Version="1.3.11" />
    <PackageReference Include="Dapplo.Windows.Clipboard" Version="0.7.24" />
--- a/src/version.json
+++ 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
+}