Merge master into SdkProj
authorEric Erhardt <eric.erhardt@microsoft.com>
Sat, 7 Jul 2018 16:03:56 +0000 (11:03 -0500)
committerEric Erhardt <eric.erhardt@microsoft.com>
Sat, 7 Jul 2018 16:03:56 +0000 (11:03 -0500)
commit5dfc71369bb555a41aef4b680b7fce667cd263df
treef843174a1ce05cb3751f1956c2125568e5bad6d4
parentf0d61cbc71795dd3a7f98321125d0cc8dea8a801
parent1b5bd14cc5bbb008e90d11f89aa1e1338ac4c824
Merge master into SdkProj

Commit migrated from https://github.com/dotnet/corefx/commit/99e21e612ddd8fbd23bb760e9c802ca2cfc01d4a
src/libraries/System.Globalization/tests/Performance/System.Globalization.Performance.Tests.csproj
src/libraries/System.Runtime.InteropServices/tests/System.Runtime.InteropServices.Tests.csproj