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

Address PR feedback.

Browse source
This commit is contained in:
Sridhar Periyasamy 2016-05-16 23:12:48 -07:00 • committed by Livar Cunha
parent d2188cd95a
commit baf28233f4
6 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc3-24113-00", "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", "Microsoft.CSharp": "4.0.1-rc3-24113-00",
"System.Dynamic.Runtime": "4.0.11-rc3-24113-00", "System.Dynamic.Runtime": "4.0.11-rc3-24113-00",
"System.Reflection.Metadata": "1.3.0-rc3-24113-00", "System.Reflection.Metadata": "1.3.0-rc3-24113-00",

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

@ -6,6 +6,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc3-24113-00", "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", "Microsoft.CSharp": "4.0.1-rc3-24113-00",
"System.Dynamic.Runtime": "4.0.11-rc3-24113-00", "System.Dynamic.Runtime": "4.0.11-rc3-24113-00",
"System.Reflection.Metadata": "1.3.0-rc3-24113-00", "System.Reflection.Metadata": "1.3.0-rc3-24113-00",

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

@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Build
{ {
private string _coreClrVersion; private string _coreClrVersion;
private string _crossGenPath; private string _crossGenPath;
private List<string> _excludedLibraries = new List<string>() private static readonly string[] s_excludedLibraries =
{ {
"mscorlib.dll", "mscorlib.dll",
"mscorlib.ni.dll" "mscorlib.ni.dll"
@ -100,7 +100,7 @@ namespace Microsoft.DotNet.Cli.Build
{ {
string fileName = Path.GetFileName(file); string fileName = Path.GetFileName(file);
if (_excludedLibraries.Any(lib => String.Equals(lib, fileName, StringComparison.OrdinalIgnoreCase)) if (s_excludedLibraries.Any(lib => String.Equals(lib, fileName, StringComparison.OrdinalIgnoreCase))
|| !PEUtils.HasMetadata(file)) || !PEUtils.HasMetadata(file))
{ {
continue; continue;

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

@ -3,7 +3,6 @@
"description": "Build scripts for dotnet-cli", "description": "Build scripts for dotnet-cli",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc3-24113-00", "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", "Microsoft.CSharp": "4.0.1-rc3-24113-00",
"System.Dynamic.Runtime": "4.0.11-rc3-24113-00", "System.Dynamic.Runtime": "4.0.11-rc3-24113-00",
"System.Reflection.Metadata": "1.3.0-rc3-24113-00", "System.Reflection.Metadata": "1.3.0-rc3-24113-00",

2
src/dotnet/project.json
View file

@ -41,8 +41,6 @@
"Microsoft.Extensions.Testing.Abstractions": { "Microsoft.Extensions.Testing.Abstractions": {
"target": "project" "target": "project"
}, },
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc3-24113-00",
"Microsoft.NETCore.TestHost": "1.0.0-rc3-24113-00",
"Microsoft.NETCore.App": { "Microsoft.NETCore.App": {
"type": "platform", "type": "platform",
"version": "1.0.0-rc3-*" "version": "1.0.0-rc3-*"

3
tools/MultiProjectValidator/project.json
View file

@ -5,8 +5,7 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.5.0-rc3-24113-00", "Microsoft.NETCore.App": "1.0.0-rc3-*",
"Microsoft.NETCore.Runtime": "1.0.2-rc3-24113-00",
"Microsoft.DotNet.ProjectModel": { "Microsoft.DotNet.ProjectModel": {
"target": "project" "target": "project"
}, },