Merge release/2.1.4xx to master#2276

Merged

nguerrera merged 18 commits intomasterfrom

merges/release/2.1.4xx-to-master

May 29, 2018

Commits on May 16, 2018

Add test coverage for .NET 4.7.2 and conflict resolution with HttpClient
dsplaisted
committed
Add references to platform assemblies that win compile conflict resolution
dsplaisted
committed

Commits on May 19, 2018

Code review feedback
dsplaisted
committed

Commits on May 23, 2018

Fix conflict resolver issues
dsplaisted
committed

Commits on May 24, 2018

Disable tests requiring .NET 4.7.2 if the corresponding reference assemblies aren't installed
dsplaisted
committed
Update tests to account for change to test hook
dsplaisted
committed
Always assume required reference assemblies are installed (when on Windows)
dsplaisted
committed
Putting back the 'perf' property switch: "/p:PerformanceTest=$perf"
jbeisner
committed
Merge pull request #2273 from johnbeisner/FixPerformance
johnbeisner
authored
Apply code review feedback
dsplaisted
committed
Merge pull request #2274 from dotnet/merges/release/2.1.3xx-to-release/2.1.4xx
johnbeisner
authored
Merge pull request #2250 from dsplaisted/2221-platform-references-and-conflict-resolution
dsplaisted
authored