diff --git a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
index f74b37f21..a00642688 100644
--- a/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
+++ b/src/Greenshot.Addon.Win10/Greenshot.Addon.Win10.csproj
@@ -156,8 +156,9 @@
C:\Windows\Microsoft.NET\Framework\v4.0.30319\System.Runtime.WindowsRuntime.dll
global
-
- C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0\Windows.winmd
+
+ False
+ C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.17134.0\Windows.winmd
{f041c685-eb96-4ed1-9ace-0f5bd836610f}
diff --git a/src/Greenshot.Gfx/Murmur3.cs b/src/Greenshot.Gfx/Murmur3.cs
index 28957f65e..569cc55f1 100644
--- a/src/Greenshot.Gfx/Murmur3.cs
+++ b/src/Greenshot.Gfx/Murmur3.cs
@@ -64,13 +64,16 @@ namespace Greenshot.Gfx
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void AddBytes(byte one, byte two, byte three, byte four)
{
- var k = (uint)(one | two << 8 | three << 16 | four << 24);
- k *= C1;
- k = RotateLeft(k, R1);
- k *= C2;
- _hash ^= k;
- _hash = RotateLeft(_hash, R2);
- _hash = _hash * M + N;
+ unchecked
+ {
+ var k = (uint)(one | two << 8 | three << 16 | four << 24);
+ k *= C1;
+ k = RotateLeft(k, R1);
+ k *= C2;
+ _hash ^= k;
+ _hash = RotateLeft(_hash, R2);
+ _hash = _hash * M + N;
+ }
}
///
@@ -81,11 +84,14 @@ namespace Greenshot.Gfx
/// third byte
public void AddTrailingBytes(byte one, byte two = 0, byte three = 0)
{
- var k = (uint)(one | two << 8 | three << 16);
- k *= C1;
- k = RotateLeft(k, R1);
- k *= C2;
- _hash ^= k;
+ unchecked
+ {
+ var k = (uint) (one | two << 8 | three << 16);
+ k *= C1;
+ k = RotateLeft(k, R1);
+ k *= C2;
+ _hash ^= k;
+ }
}
///
@@ -126,13 +132,16 @@ namespace Greenshot.Gfx
{
get
{
- var hash = _hash ^ _length;
- hash ^= hash >> 16;
- hash *= 0x85ebca6b;
- hash ^= hash >> 13;
- hash *= 0xc2b2ae35;
- hash ^= hash >> 16;
- return hash;
+ unchecked
+ {
+ var hash = _hash ^ _length;
+ hash ^= hash >> 16;
+ hash *= 0x85ebca6b;
+ hash ^= hash >> 13;
+ hash *= 0xc2b2ae35;
+ hash ^= hash >> 16;
+ return hash;
+ }
}
}
diff --git a/src/Greenshot.Tests/CommandlineTests.cs b/src/Greenshot.Tests/CommandlineTests.cs
index 52b2c4467..b63b49e77 100644
--- a/src/Greenshot.Tests/CommandlineTests.cs
+++ b/src/Greenshot.Tests/CommandlineTests.cs
@@ -51,7 +51,7 @@ namespace Greenshot.Tests
[Fact]
public void TestLanguageOption()
{
- var arguments = new[] { "-language", "de-DE" };
+ var arguments = new[] { "--language", "de-DE" };
CommandlineCaptureOptions captureOptions = null;
CommandlineOptions commandlineOptions = null;
diff --git a/src/Greenshot.Tests/UpdateTests.cs b/src/Greenshot.Tests/UpdateTests.cs
index 991e6deaa..a4cb0afcb 100644
--- a/src/Greenshot.Tests/UpdateTests.cs
+++ b/src/Greenshot.Tests/UpdateTests.cs
@@ -3,6 +3,10 @@ using System.ServiceModel.Syndication;
using System.Threading.Tasks;
using System.Xml;
using Dapplo.HttpExtensions;
+using Dapplo.Ini;
+using Dapplo.Language;
+using Greenshot.Addons;
+using Greenshot.Addons.Core;
using Greenshot.Components;
using Xunit;
@@ -20,7 +24,9 @@ namespace Greenshot.Tests
[Fact]
public void UpdateTest()
{
- var updateService = new UpdateService(null, null);
+ var testConfig = new IniConfig("GreenShotTest", "testconfig");
+ var testLangLoader = new LanguageLoader("GreenShotTest", "en_US");
+ var updateService = new UpdateService(IniConfig.Current.Get(), LanguageLoader.Current.Get());
using (var reader = XmlReader.Create(@"TestFiles\project-feed.xml"))
{
var feed = SyndicationFeed.Load(reader);
diff --git a/src/Greenshot/Components/UpdateService.cs b/src/Greenshot/Components/UpdateService.cs
index b4c078499..1233718bc 100644
--- a/src/Greenshot/Components/UpdateService.cs
+++ b/src/Greenshot/Components/UpdateService.cs
@@ -202,7 +202,8 @@ namespace Greenshot.Components
{
BetaVersion = version;
}
- if ("rc".Equals(type, StringComparison.OrdinalIgnoreCase))
+ Regex rcReg = new Regex(@"^rc\d*$",RegexOptions.IgnoreCase);
+ if (rcReg.IsMatch(type))
{
ReleaseCandidateVersion = version;
}
diff --git a/src/Greenshot/Greenshot.csproj b/src/Greenshot/Greenshot.csproj
index 7f900b958..870318a37 100644
--- a/src/Greenshot/Greenshot.csproj
+++ b/src/Greenshot/Greenshot.csproj
@@ -183,8 +183,8 @@
-
- ..\packages\System.Console.4.0.0\lib\net46\System.Console.dll
+
+ ..\packages\System.Console.4.3.1\lib\net46\System.Console.dll
@@ -192,8 +192,8 @@
..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll
-
- ..\packages\System.Reflection.TypeExtensions.4.1.0\lib\net46\System.Reflection.TypeExtensions.dll
+
+ ..\packages\System.Reflection.TypeExtensions.4.5.0\lib\net461\System.Reflection.TypeExtensions.dll
@@ -439,7 +439,9 @@
Always
-
+
+ Designer
+
diff --git a/src/Greenshot/packages.config b/src/Greenshot/packages.config
index a3d456e45..10aede612 100644
--- a/src/Greenshot/packages.config
+++ b/src/Greenshot/packages.config
@@ -50,19 +50,19 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file