diff --git a/src/Compilers/Core/MSBuildTask/ManagedCompiler.cs b/src/Compilers/Core/MSBuildTask/ManagedCompiler.cs
index 41f2b3acce4b77ae8916c1b322a5461ffcbde9a6..0288de251868cc3dcb508941b38ca51e9517835f 100644
--- a/src/Compilers/Core/MSBuildTask/ManagedCompiler.cs
+++ b/src/Compilers/Core/MSBuildTask/ManagedCompiler.cs
@@ -72,6 +72,13 @@ public int CodePage
             get { return _store.GetOrDefault(nameof(CodePage), 0); }
         }
 
+        [Output]
+        public ITaskItem[] CommandLineArgs
+        {
+            set { _store[nameof(CommandLineArgs)] = value; }
+            get { return (ITaskItem[])_store[nameof(CommandLineArgs)]; }
+        }
+
         public string DebugType
         {
             set { _store[nameof(DebugType)] = value; }
@@ -187,6 +194,12 @@ public bool Prefer32Bit
             get { return _store.GetOrDefault(nameof(Prefer32Bit), false); }
         }
 
+        public bool ProvideCommandLineArgs
+        {
+            set { _store[nameof(ProvideCommandLineArgs)] = value; }
+            get { return _store.GetOrDefault(nameof(ProvideCommandLineArgs), false); }
+        }
+
         public ITaskItem[] References
         {
             set { _store[nameof(References)] = value; }
@@ -211,6 +224,12 @@ public ITaskItem[] ResponseFiles
             get { return (ITaskItem[])_store[nameof(ResponseFiles)]; }
         }
 
+        public bool SkipCompilerExecution
+        {
+            set { _store[nameof(SkipCompilerExecution)] = value; }
+            get { return _store.GetOrDefault(nameof(SkipCompilerExecution), false); }
+        }
+
         public ITaskItem[] Sources
         {
             set
@@ -312,6 +331,17 @@ protected override Encoding StandardOutputEncoding
 
         protected override int ExecuteTool(string pathToTool, string responseFileCommands, string commandLineCommands)
         {
+            if (ProvideCommandLineArgs)
+            {
+                CommandLineArgs = GetArguments(commandLineCommands, responseFileCommands)
+                    .Select(arg => new TaskItem(arg)).ToArray();
+            }
+
+            if (SkipCompilerExecution)
+            {
+                return 0;
+            }
+
             if (!UseSharedCompilation || !String.IsNullOrEmpty(this.ToolPath))
             {
                 return base.ExecuteTool(pathToTool, responseFileCommands, commandLineCommands);
@@ -321,6 +351,9 @@ protected override int ExecuteTool(string pathToTool, string responseFileCommand
             {
                 try
                 {
+                    CompilerServerLogger.Log($"CommandLine = '{commandLineCommands}'");
+                    CompilerServerLogger.Log($"BuildResponseFile = '{responseFileCommands}'");
+
                     var responseTask = BuildClient.TryRunServerCompilation(
                         Language,
                         TryGetClientDir() ?? Path.GetDirectoryName(pathToTool),
@@ -496,9 +529,6 @@ public string GenerateResponseFileContents()
         /// </summary>
         private string[] GetArguments(string commandLineCommands, string responseFileCommands)
         {
-            CompilerServerLogger.Log($"CommandLine = '{commandLineCommands}'");
-            CompilerServerLogger.Log($"BuildResponseFile = '{responseFileCommands}'");
-
             var commandLineArguments =
                 CommandLineParser.SplitCommandLineIntoArguments(commandLineCommands, removeHashComments: true);
             var responseFileArguments =
diff --git a/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets b/src/Compilers/Core/MSBuildTask/Microsoft.CSharp.Core.targets
index 876789c758660618f261b87a16a43f3db239e91c..37270ab1ba15310bfef7209d108f11b915b1d3fa 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=""
+          Returns="@(CscCommandLineArgs)"
           DependsOnTargets="$(CoreCompileDependsOn)"
     >
     <!-- These two compiler warnings are raised when a reference is bound to a different version
@@ -105,10 +105,12 @@
           Platform="$(PlatformTarget)"
           Prefer32Bit="$(Prefer32Bit)"
           PreferredUILang="$(PreferredUILang)"
+          ProvideCommandLineArgs="$(ProvideCommandLineArgs)"
           References="@(ReferencePath)"
           ReportAnalyzer="$(ReportAnalyzer)"
           Resources="@(_CoreCompileResourceInputs);@(CompiledLicenseFile)"
           ResponseFiles="$(CompilerResponseFile)"
+          SkipCompilerExecution="$(SkipCompilerExecution)"
           Sources="@(Compile)"
           SubsystemVersion="$(SubsystemVersion)"
           TargetType="$(OutputType)"
@@ -125,7 +127,9 @@
           Win32Icon="$(ApplicationIcon)"
           Win32Manifest="$(Win32Manifest)"
           Win32Resource="$(Win32Resource)"
-              />
+          >
+      <Output TaskParameter="CommandLineArgs" ItemName="CscCommandLineArgs" />
+    </Csc>
 
     <ItemGroup>
       <_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" />
diff --git a/src/Compilers/Core/MSBuildTask/Microsoft.VisualBasic.Core.targets b/src/Compilers/Core/MSBuildTask/Microsoft.VisualBasic.Core.targets
index 78ca3e51f5e089d6f0d963d6a3a6d8a27f662d82..5a5814cb05ebfd3f7efdec583ee2d8e580ab0f4c 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=""
+          Returns="@(VbcCommandLineArgs)"
           DependsOnTargets="$(CoreCompileDependsOn)"
     >
     <PropertyGroup>
@@ -97,6 +97,7 @@
           Platform="$(PlatformTarget)"
           Prefer32Bit="$(Prefer32Bit)"
           PreferredUILang="$(PreferredUILang)"
+          ProvideCommandLineArgs="$(ProvideCommandLineArgs)"
           References="@(ReferencePath)"
           RemoveIntegerChecks="$(RemoveIntegerChecks)"
           ReportAnalyzer="$(ReportAnalyzer)"
@@ -104,6 +105,7 @@
           ResponseFiles="$(CompilerResponseFile)"
           RootNamespace="$(RootNamespace)"
           SdkPath="$(FrameworkPathOverride)"
+          SkipCompilerExecution="$(SkipCompilerExecution)"
           Sources="@(Compile)"
           SubsystemVersion="$(SubsystemVersion)"
           TargetCompactFramework="$(TargetCompactFramework)"
@@ -123,8 +125,9 @@
           Win32Manifest="$(Win32Manifest)"
           Win32Resource="$(Win32Resource)"
           VBRuntime="$(VBRuntime)"
-          />
-
+          >
+      <Output TaskParameter="CommandLineArgs" ItemName="VbcCommandLineArgs" />
+    </Vbc>
     <ItemGroup>
       <_CoreCompileResourceInputs Remove="@(_CoreCompileResourceInputs)" />
     </ItemGroup>
diff --git a/src/Compilers/Core/MSBuildTask/Vbc.cs b/src/Compilers/Core/MSBuildTask/Vbc.cs
index 36027d9acb91c41219254ce4d1de083821b60ce8..a131b29c328f7643b7d4821c679b4fd814d5865b 100644
--- a/src/Compilers/Core/MSBuildTask/Vbc.cs
+++ b/src/Compilers/Core/MSBuildTask/Vbc.cs
@@ -273,7 +273,10 @@ public override bool Execute()
                 return false;
             }
 
-            MovePdbFileIfNecessary(OutputAssembly.ItemSpec);
+            if (!SkipCompilerExecution)
+            {
+                MovePdbFileIfNecessary(OutputAssembly.ItemSpec);
+            }
 
             return !Log.HasLoggedErrors;
         }