Browse Source
Merge pull request #600 from SixLabors/js/update-dependencies
Update dependencies
pull/545/merge
James Jackson-South
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with
15 additions and
13 deletions
-
ImageSharp.ruleset
-
src/ImageSharp.Drawing/ImageSharp.Drawing.csproj
-
src/ImageSharp/ImageSharp.csproj
-
tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
-
tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
-
tests/ImageSharp.Tests/ImageSharp.Tests.csproj
|
|
|
@ -9,5 +9,7 @@ |
|
|
|
<Rule Id="SA1633" Action="None" /> |
|
|
|
<!--1.1.0-beta6 incorrectly throws a wobbler here for multiline matrices--> |
|
|
|
<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> |
|
|
|
</RuleSet> |
|
|
|
@ -40,7 +40,7 @@ |
|
|
|
<PackageReference Include="SixLabors.Core" Version="1.0.0-beta0005" /> |
|
|
|
<AdditionalFiles Include="..\..\stylecop.json" /> |
|
|
|
<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> |
|
|
|
</PackageReference> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
@ -37,17 +37,17 @@ |
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="SixLabors.Core" Version="1.0.0-beta0005" /> |
|
|
|
<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> |
|
|
|
</PackageReference> |
|
|
|
<PackageReference Include="System.Buffers" Version="4.4.0" /> |
|
|
|
<PackageReference Include="System.Memory" Version="4.5.0-rc1" /> |
|
|
|
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.0-rc1" /> |
|
|
|
<PackageReference Include="System.Buffers" Version="4.5.0" /> |
|
|
|
<PackageReference Include="System.Memory" Version="4.5.0" /> |
|
|
|
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.0" /> |
|
|
|
</ItemGroup> |
|
|
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' OR '$(TargetFramework)' == 'netstandard1.3'"> |
|
|
|
<PackageReference Include="System.IO.Compression" 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> |
|
|
|
<PropertyGroup> |
|
|
|
<CodeAnalysisRuleSet>..\..\ImageSharp.ruleset</CodeAnalysisRuleSet> |
|
|
|
|
|
|
|
@ -16,9 +16,9 @@ |
|
|
|
<Compile Include="..\ImageSharp.Tests\TestUtilities\TestEnvironment.cs" Link="Tests\TestEnvironment.cs" /> |
|
|
|
</ItemGroup> |
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="BenchmarkDotNet" Version="0.10.12" /> |
|
|
|
<PackageReference Include="Colourful" Version="1.1.2" /> |
|
|
|
<PackageReference Include="System.Drawing.Common" Version="4.5.0-rc1" /> |
|
|
|
<PackageReference Include="BenchmarkDotNet" Version="0.10.14" /> |
|
|
|
<PackageReference Include="Colourful" Version="1.2.2" /> |
|
|
|
<PackageReference Include="System.Drawing.Common" Version="4.5.0" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
|
|
|
|
@ -20,7 +20,7 @@ |
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="BitMiracle.LibJpeg.NET" Version="1.4.280" /> |
|
|
|
<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="xunit.runner.visualstudio" Version="2.2.0" />--> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
@ -26,12 +26,12 @@ |
|
|
|
<None Include="PixelFormats\PixelOperationsTests.Blender.cs" /> |
|
|
|
</ItemGroup> |
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Microsoft.CSharp" Version="4.4.1" /> |
|
|
|
<PackageReference Include="System.Drawing.Common" Version="4.5.0-rc1" /> |
|
|
|
<PackageReference Include="Microsoft.CSharp" Version="4.5.0" /> |
|
|
|
<PackageReference Include="System.Drawing.Common" Version="4.5.0" /> |
|
|
|
<PackageReference Include="xunit" Version="2.3.1" /> |
|
|
|
<PackageReference Include="xunit.runner.console" 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.runner.visualstudio" Version="2.3.1" /> |
|
|
|
<PackageReference Include="Moq" Version="4.8.2" /> |
|
|
|
|