Fix merge conflicts

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

diff --git a/src/libraries/Common/test-runtime/project.json b/src/libraries/Common/test-runtime/project.json
index a885e13..014eb9e 100644 (file)
--- a/src/libraries/Common/test-runtime/project.json
+++ b/src/libraries/Common/test-runtime/project.json
@@ -3,7 +3,7 @@
     "Microsoft.NETCore.Platforms": "1.0.2-beta-24224-02",
     "Microsoft.NETCore.Targets": "1.0.2-beta-24224-02",
     "Microsoft.NETCore.TestHost": "1.0.0-rc4-24131-00",
-    "Microsoft.NETCore.Runtime.CoreCLR": "1.0.3-beta-24223-03",
+    "Microsoft.NETCore.Runtime.CoreCLR": "1.0.3-beta-24224-02",
     "System.Diagnostics.Contracts": "4.0.2-beta-24224-02",
     "System.IO.Compression": "4.1.1-beta-24224-02",
     "System.Runtime.InteropServices.RuntimeInformation": "4.0.1-beta-24224-02",

diff --git a/src/libraries/System.Diagnostics.Debug.SymbolReader/src/project.json b/src/libraries/System.Diagnostics.Debug.SymbolReader/src/project.json
index 9cb14f7..27265b1 100644 (file)
--- a/src/libraries/System.Diagnostics.Debug.SymbolReader/src/project.json
+++ b/src/libraries/System.Diagnostics.Debug.SymbolReader/src/project.json
@@ -2,7 +2,7 @@
   "frameworks": {
     "netstandard1.3": {
       "dependencies": {
-        "Microsoft.TargetingPack.Private.CoreCLR": "1.0.2-beta-24223-03",
+        "Microsoft.TargetingPack.Private.CoreCLR": "1.0.2-beta-24224-02",
         "System.IO.FileSystem": "4.0.2-beta-24224-02",
         "System.Reflection.Metadata": "1.4.1-beta-24224-02",
         "System.Collections.Immutable": "1.2.1-beta-24224-02"

diff --git a/src/libraries/System.Diagnostics.Debug/tests/project.json b/src/libraries/System.Diagnostics.Debug/tests/project.json
index 2353a36..c73cde7 100644 (file)
--- a/src/libraries/System.Diagnostics.Debug/tests/project.json
+++ b/src/libraries/System.Diagnostics.Debug/tests/project.json
@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "Microsoft.NETCore.Platforms": "1.0.2-beta-24224-02",
-    "Microsoft.TargetingPack.Private.CoreCLR": "1.0.2-beta-24223-03",
+    "Microsoft.TargetingPack.Private.CoreCLR": "1.0.2-beta-24224-02",
     "System.Linq.Expressions": "4.1.1-beta-24224-02",
     "System.ObjectModel": "4.0.13-beta-24224-02",
     "System.Text.RegularExpressions": "4.2.0-beta-24224-02",

diff --git a/src/libraries/System.Threading.Overlapped/src/project.json b/src/libraries/System.Threading.Overlapped/src/project.json
index 4efa8a7..5461bdb 100644 (file)
--- a/src/libraries/System.Threading.Overlapped/src/project.json
+++ b/src/libraries/System.Threading.Overlapped/src/project.json
@@ -3,7 +3,7 @@
     "netstandard1.3": {
       "dependencies": {
         "Microsoft.NETCore.Platforms": "1.0.2-beta-24224-02",
-        "Microsoft.TargetingPack.Private.CoreCLR": "1.0.2-beta-24223-03"
+        "Microsoft.TargetingPack.Private.CoreCLR": "1.0.2-beta-24224-02"
       }
     },
     "netcore50": {