Add Warning output to error out in PS Core results.

immense · Apr 16, 2021 · c00f171 · c00f171
1 parent 7c4f935
commit c00f171
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Agent/Services/PSCore.cs b/Agent/Services/PSCore.cs
@@ -84,7 +84,7 @@ public ScriptResult WriteInput(string input)
             using var ps = PowerShell.Create();
             ps.AddScript("$args[0] | Out-String");
             ps.AddArgument(results);
-            var hostOutput = (ps.Invoke()[0].BaseObject as string);
+            var hostOutput = (string)ps.Invoke()[0].BaseObject;
 
             var verboseOut = _powershell.Streams.Verbose.ReadAll().Select(x => x.Message);
             var debugOut = _powershell.Streams.Debug.ReadAll().Select(x => x.Message);
@@ -95,8 +95,7 @@ public ScriptResult WriteInput(string input)
             var standardOut = hostOutput.Split(Environment.NewLine)
                 .Concat(infoOut)
                 .Concat(debugOut)
-                .Concat(verboseOut)
-                .Concat(warningOut);
+                .Concat(verboseOut);
 
 
             return new ScriptResult()
@@ -106,7 +105,7 @@ public ScriptResult WriteInput(string input)
                 ScriptInput = input,
                 Shell = Shared.Enums.ScriptingShell.PSCore,
                 StandardOutput = standardOut.ToArray(),
-                ErrorOutput = errorOut.ToArray(),
+                ErrorOutput = errorOut.Concat(warningOut).ToArray(),
                 RunTime = sw.Elapsed,
                 HadErrors = _powershell.HadErrors
             };

diff --git a/Server/Server.csproj b/Server/Server.csproj
@@ -14,6 +14,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <Compile Remove="bin\**" />
+    <Content Remove="bin\**" />
+    <EmbeddedResource Remove="bin\**" />
+    <None Remove="bin\**" />
+    <TypeScriptCompile Remove="bin\**" />
     <TypeScriptCompile Remove="node_modules\**" />
   </ItemGroup>