Skip to content
This repository was archived by the owner on Dec 18, 2018. It is now read-only.

Combined fixes #567 and #599#603

Merged
halter73 merged 9 commits into
aspnet:devfrom
benaadams:combined-fixes
Jan 27, 2016
Merged

Combined fixes #567 and #599#603
halter73 merged 9 commits into
aspnet:devfrom
benaadams:combined-fixes

Conversation

@benaadams
Copy link
Copy Markdown
Contributor

Combines fixes in #567 and #599
Merge and rename clash resolved

Should build!!

@benaadams
Copy link
Copy Markdown
Contributor Author

Don't know about Travis failure; doesn't seem to be a new test that would do that
System.IO.FileNotFoundException: Could not load file or assembly 'System.Security.Principal.Windows

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.

This duplicate class should be removed.

@benaadams benaadams force-pushed the combined-fixes branch 2 times, most recently from c4a1ec8 to 37be253 Compare January 26, 2016 11:22
@benaadams benaadams closed this Jan 26, 2016
@benaadams benaadams reopened this Jan 26, 2016
@benaadams
Copy link
Copy Markdown
Contributor Author

Raised bug for Travis fail https://github.com/dotnet/corefx/issues/5694

@halter73 halter73 merged commit 00b8a13 into aspnet:dev Jan 27, 2016
@benaadams benaadams deleted the combined-fixes branch May 10, 2016 11:05
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.

3 participants