mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #3215 from eerhardt/netcore-rc3

Browse source 
Upgrade to CoreFX rc3
This commit is contained in:
Livar 2016-05-24 10:33:59 -07:00
commit fe7b519722
113 changed files with 702 additions and 315 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
NuGet.Config
View file

@ -3,6 +3,7 @@
<packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear />
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
<add key="cli-deps" value="https://dotnet.myget.org/F/cli-deps/api/v3/index.json" />
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
</packageSources>

4
TestAssets/DesktopTestProjects/DesktopAppWithNativeDep/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*",
"dependencies": {
"PackageWithFakeNativeDep": "1.0.0-*",
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24027"
"Microsoft.NETCore.Platforms": "1.0.0-rc3-24123-01"
},
"buildOptions": {
"emitEntryPoint": true
@ -10,4 +10,4 @@
"frameworks": {
"net451": {}
}
}
}

4
TestAssets/DesktopTestProjects/DesktopAppWithRuntimes/project.json
View file

@ -1,7 +1,7 @@
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc2-*"
"Microsoft.NETCore.Windows.ApiSets": "1.0.1-rc3-24123-01"
},
"buildOptions": {
"emitEntryPoint": true
@ -12,4 +12,4 @@
"runtimes": {
"win7-x64": {}
}
}
}

4
TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktop/project.json
View file

@ -4,7 +4,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113",
"Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24027"
"Microsoft.NETCore.Platforms": "1.0.0-rc3-24123-01"
},
"buildOptions": {
"emitEntryPoint": true,
@ -17,4 +17,4 @@
"frameworks": {
"net451": {}
}
}
}

4
TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopForce32/project.json
View file

@ -4,7 +4,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113",
"Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24027"
"Microsoft.NETCore.Platforms": "1.0.0-rc3-24123-01"
},
"buildOptions": {
"platform": "anycpu32bitpreferred",
@ -18,4 +18,4 @@
"frameworks": {
"net451": {}
}
}
}

4
TestAssets/DesktopTestProjects/DesktopKestrelSample/KestrelDesktopWithRuntimes/project.json
View file

@ -4,7 +4,7 @@
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-20113",
"Microsoft.AspNetCore.Hosting": "1.0.0-rc2-20113",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-20254",
"Microsoft.NETCore.Platforms": "1.0.0-rc2-24027"
"Microsoft.NETCore.Platforms": "1.0.0-rc3-24123-01"
},
"buildOptions": {
"emitEntryPoint": true,
@ -22,4 +22,4 @@
"win7-x64": {},
"osx.10.11-x64": {}
}
}
}

4
TestAssets/DesktopTestProjects/LibraryWithDirectDependencyDesktopAndPortable/project.json
View file

@ -9,7 +9,7 @@
"frameworks": {
"netstandard1.5": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
},
"imports": [
"portable-net45+win8",
@ -28,4 +28,4 @@
]
}
}
}
}

2
TestAssets/ProjectModelServer/DthTestProjects/src/EmptyLibrary/project.json
View file

@ -5,7 +5,7 @@
"netstandard1.3": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
}
}
}

10
TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json
View file

@ -8,5 +8,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

10
TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json
View file

@ -8,5 +8,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

10
TestAssets/TestProjects/AppWithBomGlobalJson/project.json
View file

@ -9,6 +9,16 @@
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
},
"tools": {
"dotnet-portable": {
"version": "1.0.0",

10
TestAssets/TestProjects/AppWithDirectAndToolDependency/project.json
View file

@ -13,6 +13,16 @@
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
},
"tools": {
"dotnet-portable": {
"version": "1.0.0",

10
TestAssets/TestProjects/AppWithDirectDependency/project.json
View file

@ -12,5 +12,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

10
TestAssets/TestProjects/AppWithOutputAssemblyName/project.json
View file

@ -8,5 +8,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

10
TestAssets/TestProjects/AppWithToolDependency/project.json
View file

@ -14,5 +14,15 @@
"version": "1.0.0",
"target": "package"
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

10
TestAssets/TestProjects/CompileFail/project.json
View file

@ -8,5 +8,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

2
TestAssets/TestProjects/DependencyChangeTest/PortableApp_Standalone/project.json.modified
View file

@ -7,7 +7,7 @@
"netcoreapp1.0": {
"dependencies": {
"Microsoft.NETCore.App": {
"version": "1.0.0-rc2-*"
"version": "1.0.0-rc3-*"
}
}
}

17
TestAssets/TestProjects/DependencyContextValidator/TestApp/project.json
View file

@ -9,11 +9,16 @@
"DependencyContextValidator": "1.0.0-*"
},
"frameworks": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
"netcoreapp1.0": { "imports": ["dnxcore50", "portable-net45+win8"] }
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

17
TestAssets/TestProjects/DependencyContextValidator/TestAppDeps/project.json
View file

@ -8,11 +8,16 @@
"DependencyContextValidator": "1.0.0-*"
},
"frameworks": {
"netcoreapp1.0": {
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
"netcoreapp1.0": { "imports": ["dnxcore50", "portable-net45+win8"] }
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

5
TestAssets/TestProjects/DuplicatedReferenceAssembly/TestApp/project.json
View file

@ -2,10 +2,9 @@
"version": "1.0.0",
"dependencies": {
"TestLibrary": "1.0.0",
"System.IO.Compression": "4.1.0-rc2-24027"
"System.IO.Compression": "4.1.0-rc3-24123-01"
},
"frameworks": {
"net461": {
}
"net461": {}
}
}

10
TestAssets/TestProjects/EndToEndTestApp/project.json
View file

@ -27,5 +27,15 @@
"publishOptions": "testpublishfile.txt",
"frameworks": {
"netcoreapp1.0": { }
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

10
TestAssets/TestProjects/FSharpTestProjects/CompileFailApp/project.json
View file

@ -30,5 +30,15 @@
"netstandard1.3"
]
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

10
TestAssets/TestProjects/FSharpTestProjects/TestApp/project.json
View file

@ -31,5 +31,15 @@
"netcoreapp1.0": {
"imports": "dnxcore50"
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

10
TestAssets/TestProjects/FSharpTestProjects/TestAppWithArgs/project.json
View file

@ -27,5 +27,15 @@
"netcoreapp1.0": {
"imports": "dnxcore50"
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

4
TestAssets/TestProjects/FSharpTestProjects/TestLibrary/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*",
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
},
"tools": {
"dotnet-compile-fsc": {
@ -28,4 +28,4 @@
]
}
}
}
}

10
TestAssets/TestProjects/KestrelSample/KestrelStandalone/project.json
View file

@ -23,5 +23,15 @@
"portable-net45+win8"
]
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

4
TestAssets/TestProjects/LibraryWithOutputAssemblyName/project.json
View file

@ -3,9 +3,9 @@
"outputName": "MyLibrary"
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
},
"frameworks": {
"netstandard1.5": {}
}
}
}

10
TestAssets/TestProjects/OutputStandardOutputAndError/project.json
View file

@ -8,5 +8,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

6
TestAssets/TestProjects/ProjectsWithTests/MultipleFrameworkProject/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*",
"dependencies": {
"dotnet-test-xunit": "1.0.0-rc2-192208-24",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24123-01",
"xunit": "2.1.0"
},
"frameworks": {
@ -17,8 +17,8 @@
"type": "platform",
"version": "1.0.0-rc2-*"
},
"System.Linq.Expressions": "4.0.11-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027"
"System.Linq.Expressions": "4.1.0-rc3-24123-01",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01"
}
},
"net451": {}

4
TestAssets/TestProjects/ProjectsWithTests/NetCoreAppOnlyProject/project.json
View file

@ -5,8 +5,8 @@
"type": "platform",
"version": "1.0.0-rc2-*"
},
"System.Linq.Expressions": "4.0.11-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Linq.Expressions": "4.1.0-rc3-24123-01",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24"
},

2
TestAssets/TestProjects/ResourcesTests/TestLibraryWithResources/project.json
View file

@ -1,7 +1,7 @@
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
},
"frameworks": {
"netstandard1.5": {

10
TestAssets/TestProjects/TestAppCompilationContext/TestApp/project.json
View file

@ -10,5 +10,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

4
TestAssets/TestProjects/TestAppCompilationContext/TestLibrary/project.json
View file

@ -10,9 +10,9 @@
]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
},
"frameworks": {
"netstandard1.5": {}
}
}
}

10
TestAssets/TestProjects/TestAppWithArgs/project.json
View file

@ -8,5 +8,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

17
TestAssets/TestProjects/TestAppWithContentPackage/project.json
View file

@ -9,11 +9,16 @@
"SharedContentA": "1.0.0-*"
},
"frameworks": {
"netcoreapp1.0": {
"imports": [
"netstandardapp1.5",
"dnxcore50"
]
}
"netcoreapp1.0": { "imports": ["netstandardapp1.5", "dnxcore50"] }
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

10
TestAssets/TestProjects/TestAppWithContents/project.json
View file

@ -14,5 +14,15 @@
},
"publishOptions": {
"include": "testcontentfile.txt"
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

10
TestAssets/TestProjects/TestAppWithLibrary/TestApp/project.json
View file

@ -13,5 +13,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

4
TestAssets/TestProjects/TestAppWithLibrary/TestLibrary/project.json
View file

@ -10,9 +10,9 @@
]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
},
"frameworks": {
"netstandard1.5": {}
}
}
}

10
TestAssets/TestProjects/TestAppWithScripts/project.json
View file

@ -9,6 +9,16 @@
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
},
"scripts": {
"prepublish": [
"echoscript prepublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:TargetFramework%? ?%publish:Runtime%?"

10
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestApp/project.json
View file

@ -14,6 +14,16 @@
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
},
"scripts": {
"prepublish": [
"echo prepublish_output ?%publish:ProjectPath%? ?%publish:Configuration%? ?%publish:OutputPath%? ?%publish:Framework%? ?%publish:Runtime%?"

4
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary/project.json
View file

@ -10,9 +10,9 @@
]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
},
"frameworks": {
"netcoreapp1.0": {}
}
}
}

14
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibrary2/project.json
View file

@ -8,9 +8,19 @@
"target": "project",
"version": "1.0.0-*"
},
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
},
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}
}

2
TestAssets/TestProjects/TestAppWithTransitiveAppDependency/TestLibraryWithAppDependency/project.json
View file

@ -5,7 +5,7 @@
"target": "project",
"version": "1.0.0-*"
},
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
},
"frameworks": {
"netcoreapp1.0": {}

10
TestAssets/TestProjects/TestAppWithWrapperProjectDependency/TestApp/project.json
View file

@ -13,5 +13,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

3
TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json
View file

@ -1,6 +1,5 @@
{
"version": "1.0.0-*",
"testRunner": "xunit",
"dependencies": {
"Newtonsoft.Json": "7.0.1"
},
@ -8,7 +7,7 @@
"net451": {},
"netstandard1.5": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
},
"imports": "portable-net45+win8"
}

12
TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json
View file

@ -1,6 +1,8 @@
{
"version": "1.0.0-*",
"testRunner": "xunit",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"Newtonsoft.Json": "6.0.1",
"TestLibraryGreater": {
@ -9,11 +11,15 @@
},
"frameworks": {
"net451": {},
"netstandard1.5": {
"netcoreapp1.0": {
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"Microsoft.NETCore.App": "1.0.0-rc3-*"
},
"imports": "portable-net45+win8"
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {}
}
}

2
TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json
View file

@ -1,7 +1,7 @@
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"NETStandard.Library": "1.5.0-rc3-24123-01",
"System.Runtime.Analyzers": {
"version": "1.1.0",
"type": "build"

4
TestAssets/TestProjects/TestLibraryWithConfiguration/project.json
View file

@ -10,7 +10,7 @@
]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
},
"configurations": {
"Test": {}
@ -18,4 +18,4 @@
"frameworks": {
"netstandard1.5": {}
}
}
}

4
TestAssets/TestProjects/TestLibraryWithDeprecatedProjectFile/project.json
View file

@ -5,9 +5,9 @@
},
"packInclude": {},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
},
"frameworks": {
"netstandard1.5": {}
}
}
}

4
TestAssets/TestProjects/TestLibraryWithMultipleFrameworks/project.json
View file

@ -28,8 +28,8 @@
"netstandard1.5": {
"imports": "dnxcore50",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
}
}
}
}
}

4
TestAssets/TestProjects/TestLibraryWithXmlDoc/project.json
View file

@ -4,9 +4,9 @@
"xmlDoc": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
},
"frameworks": {
"netstandard1.5": {}
}
}
}

12
TestAssets/TestProjects/TestMicrosoftCSharpReference/project.json
View file

@ -10,8 +10,18 @@
},
"net451": {
"dependencies": {
"Microsoft.CSharp": "4.0.1-rc2-24027"
"Microsoft.CSharp": "4.0.1-rc3-24123-01"
}
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

14
TestAssets/TestProjects/TestMicrosoftCSharpReferenceMissingFramework/project.json
View file

@ -10,13 +10,23 @@
},
"netcore50": {
"dependencies": {
"System.Private.Uri": "4.0.1-rc2-24027"
"System.Private.Uri": "4.0.1-rc3-24123-01"
}
},
"net99": {
"dependencies": {
"Microsoft.CSharp": "4.0.1-rc2-24027"
"Microsoft.CSharp": "4.0.1-rc3-24123-01"
}
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

10
TestAssets/TestProjects/TestMscorlibReference/project.json
View file

@ -12,5 +12,15 @@
"mscorlib": ""
}
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

10
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json
View file

@ -10,5 +10,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

10
TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json
View file

@ -8,5 +8,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

10
TestAssets/TestProjects/TestProjectWithResource/project.json
View file

@ -8,5 +8,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

6
TestAssets/TestProjects/TestRuleSet/TestLibraryWithRuleSet/project.json
View file

@ -1,10 +1,12 @@
{
"version": "1.0.0-*",
"buildOptions": {
"additionalArguments": [ "/ruleset:../global.ruleset" ]
"additionalArguments": [
"/ruleset:../global.ruleset"
]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"NETStandard.Library": "1.5.0-rc3-24123-01",
"System.Runtime.Analyzers": {
"version": "1.1.0",
"type": "build"

10
TestAssets/TestProjects/TestSimpleIncrementalApp/project.json
View file

@ -9,5 +9,15 @@
},
"frameworks": {
"netcoreapp1.0": {}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

10
TestAssets/TestProjects/TestSystemCoreReference/project.json
View file

@ -12,5 +12,15 @@
"System": ""
}
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

10
TestAssets/TestProjects/TestSystemReference/project.json
View file

@ -12,5 +12,15 @@
"System.Core": ""
}
}
},
"runtimes": {
"win7-x64": {},
"win7-x86": {},
"osx.10.10-x64": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

8
build_projects/Microsoft.DotNet.Cli.Build.Framework/project.json
View file

@ -10,12 +10,12 @@
]
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"System.Diagnostics.Process": "4.1.0-rc2-24027",
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01",
"System.Diagnostics.Process": "4.1.0-rc3-24123-01",
"System.Reflection.TypeExtensions": "4.1.0-rc3-24123-01"
},
"frameworks": {
"netstandard1.3": {
"netstandard1.6": {
"imports": "dnxcore50"
}
}

2
build_projects/dotnet-cli-build/CompileTargets.cs
View file

@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Cli.Build
{
public class CompileTargets
{
public static readonly string CoreCLRVersion = "1.0.2-rc2-24027";
public static readonly string CoreCLRVersion = "1.0.2-rc3-24123-01";
public static readonly bool IsWinx86 = CurrentPlatform.IsWindows && CurrentArchitecture.Isx86;
public static readonly string[] BinariesForCoreHost = new[]

9
build_projects/dotnet-cli-build/TestTargets.cs
View file

@ -34,7 +34,8 @@ namespace Microsoft.DotNet.Cli.Build
"dotnet-run.UnitTests",
"dotnet-test.Tests",
"dotnet-test.UnitTests",
"Kestrel.Tests",
// TODO: https://github.com/dotnet/cli/issues/3216
//"Kestrel.Tests",
"Microsoft.DotNet.Cli.Utils.Tests",
"Microsoft.DotNet.Compiler.Common.Tests",
"Microsoft.DotNet.ProjectModel.Tests",
@ -82,8 +83,7 @@ namespace Microsoft.DotNet.Cli.Build
CleanNuGetTempCache();
var dotnet = DotNetCli.Stage2;
dotnet.Restore("--verbosity", "verbose",
"--infer-runtimes",
dotnet.Restore("--verbosity", "verbose",
"--fallbacksource", Dirs.CorehostLocalPackages,
"--fallbacksource", Dirs.CorehostDummyPackages)
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "TestPackages"))
@ -103,8 +103,7 @@ namespace Microsoft.DotNet.Cli.Build
var dotnet = DotNetCli.Stage2;
dotnet.Restore(
"--verbosity", "verbose",
"--infer-runtimes",
"--verbosity", "verbose",
"--fallbacksource", Dirs.TestPackages,
"--fallbacksource", Dirs.CorehostLocalPackages,
"--fallbacksource", Dirs.CorehostDummyPackages)

3
build_projects/dotnet-cli-build/build.ps1
View file

@ -35,6 +35,9 @@ else
$env:DOTNET_BUILD_SKIP_PACKAGING=0
}
Write-Host "Disabling crossgen for the CLI build. See issue - https://github.com/dotnet/cli/issues/3059"
$env:DISABLE_CROSSGEN=1
# Load Branch Info
cat "$RepoRoot\branchinfo.txt" | ForEach-Object {
if(!$_.StartsWith("#") -and ![String]::IsNullOrWhiteSpace($_)) {

35
build_projects/dotnet-cli-build/project.json
View file

@ -5,16 +5,21 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"Microsoft.CSharp": "4.0.1-rc2-24027",
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.Reflection.Metadata": "1.3.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Xml.XmlSerializer": "4.0.11-rc2-24027",
"NETStandard.Library": "1.5.0-rc3-24123-01",
"Microsoft.NETCore.Runtime": "1.0.2-rc3-24123-01",
"Microsoft.CSharp": "4.0.1-rc3-24123-01",
"System.Dynamic.Runtime": "4.0.11-rc3-24123-01",
"System.Reflection.Metadata": "1.3.0-rc3-24123-01",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"System.Xml.XmlSerializer": "4.0.11-rc3-24123-01",
"WindowsAzure.Storage": "6.2.2-preview",
"NuGet.CommandLine.XPlat": "3.5.0-rc-1285",
"Microsoft.DotNet.Cli.Build.Framework": { "target": "project" },
"shared-build-targets-utils": { "target": "project" }
"Microsoft.DotNet.Cli.Build.Framework": {
"target": "project"
},
"shared-build-targets-utils": {
"target": "project"
}
},
"frameworks": {
"netcoreapp1.0": {
@ -25,12 +30,12 @@
}
},
"runtimes": {
"win7-x64": { },
"win7-x86": { },
"osx.10.11-x64": { },
"ubuntu.14.04-x64": { },
"centos.7-x64": { },
"rhel.7.2-x64": { },
"debian.8-x64": { }
"win7-x64": {},
"win7-x86": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

37
build_projects/dotnet-host-build/project.json
View file

@ -5,17 +5,20 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"Microsoft.CSharp": "4.0.1-rc2-24027",
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.Reflection.Metadata": "1.3.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Xml.XmlSerializer": "4.0.11-rc2-24027",
"NETStandard.Library": "1.5.0-rc3-24123-01",
"Microsoft.NETCore.Runtime": "1.0.2-rc3-24123-01",
"Microsoft.CSharp": "4.0.1-rc3-24123-01",
"System.Dynamic.Runtime": "4.0.11-rc3-24123-01",
"System.Reflection.Metadata": "1.3.0-rc3-24123-01",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"System.Xml.XmlSerializer": "4.0.11-rc3-24123-01",
"WindowsAzure.Storage": "6.2.2-preview",
"Microsoft.DotNet.Cli.Build.Framework": { "target": "project" },
"shared-build-targets-utils": { "target": "project" }
"Microsoft.DotNet.Cli.Build.Framework": {
"target": "project"
},
"shared-build-targets-utils": {
"target": "project"
}
},
"frameworks": {
"netcoreapp1.0": {
@ -26,12 +29,12 @@
}
},
"runtimes": {
"win7-x64": { },
"win7-x86": { },
"osx.10.11-x64": { },
"ubuntu.14.04-x64": { },
"centos.7-x64": { },
"rhel.7.2-x64": { },
"debian.8-x64": { }
"win7-x64": {},
"win7-x86": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}

106
build_projects/shared-build-targets-utils/Utils/Crossgen.cs
View file

@ -12,6 +12,13 @@ namespace Microsoft.DotNet.Cli.Build
{
private string _coreClrVersion;
private string _crossGenPath;
private static readonly string[] s_excludedLibraries =
{
"mscorlib.dll",
"mscorlib.ni.dll",
"System.Private.CoreLib",
"System.Private.CoreLib.ni.dll"
};
// This is not always correct. The version of crossgen we need to pick up is whatever one was restored as part
// of the Microsoft.NETCore.Runtime.CoreCLR package that is part of the shared library. For now, the version hardcoded
@ -26,42 +33,83 @@ namespace Microsoft.DotNet.Cli.Build
private string GetCrossgenPathForVersion()
{
string arch = RuntimeEnvironment.RuntimeArchitecture;
string packageId;
if (CurrentPlatform.IsWindows)
{
packageId = $"runtime.win7-{arch}.Microsoft.NETCore.Runtime.CoreCLR";
}
else if (CurrentPlatform.IsUbuntu)
{
packageId = "runtime.ubuntu.14.04-x64.Microsoft.NETCore.Runtime.CoreCLR";
}
else if (CurrentPlatform.IsCentOS || CurrentPlatform.IsRHEL)
{
// CentOS runtime is in the runtime.rhel.7-x64... package.
packageId = "runtime.rhel.7-x64.Microsoft.NETCore.Runtime.CoreCLR";
}
else if (CurrentPlatform.IsOSX)
{
packageId = "runtime.osx.10.10-x64.Microsoft.NETCore.Runtime.CoreCLR";
}
else if (CurrentPlatform.IsDebian)
{
packageId = "runtime.debian.8-x64.Microsoft.NETCore.Runtime.CoreCLR";
}
else
var crossgenPackagePath = GetCrossGenPackagePathForVersion();
if (crossgenPackagePath == null)
{
return null;
}
return Path.Combine(
Dirs.NuGetPackages,
packageId,
_coreClrVersion,
crossgenPackagePath,
"tools",
$"crossgen{Constants.ExeSuffix}");
}
private string GetLibCLRJitPathForVersion()
{
var coreclrRid = GetCoreCLRRid();
var crossgenPackagePath = GetCrossGenPackagePathForVersion();
if (crossgenPackagePath == null)
{
return null;
}
return Path.Combine(
crossgenPackagePath,
"runtimes",
coreclrRid,
"native",
$"{Constants.DynamicLibPrefix}clrjit{Constants.DynamicLibSuffix}");
}
private string GetCrossGenPackagePathForVersion()
{
string coreclrRid = GetCoreCLRRid();
if (coreclrRid == null)
{
return null;
}
string packageId = $"runtime.{coreclrRid}.Microsoft.NETCore.Runtime.CoreCLR";
return Path.Combine(
Dirs.NuGetPackages,
packageId,
_coreClrVersion);
}
private string GetCoreCLRRid()
{
string rid = null;
if (CurrentPlatform.IsWindows)
{
var arch = RuntimeEnvironment.RuntimeArchitecture;
rid = $"win7-{arch}";
}
else if (CurrentPlatform.IsUbuntu)
{
rid = "ubuntu.14.04-x64";
}
else if (CurrentPlatform.IsCentOS || CurrentPlatform.IsRHEL)
{
// CentOS runtime is in the runtime.rhel.7-x64... package.
rid = "rhel.7-x64";
}
else if (CurrentPlatform.IsOSX)
{
rid = "osx.10.10-x64";
}
else if (CurrentPlatform.IsDebian)
{
rid = "debian.8-x64";
}
return rid;
}
public void CrossgenDirectory(BuildTargetContext c, string pathToAssemblies)
{
// Check if we need to skip crossgen
@ -95,7 +143,8 @@ namespace Microsoft.DotNet.Cli.Build
{
string fileName = Path.GetFileName(file);
if (fileName == "mscorlib.dll" || fileName == "mscorlib.ni.dll" || !PEUtils.HasMetadata(file))
if (s_excludedLibraries.Any(lib => String.Equals(lib, fileName, StringComparison.OrdinalIgnoreCase))
|| !PEUtils.HasMetadata(file))
{
continue;
}
@ -104,6 +153,7 @@ namespace Microsoft.DotNet.Cli.Build
IList<string> crossgenArgs = new List<string> {
"-readytorun", "-in", file, "-out", tempPathName,
"-JITPath", GetLibCLRJitPathForVersion(),
"-platform_assemblies_paths", platformAssembliesPaths
};

20
build_projects/shared-build-targets-utils/project.json
View file

@ -2,17 +2,19 @@
"version": "1.0.0-*",
"description": "Build scripts for dotnet-cli",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"Microsoft.CSharp": "4.0.1-rc2-24027",
"Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*",
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.Reflection.Metadata": "1.3.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Xml.XmlSerializer": "4.0.11-rc2-24027",
"WindowsAzure.Storage": "6.2.2-preview"
"NETStandard.Library": "1.5.0-rc3-24123-01",
"Microsoft.CSharp": "4.0.1-rc3-24123-01",
"System.Dynamic.Runtime": "4.0.11-rc3-24123-01",
"System.Reflection.Metadata": "1.3.0-rc3-24123-01",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"System.Xml.XmlSerializer": "4.0.11-rc3-24123-01",
"WindowsAzure.Storage": "6.2.2-preview",
"Microsoft.DotNet.Cli.Build.Framework": {
"target": "project"
}
},
"frameworks": {
"netstandard1.5": {
"netstandard1.6": {
"imports": [
"dnxcore50",
"portable-net45+win8"

2
pkg/deps/project.json
View file

@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027"
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24123-01"
},
"frameworks": {
"dnxcore50": {

2
pkg/dir.props
View file

@ -23,7 +23,7 @@
<PropertyGroup>
<PackageOutputPath>$(PackagesOutDir)</PackageOutputPath>
<RuntimeIdGraphDefinitionFile>$(ProjectDir)packages\Microsoft.NETCore.Platforms\1.0.1-rc2-24027\runtime.json</RuntimeIdGraphDefinitionFile>
<RuntimeIdGraphDefinitionFile>$(ProjectDir)packages\Microsoft.NETCore.Platforms\1.0.1-rc3-24123-01\runtime.json</RuntimeIdGraphDefinitionFile>
<PackageLicenseFile>$(ProjectDir)projects/dotnet_library_license.txt</PackageLicenseFile>
<PackageThirdPartyNoticesFile>$(ProjectDir)projects/ThirdPartyNotices.txt</PackageThirdPartyNoticesFile>
<PackageDescriptionFile>$(ProjectDir)projects/descriptions.json</PackageDescriptionFile>

73
pkg/projects/Microsoft.NETCore.App/project.json
View file

@ -2,42 +2,43 @@
"dependencies": {
"Microsoft.CodeAnalysis.CSharp": "1.3.0-beta1-20160429-01",
"Microsoft.CodeAnalysis.VisualBasic": "1.3.0-beta1-20160429-01",
"Microsoft.CSharp": "4.0.1-rc2-24027",
"Microsoft.VisualBasic": "10.0.1-rc2-24027",
"NETStandard.Library": "1.5.0-rc2-24027",
"System.Buffers": "4.0.0-rc2-24027",
"System.Collections.Immutable": "1.2.0-rc2-24027",
"System.ComponentModel": "4.0.1-rc2-24027",
"System.ComponentModel.Annotations": "4.1.0-rc2-24027",
"System.Diagnostics.DiagnosticSource": "4.0.0-rc2-24027",
"System.Diagnostics.Process": "4.1.0-rc2-24027",
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.Globalization.Extensions": "4.0.1-rc2-24027",
"System.IO.FileSystem.Watcher": "4.0.0-rc2-24027",
"System.IO.MemoryMappedFiles": "4.0.0-rc2-24027",
"System.IO.UnmanagedMemoryStream": "4.0.1-rc2-24027",
"System.Linq.Expressions": "4.0.11-rc2-24027",
"System.Linq.Parallel": "4.0.1-rc2-24027",
"System.Linq.Queryable": "4.0.1-rc2-24027",
"System.Net.NameResolution": "4.0.0-rc2-24027",
"System.Net.Requests": "4.0.11-rc2-24027",
"System.Net.Security": "4.0.0-rc2-24027",
"System.Net.WebHeaderCollection": "4.0.1-rc2-24027",
"System.Numerics.Vectors": "4.1.1-rc2-24027",
"System.Reflection.DispatchProxy": "4.0.1-rc2-24027",
"System.Reflection.Metadata": "1.3.0-rc2-24027",
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
"System.Resources.Reader": "4.0.0-rc2-24027",
"System.Runtime.Loader": "4.0.0-rc2-24027",
"System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027",
"System.Security.Cryptography.Encoding": "4.0.0-rc2-24027",
"System.Security.Cryptography.Primitives": "4.0.0-rc2-24027",
"System.Security.Cryptography.X509Certificates": "4.1.0-rc2-24027",
"System.Threading.Tasks.Dataflow": "4.6.0-rc2-24027",
"System.Threading.Tasks.Extensions": "4.0.0-rc2-24027",
"System.Threading.Tasks.Parallel": "4.0.1-rc2-24027",
"System.Threading.Thread": "4.0.0-rc2-24027",
"System.Threading.ThreadPool": "4.0.10-rc2-24027"
"Microsoft.CSharp": "4.0.1-rc3-24123-01",
"Microsoft.NETCore.Runtime": "1.0.2-rc3-24123-01",
"Microsoft.VisualBasic": "10.0.1-rc3-24123-01",
"NETStandard.Library": "1.5.0-rc3-24123-01",
"System.Buffers": "4.0.0-rc3-24123-01",
"System.Collections.Immutable": "1.2.0-rc3-24123-01",
"System.ComponentModel": "4.0.1-rc3-24123-01",
"System.ComponentModel.Annotations": "4.1.0-rc3-24123-01",
"System.Diagnostics.DiagnosticSource": "4.0.0-rc3-24123-01",
"System.Diagnostics.Process": "4.1.0-rc3-24123-01",
"System.Dynamic.Runtime": "4.0.11-rc3-24123-01",
"System.Globalization.Extensions": "4.0.1-rc3-24123-01",
"System.IO.FileSystem.Watcher": "4.0.0-rc3-24123-01",
"System.IO.MemoryMappedFiles": "4.0.0-rc3-24123-01",
"System.IO.UnmanagedMemoryStream": "4.0.1-rc3-24123-01",
"System.Linq.Expressions": "4.1.0-rc3-24123-01",
"System.Linq.Parallel": "4.0.1-rc3-24123-01",
"System.Linq.Queryable": "4.0.1-rc3-24123-01",
"System.Net.NameResolution": "4.0.0-rc3-24123-01",
"System.Net.Requests": "4.0.11-rc3-24123-01",
"System.Net.Security": "4.0.0-rc3-24123-01",
"System.Net.WebHeaderCollection": "4.0.1-rc3-24123-01",
"System.Numerics.Vectors": "4.1.1-rc3-24123-01",
"System.Reflection.DispatchProxy": "4.0.1-rc3-24123-01",
"System.Reflection.Metadata": "1.3.0-rc3-24123-01",
"System.Reflection.TypeExtensions": "4.1.0-rc3-24123-01",
"System.Resources.Reader": "4.0.0-rc3-24123-01",
"System.Runtime.Loader": "4.0.0-rc3-24123-01",
"System.Security.Cryptography.Algorithms": "4.2.0-rc3-24123-01",
"System.Security.Cryptography.Encoding": "4.0.0-rc3-24123-01",
"System.Security.Cryptography.Primitives": "4.0.0-rc3-24123-01",
"System.Security.Cryptography.X509Certificates": "4.1.0-rc3-24123-01",
"System.Threading.Tasks.Dataflow": "4.6.0-rc3-24123-01",
"System.Threading.Tasks.Extensions": "4.0.0-rc3-24123-01",
"System.Threading.Tasks.Parallel": "4.0.1-rc3-24123-01",
"System.Threading.Thread": "4.0.0-rc3-24123-01",
"System.Threading.ThreadPool": "4.0.10-rc3-24123-01"
},
"frameworks": {
"netstandard1.5": {}

9
scripts/update-dependencies/project.json
View file

@ -5,9 +5,10 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"Microsoft.CSharp": "4.0.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"NETStandard.Library": "1.5.0-rc3-24123-01",
"Microsoft.CSharp": "4.0.1-rc3-24123-01",
"Microsoft.NETCore.Runtime": "1.0.2-rc3-24123-01",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.Cli.Build.Framework": {
"target": "project"
},
@ -24,4 +25,4 @@
]
}
}
}
}

2
src/Microsoft.DotNet.Cli.Utils/project.json
View file

@ -26,7 +26,7 @@
"portable-net45+wp80+win8+wpa81+dnxcore50"
],
"dependencies": {
"System.Diagnostics.Process": "4.1.0-rc2-24027"
"System.Diagnostics.Process": "4.1.0-rc3-24123-01"
}
}
}

4
src/Microsoft.DotNet.Files/project.json
View file

@ -11,7 +11,7 @@
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},
"System.Linq.Expressions": "4.0.11-rc2-24027"
"System.Linq.Expressions": "4.1.0-rc3-24123-01"
},
"frameworks": {
"net451": {
@ -34,4 +34,4 @@
}
},
"scripts": {}
}
}

18
src/Microsoft.DotNet.InternalAbstractions/project.json
View file

@ -10,14 +10,14 @@
"net451": {},
"netstandard1.3": {
"dependencies": {
"System.AppContext": "4.1.0-rc2-24027",
"System.Collections": "4.0.11-rc2-24027",
"System.IO": "4.1.0-rc2-24027",
"System.IO.FileSystem": "4.0.1-rc2-24027",
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027",
"System.Runtime.Extensions": "4.1.0-rc2-24027",
"System.Runtime.InteropServices": "4.1.0-rc2-24027",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc2-24027"
"System.AppContext": "4.1.0-rc3-24123-01",
"System.Collections": "4.0.11-rc3-24123-01",
"System.IO": "4.1.0-rc3-24123-01",
"System.IO.FileSystem": "4.0.1-rc3-24123-01",
"System.Reflection.TypeExtensions": "4.1.0-rc3-24123-01",
"System.Runtime.Extensions": "4.1.0-rc3-24123-01",
"System.Runtime.InteropServices": "4.1.0-rc3-24123-01",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-rc3-24123-01"
}
}
},
@ -28,4 +28,4 @@
"url": "git://github.com/dotnet/cli"
}
}
}
}

4
src/Microsoft.DotNet.ProjectModel.Loader/project.json
View file

@ -7,11 +7,11 @@
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},
"System.Runtime.Loader": "4.0.0-rc2-24027"
"System.Runtime.Loader": "4.0.0-rc3-24123-01"
},
"frameworks": {
"netstandard1.5": {
"imports": "portable-net45+wp80+win8+wpa81+dnxcore50"
}
}
}
}

18
src/Microsoft.DotNet.ProjectModel/project.json
View file

@ -11,7 +11,7 @@
"Newtonsoft.Json": "7.0.1",
"NuGet.Packaging": "3.5.0-rc-1285",
"NuGet.RuntimeModel": "3.5.0-rc-1285",
"System.Reflection.Metadata": "1.3.0-rc2-24027"
"System.Reflection.Metadata": "1.3.0-rc3-24123-01"
},
"frameworks": {
"net451": {
@ -33,14 +33,14 @@
"dotnet5.4"
],
"dependencies": {
"Microsoft.CSharp": "4.0.1-rc2-24027",
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.Runtime.Loader": "4.0.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Security.Cryptography.Algorithms": "4.1.0-rc2-24027",
"System.Threading.Thread": "4.0.0-rc2-24027",
"System.Xml.XDocument": "4.0.11-rc2-24027"
"Microsoft.CSharp": "4.0.1-rc3-24123-01",
"System.Dynamic.Runtime": "4.0.11-rc3-24123-01",
"System.Runtime.Loader": "4.0.0-rc3-24123-01",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"System.Security.Cryptography.Algorithms": "4.2.0-rc3-24123-01",
"System.Threading.Thread": "4.0.0-rc3-24123-01",
"System.Xml.XDocument": "4.0.11-rc3-24123-01"
}
}
}
}
}

8
src/Microsoft.Extensions.DependencyModel/project.json
View file

@ -16,9 +16,9 @@
"netstandard1.5": {
"imports": "portable-net45+wp80+win8+wpa81+dnxcore50",
"dependencies": {
"System.Diagnostics.Debug": "4.0.11-rc2-24027",
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.Linq": "4.1.0-rc2-24027"
"System.Diagnostics.Debug": "4.0.11-rc3-24123-01",
"System.Dynamic.Runtime": "4.0.11-rc3-24123-01",
"System.Linq": "4.1.0-rc3-24123-01"
}
}
},
@ -29,4 +29,4 @@
"url": "git://github.com/dotnet/cli"
}
}
}
}

6
src/Microsoft.Extensions.Testing.Abstractions/project.json
View file

@ -22,8 +22,8 @@
"portable-net45+win8"
],
"dependencies": {
"System.Resources.ResourceManager": "4.0.1-rc2-24027",
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027"
"System.Resources.ResourceManager": "4.0.1-rc3-24123-01",
"System.Reflection.TypeExtensions": "4.1.0-rc3-24123-01"
}
}
},
@ -34,4 +34,4 @@
"url": "git://github.com/dotnet/cli"
}
}
}
}

6
src/corehost/common/pal.windows.cpp
View file

@ -275,18 +275,18 @@ bool pal::pal_clrstring(const pal::string_t& str, std::vector<char>* out)
out->clear();
// Pass -1 as we want explicit null termination in the char buffer.
size_t size = ::WideCharToMultiByte(CP_ACP, 0, str.c_str(), -1, nullptr, 0, nullptr, nullptr);
size_t size = ::WideCharToMultiByte(CP_UTF8, 0, str.c_str(), -1, nullptr, 0, nullptr, nullptr);
if (size == 0)
{
return false;
}
out->resize(size, '\0');
return ::WideCharToMultiByte(CP_ACP, 0, str.c_str(), -1, out->data(), out->size(), nullptr, nullptr) != 0;
return ::WideCharToMultiByte(CP_UTF8, 0, str.c_str(), -1, out->data(), out->size(), nullptr, nullptr) != 0;
}
bool pal::clr_palstring(const char* cstr, pal::string_t* out)
{
return wchar_convert_helper(CP_ACP, cstr, ::strlen(cstr), out);
return wchar_convert_helper(CP_UTF8, cstr, ::strlen(cstr), out);
}
bool pal::realpath(string_t* path)

21
src/dotnet/project.json
View file

@ -26,8 +26,8 @@
},
"NuGet.CommandLine.XPlat": "3.5.0-rc-1285",
"Newtonsoft.Json": "7.0.1",
"System.Text.Encoding.CodePages": "4.0.1-rc2-24027",
"System.Diagnostics.FileVersionInfo": "4.0.0-rc2-24027",
"System.Text.Encoding.CodePages": "4.0.1-rc3-24123-01",
"System.Diagnostics.FileVersionInfo": "4.0.0-rc3-24123-01",
"Microsoft.ApplicationInsights": "2.0.0",
"Microsoft.DotNet.ProjectModel": {
"target": "project"
@ -41,19 +41,18 @@
"Microsoft.Extensions.Testing.Abstractions": {
"target": "project"
},
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-24027",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-24027",
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-24027",
"System.Resources.ReaderWriter": "4.0.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Private.DataContractSerialization": "4.1.1-rc2-24027",
"System.Diagnostics.TraceSource": "4.0.0-rc3-24123-01",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-24123-01",
"System.Resources.Writer": "4.0.0-rc3-24123-01",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"System.Private.DataContractSerialization": "4.1.1-rc3-24123-01",
"System.Text.RegularExpressions": "4.1.0-rc3-24123-01",
"Microsoft.Win32.Registry": {
"version": "4.0.0-rc2-24027",
"version": "4.0.0-rc3-24123-01",
"exclude": "compile"
}
},
@ -67,4 +66,4 @@
]
}
}
}
}

4
test/ArgumentForwardingTests/project.json
View file

@ -8,7 +8,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},
@ -33,4 +33,4 @@
"scripts": {
"precompile": "dotnet publish ../ArgumentsReflector/project.json --framework netcoreapp1.0 --runtime %compile:RuntimeIdentifier% --output %compile:RuntimeOutputDir%"
}
}
}

4
test/EndToEnd/project.json
View file

@ -8,7 +8,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},
@ -31,4 +31,4 @@
}
},
"testRunner": "xunit"
}
}

2
test/Kestrel.Tests/project.json
View file

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

6
test/Microsoft.DotNet.Cli.Utils.Tests/project.json
View file

@ -18,8 +18,8 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Diagnostics.TraceSource": "4.0.0-rc3-24123-01",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"NuGet.Versioning": "3.5.0-rc-1285",
"NuGet.Packaging": "3.5.0-rc-1285",
"NuGet.Frameworks": "3.5.0-rc-1285",
@ -56,4 +56,4 @@
"../../TestAssets/TestProjects/AppWithToolDependency/**/*"
]
}
}
}

2
test/Microsoft.DotNet.Compiler.Common.Tests/project.json
View file

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

4
test/Microsoft.DotNet.ProjectModel.Tests/project.json
View file

@ -13,7 +13,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},
@ -37,4 +37,4 @@
"../../TestAssets/TestProjects/TestAppWithLibrary/**"
]
}
}
}

12
test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
View file

@ -8,15 +8,9 @@
"FluentAssertions": "4.0.0",
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24",
"Microsoft.DotNet.TestFramework": {
"target": "project"
},
"Microsoft.DotNet.Cli.Utils": {
"target": "project"
},
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},
"Microsoft.DotNet.TestFramework": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "target": "project" },
"Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.InternalAbstractions": {
"target": "project"
}

4
test/Microsoft.Extensions.DependencyModel.Tests/project.json
View file

@ -9,7 +9,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Diagnostics.TraceSource": "4.0.0-rc2-24027",
"System.Diagnostics.TraceSource": "4.0.0-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},
@ -30,4 +30,4 @@
}
},
"testRunner": "xunit"
}
}

2
test/Performance/project.json
View file

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.ProjectModel": {
"target": "project"
},

2
test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.Tests/project.json
View file

@ -8,7 +8,7 @@
"Microsoft.Extensions.Testing.Abstractions": {
"target": "project"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

4
test/TestingAbstractions/Microsoft.Extensions.Testing.Abstractions.UnitTests/project.json
View file

@ -8,8 +8,8 @@
"Microsoft.Extensions.Testing.Abstractions": {
"target": "project"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Diagnostics.Process": "4.1.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"System.Diagnostics.Process": "4.1.0-rc3-24123-01",
"TestAppWithPortablePdbs": {
"target": "project"
},

4
test/TestingAbstractions/TestAppWithFullPdbs/project.json
View file

@ -4,9 +4,9 @@
"debugType": "full"
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
},
"frameworks": {
"netstandard1.5": {}
}
}
}

4
test/TestingAbstractions/TestAppWithPortablePdbs/project.json
View file

@ -4,9 +4,9 @@
"debugType": "portable"
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027"
"NETStandard.Library": "1.5.0-rc3-24123-01"
},
"frameworks": {
"netstandard1.5": {}
}
}
}

2
test/binding-redirects.Tests/project.json
View file

@ -3,7 +3,7 @@
"dependencies": {
"xunit": "2.1.0",
"dotnet-test-xunit": "1.0.0-rc2-192208-24",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-24027",
"Microsoft.NETCore.Platforms": "1.0.1-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
}

4
test/crossgen.Tests/crossgen.Tests.cs
View file

@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Tests
/// </summary>
public class CrossgenTests : TestBase
{
[Fact]
[Fact(Skip="https://github.com/dotnet/cli/issues/3059")]
public void CLI_SDK_assemblies_must_be_crossgened()
{
string dotnetDir = FindDotnetDirInPath();
@ -27,7 +27,7 @@ namespace Microsoft.DotNet.Tests
CheckDirectoryIsCrossgened(cliPath);
}
[Fact]
[Fact(Skip="https://github.com/dotnet/cli/issues/3059")]
public void Shared_Fx_assemblies_must_be_crossgened()
{
string dotnetDir = FindDotnetDirInPath();

3
test/dotnet-build.Tests/BuildOutputTests.cs
View file

@ -347,7 +347,8 @@ namespace Microsoft.DotNet.Tools.Builder.Tests
buildResult.Should().Fail();
buildResult.StdErr.Should().Contain("Expected coreclr library not found in package graph. Please try running dotnet restore again.");
buildResult.StdErr.Should().Contain("Can not find runtime target for framework '.NETCoreApp,Version=v1.0' compatible with one of the target runtimes");
buildResult.StdErr.Should().Contain("The project has not been restored or restore failed - run `dotnet restore`");
}
private void CopyProjectToTempDir(string projectDir, TempDirectory tempDir)

2
test/dotnet-build.Tests/project.json
View file

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},

4
test/dotnet-compile.Tests/project.json
View file

@ -5,7 +5,7 @@
"type": "platform",
"version": "1.0.0-rc3-*"
},
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"Microsoft.DotNet.Tools.Tests.Utilities": {
"target": "project"
},
@ -46,4 +46,4 @@
]
}
}
}
}

Some files were not shown because too many files have changed in this diff Show more