Just log an error when static graph-based restore fails to start.

NuGet · Oct 10, 2023 · f18a31c · f18a31c
1 parent 6ce36a5
commit f18a31c
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 28 deletions.
diff --git a/src/NuGet.Core/NuGet.Build.Tasks/StaticGraphRestoreTaskBase.cs b/src/NuGet.Core/NuGet.Build.Tasks/StaticGraphRestoreTaskBase.cs
@@ -155,24 +155,30 @@ public override bool Execute()
                         try
                         {
                             process.Start();
+                        }
+                        catch (Exception e)
+                        {
+                            Log.LogErrorFromResources(nameof(Strings.Error_StaticGraphRestoreFailedToStart), e.Message);
 
-                            process.BeginOutputReadLine();
-                            process.BeginErrorReadLine();
-
-                            if (SerializeGlobalProperties)
-                            {
-                                using var writer = new BinaryWriter(process.StandardInput.BaseStream, Encoding.UTF8, leaveOpen: true);
-
-                                WriteGlobalProperties(writer, globalProperties);
-                            }
+                            return false;
                         }
                         finally
                         {
-                            process.StandardInput.Close();
-
                             Console.InputEncoding = previousConsoleInputEncoding;
                         }
 
+                        process.BeginOutputReadLine();
+                        process.BeginErrorReadLine();
+
+                        if (SerializeGlobalProperties)
+                        {
+                            using var writer = new BinaryWriter(process.StandardInput.BaseStream, Encoding.UTF8, leaveOpen: true);
+
+                            WriteGlobalProperties(writer, globalProperties);
+                        }
+
+                        process.StandardInput.Close();
+
                         semaphore.Wait(_cancellationTokenSource.Token);
 
                         if (!process.HasExited)
@@ -224,23 +230,7 @@ e is OperationCanceledException
         internal string GetCommandLineArguments(Dictionary<string, string> globalProperties)
         {
             // First get the command-line arguments including the global properties
-            string commandLineArguments = CreateArgumentString(EnumerateCommandLineArguments(SerializeGlobalProperties ? null : globalProperties));
-
-            if (SerializeGlobalProperties)
-            {
-                return commandLineArguments;
-            }
-
-            // If the command-line arguments exceed the supported length, set the flag to serialize the global properties to the standard input stream get the
-            // arguments again without the global properties.
-            if (commandLineArguments.Length > 8000)
-            {
-                SerializeGlobalProperties = true;
-
-                commandLineArguments = CreateArgumentString(EnumerateCommandLineArguments(globalProperties: null));
-            }
-
-            return commandLineArguments;
+            return CreateArgumentString(EnumerateCommandLineArguments(SerializeGlobalProperties ? null : globalProperties));
 
             IEnumerable<string> EnumerateCommandLineArguments(Dictionary<string, string> globalProperties)
             {

diff --git a/src/NuGet.Core/NuGet.Build.Tasks/Strings.Designer.cs b/src/NuGet.Core/NuGet.Build.Tasks/Strings.Designer.cs
diff --git a/src/NuGet.Core/NuGet.Build.Tasks/Strings.resx b/src/NuGet.Core/NuGet.Build.Tasks/Strings.resx
@@ -225,4 +225,8 @@
     <value>An error occurred parsing command-line arguments in static graph-based restore as the first integer read, {0}, is not an allowable value. Please file an issue at https://github.com/NuGet/Home</value>
     <comment>0 - The value of the first integer read from the stream</comment>
   </data>
+  <data name="Error_StaticGraphRestoreFailedToStart" xml:space="preserve">
+    <value>An error occurred starting static graph-based restore. {0}. Please file an issue at https://github.com/NuGet/Home</value>
+    <comment>0 - The exception message</comment>
+  </data>
 </root>