From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Mon, 18 Jul 2016 18:35:44 +0000 (-0700)
Subject: Merge remote-tracking branch 'master' into dev/api
X-Git-Tag: submit/tizen/20210909.063632~11031^2~11196^2~2^2~181^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=78439f4b3b1a7a87d698a7e0fbd663d15515cd3c;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Merge remote-tracking branch 'master' into dev/api


Commit migrated from https://github.com/dotnet/corefx/commit/9c80fc6b6b80ff832a911b022d6e1b88fa62fada
---

78439f4b3b1a7a87d698a7e0fbd663d15515cd3c
diff --cc src/libraries/System.IO/pkg/System.IO.pkgproj
index 645b05b,01f1fa1..73ea9c7
--- a/src/libraries/System.IO/pkg/System.IO.pkgproj
+++ b/src/libraries/System.IO/pkg/System.IO.pkgproj
@@@ -8,11 -8,8 +8,11 @@@
      <ProjectReference Include="..\ref\4.0.10\System.IO.depproj">
        <SupportedFramework>net46;netcore50</SupportedFramework>
      </ProjectReference>
 +    <ProjectReference Include="..\ref\4.1\System.IO.depproj">
 +      <SupportedFramework>net462</SupportedFramework>
 +    </ProjectReference>	
      <ProjectReference Include="..\ref\System.IO.csproj">
-       <SupportedFramework>net463;netcoreapp1.0</SupportedFramework>
 -      <SupportedFramework>net462;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
++      <SupportedFramework>net463;netcoreapp1.0;$(AllXamarinFrameworks)</SupportedFramework>
      </ProjectReference>
      <ProjectReference Include="..\src\System.IO.csproj">
        <TargetGroup>net462</TargetGroup>
diff --cc src/libraries/System.IO/src/project.json
index b49c70d,852ceeb..70f89b6
--- a/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",
-         "Microsoft.TargetingPack.Private.CoreCLR": "1.0.1-rc4-24215-01"
+         "Microsoft.TargetingPack.Private.CoreCLR": "1.0.2-beta-24314-02"
        },
        "imports": [
 -        "dotnet5.6"
 +        "dotnet5.7"
        ]
      },
      "netcore50": {
diff --cc src/libraries/System.Runtime.Extensions/tests/project.json
index fe93441,1a86f34..8141767
--- a/src/libraries/System.Runtime.Extensions/tests/project.json
+++ b/src/libraries/System.Runtime.Extensions/tests/project.json
@@@ -1,19 -1,18 +1,19 @@@
  {
    "dependencies": {
-     "Microsoft.NETCore.Platforms": "1.0.2-beta-24222-03",
-     "System.Diagnostics.Process": "4.1.1-beta-24222-03",
-     "System.Globalization": "4.0.12-beta-24222-03",
-     "System.IO.FileSystem": "4.0.2-beta-24222-03",
-     "System.Linq.Expressions": "4.1.1-beta-24222-03",
-     "System.ObjectModel": "4.0.13-beta-24222-03",
-     "System.Reflection.TypeExtensions": "4.1.1-beta-24222-03",
-     "System.Runtime": "4.1.1-beta-24222-03",
-     "System.Runtime.Extensions": "4.1.1-beta-24222-03",
-     "System.Runtime.InteropServices.RuntimeInformation": "4.0.1-beta-24222-03",
-     "System.Text.RegularExpressions": "4.2.0-beta-24222-03",
-     "System.Threading": "4.0.12-beta-24222-03",
-     "System.Threading.Thread": "4.0.1-beta-24222-03",
-     "System.Threading.Tasks": "4.0.12-beta-24222-03",
+     "Microsoft.NETCore.Platforms": "1.0.2-beta-24318-03",
+     "System.Diagnostics.Process": "4.1.1-beta-24318-03",
+     "System.Globalization": "4.0.12-beta-24318-03",
+     "System.IO.FileSystem": "4.0.2-beta-24318-03",
+     "System.Linq.Expressions": "4.1.1-beta-24318-03",
+     "System.ObjectModel": "4.0.13-beta-24318-03",
+     "System.Reflection.TypeExtensions": "4.1.1-beta-24318-03",
+     "System.Runtime": "4.1.1-beta-24318-03",
+     "System.Runtime.Extensions": "4.1.1-beta-24318-03",
+     "System.Runtime.InteropServices.RuntimeInformation": "4.0.1-beta-24318-03",
+     "System.Text.RegularExpressions": "4.2.0-beta-24318-03",
+     "System.Threading": "4.0.12-beta-24318-03",
++    "System.Threading.Thread": "4.0.1-beta-24318-03",
+     "System.Threading.Tasks": "4.0.12-beta-24318-03",
      "test-runtime": {
        "target": "project",
        "exclude": "compile"