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

Move the CLI corefx dependencies from RC2 to RC3 - rc3-24113-00.

Browse source 
- Disable crossgen for windows.Tracked by - https://github.com/dotnet/cli/issues/3059
- And also fix #2974
This commit is contained in:
Sridhar Periyasamy 2016-05-16 12:01:13 -07:00 • committed by Livar Cunha
parent 40a2b495ba
commit d2188cd95a
86 changed files with 221 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,6 +12,11 @@ namespace Microsoft.DotNet.Cli.Build
{
private string _coreClrVersion;
private string _crossGenPath;
private List<string> _excludedLibraries = new List<string>()
{
"mscorlib.dll",
"mscorlib.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
@ -95,7 +100,8 @@ namespace Microsoft.DotNet.Cli.Build
{
string fileName = Path.GetFileName(file);
if (fileName == "mscorlib.dll" || fileName == "mscorlib.ni.dll" || !PEUtils.HasMetadata(file))
if (_excludedLibraries.Any(lib => String.Equals(lib, fileName, StringComparison.OrdinalIgnoreCase))
|| !PEUtils.HasMetadata(file))
{
continue;
}

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

@ -2,17 +2,18 @@
"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-24113-00",
"Microsoft.NETCore.Runtime": "1.0.2-rc3-24113-00",
"Microsoft.CSharp": "4.0.1-rc3-24113-00",
"System.Dynamic.Runtime": "4.0.11-rc3-24113-00",
"System.Reflection.Metadata": "1.3.0-rc3-24113-00",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24113-00",
"System.Xml.XmlSerializer": "4.0.11-rc3-24113-00",
"WindowsAzure.Storage": "6.2.2-preview",
"Microsoft.DotNet.Cli.Build.Framework": {"target":"project"}
},
"frameworks": {
"netstandard1.5": {
"netstandard1.6": {
"imports": [
"dnxcore50",
"portable-net45+win8"