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

Fix the RuntimeGraphGenerator

Browse source 
1. It was using the wrong version of System.Runtime.Serialization.Json
2. When invoking it during the build, we weren't ensuring it was successful, which allows the build to continue when it fails.
This commit is contained in:
Eric Erhardt 2016-03-22 17:46:14 -05:00
parent 3186432ebd
commit fd0ebb1bab
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -278,7 +278,8 @@ namespace Microsoft.DotNet.Cli.Build
var runtimeGraphGeneratorExe = Path.Combine(runtimeGraphGeneratorOutput, $"{runtimeGraphGeneratorName}{Constants.ExeSuffix}"); var runtimeGraphGeneratorExe = Path.Combine(runtimeGraphGeneratorOutput, $"{runtimeGraphGeneratorName}{Constants.ExeSuffix}");
Cmd(runtimeGraphGeneratorExe, "--project", SharedFrameworkSourceRoot, "--deps", destinationDeps, runtimeGraphGeneratorRuntime) Cmd(runtimeGraphGeneratorExe, "--project", SharedFrameworkSourceRoot, "--deps", destinationDeps, runtimeGraphGeneratorRuntime)
.Execute(); .Execute()
.EnsureSuccessful();
} }
else else
{ {

2
tools/RuntimeGraphGenerator/project.json
View file

@ -7,7 +7,7 @@
"NuGet.RuntimeModel": "3.5.0-beta-1068", "NuGet.RuntimeModel": "3.5.0-beta-1068",
"NuGet.Versioning": "3.5.0-beta-1068", "NuGet.Versioning": "3.5.0-beta-1068",
"System.CommandLine": "0.1.0-e160119-1", "System.CommandLine": "0.1.0-e160119-1",
"System.Runtime.Serialization.Json": "1.0.0-rc2-23922", "System.Runtime.Serialization.Json": "4.0.2-rc2-23922",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537",