summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordotnet bot <dotnet-bot@dotnetfoundation.org>2017-04-26 16:21:04 -0700
committerJan Kotas <jkotas@microsoft.com>2017-04-26 16:21:04 -0700
commit20aa8b25c8c2d920da3a050728e5ca3156253615 (patch)
tree9865fb16fd6d55fc4997eb1903f4e3ae38646d7d
parent48b0229e9b70dbe4e477b3983f16599f9d861e55 (diff)
downloadcoreclr-20aa8b25c8c2d920da3a050728e5ca3156253615.tar.gz
coreclr-20aa8b25c8c2d920da3a050728e5ca3156253615.tar.bz2
coreclr-20aa8b25c8c2d920da3a050728e5ca3156253615.zip
Update CoreClr, CoreFx to preview2-25226-02, preview2-25226-02, respectively (#11127)
-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 c06c465d52..cc48652179 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>947e90b41c30a1f0a906f8d996443233c2ceedf4</CoreFxCurrentRef>
- <CoreClrCurrentRef>947e90b41c30a1f0a906f8d996443233c2ceedf4</CoreClrCurrentRef>
+ <CoreFxCurrentRef>ea4d16199d625a75688ca5099afcc06f9fe98104</CoreFxCurrentRef>
+ <CoreClrCurrentRef>ea4d16199d625a75688ca5099afcc06f9fe98104</CoreClrCurrentRef>
</PropertyGroup>
<!-- Auto-upgraded properties for each build info dependency. -->
<PropertyGroup>
- <CoreFxExpectedPrerelease>preview1-25221-01</CoreFxExpectedPrerelease>
+ <CoreFxExpectedPrerelease>preview2-25226-02</CoreFxExpectedPrerelease>
</PropertyGroup>
<!-- Full package version strings that are used in other parts of the build. -->
<PropertyGroup>
- <CoreClrPackageVersion>2.0.0-preview1-25221-01</CoreClrPackageVersion>
+ <CoreClrPackageVersion>2.0.0-preview2-25226-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 327340f11d..0278b90692 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-preview1-25221-01",
- "Microsoft.NETCore.ILDAsm": "2.0.0-preview1-25221-01",
- "Microsoft.NETCore.Jit": "2.0.0-preview1-25221-01",
- "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25221-01",
- "Microsoft.NETCore.TestHost": "2.0.0-preview1-25221-01"
+ "Microsoft.NETCore.ILAsm": "2.0.0-preview2-25226-02",
+ "Microsoft.NETCore.ILDAsm": "2.0.0-preview2-25226-02",
+ "Microsoft.NETCore.Jit": "2.0.0-preview2-25226-02",
+ "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview2-25226-02",
+ "Microsoft.NETCore.TestHost": "2.0.0-preview2-25226-02"
},
"frameworks": {
"netcoreapp2.0": {
diff --git a/tests/src/Common/netcoreapp/project.json b/tests/src/Common/netcoreapp/project.json
index ca40b18d1e..3811ee1086 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-preview1-25221-01"
+ "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview2-25226-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 0754b74690..92ce448d68 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-preview1-25221-01"
+ "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-preview2-25226-02"
},
"frameworks": {
"netcoreapp1.1": {
diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json
index 4477c687e0..85781d9799 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-preview1-25221-01",
- "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25221-01",
- "System.Memory": "4.4.0-preview1-25221-01",
- "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25221-01",
- "System.Security.Permissions": "4.4.0-preview1-25221-01"
+ "Microsoft.NETCore.Platforms": "2.0.0-preview2-25226-02",
+ "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview2-25226-02",
+ "System.Memory": "4.4.0-preview2-25226-02",
+ "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview2-25226-02",
+ "System.Security.Permissions": "4.4.0-preview2-25226-02"
},
"frameworks": {
"netcoreapp2.0": {
diff --git a/tests/src/Common/test_runtime/project.json b/tests/src/Common/test_runtime/project.json
index 575d75d089..ed7c2d2d3e 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-preview1-25221-01",
+ "Microsoft.NETCore.Platforms": "2.0.0-preview2-25226-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 18907a1214..28878168ca 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-preview1-25221-01",
+ "Microsoft.NETCore.Platforms": "2.0.0-preview2-25226-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",
"System.IO.FileSystem": "4.4.0-beta-24913-02",
- "System.Numerics.Vectors": "4.4.0-preview1-25221-01",
+ "System.Numerics.Vectors": "4.4.0-preview2-25226-02",
"System.Reflection": "4.4.0-beta-24913-02",
"System.Reflection.Extensions": "4.4.0-beta-24913-02",
- "System.Reflection.TypeExtensions": "4.4.0-preview1-25221-01",
+ "System.Reflection.TypeExtensions": "4.4.0-preview2-25226-02",
"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 b71701f9ef..edb5b7f815 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-preview1-25221-01",
+ "Microsoft.NETCore.Platforms": "2.0.0-preview2-25226-02",
"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-preview1-25221-01",
+ "System.Reflection.TypeExtensions": "4.4.0-preview2-25226-02",
"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 aac92ecc0b..0388a6de08 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-preview1-25221-01",
+ "Microsoft.NETCore.Platforms": "2.0.0-preview2-25226-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-preview1-25221-01",
- "System.Numerics.Vectors": "4.4.0-preview1-25221-01",
+ "System.Memory": "4.4.0-preview2-25226-02",
+ "System.Numerics.Vectors": "4.4.0-preview2-25226-02",
"System.Reflection": "4.4.0-beta-24913-02",
"System.Reflection.Extensions": "4.4.0-beta-24913-02",
- "System.Reflection.TypeExtensions": "4.4.0-preview1-25221-01",
+ "System.Reflection.TypeExtensions": "4.4.0-preview2-25226-02",
"System.Runtime": "4.4.0-beta-24913-02",
- "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25221-01",
+ "System.Runtime.CompilerServices.Unsafe": "4.4.0-preview2-25226-02",
"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 56585e12b7..13543fdfab 100644
--- a/tests/src/TestWrappersConfig/project.json
+++ b/tests/src/TestWrappersConfig/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "Microsoft.NETCore.Platforms": "2.0.0-preview1-25221-01",
+ "Microsoft.NETCore.Platforms": "2.0.0-preview2-25226-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 86a42f2df7..49679535f3 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-preview1-25221-01",
+ "Microsoft.NETCore.Platforms": "2.0.0-preview2-25226-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.Expressions": "4.4.0-beta-24913-02",
- "System.Numerics.Vectors": "4.4.0-preview1-25221-01",
+ "System.Numerics.Vectors": "4.4.0-preview2-25226-02",
"System.Reflection": "4.4.0-beta-24913-02",
"System.Reflection.Extensions": "4.4.0-beta-24913-02",
- "System.Reflection.TypeExtensions": "4.4.0-preview1-25221-01",
+ "System.Reflection.TypeExtensions": "4.4.0-preview2-25226-02",
"System.Runtime": "4.4.0-beta-24913-02",
"System.Runtime.Extensions": "4.4.0-beta-24913-02",
"System.Runtime.Loader": "4.0.0",