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

Merge pull request #2040 from dotnet/anurse/eerhardt-UpdateDependencies

Browse source 
Anurse/eerhardt update dependencies
This commit is contained in:
Andrew Stanton-Nurse 2016-03-24 17:22:18 -07:00
commit 822f70f742
97 changed files with 272 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,7 @@ namespace Microsoft.DotNet.Cli.Build
{
public class CompileTargets
{
public static readonly string CoreCLRVersion = "1.0.2-rc2-23911";
public static readonly string CoreCLRVersion = "1.0.2-rc2-23924";
public static readonly string AppDepSdkVersion = "1.0.6-prerelease-00003";
public static readonly bool IsWinx86 = CurrentPlatform.IsWindows && CurrentArchitecture.Isx86;
@ -278,7 +278,8 @@ namespace Microsoft.DotNet.Cli.Build
var runtimeGraphGeneratorExe = Path.Combine(runtimeGraphGeneratorOutput, $"{runtimeGraphGeneratorName}{Constants.ExeSuffix}");
Cmd(runtimeGraphGeneratorExe, "--project", SharedFrameworkSourceRoot, "--deps", destinationDeps, runtimeGraphGeneratorRuntime)
.Execute();
.Execute()
.EnsureSuccessful();
}
else
{

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

@ -1,18 +1,23 @@
{
{
"version": "1.0.0-*",
"description": "Build scripts for dotnet-cli",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-23911",
"NETStandard.Library": "1.5.0-rc2-23924",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924",
"System.Xml.XmlSerializer": "4.0.11-rc2-23924",
"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" ]
"imports": [
"dnxcore50",
"portable-net45+win8"
]
}
}
}