Merge branch 'master' into dev/api

Merge conflicts:
src/System.IO/ref/System.IO.csproj
src/System.IO/src/System.IO.csproj
src/System.IO/tests/System.IO.Tests.csproj
src/System.IO/tests/project.json

Commit migrated from https://github.com/dotnet/corefx/commit/11eb1de5f8f2b11066e0d6caedbf40c642d17472

diff --cc src/libraries/System.IO/ref/System.IO.csproj
Simple merge

diff --cc src/libraries/System.IO/src/System.IO.csproj
Simple merge

diff --cc src/libraries/System.IO/src/project.json
index a9e9e5d,029272d..b49c70d
--- 1/src/libraries/System.IO/src/project.json
--- 2/src/libraries/System.IO/src/project.json
+++ b/src/libraries/System.IO/src/project.json
@@@ -1,12 -1,12 +1,12 @@@
  {
    "frameworks": {
 -    "netstandard1.5": {
 +    "netstandard1.6": {
        "dependencies": {
-         "Microsoft.NETCore.Platforms": "1.0.1-rc4-24214-03",
-         "Microsoft.TargetingPack.Private.CoreCLR": "1.0.1-rc4-24214-02"
+         "Microsoft.NETCore.Platforms": "1.0.1",
+         "Microsoft.TargetingPack.Private.CoreCLR": "1.0.1-rc4-24215-01"
        },
        "imports": [
 -        "dotnet5.6"
 +        "dotnet5.7"
        ]
      },
      "netcore50": {

diff --cc src/libraries/System.IO/tests/System.IO.Tests.csproj
index 73760df,4433f03..9aeda19
--- 1/src/libraries/System.IO/tests/System.IO.Tests.csproj
--- 2/src/libraries/System.IO/tests/System.IO.Tests.csproj
+++ b/src/libraries/System.IO/tests/System.IO.Tests.csproj
@@@ -42,18 -41,21 +42,14 @@@
      </Compile>
    </ItemGroup>
    <ItemGroup>
--    <!-- Compile tests against the contract, but copy our local-built implementation for testing -->
-     <ProjectReference Include="..\ref\System.IO.csproj">
-       <Project>{f82a69c2-3687-4a50-9c80-bc7005f40adc}</Project>
-       <Name>System.IO</Name>
-     </ProjectReference>
-     <ProjectReference Include="..\src\System.IO.csproj">
+     <ProjectReference Include="..\pkg\System.IO.pkgproj">
        <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
        <OutputItemType>Content</OutputItemType>
        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
        <Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
        <OSGroup>$(InputOSGroup)</OSGroup>
      </ProjectReference>
 -    <ProjectReference Include="..\..\System.Diagnostics.Debug\src\System.Diagnostics.Debug.csproj">
 -      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
 -      <OutputItemType>Content</OutputItemType>
 -      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 -      <Targets>Build;DebugSymbolsProjectOutputGroup</Targets>
 -      <OSGroup>$(InputOSGroup)</OSGroup>
 -    </ProjectReference>
++
    </ItemGroup>
    <ItemGroup>
      <None Include="project.json" />

diff --cc src/libraries/System.IO/tests/project.json
index 584855e,1cce75d..cd08f9d
--- 1/src/libraries/System.IO/tests/project.json
--- 2/src/libraries/System.IO/tests/project.json
+++ b/src/libraries/System.IO/tests/project.json
@@@ -1,13 -1,12 +1,11 @@@
  {
    "dependencies": {
-     "Microsoft.NETCore.Platforms": "1.0.1-rc4-24214-03",
-     "System.Globalization": "4.0.11-rc4-24214-03",
-     "System.Linq.Expressions": "4.1.0-rc4-24214-03",
-     "System.ObjectModel": "4.0.12-rc4-24214-03",
-     "System.Text.Encoding.CodePages": "4.0.1-rc4-24214-03",
-     "System.Text.RegularExpressions": "4.1.0-rc4-24214-03",
-     "xunit": "2.1.0",
-     "xunit.netcore.extensions": "1.0.0-prerelease-00312-04",
+     "Microsoft.NETCore.Platforms": "1.0.2-beta-24222-03",
+     "System.Globalization": "4.0.12-beta-24222-03",
 -    "System.IO": "4.1.1-beta-24222-03",
+     "System.Linq.Expressions": "4.1.1-beta-24222-03",
+     "System.ObjectModel": "4.0.13-beta-24222-03",
+     "System.Text.Encoding.CodePages": "4.0.2-beta-24222-03",
+     "System.Text.RegularExpressions": "4.2.0-beta-24222-03",
      "test-runtime": {
        "target": "project",
        "exclude": "compile"