From 74febf1533eb93bfa51d7ce1f5693e2c0846e099 Mon Sep 17 00:00:00 2001
From: Andrew Arnott <andarno@microsoft.com>
Date: Mon, 17 Aug 2015 17:08:41 -0700
Subject: [PATCH] Produce argument array instead of large string

---
 .../Core/MSBuildTask/ManagedCompiler.cs       | 28 +++++++++++--------
 .../MSBuildTask/Microsoft.CSharp.Core.targets |  6 ++--
 .../Microsoft.VisualBasic.Core.targets        |  6 ++--
 3 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/Compilers/Core/MSBuildTask/ManagedCompiler.cs b/src/Compilers/Core/MSBuildTask/ManagedCompiler.cs
index f87082f01c6..b5325d8b174 100644
--- a/src/Compilers/Core/MSBuildTask/ManagedCompiler.cs
+++ b/src/Compilers/Core/MSBuildTask/ManagedCompiler.cs
@@ -73,10 +73,10 @@ public int CodePage
         }
 
         [Output]
-        public string CommandLineInvocation
+        public ITaskItem[] CommandLineArgs
         {
-            set { _store[nameof(CommandLineInvocation)] = value; }
-            get { return _store.GetOrDefault(nameof(CommandLineInvocation), string.Empty); }
+            set { _store[nameof(CommandLineArgs)] = value; }
+            get { return (ITaskItem[])_store[nameof(CommandLineArgs)]; }
         }
 
         public string DebugType
@@ -194,10 +194,10 @@ public bool Prefer32Bit
             get { return _store.GetOrDefault(nameof(Prefer32Bit), false); }
         }
 
-        public bool ProvideCommandLineInvocation
+        public bool ProvideCommandLineArgs
         {
-            set { _store[nameof(ProvideCommandLineInvocation)] = value; }
-            get { return _store.GetOrDefault(nameof(ProvideCommandLineInvocation), false); }
+            set { _store[nameof(ProvideCommandLineArgs)] = value; }
+            get { return _store.GetOrDefault(nameof(ProvideCommandLineArgs), false); }
         }
 
         public ITaskItem[] References
@@ -331,9 +331,10 @@ protected override Encoding StandardOutputEncoding
 
         protected override int ExecuteTool(string pathToTool, string responseFileCommands, string commandLineCommands)
         {
-            if (ProvideCommandLineInvocation)
+            if (ProvideCommandLineArgs)
             {
-                CommandLineInvocation = GenerateResponseFileContents();
+                CommandLineArgs = GetArguments(commandLineCommands, responseFileCommands, false)
+                    .Select(arg => new TaskItem(arg)).ToArray();
             }
 
             if (SkipCompilerExecution)
@@ -354,7 +355,7 @@ protected override int ExecuteTool(string pathToTool, string responseFileCommand
                         Language,
                         TryGetClientDir() ?? Path.GetDirectoryName(pathToTool),
                         CurrentDirectoryToUse(),
-                        GetArguments(commandLineCommands, responseFileCommands),
+                        GetArguments(commandLineCommands, responseFileCommands, true),
                         _sharedCompileCts.Token,
                         libEnvVariable: LibDirectoryToUse());
 
@@ -523,10 +524,13 @@ public string GenerateResponseFileContents()
         /// <summary>
         /// Get the command line arguments to pass to the compiler.
         /// </summary>
-        private string[] GetArguments(string commandLineCommands, string responseFileCommands)
+        private string[] GetArguments(string commandLineCommands, string responseFileCommands, bool emitServerLog)
         {
-            CompilerServerLogger.Log($"CommandLine = '{commandLineCommands}'");
-            CompilerServerLogger.Log($"BuildResponseFile = '{responseFileCommands}'");
+            if (emitServerLog)
+            {
+                CompilerServerLogger.Log($"CommandLine = '{commandLineCommands}'");
+                CompilerServerLogger.Log($"BuildResponseFile = '{responseFileCommands}'");
+            }
 
             var commandLineArguments =
                 CommandLineParser.SplitCommandLineIntoArguments(commandLineCommands, removeHashComments: true);
diff --git a/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets b/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets
index b52435e394f..37270ab1ba1 100644
--- a/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets
+++ b/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets
@@ -19,7 +19,7 @@
                  @(_DebugSymbolsIntermediatePath);
                  $(NonExistentFile);
                  @(CustomAdditionalCompileOutputs)"
-          Returns="$(CscCommandLineInvocation)"
+          Returns="@(CscCommandLineArgs)"
           DependsOnTargets="$(CoreCompileDependsOn)"
     >
     <!-- These two compiler warnings are raised when a reference is bound to a different version
@@ -105,7 +105,7 @@
           Platform="$(PlatformTarget)"
           Prefer32Bit="$(Prefer32Bit)"
           PreferredUILang="$(PreferredUILang)"
-          ProvideCommandLineInvocation="$(ProvideCommandLineInvocation)"
+          ProvideCommandLineArgs="$(ProvideCommandLineArgs)"
           References="@(ReferencePath)"
           ReportAnalyzer="$(ReportAnalyzer)"
           Resources="@(_CoreCompileResourceInputs);@(CompiledLicenseFile)"
@@ -128,7 +128,7 @@
           Win32Manifest="$(Win32Manifest)"
           Win32Resource="$(Win32Resource)"
           >
-      <Output TaskParameter="CommandLineInvocation" PropertyName="CscCommandLineInvocation" />
+      <Output TaskParameter="CommandLineArgs" ItemName="CscCommandLineArgs" />
     </Csc>
 
     <ItemGroup>
diff --git a/src/Compilers/Core/MSBuildTask/Microsoft.VisualBasic.Core.targets b/src/Compilers/Core/MSBuildTask/Microsoft.VisualBasic.Core.targets
index a916d148000..5a5814cb05e 100644
--- a/src/Compilers/Core/MSBuildTask/Microsoft.VisualBasic.Core.targets
+++ b/src/Compilers/Core/MSBuildTask/Microsoft.VisualBasic.Core.targets
@@ -19,7 +19,7 @@
                  @(_DebugSymbolsIntermediatePath);
                  $(NonExistentFile);
                  @(CustomAdditionalCompileOutputs)"
-          Returns="$(VbcCommandLineInvocation)"
+          Returns="@(VbcCommandLineArgs)"
           DependsOnTargets="$(CoreCompileDependsOn)"
     >
     <PropertyGroup>
@@ -97,7 +97,7 @@
           Platform="$(PlatformTarget)"
           Prefer32Bit="$(Prefer32Bit)"
           PreferredUILang="$(PreferredUILang)"
-          ProvideCommandLineInvocation="$(ProvideCommandLineInvocation)"
+          ProvideCommandLineArgs="$(ProvideCommandLineArgs)"
           References="@(ReferencePath)"
           RemoveIntegerChecks="$(RemoveIntegerChecks)"
           ReportAnalyzer="$(ReportAnalyzer)"
@@ -126,7 +126,7 @@
           Win32Resource="$(Win32Resource)"
           VBRuntime="$(VBRuntime)"
           >
-      <Output TaskParameter="CommandLineInvocation" PropertyName="CscCommandLineInvocation" />
+      <Output TaskParameter="CommandLineArgs" ItemName="VbcCommandLineArgs" />
     </Vbc>
     <ItemGroup>
       <_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" />
-- 
GitLab