Make all communication timeouts configurable.

src/Microsoft.TestPlatform.CommunicationUtilities/Resources/Resources.resx

@@ -136,6 +136,6 @@
     <value>Protocol version check failed. Make sure test runner and host are compatible.</value>
   </data>
   <data name="VersionCheckTimedout" xml:space="preserve">
-    <value>Failed to negotiate protocol. Wait for response timed out.</value>
+    <value>Failed to negotiate protocol, Timeout: {0} milliseconds occured while waiting for response, Set enviroment variable {1} to increase timeout.</value>
   </data>
 </root>

src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.cs.xlf

@@ -67,9 +67,9 @@
         <note />
       </trans-unit>
       <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol. Wait for response timed out.</source>
-        <target state="translated">Nepovedlo se vyjednat protokol. Při čekání na odpověď vypršel časový limit.</target>
-        <note />
+        <source>Failed to negotiate protocol, Timeout: {0} milliseconds occured while waiting for response, Set enviroment variable {1} to increase timeout.</source>
+        <target state="new">Nepovedlo se vyjednat protokol. Při čekání na odpověď vypršel časový limit.</target>
+        <note></note>
       </trans-unit>
     </body>
   </file>

src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.de.xlf

@@ -67,9 +67,9 @@
         <note />
       </trans-unit>
       <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol. Wait for response timed out.</source>
-        <target state="translated">Fehler beim Verhandeln des Protokolls. Timeout beim Warten auf Antwort.</target>
-        <note />
+        <source>Failed to negotiate protocol, Timeout: {0} milliseconds occured while waiting for response, Set enviroment variable {1} to increase timeout.</source>
+        <target state="new">Fehler beim Verhandeln des Protokolls. Timeout beim Warten auf Antwort.</target>
+        <note></note>
       </trans-unit>
     </body>
   </file>

src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.es.xlf

@@ -67,9 +67,9 @@
         <note />
       </trans-unit>
       <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol. Wait for response timed out.</source>
-        <target state="translated">No se pudo negociar el protocolo. Se agotó el tiempo de espera para la respuesta.</target>
-        <note />
+        <source>Failed to negotiate protocol, Timeout: {0} milliseconds occured while waiting for response, Set enviroment variable {1} to increase timeout.</source>
+        <target state="new">No se pudo negociar el protocolo. Se agotó el tiempo de espera para la respuesta.</target>
+        <note></note>
       </trans-unit>
     </body>
   </file>

src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.fr.xlf

@@ -67,9 +67,9 @@
         <note />
       </trans-unit>
       <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol. Wait for response timed out.</source>
-        <target state="translated">Échec de la négociation du protocole. Expiration du délai d'attente de la réponse.</target>
-        <note />
+        <source>Failed to negotiate protocol, Timeout: {0} milliseconds occured while waiting for response, Set enviroment variable {1} to increase timeout.</source>
+        <target state="new">Échec de la négociation du protocole. Expiration du délai d'attente de la réponse.</target>
+        <note></note>
       </trans-unit>
     </body>
   </file>

src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.it.xlf

@@ -67,9 +67,9 @@
         <note />
       </trans-unit>
       <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol. Wait for response timed out.</source>
-        <target state="translated">Non è stato possibile negoziare il protocollo. Si è verificato un timeout durante l'attesa della risposta.</target>
-        <note />
+        <source>Failed to negotiate protocol, Timeout: {0} milliseconds occured while waiting for response, Set enviroment variable {1} to increase timeout.</source>
+        <target state="new">Non è stato possibile negoziare il protocollo. Si è verificato un timeout durante l'attesa della risposta.</target>
+        <note></note>
       </trans-unit>
     </body>
   </file>

src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ja.xlf

@@ -67,9 +67,9 @@
         <note />
       </trans-unit>
       <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol. Wait for response timed out.</source>
-        <target state="translated">プロトコルをネゴシエートできませんでした。応答がタイムアウトするまでしばらくお待ちください。</target>
-        <note />
+        <source>Failed to negotiate protocol, Timeout: {0} milliseconds occured while waiting for response, Set enviroment variable {1} to increase timeout.</source>
+        <target state="new">プロトコルをネゴシエートできませんでした。応答がタイムアウトするまでしばらくお待ちください。</target>
+        <note></note>
       </trans-unit>
     </body>
   </file>

src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ko.xlf

@@ -67,9 +67,9 @@
         <note />
       </trans-unit>
       <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol. Wait for response timed out.</source>
-        <target state="translated">프로토콜을 협상하지 못했습니다. 응답 시간이 초과될 때까지 기다려 주세요.</target>
-        <note />
+        <source>Failed to negotiate protocol, Timeout: {0} milliseconds occured while waiting for response, Set enviroment variable {1} to increase timeout.</source>
+        <target state="new">프로토콜을 협상하지 못했습니다. 응답 시간이 초과될 때까지 기다려 주세요.</target>
+        <note></note>
       </trans-unit>
     </body>
   </file>

src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.pl.xlf

@@ -67,9 +67,9 @@
         <note />
       </trans-unit>
       <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol. Wait for response timed out.</source>
-        <target state="translated">Nie można negocjować protokołu. Zaczekaj na przekroczenie limitu czasu odpowiedzi.</target>
-        <note />
+        <source>Failed to negotiate protocol, Timeout: {0} milliseconds occured while waiting for response, Set enviroment variable {1} to increase timeout.</source>
+        <target state="new">Nie można negocjować protokołu. Zaczekaj na przekroczenie limitu czasu odpowiedzi.</target>
+        <note></note>
       </trans-unit>
     </body>
   </file>

src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.pt-BR.xlf

@@ -67,9 +67,9 @@
         <note />
       </trans-unit>
       <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol. Wait for response timed out.</source>
-        <target state="translated">Falha ao negociar o protocolo. Aguarde a resposta atingir o tempo limite.</target>
-        <note />
+        <source>Failed to negotiate protocol, Timeout: {0} milliseconds occured while waiting for response, Set enviroment variable {1} to increase timeout.</source>
+        <target state="new">Falha ao negociar o protocolo. Aguarde a resposta atingir o tempo limite.</target>
+        <note></note>
       </trans-unit>
     </body>
   </file>

src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.ru.xlf

@@ -67,9 +67,9 @@
         <note />
       </trans-unit>
       <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol. Wait for response timed out.</source>
-        <target state="translated">Не удалось согласовать протокол. Подождите, пока истечет время ожидания ответа.</target>
-        <note />
+        <source>Failed to negotiate protocol, Timeout: {0} milliseconds occured while waiting for response, Set enviroment variable {1} to increase timeout.</source>
+        <target state="new">Не удалось согласовать протокол. Подождите, пока истечет время ожидания ответа.</target>
+        <note></note>
       </trans-unit>
     </body>
   </file>

src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.tr.xlf

@@ -67,9 +67,9 @@
         <note />
       </trans-unit>
       <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol. Wait for response timed out.</source>
-        <target state="translated">Protokol üzerinde anlaşmaya varılamadı. Yanıt beklenirken zaman aşımı gerçekleşti.</target>
-        <note />
+        <source>Failed to negotiate protocol, Timeout: {0} milliseconds occured while waiting for response, Set enviroment variable {1} to increase timeout.</source>
+        <target state="new">Protokol üzerinde anlaşmaya varılamadı. Yanıt beklenirken zaman aşımı gerçekleşti.</target>
+        <note></note>
       </trans-unit>
     </body>
   </file>

src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.xlf

@@ -29,7 +29,7 @@
         <note></note>
       </trans-unit>
       <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol. Wait for response timed out.</source>
+        <source>Failed to negotiate protocol, Timeout: {0} milliseconds occured while waiting for response, Set enviroment variable {1} to increase timeout.</source>
         <target state="new">Failed to negotiate protocol. Wait for response timed out.</target>
         <note></note>
       </trans-unit>

src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.zh-Hans.xlf

@@ -67,9 +67,9 @@
         <note />
       </trans-unit>
       <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol. Wait for response timed out.</source>
-        <target state="translated">未能协商协议。等待响应超时。</target>
-        <note />
+        <source>Failed to negotiate protocol, Timeout: {0} milliseconds occured while waiting for response, Set enviroment variable {1} to increase timeout.</source>
+        <target state="new">未能协商协议。等待响应超时。</target>
+        <note></note>
       </trans-unit>
     </body>
   </file>

src/Microsoft.TestPlatform.CommunicationUtilities/Resources/xlf/Resources.zh-Hant.xlf

@@ -67,9 +67,9 @@
         <note />
       </trans-unit>
       <trans-unit id="VersionCheckTimedout">
-        <source>Failed to negotiate protocol. Wait for response timed out.</source>
-        <target state="translated">無法交涉通訊協定。請等候回應逾時。</target>
-        <note />
+        <source>Failed to negotiate protocol, Timeout: {0} milliseconds occured while waiting for response, Set enviroment variable {1} to increase timeout.</source>
+        <target state="new">無法交涉通訊協定。請等候回應逾時。</target>
+        <note></note>
       </trans-unit>
     </body>
   </file>

src/Microsoft.TestPlatform.CommunicationUtilities/TestRequestSender.cs

@@ -7,13 +7,13 @@ namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities
     using System.Collections.Generic;
     using System.Globalization;
     using System.Threading;
-
+    using CoreUtilities.Helpers;
     using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
     using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
-
+    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
     using CommonResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
 
     /// <summary>
@@ -96,11 +96,11 @@ internal TestRequestSender(
         /// <param name="protocolConfig">Protocol configuration.</param>
         /// <param name="clientExitedWaitTime">Time to wait for client process exit.</param>
         internal TestRequestSender(
-                ICommunicationEndPoint communicationEndPoint,
-                TestHostConnectionInfo connectionInfo,
-                IDataSerializer serializer,
-                ProtocolConfig protocolConfig,
-                int clientExitedWaitTime)
+            ICommunicationEndPoint communicationEndPoint,
+            TestHostConnectionInfo connectionInfo,
+            IDataSerializer serializer,
+            ProtocolConfig protocolConfig,
+            int clientExitedWaitTime)
             : this(connectionInfo, serializer, protocolConfig, clientExitedWaitTime)
         {
             this.communicationEndpoint = communicationEndPoint;
@@ -198,9 +198,10 @@ public void CheckVersionWithTestHost()
                 this.channel.Send(data);
 
                 // Wait for negotiation response
-                if (!protocolNegotiated.WaitOne(60 * 1000))
+                var timeout = EnvironmentHelper.GetConnectionTimeout();
+                if (!protocolNegotiated.WaitOne(timeout * 1000))
                 {
-                    throw new TestPlatformException(string.Format(CultureInfo.CurrentUICulture, CommonResources.VersionCheckTimedout));
+                    throw new TestPlatformException(string.Format(CultureInfo.CurrentUICulture, CommonResources.VersionCheckTimedout, timeout, Constants.VstestTimeoutIncreaseByTimes));
                 }
             }
             finally

src/Microsoft.TestPlatform.CoreUtilities/Helpers/EnvironmentHelper.cs

@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers
+{
+    using System;
+    using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
+    using ObjectModel;
+
+    public class EnvironmentHelper
+    {
+        public const string VstestConnectionTimeout = "VSTEST_CONNECTION_TIMEOUT";
+        public const int DefaultConnectionTimeout = 90; // seconds
+
+        /// <summary>
+        /// Get timeout based on environment variable VSTEST_CONNECTION_TIMEOUT.
+        /// </summary>
+        public static int GetConnectionTimeout()
+        {
+            var envVarValue = Environment.GetEnvironmentVariable(EnvironmentHelper.VstestConnectionTimeout);
+            if (!string.IsNullOrEmpty(envVarValue) && int.TryParse(envVarValue, out int value))
+            {
+                EqtTrace.Info("EnvironmentHelper.GetConnectionTimeout: {0} value set to {1}.", EnvironmentHelper.VstestConnectionTimeout, value);
+            }
+            else
+            {
+                value = EnvironmentHelper.DefaultConnectionTimeout;
+            }
+
+            return value;
+        }
+    }
+}

src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyDiscoveryManager.cs

@@ -42,7 +42,7 @@ public class ProxyDiscoveryManager : ProxyOperationManager, IProxyDiscoveryManag
         /// <param name="testRequestSender">Test request sender instance.</param>
         /// <param name="testHostManager">Test host manager instance.</param>
         public ProxyDiscoveryManager(IRequestData requestData, ITestRequestSender testRequestSender, ITestRuntimeProvider testHostManager)
-            : this(requestData, testRequestSender, testHostManager, JsonDataSerializer.Instance, CrossPlatEngine.Constants.ClientConnectionTimeout)
+            : this(requestData, testRequestSender, testHostManager, JsonDataSerializer.Instance)
         {
             this.testHostManager = testHostManager;
         }
@@ -51,23 +51,19 @@ public ProxyDiscoveryManager(IRequestData requestData, ITestRequestSender testRe
         /// Initializes a new instance of the <see cref="ProxyDiscoveryManager"/> class.
         /// Constructor with Dependency injection. Used for unit testing.
         /// </summary>
+        /// <param name="requestData"></param>
         /// <param name="requestSender">
-        /// The request Sender.
+        ///     The request Sender.
         /// </param>
         /// <param name="testHostManager">
-        /// Test host Manager instance
+        ///     Test host Manager instance
         /// </param>
         /// <param name="dataSerializer"></param>
-        /// <param name="clientConnectionTimeout">
-        /// The client Connection Timeout
-        /// </param>
-        internal ProxyDiscoveryManager(
-            IRequestData requestData,
+        internal ProxyDiscoveryManager(IRequestData requestData,
             ITestRequestSender requestSender,
             ITestRuntimeProvider testHostManager,
-            IDataSerializer dataSerializer,
-            int clientConnectionTimeout)
-            : base(requestData, requestSender, testHostManager, clientConnectionTimeout)
+            IDataSerializer dataSerializer)
+            : base(requestData, requestSender, testHostManager)
         {
             this.dataSerializer = dataSerializer;
             this.testHostManager = testHostManager;

src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyExecutionManager.cs

@@ -22,8 +22,6 @@ namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Host;
     using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
-    using Constants = Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Constants;
-
     /// <summary>
     /// Orchestrates test execution operations for the engine communicating with the client.
     /// </summary>
@@ -49,7 +47,7 @@ internal class ProxyExecutionManager : ProxyOperationManager, IProxyExecutionMan
         /// <param name="requestSender">Test request sender instance.</param>
         /// <param name="testHostManager">Test host manager for this proxy.</param>
         public ProxyExecutionManager(IRequestData requestData, ITestRequestSender requestSender, ITestRuntimeProvider testHostManager) : 
-            this(requestData, requestSender, testHostManager, JsonDataSerializer.Instance, Constants.ClientConnectionTimeout)
+            this(requestData, requestSender, testHostManager, JsonDataSerializer.Instance)
         {
         }
 
@@ -61,9 +59,9 @@ public ProxyExecutionManager(IRequestData requestData, ITestRequestSender reques
         /// <param name="requestSender">Request Sender instance</param>
         /// <param name="testHostManager">Test host manager instance</param>
         /// <param name="dataSerializer"></param>
-        /// <param name="clientConnectionTimeout">The client Connection Timeout</param>
-        internal ProxyExecutionManager(IRequestData requestData, ITestRequestSender requestSender, ITestRuntimeProvider testHostManager, IDataSerializer dataSerializer, int clientConnectionTimeout)
-            : base(requestData, requestSender, testHostManager, clientConnectionTimeout)
+        internal ProxyExecutionManager(IRequestData requestData, ITestRequestSender requestSender,
+            ITestRuntimeProvider testHostManager, IDataSerializer dataSerializer)
+            : base(requestData, requestSender, testHostManager)
         {
             this.testHostManager = testHostManager;
             this.dataSerializer = dataSerializer;