From f94889854a646b4372afcf8f047711b6722f4557 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Wed, 26 Apr 2017 16:21:04 -0700 Subject: [PATCH] Update CoreClr, CoreFx to preview2-25226-02, preview2-25226-02, respectively (dotnet/coreclr#11127) Commit migrated from https://github.com/dotnet/coreclr/commit/20aa8b25c8c2d920da3a050728e5ca3156253615 --- src/coreclr/dependencies.props | 8 ++++---- .../src/Common/build_against_pkg_dependencies/project.json | 10 +++++----- src/coreclr/tests/src/Common/netcoreapp/project.json | 2 +- src/coreclr/tests/src/Common/targeting_pack_ref/project.json | 2 +- src/coreclr/tests/src/Common/test_dependencies/project.json | 10 +++++----- src/coreclr/tests/src/Common/test_runtime/project.json | 2 +- src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json | 6 +++--- .../tests/src/JIT/config/benchmark+serialize/project.json | 4 ++-- src/coreclr/tests/src/JIT/config/benchmark/project.json | 10 +++++----- src/coreclr/tests/src/TestWrappersConfig/project.json | 2 +- src/coreclr/tests/src/performance/project.json | 6 +++--- 11 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props index c06c465..cc48652 100644 --- a/src/coreclr/dependencies.props +++ b/src/coreclr/dependencies.props @@ -1,18 +1,18 @@ - 947e90b41c30a1f0a906f8d996443233c2ceedf4 - 947e90b41c30a1f0a906f8d996443233c2ceedf4 + ea4d16199d625a75688ca5099afcc06f9fe98104 + ea4d16199d625a75688ca5099afcc06f9fe98104 - preview1-25221-01 + preview2-25226-02 - 2.0.0-preview1-25221-01 + 2.0.0-preview2-25226-02 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 327340f..0278b90 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": "2.0.0-preview1-25221-01", - "Microsoft.NETCore.ILDAsm": "2.0.0-preview1-25221-01", - "Microsoft.NETCore.Jit": "2.0.0-preview1-25221-01", - "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25221-01", - "Microsoft.NETCore.TestHost": "2.0.0-preview1-25221-01" + "Microsoft.NETCore.ILAsm": "2.0.0-preview2-25226-02", + "Microsoft.NETCore.ILDAsm": "2.0.0-preview2-25226-02", + "Microsoft.NETCore.Jit": "2.0.0-preview2-25226-02", + "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview2-25226-02", + "Microsoft.NETCore.TestHost": "2.0.0-preview2-25226-02" }, "frameworks": { "netcoreapp2.0": { diff --git a/src/coreclr/tests/src/Common/netcoreapp/project.json b/src/coreclr/tests/src/Common/netcoreapp/project.json index ca40b18..3811ee1 100644 --- a/src/coreclr/tests/src/Common/netcoreapp/project.json +++ b/src/coreclr/tests/src/Common/netcoreapp/project.json @@ -1,7 +1,7 @@ { "dependencies": { "Microsoft.NETCore.App": "2.0.0-beta-001494-00", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25221-01" + "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview2-25226-02" }, "frameworks": { "netcoreapp2.0": {} 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 0754b74..92ce448 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": "2.0.0-preview1-25221-01" + "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-preview2-25226-02" }, "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 4477c68..85781d9 100644 --- a/src/coreclr/tests/src/Common/test_dependencies/project.json +++ b/src/coreclr/tests/src/Common/test_dependencies/project.json @@ -1,10 +1,10 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01", - "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25221-01", - "System.Memory": "4.4.0-preview1-25221-01", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25221-01", - "System.Security.Permissions": "4.4.0-preview1-25221-01" + "Microsoft.NETCore.Platforms": "2.0.0-preview2-25226-02", + "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview2-25226-02", + "System.Memory": "4.4.0-preview2-25226-02", + "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview2-25226-02", + "System.Security.Permissions": "4.4.0-preview2-25226-02" }, "frameworks": { "netcoreapp2.0": { diff --git a/src/coreclr/tests/src/Common/test_runtime/project.json b/src/coreclr/tests/src/Common/test_runtime/project.json index 575d75d..ed7c2d2 100644 --- a/src/coreclr/tests/src/Common/test_runtime/project.json +++ b/src/coreclr/tests/src/Common/test_runtime/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01", + "Microsoft.NETCore.Platforms": "2.0.0-preview2-25226-02", "Microsoft.DotNet.CoreCLR.TestDependencies": "1.0.0-prerelease", "jit-dasm": "0.0.1.4", "cijobs": "0.0.1.2", 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 18907a1..2887816 100644 --- a/src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json +++ b/src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json @@ -6,15 +6,15 @@ "xunit.performance.execution": "1.0.0-beta-build0003", "xunit.performance.metrics": "1.0.0-beta-build0003", "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01", + "Microsoft.NETCore.Platforms": "2.0.0-preview2-25226-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", "System.IO.FileSystem": "4.4.0-beta-24913-02", - "System.Numerics.Vectors": "4.4.0-preview1-25221-01", + "System.Numerics.Vectors": "4.4.0-preview2-25226-02", "System.Reflection": "4.4.0-beta-24913-02", "System.Reflection.Extensions": "4.4.0-beta-24913-02", - "System.Reflection.TypeExtensions": "4.4.0-preview1-25221-01", + "System.Reflection.TypeExtensions": "4.4.0-preview2-25226-02", "System.Runtime": "4.4.0-beta-24913-02", "System.Runtime.Extensions": "4.4.0-beta-24913-02", "System.Runtime.Numerics": "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 b71701f..edb5b7f 100644 --- a/src/coreclr/tests/src/JIT/config/benchmark+serialize/project.json +++ b/src/coreclr/tests/src/JIT/config/benchmark+serialize/project.json @@ -5,7 +5,7 @@ "xunit.performance.execution": "1.0.0-beta-build0003", "xunit.performance.metrics": "1.0.0-beta-build0003", "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01", + "Microsoft.NETCore.Platforms": "2.0.0-preview2-25226-02", "Newtonsoft.Json": "7.0.1", "System.Console": "4.4.0-beta-24913-02", "System.IO": "4.4.0-beta-24913-02", @@ -15,7 +15,7 @@ "System.Dynamic.Runtime": "4.4.0-beta-24913-02", "System.Reflection": "4.4.0-beta-24913-02", "System.Reflection.Extensions": "4.4.0-beta-24913-02", - "System.Reflection.TypeExtensions": "4.4.0-preview1-25221-01", + "System.Reflection.TypeExtensions": "4.4.0-preview2-25226-02", "System.Runtime": "4.4.0-beta-24913-02", "System.Runtime.Serialization.Json": "4.4.0-beta-24913-02", "System.Runtime.Serialization.Primitives": "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 aac92ec..0388a6d 100644 --- a/src/coreclr/tests/src/JIT/config/benchmark/project.json +++ b/src/coreclr/tests/src/JIT/config/benchmark/project.json @@ -5,20 +5,20 @@ "xunit.performance.execution": "1.0.0-beta-build0003", "xunit.performance.metrics": "1.0.0-beta-build0003", "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01", + "Microsoft.NETCore.Platforms": "2.0.0-preview2-25226-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", "System.Linq": "4.4.0-beta-24913-02", "System.Linq.Parallel": "4.4.0-beta-24913-02", "System.Linq.Expressions": "4.4.0-beta-24913-02", - "System.Memory": "4.4.0-preview1-25221-01", - "System.Numerics.Vectors": "4.4.0-preview1-25221-01", + "System.Memory": "4.4.0-preview2-25226-02", + "System.Numerics.Vectors": "4.4.0-preview2-25226-02", "System.Reflection": "4.4.0-beta-24913-02", "System.Reflection.Extensions": "4.4.0-beta-24913-02", - "System.Reflection.TypeExtensions": "4.4.0-preview1-25221-01", + "System.Reflection.TypeExtensions": "4.4.0-preview2-25226-02", "System.Runtime": "4.4.0-beta-24913-02", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25221-01", + "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview2-25226-02", "System.Runtime.Extensions": "4.4.0-beta-24913-02", "System.Runtime.Numerics": "4.4.0-beta-24913-02", "System.Text.RegularExpressions": "4.4.0-beta-24913-02", diff --git a/src/coreclr/tests/src/TestWrappersConfig/project.json b/src/coreclr/tests/src/TestWrappersConfig/project.json index 56585e1..13543fd 100644 --- a/src/coreclr/tests/src/TestWrappersConfig/project.json +++ b/src/coreclr/tests/src/TestWrappersConfig/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01", + "Microsoft.NETCore.Platforms": "2.0.0-preview2-25226-02", "xunit": "2.2.0-beta2-build3300", "xunit.assert": "2.2.0-beta2-build3300", "xunit.core": "2.2.0-beta2-build3300", diff --git a/src/coreclr/tests/src/performance/project.json b/src/coreclr/tests/src/performance/project.json index 86a42f2..4967953 100644 --- a/src/coreclr/tests/src/performance/project.json +++ b/src/coreclr/tests/src/performance/project.json @@ -5,16 +5,16 @@ "xunit.performance.execution": "1.0.0-beta-build0003", "xunit.performance.metrics": "1.0.0-beta-build0003", "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental", - "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01", + "Microsoft.NETCore.Platforms": "2.0.0-preview2-25226-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", "System.Linq": "4.4.0-beta-24913-02", "System.Linq.Expressions": "4.4.0-beta-24913-02", - "System.Numerics.Vectors": "4.4.0-preview1-25221-01", + "System.Numerics.Vectors": "4.4.0-preview2-25226-02", "System.Reflection": "4.4.0-beta-24913-02", "System.Reflection.Extensions": "4.4.0-beta-24913-02", - "System.Reflection.TypeExtensions": "4.4.0-preview1-25221-01", + "System.Reflection.TypeExtensions": "4.4.0-preview2-25226-02", "System.Runtime": "4.4.0-beta-24913-02", "System.Runtime.Extensions": "4.4.0-beta-24913-02", "System.Runtime.Loader": "4.0.0", -- 2.7.4