Browse Source

Merge branch 'master' into feature/refactorPacketPixelTests

af/merge-core
brianpopow 8 years ago
committed by GitHub
parent
commit
d921384947
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      ImageSharp.ruleset
  2. 2
      src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
  3. 4
      src/ImageSharp/Common/Helpers/DebugGuard.cs
  4. 8
      src/ImageSharp/Common/Helpers/Guard.cs
  5. 10
      src/ImageSharp/ImageSharp.csproj
  6. 6
      tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
  7. 2
      tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
  8. 6
      tests/ImageSharp.Tests/ImageSharp.Tests.csproj

2
ImageSharp.ruleset

@ -9,5 +9,7 @@
<Rule Id="SA1633" Action="None" /> <Rule Id="SA1633" Action="None" />
<!--1.1.0-beta6 incorrectly throws a wobbler here for multiline matrices--> <!--1.1.0-beta6 incorrectly throws a wobbler here for multiline matrices-->
<Rule Id="SA1500" Action="None" /> <Rule Id="SA1500" Action="None" />
<!--Comments should end with a period. I like this but there's 3000+ errors to fix-->
<Rule Id="SA1629" Action="None" />
</Rules> </Rules>
</RuleSet> </RuleSet>

2
src/ImageSharp.Drawing/ImageSharp.Drawing.csproj

@ -40,7 +40,7 @@
<PackageReference Include="SixLabors.Core" Version="1.0.0-beta0005" /> <PackageReference Include="SixLabors.Core" Version="1.0.0-beta0005" />
<AdditionalFiles Include="..\..\stylecop.json" /> <AdditionalFiles Include="..\..\stylecop.json" />
<PackageReference Include="SixLabors.Shapes.Text" Version="1.0.0-beta0005" /> <PackageReference Include="SixLabors.Shapes.Text" Version="1.0.0-beta0005" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004"> <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta007">
<PrivateAssets>All</PrivateAssets> <PrivateAssets>All</PrivateAssets>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>

4
src/ImageSharp/Common/Helpers/DebugGuard.cs

@ -189,7 +189,7 @@ namespace SixLabors.ImageSharp
/// <param name="other">The 'other' span to compare 'target' to.</param> /// <param name="other">The 'other' span to compare 'target' to.</param>
/// <param name="parameterName">The name of the parameter that is to be checked.</param> /// <param name="parameterName">The name of the parameter that is to be checked.</param>
/// <exception cref="ArgumentException"> /// <exception cref="ArgumentException">
/// <paramref name="target"/> is true /// <paramref name="target"/> has a different size than <paramref name="other"/>
/// </exception> /// </exception>
[Conditional("DEBUG")] [Conditional("DEBUG")]
public static void MustBeSameSized<T>(Span<T> target, Span<T> other, string parameterName) public static void MustBeSameSized<T>(Span<T> target, Span<T> other, string parameterName)
@ -209,7 +209,7 @@ namespace SixLabors.ImageSharp
/// <param name="minSpan">The 'minSpan' span to compare 'target' to.</param> /// <param name="minSpan">The 'minSpan' span to compare 'target' to.</param>
/// <param name="parameterName">The name of the parameter that is to be checked.</param> /// <param name="parameterName">The name of the parameter that is to be checked.</param>
/// <exception cref="ArgumentException"> /// <exception cref="ArgumentException">
/// <paramref name="target"/> is true /// <paramref name="target"/> has less items than <paramref name="minSpan"/>
/// </exception> /// </exception>
[Conditional("DEBUG")] [Conditional("DEBUG")]
public static void MustBeSizedAtLeast<T>(Span<T> target, Span<T> minSpan, string parameterName) public static void MustBeSizedAtLeast<T>(Span<T> target, Span<T> minSpan, string parameterName)

8
src/ImageSharp/Common/Helpers/Guard.cs

@ -207,14 +207,14 @@ namespace SixLabors.ImageSharp
} }
/// <summary> /// <summary>
/// Verifies, that the `source` span has the length of 'minSpan', or longer. /// Verifies, that the `source` span has the length of 'minLength', or longer.
/// </summary> /// </summary>
/// <typeparam name="T">The element type of the spans</typeparam> /// <typeparam name="T">The element type of the spans</typeparam>
/// <param name="source">The source span.</param> /// <param name="source">The source span.</param>
/// <param name="minLength">The minimum length.</param> /// <param name="minLength">The minimum length.</param>
/// <param name="parameterName">The name of the parameter that is to be checked.</param> /// <param name="parameterName">The name of the parameter that is to be checked.</param>
/// <exception cref="ArgumentException"> /// <exception cref="ArgumentException">
/// <paramref name="source"/> is true /// <paramref name="source"/> has less than <paramref name="minLength"/> items
/// </exception> /// </exception>
public static void MustBeSizedAtLeast<T>(ReadOnlySpan<T> source, int minLength, string parameterName) public static void MustBeSizedAtLeast<T>(ReadOnlySpan<T> source, int minLength, string parameterName)
{ {
@ -225,14 +225,14 @@ namespace SixLabors.ImageSharp
} }
/// <summary> /// <summary>
/// Verifies, that the `source` span has the length of 'minSpan', or longer. /// Verifies, that the `source` span has the length of 'minLength', or longer.
/// </summary> /// </summary>
/// <typeparam name="T">The element type of the spans</typeparam> /// <typeparam name="T">The element type of the spans</typeparam>
/// <param name="source">The target span.</param> /// <param name="source">The target span.</param>
/// <param name="minLength">The minimum length.</param> /// <param name="minLength">The minimum length.</param>
/// <param name="parameterName">The name of the parameter that is to be checked.</param> /// <param name="parameterName">The name of the parameter that is to be checked.</param>
/// <exception cref="ArgumentException"> /// <exception cref="ArgumentException">
/// <paramref name="source"/> is true /// <paramref name="source"/> has less than <paramref name="minLength"/> items
/// </exception> /// </exception>
public static void MustBeSizedAtLeast<T>(Span<T> source, int minLength, string parameterName) public static void MustBeSizedAtLeast<T>(Span<T> source, int minLength, string parameterName)
{ {

10
src/ImageSharp/ImageSharp.csproj

@ -37,17 +37,17 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="SixLabors.Core" Version="1.0.0-beta0005" /> <PackageReference Include="SixLabors.Core" Version="1.0.0-beta0005" />
<AdditionalFiles Include="..\..\stylecop.json" /> <AdditionalFiles Include="..\..\stylecop.json" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta006"> <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta007">
<PrivateAssets>All</PrivateAssets> <PrivateAssets>All</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="System.Buffers" Version="4.4.0" /> <PackageReference Include="System.Buffers" Version="4.5.0" />
<PackageReference Include="System.Memory" Version="4.5.0-rc1" /> <PackageReference Include="System.Memory" Version="4.5.0" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.0-rc1" /> <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.0" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' OR '$(TargetFramework)' == 'netstandard1.3'"> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' OR '$(TargetFramework)' == 'netstandard1.3'">
<PackageReference Include="System.IO.Compression" Version="4.3.0" /> <PackageReference Include="System.IO.Compression" Version="4.3.0" />
<PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" /> <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.3.0" />
<PackageReference Include="System.ValueTuple" Version="4.4.0" /> <PackageReference Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup> </ItemGroup>
<PropertyGroup> <PropertyGroup>
<CodeAnalysisRuleSet>..\..\ImageSharp.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>..\..\ImageSharp.ruleset</CodeAnalysisRuleSet>

6
tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj

@ -16,9 +16,9 @@
<Compile Include="..\ImageSharp.Tests\TestUtilities\TestEnvironment.cs" Link="Tests\TestEnvironment.cs" /> <Compile Include="..\ImageSharp.Tests\TestUtilities\TestEnvironment.cs" Link="Tests\TestEnvironment.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BenchmarkDotNet" Version="0.10.12" /> <PackageReference Include="BenchmarkDotNet" Version="0.10.14" />
<PackageReference Include="Colourful" Version="1.1.2" /> <PackageReference Include="Colourful" Version="1.2.2" />
<PackageReference Include="System.Drawing.Common" Version="4.5.0-rc1" /> <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj

@ -20,7 +20,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="BitMiracle.LibJpeg.NET" Version="1.4.280" /> <PackageReference Include="BitMiracle.LibJpeg.NET" Version="1.4.280" />
<PackageReference Include="xunit" Version="2.3.1" /> <PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="Moq" Version="4.8.1" /> <PackageReference Include="Moq" Version="4.8.2" />
<!--<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />--> <!--<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />-->
<!--<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />--> <!--<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />-->
</ItemGroup> </ItemGroup>

6
tests/ImageSharp.Tests/ImageSharp.Tests.csproj

@ -26,12 +26,12 @@
<None Include="PixelFormats\PixelOperationsTests.Blender.cs" /> <None Include="PixelFormats\PixelOperationsTests.Blender.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.4.1" /> <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
<PackageReference Include="System.Drawing.Common" Version="4.5.0-rc1" /> <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
<PackageReference Include="xunit" Version="2.3.1" /> <PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.console" Version="2.3.1" /> <PackageReference Include="xunit.runner.console" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
<PackageReference Include="xunit" Version="2.3.1" /> <PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" /> <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<PackageReference Include="Moq" Version="4.8.2" /> <PackageReference Include="Moq" Version="4.8.2" />

Loading…
Cancel
Save