diff options
author | dotnet bot <dotnet-bot@dotnetfoundation.org> | 2017-02-03 21:48:31 -0800 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2017-02-03 21:48:31 -0800 |
commit | e8dff5550c022d2854914dc534f9ec3d7fe623ac (patch) | |
tree | a3413efe5fcb6560038a8f0f772abeb6b9a3dad8 | |
parent | 748d467b1cbc759c23d94de0b559d9a437623b38 (diff) | |
download | coreclr-e8dff5550c022d2854914dc534f9ec3d7fe623ac.tar.gz coreclr-e8dff5550c022d2854914dc534f9ec3d7fe623ac.tar.bz2 coreclr-e8dff5550c022d2854914dc534f9ec3d7fe623ac.zip |
Update CoreClr, CoreFx to beta-25004-01, beta-25004-01, respectively (#9330)
-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 ecb629bc6f..335d7da79b 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>d8a5ef9aa18fac28c32f329a734f5095f6095b53</CoreFxCurrentRef> - <CoreClrCurrentRef>d8a5ef9aa18fac28c32f329a734f5095f6095b53</CoreClrCurrentRef> + <CoreFxCurrentRef>96174699177b3d60f3514fde260fff8c2ee87d00</CoreFxCurrentRef> + <CoreClrCurrentRef>96174699177b3d60f3514fde260fff8c2ee87d00</CoreClrCurrentRef> </PropertyGroup> <!-- Auto-upgraded properties for each build info dependency. --> <PropertyGroup> - <CoreFxExpectedPrerelease>beta-25003-02</CoreFxExpectedPrerelease> + <CoreFxExpectedPrerelease>beta-25004-01</CoreFxExpectedPrerelease> </PropertyGroup> <!-- Full package version strings that are used in other parts of the build. --> <PropertyGroup> - <CoreClrPackageVersion>2.0.0-beta-25003-02</CoreClrPackageVersion> + <CoreClrPackageVersion>2.0.0-beta-25004-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 65a947fbfe..c76617f6b0 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-25003-02", - "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25003-02", - "Microsoft.NETCore.Jit": "2.0.0-beta-25003-02", - "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25003-02", - "Microsoft.NETCore.TestHost": "2.0.0-beta-25003-02" + "Microsoft.NETCore.ILAsm": "2.0.0-beta-25004-01", + "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25004-01", + "Microsoft.NETCore.Jit": "2.0.0-beta-25004-01", + "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25004-01", + "Microsoft.NETCore.TestHost": "2.0.0-beta-25004-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 84282ce4cd..dd70ea5361 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-25003-02" + "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-beta-25004-01" }, "frameworks": { "netcoreapp1.1": { diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json index bf01d6974c..c4937b6e47 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-25003-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25004-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 dd8173431c..79f3079914 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-25003-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25004-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 0408c0c1d0..728a62ac55 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-25003-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25004-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 e11b8bf65b..4e3e6bfb3a 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-25003-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25004-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 108a5d7525..1fd50576f5 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-25003-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25004-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 b7ceed448f..16db7e0ec1 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-25003-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25004-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 cafac968c0..126e73a1f7 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-25003-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25004-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 09c2ed98bb..7a016b4309 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-25003-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25004-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 2db3773c28..076bf7c2a2 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-25003-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25004-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 407fab908c..04cebc5620 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-25003-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25004-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 060f3fddb3..fce37f3a7e 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-25003-02", + "Microsoft.NETCore.Platforms": "2.0.0-beta-25004-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", |