Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Update CoreClr, CoreFx to preview1-25230-02, preview1-25301-01, respectively (release/2.0.0) #11310

Merged
merged 1 commit into from
May 1, 2017
Merged

Update CoreClr, CoreFx to preview1-25230-02, preview1-25301-01, respectively (release/2.0.0) #11310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>10667e2a9a601bc5fe5fe5ec8a50b73b3e271000</CoreFxCurrentRef>
<CoreClrCurrentRef>10667e2a9a601bc5fe5fe5ec8a50b73b3e271000</CoreClrCurrentRef>
<CoreFxCurrentRef>8d2a9168a1a6d42e5f9b0804f3fd60d7cd6d2a66</CoreFxCurrentRef>
<CoreClrCurrentRef>8d2a9168a1a6d42e5f9b0804f3fd60d7cd6d2a66</CoreClrCurrentRef>
</PropertyGroup>

<!-- Auto-upgraded properties for each build info dependency. -->
<PropertyGroup>
<CoreFxExpectedPrerelease>preview1-25229-02</CoreFxExpectedPrerelease>
<CoreFxExpectedPrerelease>preview1-25301-01</CoreFxExpectedPrerelease>
</PropertyGroup>

<!-- Full package version strings that are used in other parts of the build. -->
<PropertyGroup>
<CoreClrPackageVersion>2.0.0-preview1-25229-01</CoreClrPackageVersion>
<CoreClrPackageVersion>2.0.0-preview1-25230-02</CoreClrPackageVersion>
<XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
</PropertyGroup>

Expand Down
10 changes: 5 additions & 5 deletions tests/src/Common/build_against_pkg_dependencies/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"dependencies": {
"Microsoft.NETCore.ILAsm": "2.0.0-preview1-25229-01",
"Microsoft.NETCore.ILDAsm": "2.0.0-preview1-25229-01",
"Microsoft.NETCore.Jit": "2.0.0-preview1-25229-01",
"Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25229-01",
"Microsoft.NETCore.TestHost": "2.0.0-preview1-25229-01"
"Microsoft.NETCore.ILAsm": "2.0.0-preview1-25230-02",
"Microsoft.NETCore.ILDAsm": "2.0.0-preview1-25230-02",
"Microsoft.NETCore.Jit": "2.0.0-preview1-25230-02",
"Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview1-25230-02",
"Microsoft.NETCore.TestHost": "2.0.0-preview1-25230-02"
},
"frameworks": {
"netcoreapp2.0": {
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Common/netcoreapp/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"Microsoft.NETCore.App": "2.0.0-beta-001494-00",
"System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25229-02"
"System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25301-01"
},
"frameworks": {
"netcoreapp2.0": {}
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Common/targeting_pack_ref/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-preview1-25229-01"
"Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-preview1-25230-02"
},
"frameworks": {
"netcoreapp1.1": {
Expand Down
10 changes: 5 additions & 5 deletions tests/src/Common/test_dependencies/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"dependencies": {
"Microsoft.NETCore.Platforms": "2.0.0-preview1-25229-02",
"Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25229-02",
"System.Memory": "4.4.0-preview1-25229-02",
"System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25229-02",
"System.Security.Permissions": "4.4.0-preview1-25229-02"
"Microsoft.NETCore.Platforms": "2.0.0-preview1-25301-01",
"Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview1-25301-01",
"System.Memory": "4.4.0-preview1-25301-01",
"System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25301-01",
"System.Security.Permissions": "4.4.0-preview1-25301-01"
},
"frameworks": {
"netcoreapp2.0": {
Expand Down
2 changes: 1 addition & 1 deletion tests/src/Common/test_runtime/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.NETCore.Platforms": "2.0.0-preview1-25229-02",
"Microsoft.NETCore.Platforms": "2.0.0-preview1-25301-01",
"Microsoft.DotNet.CoreCLR.TestDependencies": "1.0.0-prerelease",
"jit-dasm": "0.0.1.4",
"cijobs": "0.0.1.2",
Expand Down
6 changes: 3 additions & 3 deletions tests/src/JIT/config/benchmark+roslyn/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-25229-02",
"Microsoft.NETCore.Platforms": "2.0.0-preview1-25301-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",
"System.IO.FileSystem": "4.4.0-beta-24913-02",
"System.Numerics.Vectors": "4.4.0-preview1-25229-02",
"System.Numerics.Vectors": "4.4.0-preview1-25301-01",
"System.Reflection": "4.4.0-beta-24913-02",
"System.Reflection.Extensions": "4.4.0-beta-24913-02",
"System.Reflection.TypeExtensions": "4.4.0-preview1-25229-02",
"System.Reflection.TypeExtensions": "4.4.0-preview1-25301-01",
"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",
Expand Down
4 changes: 2 additions & 2 deletions tests/src/JIT/config/benchmark+serialize/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-25229-02",
"Microsoft.NETCore.Platforms": "2.0.0-preview1-25301-01",
"Newtonsoft.Json": "7.0.1",
"System.Console": "4.4.0-beta-24913-02",
"System.IO": "4.4.0-beta-24913-02",
Expand All @@ -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-25229-02",
"System.Reflection.TypeExtensions": "4.4.0-preview1-25301-01",
"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",
Expand Down
10 changes: 5 additions & 5 deletions tests/src/JIT/config/benchmark/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-25229-02",
"Microsoft.NETCore.Platforms": "2.0.0-preview1-25301-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",
"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-25229-02",
"System.Numerics.Vectors": "4.4.0-preview1-25229-02",
"System.Memory": "4.4.0-preview1-25301-01",
"System.Numerics.Vectors": "4.4.0-preview1-25301-01",
"System.Reflection": "4.4.0-beta-24913-02",
"System.Reflection.Extensions": "4.4.0-beta-24913-02",
"System.Reflection.TypeExtensions": "4.4.0-preview1-25229-02",
"System.Reflection.TypeExtensions": "4.4.0-preview1-25301-01",
"System.Runtime": "4.4.0-beta-24913-02",
"System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25229-02",
"System.Runtime.CompilerServices.Unsafe": "4.4.0-preview1-25301-01",
"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",
Expand Down
2 changes: 1 addition & 1 deletion tests/src/TestWrappersConfig/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.NETCore.Platforms": "2.0.0-preview1-25229-02",
"Microsoft.NETCore.Platforms": "2.0.0-preview1-25301-01",
"xunit": "2.2.0-beta2-build3300",
"xunit.assert": "2.2.0-beta2-build3300",
"xunit.core": "2.2.0-beta2-build3300",
Expand Down
6 changes: 3 additions & 3 deletions tests/src/performance/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-25229-02",
"Microsoft.NETCore.Platforms": "2.0.0-preview1-25301-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",
"System.Linq": "4.4.0-beta-24913-02",
"System.Linq.Expressions": "4.4.0-beta-24913-02",
"System.Numerics.Vectors": "4.4.0-preview1-25229-02",
"System.Numerics.Vectors": "4.4.0-preview1-25301-01",
"System.Reflection": "4.4.0-beta-24913-02",
"System.Reflection.Extensions": "4.4.0-beta-24913-02",
"System.Reflection.TypeExtensions": "4.4.0-preview1-25229-02",
"System.Reflection.TypeExtensions": "4.4.0-preview1-25301-01",
"System.Runtime": "4.4.0-beta-24913-02",
"System.Runtime.Extensions": "4.4.0-beta-24913-02",
"System.Runtime.Loader": "4.0.0",
Expand Down