From fd0ebb1bab31ebb33ea7713a7d43bf4a5df24855 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Tue, 22 Mar 2016 17:46:14 -0500 Subject: [PATCH] Fix the RuntimeGraphGenerator 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. --- scripts/dotnet-cli-build/CompileTargets.cs | 3 ++- tools/RuntimeGraphGenerator/project.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/dotnet-cli-build/CompileTargets.cs b/scripts/dotnet-cli-build/CompileTargets.cs index 73fc2e716..336337efc 100644 --- a/scripts/dotnet-cli-build/CompileTargets.cs +++ b/scripts/dotnet-cli-build/CompileTargets.cs @@ -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 { diff --git a/tools/RuntimeGraphGenerator/project.json b/tools/RuntimeGraphGenerator/project.json index 7b8e87b28..a85e9a3c8 100644 --- a/tools/RuntimeGraphGenerator/project.json +++ b/tools/RuntimeGraphGenerator/project.json @@ -7,7 +7,7 @@ "NuGet.RuntimeModel": "3.5.0-beta-1068", "NuGet.Versioning": "3.5.0-beta-1068", "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.Cli.Utils": "1.0.0-*", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537",