Merge pull request #1825 from eerhardt/NewCoreFx
Updating dependencies from last known good builds
This commit is contained in:
commit
9b0892c399
87 changed files with 1256 additions and 1325 deletions
|
@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
{
|
||||
public class CompileTargets
|
||||
{
|
||||
public static readonly string CoreCLRVersion = "1.0.2-rc2-23901";
|
||||
public static readonly string CoreCLRVersion = "1.0.2-rc2-23911";
|
||||
public static readonly string AppDepSdkVersion = "1.0.6-prerelease-00003";
|
||||
public static readonly bool IsWinx86 = CurrentPlatform.IsWindows && CurrentArchitecture.Isx86;
|
||||
|
||||
|
@ -348,7 +348,7 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
|
||||
private static List<string> GetAssembliesToCrossGen()
|
||||
{
|
||||
var list = new List<string>
|
||||
return new List<string>
|
||||
{
|
||||
"System.Collections.Immutable.dll",
|
||||
"System.Reflection.Metadata.dll",
|
||||
|
@ -358,15 +358,6 @@ namespace Microsoft.DotNet.Cli.Build
|
|||
"csc.dll",
|
||||
"vbc.dll"
|
||||
};
|
||||
|
||||
// mscorlib is already crossgenned on Windows
|
||||
if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
|
||||
{
|
||||
// mscorlib has to be crossgenned first
|
||||
list.Insert(0, "mscorlib.dll");
|
||||
}
|
||||
|
||||
return list;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue