diff options
author | Gaurav Khanna <gkhanna@microsoft.com> | 2017-03-10 15:05:26 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-10 15:05:26 -0800 |
commit | a7bed220d5455a705452eb0cc7248b941a6ecd99 (patch) | |
tree | 15f15902e2a197bbe8cb920e2cf230295f685bb8 | |
parent | 0537a9d40c9ceff6e74a232990aaf7646bcb968b (diff) | |
parent | 01ddf3893d5f8752bb98e034454619542a3dc27c (diff) | |
download | coreclr-a7bed220d5455a705452eb0cc7248b941a6ecd99.tar.gz coreclr-a7bed220d5455a705452eb0cc7248b941a6ecd99.tar.bz2 coreclr-a7bed220d5455a705452eb0cc7248b941a6ecd99.zip |
Merge pull request #10075 from dotnet-bot/master-UpdateDependencies
Update CoreClr, CoreFx to beta-25110-03, beta-25110-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/netcoreapp/project.json | 2 | ||||
-rw-r--r-- | tests/src/Common/targeting_pack_ref/project.json | 2 | ||||
-rw-r--r-- | tests/src/Common/test_dependencies/project.json | 12 | ||||
-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 | 4 | ||||
-rw-r--r-- | tests/src/JIT/config/extra/project.json | 6 | ||||
-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 |
15 files changed, 30 insertions, 30 deletions
diff --git a/dependencies.props b/dependencies.props index f2a7b3ade9..0b34bb99d2 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>72efa5f7a8fcaae7cf804a3e847d571b15558815</CoreFxCurrentRef> - <CoreClrCurrentRef>546541cc58ee5728d69d6760527bbd335b482dfa</CoreClrCurrentRef> + <CoreFxCurrentRef>475ad1deaae6b2f4be053ead4c3a93576171e7f4</CoreFxCurrentRef> + <CoreClrCurrentRef>475ad1deaae6b2f4be053ead4c3a93576171e7f4</CoreClrCurrentRef> </PropertyGroup> <!-- Auto-upgraded properties for each build info dependency. --> <PropertyGroup> - <CoreFxExpectedPrerelease>beta-25109-03</CoreFxExpectedPrerelease> + <CoreFxExpectedPrerelease>beta-25110-02</CoreFxExpectedPrerelease> </PropertyGroup> <!-- Full package version strings that are used in other parts of the build. --> <PropertyGroup> - <CoreClrPackageVersion>2.0.0-beta-25109-03</CoreClrPackageVersion> + <CoreClrPackageVersion>2.0.0-beta-25110-03</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 07ba3aef81..495ac5cf50 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-25109-03", - "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25109-03", - "Microsoft.NETCore.Jit": "2.0.0-beta-25109-03", - "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25109-03", - "Microsoft.NETCore.TestHost": "2.0.0-beta-25109-03" + "Microsoft.NETCore.ILAsm": "2.0.0-beta-25110-03", + "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25110-03", + "Microsoft.NETCore.Jit": "2.0.0-beta-25110-03", + "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25110-03", + "Microsoft.NETCore.TestHost": "2.0.0-beta-25110-03" }, "frameworks": { "netcoreapp1.1": { diff --git a/tests/src/Common/netcoreapp/project.json b/tests/src/Common/netcoreapp/project.json index 6d351f90a8..fa1cb9636d 100644 --- a/tests/src/Common/netcoreapp/project.json +++ b/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-25109-03" + "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-25110-02" }, "frameworks": { "netcoreapp2.0": {} diff --git a/tests/src/Common/targeting_pack_ref/project.json b/tests/src/Common/targeting_pack_ref/project.json index a97eff8be0..fa047a43a9 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-25109-03" + "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-beta-25110-03" }, "frameworks": { "netcoreapp1.1": { diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json index bc5a6cac71..f5f41e10f5 100644 --- a/tests/src/Common/test_dependencies/project.json +++ b/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-25109-03", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25110-02", "Microsoft.NETCore.Targets": "1.2.0-beta-24913-02", - "System.Collections.Immutable": "1.4.0-beta-25109-03", + "System.Collections.Immutable": "1.4.0-beta-25110-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-25109-03", + "System.Memory": "4.4.0-beta-25110-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-25109-03", + "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-25110-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-25109-03", + "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-25110-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-25109-03", + "System.Threading.AccessControl": "4.4.0-beta-25110-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/tests/src/Common/test_runtime/project.json b/tests/src/Common/test_runtime/project.json index f3e1086f26..d4fda85974 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-25109-03", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25110-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 9951e3cdb9..e200b130ff 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-25109-03", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25110-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 deb7388701..2d7365bc0b 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-25109-03", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25110-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 b05f42f3d3..bdc0c19635 100644 --- a/tests/src/JIT/config/benchmark/project.json +++ b/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-25109-03", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25110-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-25109-03", + "System.Memory": "4.4.0-beta-25110-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/tests/src/JIT/config/extra/project.json b/tests/src/JIT/config/extra/project.json index 35bc2bbcb4..994b1838c2 100644 --- a/tests/src/JIT/config/extra/project.json +++ b/tests/src/JIT/config/extra/project.json @@ -1,10 +1,10 @@ { "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-beta-25109-03", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25110-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-25109-03", + "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-25110-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-25109-03", + "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-25110-02", "System.Runtime.InteropServices": "4.4.0-beta-24913-02" }, "frameworks": { diff --git a/tests/src/JIT/config/minimal/project.json b/tests/src/JIT/config/minimal/project.json index 6e68cd6c81..edb3d8ab19 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-25109-03", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25110-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 ef92890c41..e0978dfe86 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-25109-03", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25110-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 4302c2bb45..c115d2c511 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-25109-03", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25110-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 c146736290..58e6014b44 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-25109-03", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25110-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 8ae9e923ae..04a76748b4 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-25109-03", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25110-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", |