diff options
author | Stephen Toub <stoub@microsoft.com> | 2017-02-07 09:16:27 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-07 09:16:27 -0500 |
commit | 597a00ece8ac99b603df9876bd9e9b01e536a9e3 (patch) | |
tree | 67b2ea8a630cb68eee031077ad0ec447cf9fd4f4 | |
parent | 35e91e578712bdcc881c56e515dba07e6be3f15d (diff) | |
parent | c9b94fa3c428a41e3e24896c598706eba16ca36c (diff) | |
download | coreclr-597a00ece8ac99b603df9876bd9e9b01e536a9e3.tar.gz coreclr-597a00ece8ac99b603df9876bd9e9b01e536a9e3.tar.bz2 coreclr-597a00ece8ac99b603df9876bd9e9b01e536a9e3.zip |
Merge pull request #9383 from dotnet-bot/master-UpdateDependencies
Update CoreClr, CoreFx to beta-25007-01, beta-25007-01, 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 5f10e99e31..36e16b012b 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>bcd06bf0e441fa9c018bf722f08bbaece884a8f9</CoreFxCurrentRef> - <CoreClrCurrentRef>bcd06bf0e441fa9c018bf722f08bbaece884a8f9</CoreClrCurrentRef> + <CoreFxCurrentRef>9bdceed2f3a12a62e66c5202a13f3220ccc10f89</CoreFxCurrentRef> + <CoreClrCurrentRef>9bdceed2f3a12a62e66c5202a13f3220ccc10f89</CoreClrCurrentRef> </PropertyGroup> <!-- Auto-upgraded properties for each build info dependency. --> <PropertyGroup> - <CoreFxExpectedPrerelease>beta-25006-01</CoreFxExpectedPrerelease> + <CoreFxExpectedPrerelease>beta-25007-01</CoreFxExpectedPrerelease> </PropertyGroup> <!-- Full package version strings that are used in other parts of the build. --> <PropertyGroup> - <CoreClrPackageVersion>2.0.0-beta-25006-03</CoreClrPackageVersion> + <CoreClrPackageVersion>2.0.0-beta-25007-01</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 b285f82386..719be5949c 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-25006-03", - "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25006-03", - "Microsoft.NETCore.Jit": "2.0.0-beta-25006-03", - "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25006-03", - "Microsoft.NETCore.TestHost": "2.0.0-beta-25006-03" + "Microsoft.NETCore.ILAsm": "2.0.0-beta-25007-01", + "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25007-01", + "Microsoft.NETCore.Jit": "2.0.0-beta-25007-01", + "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25007-01", + "Microsoft.NETCore.TestHost": "2.0.0-beta-25007-01" }, "frameworks": { "netcoreapp1.1": { diff --git a/tests/src/Common/targeting_pack_ref/project.json b/tests/src/Common/targeting_pack_ref/project.json index f8a42864a8..1743f6fc8a 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-25006-03" + "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-beta-25007-01" }, "frameworks": { "netcoreapp1.1": { diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json index 5032c233fc..771391a989 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-25006-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01", "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 734f56c7c9..ef47999b2c 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-25006-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01", "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 cfcc25c4e8..8c03f09e08 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-25006-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01", "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 ff25c25967..7cc415cd3c 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-25006-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01", "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 0a490597a1..f852a575c2 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-25006-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01", "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 44ec5d06a8..1e42ca16e6 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-25006-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01", "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 79ed279745..1cca77c604 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-25006-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01", "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 df3ed98dcd..6a6fe49373 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-25006-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01", "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 a3aa164268..68b783a0f2 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-25006-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01", "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 e68e03e55a..2f706066dd 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-25006-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01", "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 63d52073b8..e1af7fc15f 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-25006-01", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01", "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", |