We should update the SDK we build with and clean up workarounds that were in place due to being on an old one. Here are the workarounds I recall: https://github.com/dotnet/corefx/blob/a680b92d4c7c1d99d9facf2b7eca8dd33ee87515/external/runtime/runtime.depproj#L53-L57 https://github.com/dotnet/corefx/blob/d07ba0a0026aa4effe9cc24ec5c1ed12e08c5d8d/Directory.Build.props#L145-L149