[Draft] [Design mode] Invoking vstest.console with environment variab…

…les (#2023) * Changes to allow clients to provide environment variable while initializing VsTestConsoleWrapper * Changes based on comments.
microsoft · May 29, 2019 · 7d28e20 · 7d28e20
1 parent 93ffe26
commit 7d28e20
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/ConsoleParameters.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/ConsoleParameters.cs
@@ -4,6 +4,7 @@
 namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer
 {
     using System;
+    using System.Collections.Generic;
     using System.Diagnostics;
     using System.IO;
 
@@ -37,6 +38,16 @@ public ConsoleParameters(IFileHelper fileHelper)
             this.fileHelper = fileHelper;
         }
 
+#if NET451
+
+        /// <summary>
+        /// TODO: Remove the #if when project is targeted to netstandard2.0
+        /// Environment variables to be set for the process
+        /// </summary>
+        public Dictionary<string, string> EnvironmentVariables { get; set; }
+
+#endif
+
         /// <summary>
         /// Trace level for logs.
         /// </summary>

diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleProcessManager.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleProcessManager.cs
@@ -9,6 +9,7 @@ namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer
     using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers;
     using Microsoft.VisualStudio.TestPlatform.Utilities.Helpers.Interfaces;
     using System;
+    using System.Collections;
     using System.Collections.Generic;
     using System.Diagnostics;
     using System.Globalization;
@@ -106,6 +107,19 @@ public void StartProcess(ConsoleParameters consoleParameters)
 
             EqtTrace.Verbose("VsTestCommandLineWrapper: Process Start Info {0} {1}", info.FileName, info.Arguments);
 
+#if NET451
+            if (consoleParameters.EnvironmentVariables != null)
+            {
+                info.EnvironmentVariables.Clear();
+                foreach (var envVariable in consoleParameters.EnvironmentVariables)
+                {
+                    if (envVariable.Key != null)
+                    {
+                        info.EnvironmentVariables.Add(envVariable.Key.ToString(), envVariable.Value?.ToString());
+                    }
+                }
+            }
+#endif
             this.process = Process.Start(info);
             this.process.Start();