Browse Source
Merge pull request #560 from carbon/memory-rc1
Update System.* deps to 4.5.0-rc1
af/merge-core
James Jackson-South
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
4 additions and
11 deletions
-
src/ImageSharp/ImageSharp.csproj
-
tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
-
tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
-
tests/ImageSharp.Tests/ImageSharp.Tests.csproj
|
|
|
@ -41,8 +41,8 @@ |
|
|
|
<PrivateAssets>All</PrivateAssets> |
|
|
|
</PackageReference> |
|
|
|
<PackageReference Include="System.Buffers" Version="4.4.0" /> |
|
|
|
<PackageReference Include="System.Memory" Version="4.5.0-preview2-26406-04" /> |
|
|
|
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.0-preview2-26406-04" /> |
|
|
|
<PackageReference Include="System.Memory" Version="4.5.0-rc1" /> |
|
|
|
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.0-rc1" /> |
|
|
|
</ItemGroup> |
|
|
|
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' OR '$(TargetFramework)' == 'netstandard1.3'"> |
|
|
|
<PackageReference Include="System.IO.Compression" Version="4.3.0" /> |
|
|
|
|
|
|
|
@ -18,9 +18,7 @@ |
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="BenchmarkDotNet" Version="0.10.12" /> |
|
|
|
<PackageReference Include="Colourful" Version="1.1.2" /> |
|
|
|
<PackageReference Include="System.Drawing.Common" Version="4.5.0-preview1-26216-02" /> |
|
|
|
<PackageReference Include="System.Memory" Version="4.5.0-preview2-26406-04" /> |
|
|
|
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0-preview2-26406-04" /> |
|
|
|
<PackageReference Include="System.Drawing.Common" Version="4.5.0-rc1" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
|
|
|
|
@ -21,7 +21,6 @@ |
|
|
|
<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="System.Numerics.Vectors" Version="4.5.0-preview2-26406-04" /> |
|
|
|
<!--<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />--> |
|
|
|
<!--<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />--> |
|
|
|
</ItemGroup> |
|
|
|
@ -33,7 +32,4 @@ |
|
|
|
<ItemGroup> |
|
|
|
<Reference Include="Microsoft.CSharp" /> |
|
|
|
</ItemGroup> |
|
|
|
<ItemGroup> |
|
|
|
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" /> |
|
|
|
</ItemGroup> |
|
|
|
</Project> |
|
|
|
@ -27,8 +27,7 @@ |
|
|
|
</ItemGroup> |
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Microsoft.CSharp" Version="4.4.1" /> |
|
|
|
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0-preview2-26406-04" /> |
|
|
|
<PackageReference Include="System.Drawing.Common" Version="4.5.0-preview2-26406-04" /> |
|
|
|
<PackageReference Include="System.Drawing.Common" Version="4.5.0-rc1" /> |
|
|
|
<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" /> |
|
|
|
|
