Move the CLI corefx dependencies from RC2 to RC3 - rc3-24113-00.
- Disable crossgen for windows.Tracked by - https://github.com/dotnet/cli/issues/3059 - And also fix #2974
This commit is contained in:
parent
40a2b495ba
commit
d2188cd95a
86 changed files with 221 additions and 204 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue