From 57e17a4956bd50046cfcf40e5c6ef34e280b32d0 Mon Sep 17 00:00:00 2001 From: dotnet-bot Date: Wed, 8 Mar 2017 17:26:01 +0000 Subject: [PATCH] Update CoreClr, CoreFx to beta-25108-04, beta-25108-02, respectively Commit migrated from https://github.com/dotnet/coreclr/commit/d09fc33bb70d779e09bcd10e3161366a93709fdd --- 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 | 12 ++++++------ src/coreclr/tests/src/Common/test_runtime/project.json | 2 +- .../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 | 4 ++-- src/coreclr/tests/src/JIT/config/extra/project.json | 6 +++--- src/coreclr/tests/src/JIT/config/minimal/project.json | 2 +- .../tests/src/JIT/config/threading+thread/project.json | 2 +- src/coreclr/tests/src/JIT/config/threading/project.json | 2 +- src/coreclr/tests/src/TestWrappersConfig/project.json | 2 +- src/coreclr/tests/src/performance/project.json | 2 +- 15 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props index deb04ac..96d99b8 100644 --- a/src/coreclr/dependencies.props +++ b/src/coreclr/dependencies.props @@ -1,18 +1,18 @@ - 3bb43ab67bc17fdf91f3ac55e4ac0750b4baa2c8 - ae142d6854360d9e49f28ffa2dfda493de38a447 + 5eb1949b642b0c0bbd8506ee0f0437baffb74801 + 5eb1949b642b0c0bbd8506ee0f0437baffb74801 - stable + beta-25108-02 - 2.0.0-beta-25103-03 + 2.0.0-beta-25108-04 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 90b381e..4e21867 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-beta-25103-03", - "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25103-03", - "Microsoft.NETCore.Jit": "2.0.0-beta-25103-03", - "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25103-03", - "Microsoft.NETCore.TestHost": "2.0.0-beta-25103-03" + "Microsoft.NETCore.ILAsm": "2.0.0-beta-25108-04", + "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25108-04", + "Microsoft.NETCore.Jit": "2.0.0-beta-25108-04", + "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25108-04", + "Microsoft.NETCore.TestHost": "2.0.0-beta-25108-04" }, "frameworks": { "netcoreapp1.1": { diff --git a/src/coreclr/tests/src/Common/netcoreapp/project.json b/src/coreclr/tests/src/Common/netcoreapp/project.json index 9232803..de78ebd 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-beta-25022-02" + "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-25108-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 e13ab52..c15bdb4 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-beta-25103-03" + "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-beta-25108-04" }, "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 82358f9..cee446f 100644 --- a/src/coreclr/tests/src/Common/test_dependencies/project.json +++ b/src/coreclr/tests/src/Common/test_dependencies/project.json @@ -9,9 +9,9 @@ "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-25022-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25108-02", "Microsoft.NETCore.Targets": "1.2.0-beta-24913-02", - "System.Collections.Immutable": "1.4.0-beta-25022-02", + "System.Collections.Immutable": "1.4.0-beta-25108-02", "System.Threading.Thread": "4.4.0-beta-24913-02", "System.Collections": "4.4.0-beta-24913-02", "System.Xml.XmlSerializer": "4.4.0-beta-24913-02", @@ -38,16 +38,16 @@ "System.Linq": "4.4.0-beta-24913-02", "System.Linq.Queryable": "4.4.0-beta-24913-02", "System.Linq.Expressions": "4.4.0-beta-24913-02", - "System.Memory": "4.4.0-beta-25022-02", + "System.Memory": "4.4.0-beta-25108-02", "System.Reflection": "4.4.0-beta-24913-02", "System.Reflection.Extensions": "4.4.0-beta-24913-02", "System.Resources.ResourceManager": "4.4.0-beta-24913-02", "System.Runtime": "4.4.0-beta-24913-02", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-25022-02", + "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-25108-02", "System.Runtime.Extensions": "4.4.0-beta-24913-02", "System.Runtime.Handles": "4.4.0-beta-24913-02", "System.Runtime.InteropServices": "4.4.0-beta-24913-02", - "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-25022-02", + "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-25108-02", "System.Runtime.Loader": "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", @@ -57,7 +57,7 @@ "System.Text.Encoding.Extensions": "4.4.0-beta-24913-02", "System.Text.RegularExpressions": "4.4.0-beta-24913-02", "System.Threading": "4.4.0-beta-24913-02", - "System.Threading.AccessControl": "4.4.0-beta-25022-02", + "System.Threading.AccessControl": "4.4.0-beta-25108-02", "System.Threading.Overlapped": "4.4.0-beta-24913-02", "System.Threading.Tasks": "4.4.0-beta-24913-02", "System.Threading.Tasks.Parallel": "4.4.0-beta-24913-02", diff --git a/src/coreclr/tests/src/Common/test_runtime/project.json b/src/coreclr/tests/src/Common/test_runtime/project.json index 88f0151..9a0a7e4 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-beta-25022-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25108-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 7cfabc1..8d37705 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-25022-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25108-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 892d773..c8f72de 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-25022-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25108-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 74d8973..27cf3e6 100644 --- a/src/coreclr/tests/src/JIT/config/benchmark/project.json +++ b/src/coreclr/tests/src/JIT/config/benchmark/project.json @@ -3,14 +3,14 @@ "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-25022-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25108-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-beta-25022-02", + "System.Memory": "4.4.0-beta-25108-02", "System.Numerics.Vectors": "4.4.0-beta-24913-02", "System.Reflection": "4.4.0-beta-24913-02", "System.Reflection.Extensions": "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 56515da..eb39699 100644 --- a/src/coreclr/tests/src/JIT/config/extra/project.json +++ b/src/coreclr/tests/src/JIT/config/extra/project.json @@ -1,10 +1,10 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-beta-25022-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25108-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", - "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-25022-02", + "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-25108-02", "System.Diagnostics.Process": "4.4.0-beta-24913-02", "System.Globalization": "4.4.0-beta-24913-02", "System.IO": "4.4.0-beta-24913-02", @@ -14,7 +14,7 @@ "System.Reflection.TypeExtensions": "4.4.0-beta-24913-02", "System.Runtime": "4.4.0-beta-24913-02", "System.Runtime.Extensions": "4.4.0-beta-24913-02", - "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-25022-02", + "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-25108-02", "System.Runtime.InteropServices": "4.4.0-beta-24913-02" }, "frameworks": { diff --git a/src/coreclr/tests/src/JIT/config/minimal/project.json b/src/coreclr/tests/src/JIT/config/minimal/project.json index d1c8def..19f6911 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-25022-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25108-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 62b27ff..0bbacc0 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-25022-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25108-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 532b9cd..ef9ba03 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-25022-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25108-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/TestWrappersConfig/project.json b/src/coreclr/tests/src/TestWrappersConfig/project.json index c321180..4b193e1 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-beta-25022-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25108-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 414cf82..6f6637a 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-25022-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25108-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