Skip to content

Update System.* deps to 4.5.0-rc1 #560

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 9, 2018
Merged

Update System.* deps to 4.5.0-rc1 #560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f00b025
Update System.* deps to 4.5.0-rc1
iamcarbon May 7, 2018
42adce1
Merge branch 'master' into memory-rc1
iamcarbon May 7, 2018
9c5dfee
Merge branch 'master' into memory-rc1
iamcarbon May 8, 2018
a447ebc
Remove explict reference to System.Numerics.Vectors
iamcarbon May 8, 2018
02dde9d
Merge branch 'master' into memory-rc1
antonfirsov May 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ImageSharp/ImageSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 1 addition & 3 deletions tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 0 additions & 4 deletions tests/ImageSharp.Sandbox46/ImageSharp.Sandbox46.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -33,7 +32,4 @@
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
Copy link
Member

@antonfirsov antonfirsov May 7, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This addition is accidental I guess.

Copy link
Contributor Author

@iamcarbon iamcarbon May 7, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VS used to create these service references for test projects. It hasn't for a few releases now. Are there any legacy tools that still need this? cc: @antonfirsov

Copy link
Member

@JimBobSquarePants JimBobSquarePants May 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think so as far as I'm aware.

Copy link
Contributor Author

@iamcarbon iamcarbon May 8, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JimBobSquarePants Removed the System.Numerics.Vectors reference all together. I think the NuGET package just type forwards everything to the builtins anyhow.

Copy link
Member

@JimBobSquarePants JimBobSquarePants May 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@iamcarbon Good man. 👍

</ItemGroup>
</Project>
3 changes: 1 addition & 2 deletions tests/ImageSharp.Tests/ImageSharp.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down