Skip to content

Commit

Permalink
Merge pull request dotnet/corefx#10972 from stephentoub/update_coreclr
Browse files Browse the repository at this point in the history
Update dev/api coreclr dependency to 24418-04

Commit migrated from dotnet/corefx@079e414
  • Loading branch information
stephentoub authored Aug 19, 2016
2 parents fc4c1bd + 40af178 commit 88916fc
Show file tree
Hide file tree
Showing 38 changed files with 54 additions and 54 deletions.
2 changes: 1 addition & 1 deletion src/libraries/Common/test-runtime/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"Microsoft.NETCore.Platforms": "1.0.2-beta-devapi-24418-01",
"Microsoft.NETCore.Targets": "1.0.3-beta-devapi-24418-01",
"Microsoft.NETCore.TestHost": "1.1.0-beta-24416-04",
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.0-beta-24418-02",
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.0-beta-24418-04",
"System.Diagnostics.Contracts": "4.0.2-beta-devapi-24418-01",
"System.IO.Compression": "4.2.0-beta-devapi-24418-01",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.1-beta-devapi-24418-01",
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.AppContext/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"frameworks": {
"netstandard1.6": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.6"
]
},
"netcore50": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
}
},
"net463": {
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Collections/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"netstandard1.3": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.4"
Expand All @@ -12,7 +12,7 @@
"netstandard1.7": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.6"
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Diagnostics.Contracts/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"frameworks": {
"netstandard1.0": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.1"
]
},
"netcore50": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
}
},
"net46": {
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Diagnostics.Debug/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.3": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.4"
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Diagnostics.Debug/tests/project.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.2-beta-devapi-24418-01",
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02",
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04",
"System.Linq.Expressions": "4.2.0-beta-devapi-24418-01",
"System.ObjectModel": "4.0.13-beta-devapi-24418-01",
"System.Text.RegularExpressions": "4.2.0-beta-devapi-24418-01",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.3": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02",
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04",
"System.IO.FileSystem": "4.0.1",
"System.Reflection.Metadata": "1.4.1-beta-devapi-24418-01",
"System.Collections.Immutable": "1.2.0"
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Diagnostics.Tools/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.3": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.4"
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Diagnostics.Tracing/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"netstandard1.5": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.6"
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Globalization.Calendars/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"frameworks": {
"netstandard1.3": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.4"
]
},
"netcore50": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
}
},
"net46": {
Expand Down
6 changes: 3 additions & 3 deletions src/libraries/System.Globalization/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
"frameworks": {
"netstandard1.3": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.4"
]
},
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.8"
]
},
"netcore50": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
}
},
"net463": {
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.IO/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"frameworks": {
"netstandard1.6": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.7"
]
},
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.8"
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Private.Uri/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.0": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.1"
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Private.Xml/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependencies": {
"Microsoft.CSharp": "4.0.2-beta-devapi-24418-01",
"Microsoft.NETCore.Platforms": "1.0.2-beta-devapi-24418-01",
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.0-beta-24418-02",
"Microsoft.NETCore.Runtime.CoreCLR": "1.1.0-beta-24418-04",
"Microsoft.Win32.Registry": "4.0.1-beta-devapi-24418-01",
"System.Collections": "4.1.0-beta-devapi-24418-01",
"System.Collections.NonGeneric": "4.1.0-beta-devapi-24418-01",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"frameworks": {
"netstandard1.3": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.4"
]
},
"netcore50": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
}
},
"net46": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"frameworks": {
"netstandard1.3": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.4"
]
},
"netcore50": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
}
},
"net46": {
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Reflection.Emit/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"frameworks": {
"netstandard1.3": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.4"
]
},
"netcore50": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
}
},
"net46": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"netstandard1.3": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"netstandard1.0": {
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1",
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.5": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
}
},
"net462": {
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Reflection/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"frameworks": {
"netstandard1.5": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.6"
]
},
"netcore50": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
}
},
"net462": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"frameworks": {
"netstandard1.3": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.4"
]
},
"netcore50": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
}
},
"net46": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.3": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.4"
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Runtime.Extensions/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"frameworks": {
"netcoreapp1.0": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dnxcore50"
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Runtime.Handles/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.3": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.3": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.6": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.7"
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Runtime.Loader/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.5": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.6"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"frameworks": {
"netstandard1.3": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02",
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04",
"Microsoft.TargetingPack.Private.WinRT": "1.0.1"
},
"imports": [
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Runtime/src/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"frameworks": {
"netstandard1.7": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
}
},
"netstandard1.5": {
"dependencies": {
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-02"
"Microsoft.TargetingPack.Private.CoreCLR": "1.1.0-beta-24418-04"
},
"imports": [
"dotnet5.6"
Expand Down
Loading

0 comments on commit 88916fc

Please sign in to comment.