include command output in restore exception message

DanielEgbers · DanielEgbers · commit 715cc19db5ad · 2020-10-22T01:29:07.000+02:00
diff --git a/src/Dotnet.Script.DependencyModel/Context/DotnetRestorer.cs b/src/Dotnet.Script.DependencyModel/Context/DotnetRestorer.cs
@@ -31,11 +31,13 @@ public void Restore(ProjectFileInfo projectFileInfo, string[] packageSources)
 
             _logger.Debug($"Restoring {projectFileInfo.Path} using the dotnet cli. RuntimeIdentifier : {runtimeIdentifier} NugetConfigFile: {projectFileInfo.NuGetConfigFile}");
 
-            var exitcode = _commandRunner.Execute("dotnet", $"restore \"{projectFileInfo.Path}\" -r {runtimeIdentifier} {packageSourcesArgument} {configFileArgument}", workingDirectory);
-            if (exitcode != 0)
+            var commandPath = "dotnet";
+            var commandArguments = $"restore \"{projectFileInfo.Path}\" -r {runtimeIdentifier} {packageSourcesArgument} {configFileArgument}";
+            var commandResult = _commandRunner.Capture(commandPath, commandArguments, workingDirectory);
+            if (commandResult.ExitCode != 0)
             {
                 // We must throw here, otherwise we may incorrectly run with the old 'project.assets.json'
-                throw new Exception($"Unable to restore packages from '{projectFileInfo.Path}'. Make sure that all script files contains valid NuGet references");
+                throw new Exception($"Unable to restore packages from '{projectFileInfo.Path}'{System.Environment.NewLine}Make sure that all script files contains valid NuGet references{System.Environment.NewLine}{System.Environment.NewLine}Details:{System.Environment.NewLine}{workingDirectory} : {commandPath} {commandArguments}{System.Environment.NewLine}{commandResult.StandardOut}");
             }
 
             string CreatePackageSourcesArguments()

Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,13 @@ public void Restore(ProjectFileInfo projectFileInfo, string[] packageSources)`
`31`	`31`
`32`	`32`	`_logger.Debug($"Restoring {projectFileInfo.Path} using the dotnet cli. RuntimeIdentifier : {runtimeIdentifier} NugetConfigFile: {projectFileInfo.NuGetConfigFile}");`
`33`	`33`
`34`		`- var exitcode = _commandRunner.Execute("dotnet", $"restore \"{projectFileInfo.Path}\" -r {runtimeIdentifier} {packageSourcesArgument} {configFileArgument}", workingDirectory);`
`35`		`- if (exitcode != 0)`
	`34`	`+ var commandPath = "dotnet";`
	`35`	`+ var commandArguments = $"restore \"{projectFileInfo.Path}\" -r {runtimeIdentifier} {packageSourcesArgument} {configFileArgument}";`
	`36`	`+ var commandResult = _commandRunner.Capture(commandPath, commandArguments, workingDirectory);`
	`37`	`+ if (commandResult.ExitCode != 0)`
`36`	`38`	`{`
`37`	`39`	`// We must throw here, otherwise we may incorrectly run with the old 'project.assets.json'`
`38`		`- throw new Exception($"Unable to restore packages from '{projectFileInfo.Path}'. Make sure that all script files contains valid NuGet references");`
	`40`	`+ throw new Exception($"Unable to restore packages from '{projectFileInfo.Path}'{System.Environment.NewLine}Make sure that all script files contains valid NuGet references{System.Environment.NewLine}{System.Environment.NewLine}Details:{System.Environment.NewLine}{workingDirectory} : {commandPath} {commandArguments}{System.Environment.NewLine}{commandResult.StandardOut}");`
`39`	`41`	`}`
`40`	`42`
`41`	`43`	`string CreatePackageSourcesArguments()`