diff options
author | Gaurav Khanna <gkhanna@microsoft.com> | 2017-02-14 09:12:57 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-14 09:12:57 -0800 |
commit | 6203c0211ed65afafd2cb003c0a64b6f3409f1d4 (patch) | |
tree | 56a0508b30c3865e2c18f1d5bb50f210bd04dd64 | |
parent | d0f8481cd42e58013879326871455586a86bec6e (diff) | |
parent | 096f26c22e8543fc958a092a56d8ade8f9d8909d (diff) | |
download | coreclr-6203c0211ed65afafd2cb003c0a64b6f3409f1d4.tar.gz coreclr-6203c0211ed65afafd2cb003c0a64b6f3409f1d4.tar.bz2 coreclr-6203c0211ed65afafd2cb003c0a64b6f3409f1d4.zip |
Merge pull request #9575 from dotnet-bot/master-UpdateDependencies
Update CoreClr, CoreFx to beta-25014-02, beta-25014-02, respectively (master)
-rw-r--r-- | dependencies.props | 8 | ||||
-rw-r--r-- | tests/src/Common/build_against_pkg_dependencies/project.json | 10 | ||||
-rw-r--r-- | tests/src/Common/targeting_pack_ref/project.json | 2 | ||||
-rw-r--r-- | tests/src/Common/test_dependencies/project.json | 2 | ||||
-rw-r--r-- | tests/src/Common/test_runtime/project.json | 2 | ||||
-rw-r--r-- | tests/src/JIT/config/benchmark+roslyn/project.json | 2 | ||||
-rw-r--r-- | tests/src/JIT/config/benchmark+serialize/project.json | 2 | ||||
-rw-r--r-- | tests/src/JIT/config/benchmark/project.json | 2 | ||||
-rw-r--r-- | tests/src/JIT/config/extra/project.json | 2 | ||||
-rw-r--r-- | tests/src/JIT/config/minimal/project.json | 2 | ||||
-rw-r--r-- | tests/src/JIT/config/threading+thread/project.json | 2 | ||||
-rw-r--r-- | tests/src/JIT/config/threading/project.json | 2 | ||||
-rw-r--r-- | tests/src/TestWrappersConfig/project.json | 2 | ||||
-rw-r--r-- | tests/src/performance/project.json | 2 |
14 files changed, 21 insertions, 21 deletions
diff --git a/dependencies.props b/dependencies.props index 0e81ccd975..3f3999dae3 100644 --- a/dependencies.props +++ b/dependencies.props @@ -1,18 +1,18 @@ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <!-- Source of truth for dependency tooling: the commit hash of the dotnet/versions master branch as of the last auto-upgrade. --> <PropertyGroup> - <CoreFxCurrentRef>1425e3e61532a0b4c84e6ddc74ffae26f35e0f0e</CoreFxCurrentRef> - <CoreClrCurrentRef>4cc04920bfdaa5ae06243d90578ef9d4be6f7f58</CoreClrCurrentRef> + <CoreFxCurrentRef>a96b46a6ea52965b20667fff5295a13ad73d5d7a</CoreFxCurrentRef> + <CoreClrCurrentRef>a96b46a6ea52965b20667fff5295a13ad73d5d7a</CoreClrCurrentRef> </PropertyGroup> <!-- Auto-upgraded properties for each build info dependency. --> <PropertyGroup> - <CoreFxExpectedPrerelease>beta-25014-01</CoreFxExpectedPrerelease> + <CoreFxExpectedPrerelease>beta-25014-02</CoreFxExpectedPrerelease> </PropertyGroup> <!-- Full package version strings that are used in other parts of the build. --> <PropertyGroup> - <CoreClrPackageVersion>2.0.0-beta-25013-09</CoreClrPackageVersion> + <CoreClrPackageVersion>2.0.0-beta-25014-02</CoreClrPackageVersion> <XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion> </PropertyGroup> diff --git a/tests/src/Common/build_against_pkg_dependencies/project.json b/tests/src/Common/build_against_pkg_dependencies/project.json index 32a96f2fbc..27acaf896d 100644 --- a/tests/src/Common/build_against_pkg_dependencies/project.json +++ b/tests/src/Common/build_against_pkg_dependencies/project.json @@ -1,10 +1,10 @@ { "dependencies": { - "Microsoft.NETCore.ILAsm": "2.0.0-beta-25013-09", - "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25013-09", - "Microsoft.NETCore.Jit": "2.0.0-beta-25013-09", - "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25013-09", - "Microsoft.NETCore.TestHost": "2.0.0-beta-25013-09" + "Microsoft.NETCore.ILAsm": "2.0.0-beta-25014-02", + "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25014-02", + "Microsoft.NETCore.Jit": "2.0.0-beta-25014-02", + "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25014-02", + "Microsoft.NETCore.TestHost": "2.0.0-beta-25014-02" }, "frameworks": { "netcoreapp1.1": { diff --git a/tests/src/Common/targeting_pack_ref/project.json b/tests/src/Common/targeting_pack_ref/project.json index 45d38f82f4..e07323bf6f 100644 --- a/tests/src/Common/targeting_pack_ref/project.json +++ b/tests/src/Common/targeting_pack_ref/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-beta-25013-09" + "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-beta-25014-02" }, "frameworks": { "netcoreapp1.1": { diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json index 4af7f98148..5e1636b84b 100644 --- a/tests/src/Common/test_dependencies/project.json +++ b/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-25014-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25014-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/tests/src/Common/test_runtime/project.json b/tests/src/Common/test_runtime/project.json index 84ab9830a7..8bb9e65189 100644 --- a/tests/src/Common/test_runtime/project.json +++ b/tests/src/Common/test_runtime/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-beta-25014-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25014-02", "Microsoft.DotNet.CoreCLR.TestDependencies": "1.0.0-prerelease", "jit-dasm": "0.0.1.4", "cijobs": "0.0.1.2", diff --git a/tests/src/JIT/config/benchmark+roslyn/project.json b/tests/src/JIT/config/benchmark+roslyn/project.json index cef669f55f..5a4b66317a 100644 --- a/tests/src/JIT/config/benchmark+roslyn/project.json +++ b/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-25014-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25014-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/tests/src/JIT/config/benchmark+serialize/project.json b/tests/src/JIT/config/benchmark+serialize/project.json index 18310058a7..29c5c7f4fe 100644 --- a/tests/src/JIT/config/benchmark+serialize/project.json +++ b/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-25014-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25014-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/tests/src/JIT/config/benchmark/project.json b/tests/src/JIT/config/benchmark/project.json index 318f20e199..23b177723a 100644 --- a/tests/src/JIT/config/benchmark/project.json +++ b/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-25014-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25014-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/tests/src/JIT/config/extra/project.json b/tests/src/JIT/config/extra/project.json index 111537c21d..37037aeeaa 100644 --- a/tests/src/JIT/config/extra/project.json +++ b/tests/src/JIT/config/extra/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-beta-25014-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25014-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/tests/src/JIT/config/minimal/project.json b/tests/src/JIT/config/minimal/project.json index cc3042bb1b..3ab8697be8 100644 --- a/tests/src/JIT/config/minimal/project.json +++ b/tests/src/JIT/config/minimal/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-beta-25014-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25014-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/tests/src/JIT/config/threading+thread/project.json b/tests/src/JIT/config/threading+thread/project.json index c5332ffee8..1390fdf245 100644 --- a/tests/src/JIT/config/threading+thread/project.json +++ b/tests/src/JIT/config/threading+thread/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-beta-25014-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25014-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/tests/src/JIT/config/threading/project.json b/tests/src/JIT/config/threading/project.json index 7e28360366..e558f5b867 100644 --- a/tests/src/JIT/config/threading/project.json +++ b/tests/src/JIT/config/threading/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-beta-25014-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25014-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/tests/src/TestWrappersConfig/project.json b/tests/src/TestWrappersConfig/project.json index 11dc6c6743..9c05df76ab 100644 --- a/tests/src/TestWrappersConfig/project.json +++ b/tests/src/TestWrappersConfig/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-beta-25014-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25014-02", "xunit": "2.2.0-beta2-build3300", "xunit.assert": "2.2.0-beta2-build3300", "xunit.core": "2.2.0-beta2-build3300", diff --git a/tests/src/performance/project.json b/tests/src/performance/project.json index 04372e1379..e4ae1ae191 100644 --- a/tests/src/performance/project.json +++ b/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-25014-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25014-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", |