In conflict resolution, treat items from FrameworkList.xml as platform assemblies#1618

Merged

dsplaisted merged 11 commits intodotnet:release/15.5from dsplaisted:1336-conflicts-read-framework-list

Oct 12, 2017

+454-14

Commits on Sep 30, 2017

Add additional string for FrameworkList parsing
dsplaisted
committed
In conflict resolution, treat items from FrameworkList.xml as platform assemblies
dsplaisted
committed

Commits on Oct 2, 2017

Use current culture for message formatting
dsplaisted
committed

Commits on Oct 3, 2017

Fix issue reading FrameworkList.xml, and add tests for targeting .NET 4.7.1
dsplaisted
committed

Commits on Oct 10, 2017

Commits on Oct 11, 2017

Commits on Oct 12, 2017