summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Toub <stoub@microsoft.com>2017-02-06 16:32:43 -0500
committerGitHub <noreply@github.com>2017-02-06 16:32:43 -0500
commit65b9cb35226c5395be531554e207bb4e2096092f (patch)
tree44272d51743425cc531f6b441e833c81f4465472
parent83585ce21902048f6ad4b7b48cc9ba53cc72e752 (diff)
parent89ec31faf6c4e3cca133a4fa8d897851b5a044b1 (diff)
downloadcoreclr-65b9cb35226c5395be531554e207bb4e2096092f.tar.gz
coreclr-65b9cb35226c5395be531554e207bb4e2096092f.tar.bz2
coreclr-65b9cb35226c5395be531554e207bb4e2096092f.zip
Merge pull request #9372 from dotnet-bot/master-UpdateDependencies
Update CoreClr, CoreFx to beta-25006-03, beta-25006-01, respectively (master)
-rw-r--r--dependencies.props8
-rw-r--r--tests/src/Common/build_against_pkg_dependencies/project.json10
-rw-r--r--tests/src/Common/targeting_pack_ref/project.json2
-rw-r--r--tests/src/Common/test_dependencies/project.json2
-rw-r--r--tests/src/Common/test_runtime/project.json2
-rw-r--r--tests/src/JIT/config/benchmark+roslyn/project.json2
-rw-r--r--tests/src/JIT/config/benchmark+serialize/project.json2
-rw-r--r--tests/src/JIT/config/benchmark/project.json2
-rw-r--r--tests/src/JIT/config/extra/project.json2
-rw-r--r--tests/src/JIT/config/minimal/project.json2
-rw-r--r--tests/src/JIT/config/threading+thread/project.json2
-rw-r--r--tests/src/JIT/config/threading/project.json2
-rw-r--r--tests/src/TestWrappersConfig/project.json2
-rw-r--r--tests/src/performance/project.json2
14 files changed, 21 insertions, 21 deletions
diff --git a/dependencies.props b/dependencies.props
index cd51c6ba37..5f10e99e31 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>6ebb1923d44306ebc37fe819f95f54e547a38c46</CoreFxCurrentRef>
- <CoreClrCurrentRef>12c003566891efaa83edd960ee54fe9f417cc18e</CoreClrCurrentRef>
+ <CoreFxCurrentRef>bcd06bf0e441fa9c018bf722f08bbaece884a8f9</CoreFxCurrentRef>
+ <CoreClrCurrentRef>bcd06bf0e441fa9c018bf722f08bbaece884a8f9</CoreClrCurrentRef>
</PropertyGroup>
<!-- Auto-upgraded properties for each build info dependency. -->
<PropertyGroup>
- <CoreFxExpectedPrerelease>beta-25004-01</CoreFxExpectedPrerelease>
+ <CoreFxExpectedPrerelease>beta-25006-01</CoreFxExpectedPrerelease>
</PropertyGroup>
<!-- Full package version strings that are used in other parts of the build. -->
<PropertyGroup>
- <CoreClrPackageVersion>2.0.0-beta-25006-02</CoreClrPackageVersion>
+ <CoreClrPackageVersion>2.0.0-beta-25006-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 f04e664695..b285f82386 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-02",
- "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25006-02",
- "Microsoft.NETCore.Jit": "2.0.0-beta-25006-02",
- "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25006-02",
- "Microsoft.NETCore.TestHost": "2.0.0-beta-25006-02"
+ "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"
},
"frameworks": {
"netcoreapp1.1": {
diff --git a/tests/src/Common/targeting_pack_ref/project.json b/tests/src/Common/targeting_pack_ref/project.json
index 7b7902d7db..f8a42864a8 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-02"
+ "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-beta-25006-03"
},
"frameworks": {
"netcoreapp1.1": {
diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json
index c4937b6e47..5032c233fc 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-25004-01",
+ "Microsoft.NETCore.Platforms": "2.0.0-beta-25006-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 79f3079914..734f56c7c9 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-25004-01",
+ "Microsoft.NETCore.Platforms": "2.0.0-beta-25006-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 728a62ac55..cfcc25c4e8 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-25004-01",
+ "Microsoft.NETCore.Platforms": "2.0.0-beta-25006-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 4e3e6bfb3a..ff25c25967 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-25004-01",
+ "Microsoft.NETCore.Platforms": "2.0.0-beta-25006-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 1fd50576f5..0a490597a1 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-25004-01",
+ "Microsoft.NETCore.Platforms": "2.0.0-beta-25006-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 16db7e0ec1..44ec5d06a8 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-25004-01",
+ "Microsoft.NETCore.Platforms": "2.0.0-beta-25006-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 126e73a1f7..79ed279745 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-25004-01",
+ "Microsoft.NETCore.Platforms": "2.0.0-beta-25006-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 7a016b4309..df3ed98dcd 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-25004-01",
+ "Microsoft.NETCore.Platforms": "2.0.0-beta-25006-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 076bf7c2a2..a3aa164268 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-25004-01",
+ "Microsoft.NETCore.Platforms": "2.0.0-beta-25006-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 04cebc5620..e68e03e55a 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-25004-01",
+ "Microsoft.NETCore.Platforms": "2.0.0-beta-25006-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 fce37f3a7e..63d52073b8 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-25004-01",
+ "Microsoft.NETCore.Platforms": "2.0.0-beta-25006-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",