github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-22 22:34:27 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge daaa44a02e into e85ed40be5

Browse source
This commit is contained in:
nvidiattx 2018-07-13 01:52:34 +00:00 • committed by GitHub
commit 7eec423626
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 66 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -149,6 +149,10 @@
<Compile Include="Native\WindowMessageMonitor.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="Windows, Version=255.255.255.255, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.17134.0\Windows.winmd</HintPath>
</Reference>
<Reference Include="WindowsBase" />
<!-- Light up Windows 10 features -->
<Reference Include="System.Runtime.WindowsRuntime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
@ -156,9 +160,6 @@
<HintPath>C:\Windows\Microsoft.NET\Framework\v4.0.30319\System.Runtime.WindowsRuntime.dll</HintPath>
<Aliases>global</Aliases>
</Reference>
<Reference Include="Windows">
<HintPath>C:\Program Files (x86)\Windows Kits\10\UnionMetadata\10.0.16299.0\Windows.winmd</HintPath>
</Reference>
<ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj">
<Project>{f041c685-eb96-4ed1-9ace-0f5bd836610f}</Project>
<Name>Greenshot.Gfx</Name>
@ -172,6 +173,9 @@
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Connected Services\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>mkdir "$(SolutionDir)Greenshot\bin\$(Configuration)\Addons"

9
src/Greenshot.Gfx/Murmur3.cs
View file

@ -63,6 +63,8 @@ namespace Greenshot.Gfx
/// <param name="four">fourth byte</param>
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void AddBytes(byte one, byte two, byte three, byte four)
{
unchecked
{
var k = (uint)(one | two << 8 | three << 16 | four << 24);
k *= C1;
@ -72,6 +74,7 @@ namespace Greenshot.Gfx
_hash = RotateLeft(_hash, R2);
_hash = _hash * M + N;
}
}
/// <summary>
/// Add the last bytes
@ -80,6 +83,8 @@ namespace Greenshot.Gfx
/// <param name="two">second byte</param>
/// <param name="three">third byte</param>
public void AddTrailingBytes(byte one, byte two = 0, byte three = 0)
{
unchecked
{
var k = (uint) (one | two << 8 | three << 16);
k *= C1;
@ -87,6 +92,7 @@ namespace Greenshot.Gfx
k *= C2;
_hash ^= k;
}
}
/// <inheritdoc />
protected override void HashCore(byte[] array, int ibStart, int cbSize)
@ -125,6 +131,8 @@ namespace Greenshot.Gfx
public uint CalculatedHash
{
get
{
unchecked
{
var hash = _hash ^ _length;
hash ^= hash >> 16;
@ -135,6 +143,7 @@ namespace Greenshot.Gfx
return hash;
}
}
}
/// <summary>
/// Generate a hash for the specified bytes

2
src/Greenshot.Tests/CommandlineTests.cs
View file

@ -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;

8
src/Greenshot.Tests/UpdateTests.cs
View file

@ -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<ICoreConfiguration>(), LanguageLoader.Current.Get<IGreenshotLanguage>());
using (var reader = XmlReader.Create(@"TestFiles\project-feed.xml"))
{
var feed = SyndicationFeed.Load(reader);

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

@ -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;
}

12
src/Greenshot/Greenshot.csproj
View file

@ -183,8 +183,8 @@
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Console, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Console.4.0.0\lib\net46\System.Console.dll</HintPath>
<Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Net.Http" />
@ -192,8 +192,8 @@
<Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath>
</Reference>
<Reference Include="System.Reflection.TypeExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.TypeExtensions.4.1.0\lib\net46\System.Reflection.TypeExtensions.dll</HintPath>
<Reference Include="System.Reflection.TypeExtensions, Version=4.1.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.TypeExtensions.4.5.0\lib\net461\System.Reflection.TypeExtensions.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Caching" />
<Reference Include="System.Runtime.Serialization" />
@ -439,7 +439,9 @@
<None Include="Languages\language-zh-tw.xml">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Greenshot.Gfx\Greenshot.Gfx.csproj">

28
src/Greenshot/packages.config
View file

@ -50,19 +50,19 @@
<package id="MahApps.Metro.IconPacks" version="2.3.0" targetFramework="net461" />
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
<package id="Svg" version="2.3.0" targetFramework="net461" />
<package id="System.Collections" version="4.0.11" targetFramework="net461" />
<package id="System.Console" version="4.0.0" targetFramework="net461" />
<package id="System.Diagnostics.Debug" version="4.0.11" targetFramework="net461" />
<package id="System.Globalization" version="4.0.11" targetFramework="net461" />
<package id="System.IO" version="4.1.0" targetFramework="net461" />
<package id="System.Linq" version="4.1.0" targetFramework="net461" />
<package id="System.Linq.Expressions" version="4.1.0" targetFramework="net461" />
<package id="System.Collections" version="4.3.0" targetFramework="net461" />
<package id="System.Console" version="4.3.1" targetFramework="net461" />
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
<package id="System.Globalization" version="4.3.0" targetFramework="net461" />
<package id="System.IO" version="4.3.0" targetFramework="net461" />
<package id="System.Linq" version="4.3.0" targetFramework="net461" />
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
<package id="System.Reactive" version="4.0.0" targetFramework="net461" />
<package id="System.Reflection" version="4.1.0" targetFramework="net461" />
<package id="System.Reflection.Extensions" version="4.0.1" targetFramework="net461" />
<package id="System.Reflection.TypeExtensions" version="4.1.0" targetFramework="net461" />
<package id="System.Resources.ResourceManager" version="4.0.1" targetFramework="net461" />
<package id="System.Runtime" version="4.1.0" targetFramework="net461" />
<package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" />
<package id="Tools.InnoSetup" version="5.5.9" targetFramework="net461" />
<package id="System.Reflection" version="4.3.0" targetFramework="net461" />
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net461" />
<package id="System.Reflection.TypeExtensions" version="4.5.0" targetFramework="net461" />
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net461" />
<package id="System.Runtime" version="4.3.0" targetFramework="net461" />
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net461" />
<package id="Tools.InnoSetup" version="5.6.1" targetFramework="net461" />
</packages>