From 7fc5d1d751f79791bac9c555db11baf9a0c289d1 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Thu, 26 Jan 2017 15:15:11 +0000 Subject: [PATCH] Update CoreClr, CoreFx to beta-24925-08, beta-24926-02, respectively Commit migrated from https://github.com/dotnet/coreclr/commit/2422572d6a4bc33d8eb3c90a4699c99d58f76ce8 --- src/coreclr/dependencies.props | 8 ++++---- .../src/Common/build_against_pkg_dependencies/project.json | 10 +++++----- src/coreclr/tests/src/Common/netcoreapp/project.json | 4 ++-- src/coreclr/tests/src/Common/targeting_pack_ref/project.json | 2 +- src/coreclr/tests/src/Common/test_dependencies/project.json | 2 +- src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json | 2 +- .../tests/src/JIT/config/benchmark+serialize/project.json | 2 +- src/coreclr/tests/src/JIT/config/benchmark/project.json | 2 +- src/coreclr/tests/src/JIT/config/extra/project.json | 2 +- src/coreclr/tests/src/JIT/config/minimal/project.json | 2 +- src/coreclr/tests/src/JIT/config/threading+thread/project.json | 2 +- src/coreclr/tests/src/JIT/config/threading/project.json | 2 +- src/coreclr/tests/src/performance/project.json | 2 +- 13 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props index eb246ac..c7d3013 100644 --- a/src/coreclr/dependencies.props +++ b/src/coreclr/dependencies.props @@ -1,18 +1,18 @@ - e4023aa1941968c816d1ba2c46c6761074b873aa - e4023aa1941968c816d1ba2c46c6761074b873aa + c921761c7e6a9b7ac5cde370565c2a57b1d192cb + c921761c7e6a9b7ac5cde370565c2a57b1d192cb - beta-24924-02 + beta-24926-02 - 1.2.0-beta-24924-01 + 2.0.0-beta-24925-08 2.2.0-beta2-build3300 diff --git a/src/coreclr/tests/src/Common/build_against_pkg_dependencies/project.json b/src/coreclr/tests/src/Common/build_against_pkg_dependencies/project.json index bb323fb..2a9d802 100644 --- a/src/coreclr/tests/src/Common/build_against_pkg_dependencies/project.json +++ b/src/coreclr/tests/src/Common/build_against_pkg_dependencies/project.json @@ -1,10 +1,10 @@ { "dependencies": { - "Microsoft.NETCore.ILAsm": "1.2.0-beta-24924-01", - "Microsoft.NETCore.ILDAsm": "1.2.0-beta-24924-01", - "Microsoft.NETCore.Jit": "1.2.0-beta-24924-01", - "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24924-01", - "Microsoft.NETCore.TestHost": "1.2.0-beta-24924-01" + "Microsoft.NETCore.ILAsm": "2.0.0-beta-24925-08", + "Microsoft.NETCore.ILDAsm": "2.0.0-beta-24925-08", + "Microsoft.NETCore.Jit": "2.0.0-beta-24925-08", + "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-24925-08", + "Microsoft.NETCore.TestHost": "2.0.0-beta-24925-08" }, "frameworks": { "netcoreapp1.1": { diff --git a/src/coreclr/tests/src/Common/netcoreapp/project.json b/src/coreclr/tests/src/Common/netcoreapp/project.json index 9222684..caad089 100644 --- a/src/coreclr/tests/src/Common/netcoreapp/project.json +++ b/src/coreclr/tests/src/Common/netcoreapp/project.json @@ -5,7 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-beta-24924-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-24926-02", "Microsoft.NETCore.Targets": "1.2.0-beta-24913-02", "System.Threading.Thread": "4.4.0-beta-24913-02", "System.Collections": "4.4.0-beta-24913-02", @@ -64,7 +64,7 @@ "frameworks": { "netcoreapp1.1": { "dependencies": { - "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24924-01" + "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-24925-08" } } }, diff --git a/src/coreclr/tests/src/Common/targeting_pack_ref/project.json b/src/coreclr/tests/src/Common/targeting_pack_ref/project.json index 252fe84..d6f317c 100644 --- a/src/coreclr/tests/src/Common/targeting_pack_ref/project.json +++ b/src/coreclr/tests/src/Common/targeting_pack_ref/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24924-01" + "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-beta-24925-08" }, "frameworks": { "netcoreapp1.1": { diff --git a/src/coreclr/tests/src/Common/test_dependencies/project.json b/src/coreclr/tests/src/Common/test_dependencies/project.json index fa7c1c2..a0febd9 100644 --- a/src/coreclr/tests/src/Common/test_dependencies/project.json +++ b/src/coreclr/tests/src/Common/test_dependencies/project.json @@ -9,7 +9,7 @@ "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040", "Microsoft.Win32.Primitives": "4.4.0-beta-24913-02", "Newtonsoft.Json": "8.0.3", - "Microsoft.NETCore.Platforms": "2.0.0-beta-24924-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-24926-02", "Microsoft.NETCore.Targets": "1.2.0-beta-24913-02", "System.Collections.Immutable": "1.4.0-beta-24913-02", "System.Threading.Thread": "4.4.0-beta-24913-02", diff --git a/src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json b/src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json index 07d1277..4002099 100644 --- a/src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json +++ b/src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json @@ -4,7 +4,7 @@ "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040", "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040", "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040", - "Microsoft.NETCore.Platforms": "2.0.0-beta-24924-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-24926-02", "System.Console": "4.4.0-beta-24913-02", "System.Dynamic.Runtime": "4.4.0-beta-24913-02", "System.Linq": "4.4.0-beta-24913-02", diff --git a/src/coreclr/tests/src/JIT/config/benchmark+serialize/project.json b/src/coreclr/tests/src/JIT/config/benchmark+serialize/project.json index c3e31c3..f7a4cd7 100644 --- a/src/coreclr/tests/src/JIT/config/benchmark+serialize/project.json +++ b/src/coreclr/tests/src/JIT/config/benchmark+serialize/project.json @@ -3,7 +3,7 @@ "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040", "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040", "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040", - "Microsoft.NETCore.Platforms": "2.0.0-beta-24924-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-24926-02", "Newtonsoft.Json": "7.0.1", "System.Console": "4.4.0-beta-24913-02", "System.IO": "4.4.0-beta-24913-02", diff --git a/src/coreclr/tests/src/JIT/config/benchmark/project.json b/src/coreclr/tests/src/JIT/config/benchmark/project.json index 3d091c1..fe3a327 100644 --- a/src/coreclr/tests/src/JIT/config/benchmark/project.json +++ b/src/coreclr/tests/src/JIT/config/benchmark/project.json @@ -3,7 +3,7 @@ "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040", "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040", "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040", - "Microsoft.NETCore.Platforms": "2.0.0-beta-24924-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-24926-02", "System.Collections.NonGeneric": "4.4.0-beta-24913-02", "System.Console": "4.4.0-beta-24913-02", "System.IO.FileSystem": "4.4.0-beta-24913-02", diff --git a/src/coreclr/tests/src/JIT/config/extra/project.json b/src/coreclr/tests/src/JIT/config/extra/project.json index 894b0ea..e0dba3b0 100644 --- a/src/coreclr/tests/src/JIT/config/extra/project.json +++ b/src/coreclr/tests/src/JIT/config/extra/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-beta-24924-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-24926-02", "System.Collections": "4.4.0-beta-24913-02", "System.Console": "4.4.0-beta-24913-02", "System.Diagnostics.Debug": "4.4.0-beta-24913-02", diff --git a/src/coreclr/tests/src/JIT/config/minimal/project.json b/src/coreclr/tests/src/JIT/config/minimal/project.json index f21355b..139b5ab 100644 --- a/src/coreclr/tests/src/JIT/config/minimal/project.json +++ b/src/coreclr/tests/src/JIT/config/minimal/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-beta-24924-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-24926-02", "System.Console": "4.4.0-beta-24913-02", "System.Runtime": "4.4.0-beta-24913-02", "System.Runtime.Extensions": "4.4.0-beta-24913-02", diff --git a/src/coreclr/tests/src/JIT/config/threading+thread/project.json b/src/coreclr/tests/src/JIT/config/threading+thread/project.json index 01c2ee8..a23b939 100644 --- a/src/coreclr/tests/src/JIT/config/threading+thread/project.json +++ b/src/coreclr/tests/src/JIT/config/threading+thread/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-beta-24924-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-24926-02", "System.Console": "4.4.0-beta-24913-02", "System.Numerics.Vectors": "4.4.0-beta-24913-02", "System.Runtime": "4.4.0-beta-24913-02", diff --git a/src/coreclr/tests/src/JIT/config/threading/project.json b/src/coreclr/tests/src/JIT/config/threading/project.json index 773e1cd..b9635ec 100644 --- a/src/coreclr/tests/src/JIT/config/threading/project.json +++ b/src/coreclr/tests/src/JIT/config/threading/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-beta-24924-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-24926-02", "System.Console": "4.4.0-beta-24913-02", "System.Runtime": "4.4.0-beta-24913-02", "System.Runtime.Extensions": "4.4.0-beta-24913-02", diff --git a/src/coreclr/tests/src/performance/project.json b/src/coreclr/tests/src/performance/project.json index 564aa9a..248c526 100644 --- a/src/coreclr/tests/src/performance/project.json +++ b/src/coreclr/tests/src/performance/project.json @@ -3,7 +3,7 @@ "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040", "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040", "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040", - "Microsoft.NETCore.Platforms": "2.0.0-beta-24924-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-24926-02", "System.Collections.NonGeneric": "4.4.0-beta-24913-02", "System.Console": "4.4.0-beta-24913-02", "System.IO.FileSystem": "4.4.0-beta-24913-02", -- 2.7.4