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

Merge pull request #1825 from eerhardt/NewCoreFx

Browse source 
Updating dependencies from last known good builds
This commit is contained in:
Eric Erhardt 2016-03-15 10:50:40 -05:00
commit 9b0892c399
87 changed files with 1256 additions and 1325 deletions
Download patch file Download diff file Expand all files Collapse all files

13
scripts/dotnet-cli-build/CompileTargets.cs
View file

@ -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;
}
}
}

38
scripts/dotnet-cli-build/project.json
View file

@ -1,23 +1,21 @@
{
"version": "1.0.0-*",
"description": "Build scripts for dotnet-cli",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23901",
"System.IO.Compression.ZipFile": "4.0.1-rc2-23901",
"System.Security.Cryptography.Algorithms": "4.0.0-rc2-23901",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537",
"Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*",
"WindowsAzure.Storage" : "6.2.2-preview",
"System.Reflection.Metadata" : "1.2.0"
},
"frameworks": {
"netstandardapp1.5": {
"imports": ["dnxcore50", "portable-net45+win8"]
}
"version": "1.0.0-*",
"description": "Build scripts for dotnet-cli",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911",
"System.IO.Compression.ZipFile": "4.0.1-rc2-23911",
"System.Security.Cryptography.Algorithms": "4.0.0-rc2-23911",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537",
"Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*",
"WindowsAzure.Storage": "6.2.2-preview",
"System.Reflection.Metadata": "1.2.0"
},
"frameworks": {
"netstandardapp1.5": {
"imports": [ "dnxcore50", "portable-net45+win8" ]
}
}
}