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

Merge in 2.1.4 changes#32229

Merged
weshaggard merged 20 commits intodotnet:release/2.1from
mmitche:214-merge
Sep 11, 2018
Merged

Merge in 2.1.4 changes#32229
weshaggard merged 20 commits intodotnet:release/2.1from
mmitche:214-merge

Conversation

@mmitche
Copy link
Member

@mmitche mmitche commented Sep 11, 2018

No description provided.

pakrym and others added 19 commits August 7, 2018 22:22
… empty could result in infinite read loop

MSRC 46845

The bug was caused by `examined.Segment == _commitHead` comparison.

When pipe is empty and read is cancelld cursors are returned with `null` segment value.

Then if memory is allocated from pipe before AdvanceTo is called `examined.Segment == _commitHead` condition would return false resulting in pipe never being observed entirely until the first Flush.
* Update packageIndex.json with versions from the 2.1.3 release
* Update packages.builds to include System.IO.Pipelines in 2.1.4
* Add System.IO.Pipelines to list of external packages used during harvesting
* Add a temporary feed pointing to the 2.1.3 release feed
This feed was added temporarily to get 2.1.4 building before the 2.1.3 release was deployed to nuget.org
@mmitche
Copy link
Member Author

mmitche commented Sep 11, 2018

@weshaggard PTAL

<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
Copy link
Member Author

Choose a reason for hiding this comment

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

@wtgodbe @weshaggard Should this be removed in the merge?

Copy link
Member

Choose a reason for hiding this comment

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

Yes we should remove this otherwise it will conflict with #32203.

@weshaggard weshaggard merged commit d418dae into dotnet:release/2.1 Sep 11, 2018
@karelz karelz added this to the 2.1.5 milestone Oct 8, 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