diff --git a/build_projects/dotnet-cli-build/project.json b/build_projects/dotnet-cli-build/project.json index 7f600483b..75cc0c4ea 100644 --- a/build_projects/dotnet-cli-build/project.json +++ b/build_projects/dotnet-cli-build/project.json @@ -6,6 +6,7 @@ }, "dependencies": { "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", diff --git a/build_projects/dotnet-host-build/project.json b/build_projects/dotnet-host-build/project.json index b3fa14ce0..3838b838d 100644 --- a/build_projects/dotnet-host-build/project.json +++ b/build_projects/dotnet-host-build/project.json @@ -6,6 +6,7 @@ }, "dependencies": { "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", diff --git a/build_projects/shared-build-targets-utils/Utils/Crossgen.cs b/build_projects/shared-build-targets-utils/Utils/Crossgen.cs index 7f3c961c4..6948b9b91 100644 --- a/build_projects/shared-build-targets-utils/Utils/Crossgen.cs +++ b/build_projects/shared-build-targets-utils/Utils/Crossgen.cs @@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Build { private string _coreClrVersion; private string _crossGenPath; - private List _excludedLibraries = new List() + private static readonly string[] s_excludedLibraries = { "mscorlib.dll", "mscorlib.ni.dll" @@ -100,7 +100,7 @@ namespace Microsoft.DotNet.Cli.Build { 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)) { continue; diff --git a/build_projects/shared-build-targets-utils/project.json b/build_projects/shared-build-targets-utils/project.json index b3e71fefd..70286401a 100644 --- a/build_projects/shared-build-targets-utils/project.json +++ b/build_projects/shared-build-targets-utils/project.json @@ -3,7 +3,6 @@ "description": "Build scripts for dotnet-cli", "dependencies": { "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", diff --git a/src/dotnet/project.json b/src/dotnet/project.json index 6d703a924..69be7349b 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -41,8 +41,6 @@ "Microsoft.Extensions.Testing.Abstractions": { "target": "project" }, - "Microsoft.NETCore.ConsoleHost": "1.0.0-rc3-24113-00", - "Microsoft.NETCore.TestHost": "1.0.0-rc3-24113-00", "Microsoft.NETCore.App": { "type": "platform", "version": "1.0.0-rc3-*" diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index a20bc22c4..dfda07290 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -5,8 +5,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.5.0-rc3-24113-00", - "Microsoft.NETCore.Runtime": "1.0.2-rc3-24113-00", + "Microsoft.NETCore.App": "1.0.0-rc3-*", "Microsoft.DotNet.ProjectModel": { "target": "project" },