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

Port rollback of System.IO DCR from release branch to master#23566

Merged
safern merged 2 commits into
dotnet:masterfrom
safern:port-iodcr-master
Sep 1, 2017
Merged

Port rollback of System.IO DCR from release branch to master#23566
safern merged 2 commits into
dotnet:masterfrom
safern:port-iodcr-master

Conversation

@safern
Copy link
Copy Markdown
Member

@safern safern commented Aug 26, 2017

cc: @danmosemsft @joshfree

@safern safern requested review from JeremyKuhne and ianhays August 26, 2017 02:40
@safern safern added the * NO MERGE * The PR is not ready for merge yet (see discussion for detailed reasons) label Aug 26, 2017
@safern
Copy link
Copy Markdown
Member Author

safern commented Aug 26, 2017

This will need the updated coreclr with the port as well. Will throw a PR now.

Copy link
Copy Markdown
Member

@JeremyKuhne JeremyKuhne left a comment

Choose a reason for hiding this comment

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

Merge needs completed- see my comment.

</Compile>
</ItemGroup>
<!-- Windows : Win32 only -->
<ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(UWPCompatible)' != 'true'">
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The ItemGroup moved down- you should be able to remove 199-201.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Oops, didn't see this conflict. Will fix it.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Fixed :)

@danmoseley
Copy link
Copy Markdown
Member

@dotnet-bot test this please (clr updated)

@safern
Copy link
Copy Markdown
Member Author

safern commented Aug 27, 2017

I think clr was updated in rel/uwp6.0 but this PR is in master... we haven't gotten an updated clr into master since yesterday afternoon -- #23563

@danmoseley
Copy link
Copy Markdown
Member

@dotnet-bot test this please (new clr)

@safern safern merged commit 7f1c480 into dotnet:master Sep 1, 2017
@safern safern deleted the port-iodcr-master branch September 1, 2017 07:19
@karelz karelz modified the milestone: 2.1.0 Sep 6, 2017
picenka21 pushed a commit to picenka21/runtime that referenced this pull request Feb 18, 2022
…corefx#23566)

* Port rollback of System.IO DCR from release branch to master


Commit migrated from dotnet/corefx@7f1c480
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-System.IO * NO MERGE * The PR is not ready for merge yet (see discussion for detailed reasons)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants