Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Merge changes from TFS#6015

Closed
dotnet-bot wants to merge 4 commits intodotnet:masterfrom
dotnet-bot:from-tfs
Closed

Merge changes from TFS#6015
dotnet-bot wants to merge 4 commits intodotnet:masterfrom
dotnet-bot:from-tfs

Conversation

@dotnet-bot
Copy link

No description provided.

dotnet-bot and others added 4 commits February 9, 2016 14:20
…S feed, and upgrades project.jsons throughout NDP\FxCore to pass new nuget compatability checks.

Some fixes (adding imports, adding Platforms package) were tooled, but more complex ones (forking project.jsons, editing csproj's) were not.

Also makes dependency version validation rules case-insensitive. (I used this fix to update the versions of some packages.)

[tfs-changeset: 1573868]
…have* the reflection blocking attribute defined.

Update the System.Runtime.Serialization.Primitives assembly to *have* the reflection blocking attribute defined.

This brings back these libraries to parity with how reflection blocking worked in Update 1.

[tfs-changeset: 1573915]
A dependency on System.Buffers was added to FileSystem
around the same time that the project.json was forked.

Add the new dependency to the new project.json.

[tfs-changeset: 1574208]
A netcore50aot configuration was added but missing from project.json.
As a result the nuget resolve build task chose to use the desktop target
and compiler blew up with conflicts between mscorlib and the local types.

Make sure we resolve for netcore50.

[tfs-changeset: 1574210]
@ericstj
Copy link
Member

ericstj commented Feb 10, 2016

I made further fixes to System.Linq to get this working.

@ericstj ericstj closed this Feb 10, 2016
@dotnet-bot dotnet-bot deleted the from-tfs branch February 10, 2016 19:15
@karelz karelz modified the milestone: 1.0.0-rtm Dec 3, 2016
dotnet-maestro-bot pushed a commit to dotnet-maestro-bot/corefx that referenced this pull request Jun 26, 2018
stephentoub pushed a commit that referenced this pull request Jun 27, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants