summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordotnet bot <dotnet-bot@dotnetfoundation.org>2017-05-03 21:58:52 -0700
committerGaurav Khanna <gkhanna@microsoft.com>2017-05-03 21:58:52 -0700
commite8eb00ebe44dffda27959fc0913fd2b8bb2667d2 (patch)
treecd1d29c68d47cd68cf2fdde05ede46ab44086305
parent3fb9d8d2fe094f09a914d31a551e14fe8a1f2215 (diff)
downloadcoreclr-e8eb00ebe44dffda27959fc0913fd2b8bb2667d2.tar.gz
coreclr-e8eb00ebe44dffda27959fc0913fd2b8bb2667d2.tar.bz2
coreclr-e8eb00ebe44dffda27959fc0913fd2b8bb2667d2.zip
Update CoreClr, CoreFx to preview2-25303-03, preview2-25303-04, respectively (#11354)
-rw-r--r--dependencies.props8
-rw-r--r--tests/src/Common/build_against_pkg_dependencies/project.json10
-rw-r--r--tests/src/Common/netcoreapp/project.json2
-rw-r--r--tests/src/Common/targeting_pack_ref/project.json2
-rw-r--r--tests/src/Common/test_dependencies/project.json10
-rw-r--r--tests/src/Common/test_runtime/project.json2
-rw-r--r--tests/src/JIT/config/benchmark+roslyn/project.json6
-rw-r--r--tests/src/JIT/config/benchmark+serialize/project.json4
-rw-r--r--tests/src/JIT/config/benchmark/project.json10
-rw-r--r--tests/src/TestWrappersConfig/project.json2
-rw-r--r--tests/src/performance/project.json6
11 files changed, 31 insertions, 31 deletions
diff --git a/dependencies.props b/dependencies.props
index e2ba3e3b02..1279c3c5a0 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>4c90661bc00114b4e7ba79c944d1c011dda5b126</CoreFxCurrentRef>
- <CoreClrCurrentRef>caa7245d2aabffcb177ee456e4d1d2901462ebcb</CoreClrCurrentRef>
+ <CoreFxCurrentRef>4a2c8b78ad4065f39c0894ccba79902822989b2c</CoreFxCurrentRef>
+ <CoreClrCurrentRef>4a2c8b78ad4065f39c0894ccba79902822989b2c</CoreClrCurrentRef>
</PropertyGroup>
<!-- Auto-upgraded properties for each build info dependency. -->
<PropertyGroup>
- <CoreFxExpectedPrerelease>preview2-25302-03</CoreFxExpectedPrerelease>
+ <CoreFxExpectedPrerelease>preview2-25303-04</CoreFxExpectedPrerelease>
</PropertyGroup>
<!-- Full package version strings that are used in other parts of the build. -->
<PropertyGroup>
- <CoreClrPackageVersion>2.0.0-preview2-25302-02</CoreClrPackageVersion>
+ <CoreClrPackageVersion>2.0.0-preview2-25303-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 46c7507097..c918557aee 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-preview2-25302-02",
- "Microsoft.NETCore.ILDAsm": "2.0.0-preview2-25302-02",
- "Microsoft.NETCore.Jit": "2.0.0-preview2-25302-02",
- "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview2-25302-02",
- "Microsoft.NETCore.TestHost": "2.0.0-preview2-25302-02"
+ "Microsoft.NETCore.ILAsm": "2.0.0-preview2-25303-03",
+ "Microsoft.NETCore.ILDAsm": "2.0.0-preview2-25303-03",
+ "Microsoft.NETCore.Jit": "2.0.0-preview2-25303-03",
+ "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview2-25303-03",
+ "Microsoft.NETCore.TestHost": "2.0.0-preview2-25303-03"
},
"frameworks": {
"netcoreapp2.0": {
diff --git a/tests/src/Common/netcoreapp/project.json b/tests/src/Common/netcoreapp/project.json
index 75ac62408e..c8031bcc59 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-preview2-25302-03"
+ "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview2-25303-04"
},
"frameworks": {
"netcoreapp2.0": {}
diff --git a/tests/src/Common/targeting_pack_ref/project.json b/tests/src/Common/targeting_pack_ref/project.json
index 40248aa70c..dde0c938c6 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-preview2-25302-02"
+ "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-preview2-25303-03"
},
"frameworks": {
"netcoreapp1.1": {
diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json
index f5feda884c..50b17747eb 100644
--- a/tests/src/Common/test_dependencies/project.json
+++ b/tests/src/Common/test_dependencies/project.json
@@ -1,10 +1,10 @@
{
"dependencies": {
- "Microsoft.NETCore.Platforms": "2.0.0-preview2-25302-03",
- "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview2-25302-03",
- "System.Memory": "4.4.0-preview2-25302-03",
- "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview2-25302-03",
- "System.Security.Permissions": "4.4.0-preview2-25302-03"
+ "Microsoft.NETCore.Platforms": "2.0.0-preview2-25303-04",
+ "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview2-25303-04",
+ "System.Memory": "4.4.0-preview2-25303-04",
+ "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview2-25303-04",
+ "System.Security.Permissions": "4.4.0-preview2-25303-04"
},
"frameworks": {
"netcoreapp2.0": {
diff --git a/tests/src/Common/test_runtime/project.json b/tests/src/Common/test_runtime/project.json
index f59ef7f307..9e4e308f61 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-preview2-25302-03",
+ "Microsoft.NETCore.Platforms": "2.0.0-preview2-25303-04",
"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 541450bab0..493c9398a5 100644
--- a/tests/src/JIT/config/benchmark+roslyn/project.json
+++ b/tests/src/JIT/config/benchmark+roslyn/project.json
@@ -6,15 +6,15 @@
"xunit.performance.execution": "1.0.0-beta-build0003",
"xunit.performance.metrics": "1.0.0-beta-build0003",
"Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
- "Microsoft.NETCore.Platforms": "2.0.0-preview2-25302-03",
+ "Microsoft.NETCore.Platforms": "2.0.0-preview2-25303-04",
"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",
"System.IO.FileSystem": "4.4.0-beta-24913-02",
- "System.Numerics.Vectors": "4.4.0-preview2-25302-03",
+ "System.Numerics.Vectors": "4.4.0-preview2-25303-04",
"System.Reflection": "4.4.0-beta-24913-02",
"System.Reflection.Extensions": "4.4.0-beta-24913-02",
- "System.Reflection.TypeExtensions": "4.4.0-preview2-25302-03",
+ "System.Reflection.TypeExtensions": "4.4.0-preview2-25303-04",
"System.Runtime": "4.4.0-beta-24913-02",
"System.Runtime.Extensions": "4.4.0-beta-24913-02",
"System.Runtime.Numerics": "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 266869f4dc..237ae2c2ce 100644
--- a/tests/src/JIT/config/benchmark+serialize/project.json
+++ b/tests/src/JIT/config/benchmark+serialize/project.json
@@ -5,7 +5,7 @@
"xunit.performance.execution": "1.0.0-beta-build0003",
"xunit.performance.metrics": "1.0.0-beta-build0003",
"Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
- "Microsoft.NETCore.Platforms": "2.0.0-preview2-25302-03",
+ "Microsoft.NETCore.Platforms": "2.0.0-preview2-25303-04",
"Newtonsoft.Json": "7.0.1",
"System.Console": "4.4.0-beta-24913-02",
"System.IO": "4.4.0-beta-24913-02",
@@ -15,7 +15,7 @@
"System.Dynamic.Runtime": "4.4.0-beta-24913-02",
"System.Reflection": "4.4.0-beta-24913-02",
"System.Reflection.Extensions": "4.4.0-beta-24913-02",
- "System.Reflection.TypeExtensions": "4.4.0-preview2-25302-03",
+ "System.Reflection.TypeExtensions": "4.4.0-preview2-25303-04",
"System.Runtime": "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",
diff --git a/tests/src/JIT/config/benchmark/project.json b/tests/src/JIT/config/benchmark/project.json
index 47ffdf7fe3..a8085d6883 100644
--- a/tests/src/JIT/config/benchmark/project.json
+++ b/tests/src/JIT/config/benchmark/project.json
@@ -5,20 +5,20 @@
"xunit.performance.execution": "1.0.0-beta-build0003",
"xunit.performance.metrics": "1.0.0-beta-build0003",
"Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
- "Microsoft.NETCore.Platforms": "2.0.0-preview2-25302-03",
+ "Microsoft.NETCore.Platforms": "2.0.0-preview2-25303-04",
"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-preview2-25302-03",
- "System.Numerics.Vectors": "4.4.0-preview2-25302-03",
+ "System.Memory": "4.4.0-preview2-25303-04",
+ "System.Numerics.Vectors": "4.4.0-preview2-25303-04",
"System.Reflection": "4.4.0-beta-24913-02",
"System.Reflection.Extensions": "4.4.0-beta-24913-02",
- "System.Reflection.TypeExtensions": "4.4.0-preview2-25302-03",
+ "System.Reflection.TypeExtensions": "4.4.0-preview2-25303-04",
"System.Runtime": "4.4.0-beta-24913-02",
- "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview2-25302-03",
+ "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview2-25303-04",
"System.Runtime.Extensions": "4.4.0-beta-24913-02",
"System.Runtime.Numerics": "4.4.0-beta-24913-02",
"System.Text.RegularExpressions": "4.4.0-beta-24913-02",
diff --git a/tests/src/TestWrappersConfig/project.json b/tests/src/TestWrappersConfig/project.json
index 94912f80aa..93f7b61acf 100644
--- a/tests/src/TestWrappersConfig/project.json
+++ b/tests/src/TestWrappersConfig/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "Microsoft.NETCore.Platforms": "2.0.0-preview2-25302-03",
+ "Microsoft.NETCore.Platforms": "2.0.0-preview2-25303-04",
"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 b4292f0934..f02866d19f 100644
--- a/tests/src/performance/project.json
+++ b/tests/src/performance/project.json
@@ -5,16 +5,16 @@
"xunit.performance.execution": "1.0.0-beta-build0003",
"xunit.performance.metrics": "1.0.0-beta-build0003",
"Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.3-alpha-experimental",
- "Microsoft.NETCore.Platforms": "2.0.0-preview2-25302-03",
+ "Microsoft.NETCore.Platforms": "2.0.0-preview2-25303-04",
"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.Expressions": "4.4.0-beta-24913-02",
- "System.Numerics.Vectors": "4.4.0-preview2-25302-03",
+ "System.Numerics.Vectors": "4.4.0-preview2-25303-04",
"System.Reflection": "4.4.0-beta-24913-02",
"System.Reflection.Extensions": "4.4.0-beta-24913-02",
- "System.Reflection.TypeExtensions": "4.4.0-preview2-25302-03",
+ "System.Reflection.TypeExtensions": "4.4.0-preview2-25303-04",
"System.Runtime": "4.4.0-beta-24913-02",
"System.Runtime.Extensions": "4.4.0-beta-24913-02",
"System.Runtime.Loader": "4.0.0",