Skip to content

Commit 635cf40

Browse files
authored
Merge pull request #4119 from dotnet/preview2-upgrade
Upgrade Corefx and coreclr references
2 parents 1e9d529 + 5e173f3 commit 635cf40

File tree

140 files changed

+193
-178
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+193
-178
lines changed

TestAssets/DesktopTestProjects/AppWithDirectDependencyDesktopAndPortable/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dependencies": {
1212
"Microsoft.NETCore.App": {
1313
"type": "platform",
14-
"version": "1.0.0"
14+
"version": "1.0.1"
1515
}
1616
},
1717
"imports": [

TestAssets/NonRestoredTestProjects/TestProjectWithUnresolvedDependency/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dependencies": {
77
"Microsoft.NETCore.App": {
88
"type": "platform",
9-
"version": "1.0.0"
9+
"version": "1.0.1"
1010
},
1111
"ThisIsNotARealDependencyAndIfSomeoneGoesAndAddsAProjectWithThisNameIWillFindThemAndPunishThem": {
1212
"target": "project"

TestAssets/ProjectModelServer/DthTestProjects/src/BrokenProjectPathSample/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"Microsoft.NETCore.App": "1.0.0",
3+
"Microsoft.NETCore.App": "1.0.1",
44
"EmptyLibrary": "1.0.0-*"
55
},
66
"frameworks": {

TestAssets/ProjectModelServer/DthTestProjects/src/EmptyConsoleApp/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"frameworks": {
44
"netcoreapp1.0": {
55
"dependencies": {
6-
"Microsoft.NETCore.App": "1.0.0"
6+
"Microsoft.NETCore.App": "1.0.1"
77
}
88
},
99
"dnx451": {}

TestAssets/ProjectModelServer/DthTestProjects/src/EmptyNetCoreApp/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dependencies": {
77
"Microsoft.NETCore.App": {
88
"type": "platform",
9-
"version": "1.0.0"
9+
"version": "1.0.1"
1010
},
1111
"Newtonsoft.Json": "8.0.3"
1212
}

TestAssets/ProjectModelServer/DthTestProjects/src/FailReleaseProject/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"netcoreapp1.0": {
44
"imports": "dnxcore50",
55
"dependencies": {
6-
"Microsoft.NETCore.App": "1.0.0"
6+
"Microsoft.NETCore.App": "1.0.1"
77
}
88
}
99
},

TestAssets/ProjectModelServer/DthTestProjects/src/IncompatiblePackageSample/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependencies": {
3-
"Microsoft.NETCore.App": "1.0.0",
3+
"Microsoft.NETCore.App": "1.0.1",
44
"Microsoft.Web.Administration": "7.0.0"
55
},
66
"frameworks": {

TestAssets/ProjectModelServer/IncorrectGlobalJson/src/Project1/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"emitEntryPoint": true
55
},
66
"dependencies": {
7-
"Microsoft.NETCore.App": "1.0.0"
7+
"Microsoft.NETCore.App": "1.0.1"
88
},
99
"frameworks": {
1010
"netcoreapp1.0": {}

TestAssets/TestPackages/ToolWithOutputName/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"dependencies": {
1010
"Microsoft.NETCore.App": {
1111
"type": "platform",
12-
"version": "1.0.0"
12+
"version": "1.0.1"
1313
}
1414
}
1515
}

TestAssets/TestPackages/dotnet-dependency-context-test/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"dependencies": {
77
"Microsoft.NETCore.App": {
88
"type": "platform",
9-
"version": "1.0.0"
9+
"version": "1.0.1"
1010
},
1111
"Microsoft.Extensions.DependencyModel": {
1212
"target": "project"

0 commit comments

Comments
 (0)