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

Commit 635cf40

Browse files
Sridhar-MSSridhar-MS
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"

‎TestAssets/TestPackages/dotnet-dependency-tool-invoker/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"Microsoft.NETCore.App": {
1414
"type": "platform",
15-
"version": "1.0.0"
15+
"version": "1.0.1"
1616
},
1717
"Microsoft.DotNet.Cli.Utils": {
1818
"target": "project"

‎TestAssets/TestPackages/dotnet-desktop-and-portable/project.json

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

‎TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/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/dotnet-hello/v2/dotnet-hello/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/dotnet-portable/project.json

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

‎TestAssets/TestProjects/AppWithAppDependency/TestApp1/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"Microsoft.NETCore.App": {
1414
"type": "platform",
15-
"version": "1.0.0"
15+
"version": "1.0.1"
1616
}
1717
}
1818
}

‎TestAssets/TestProjects/AppWithAppDependency/TestApp2/project.json

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

‎TestAssets/TestProjects/AppWithBomGlobalJson/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/TestProjects/AppWithDependencyOnToolWithOutputName/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
},
66
"dependencies": {
77
"Microsoft.NETCore.App": {
8-
"version": "1.0.0",
8+
"version": "1.0.1",
99
"type": "platform"
1010
}
1111
},

‎TestAssets/TestProjects/AppWithDirectAndToolDependency/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
"dotnet-hello": {
99
"version": "1.0.0",
1010
"target": "package"

‎TestAssets/TestProjects/AppWithDirectDependency/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
"dotnet-hello": {
99
"version": "1.0.0",
1010
"target": "package"

‎TestAssets/TestProjects/AppWithDirectDependencyAndTypeBuild/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
},
66
"dependencies": {
77
"Microsoft.NETCore.App": {
8-
"version": "1.0.0",
8+
"version": "1.0.1",
99
"type": "platform"
1010
},
1111
"xunit.core": "2.1.0",

‎TestAssets/TestProjects/AppWithDirectDependencyWithOutputName/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"target": "package"
99
},
1010
"Microsoft.NETCore.App": {
11-
"version": "1.0.0",
11+
"version": "1.0.1",
1212
"type": "platform"
1313
}
1414
},

‎TestAssets/TestProjects/AppWithOutputAssemblyName/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/TestProjects/AppWithToolDependency/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/TestProjects/CompileFail/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/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json

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

‎TestAssets/TestProjects/DependencyContextFromTool/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"dependencies": {
1313
"Microsoft.NETCore.App": {
1414
"type": "platform",
15-
"version": "1.0.0"
15+
"version": "1.0.1"
1616
}
1717
}
1818
}

‎TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"preserveCompilationContext": true
66
},
77
"dependencies": {
8-
"Microsoft.NETCore.App": "1.0.0",
8+
"Microsoft.NETCore.App": "1.0.1",
99
"DependencyContextValidator": "1.0.0-*"
1010
},
1111
"frameworks": {

‎TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/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
"DependencyContextValidator": "1.0.0-*"
99
},
1010
"frameworks": {

‎TestAssets/TestProjects/DependencyContextValidator/TestAppPortable/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dependencies": {
88
"Microsoft.NETCore.App": {
99
"type": "platform",
10-
"version": "1.0.0"
10+
"version": "1.0.1"
1111
},
1212
"DependencyContextValidator": "1.0.0-*"
1313
},

‎TestAssets/TestProjects/DependencyContextValidator/TestAppPortableDeps/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
"DependencyContextValidator": "1.0.0-*"
1212
},

‎TestAssets/TestProjects/EndToEndTestApp/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"dependencies": {
17-
"Microsoft.NETCore.App": "1.0.0"
17+
"Microsoft.NETCore.App": "1.0.1"
1818
},
1919
"packOptions": {
2020
"files": {

‎TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"dependencies": {
1313
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509",
14-
"Microsoft.NETCore.App": "1.0.0"
14+
"Microsoft.NETCore.App": "1.0.1"
1515
},
1616
"tools": {
1717
"dotnet-compile-fsc": {

‎TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"version": "1.0.0-*",
1515
"target": "project"
1616
},
17-
"Microsoft.NETCore.App": "1.0.0",
17+
"Microsoft.NETCore.App": "1.0.1",
1818
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509"
1919
},
2020
"tools": {

‎TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"dependencies": {
1313
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-160509",
14-
"Microsoft.NETCore.App": "1.0.0"
14+
"Microsoft.NETCore.App": "1.0.1"
1515
},
1616
"tools": {
1717
"dotnet-compile-fsc": {

‎TestAssets/TestProjects/KestrelSample/KestrelPortable/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"dependencies": {
1919
"Microsoft.NETCore.App": {
2020
"type": "platform",
21-
"version": "1.0.0"
21+
"version": "1.0.1"
2222
}
2323
},
2424
"imports": [

‎TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"frameworks": {
1717
"netcoreapp1.0": {
1818
"dependencies": {
19-
"Microsoft.NETCore.App": "1.0.0"
19+
"Microsoft.NETCore.App": "1.0.1"
2020
},
2121
"imports": [
2222
"dnxcore50",

‎TestAssets/TestProjects/OutputStandardOutputAndError/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/TestProjects/PerformanceTestProjects/SingleTargetApp/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
},
1212
"frameworks": {

‎TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP0/project.json

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

‎TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP1/project.json

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

‎TestAssets/TestProjects/PerformanceTestProjects/SingleTargetGraph/SingleTargetP2/project.json

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

0 commit comments

Comments
 (0)