Extend to DiagnosticsClient string constructor

Author: mdh1418

src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClient/DiagnosticsClient.cs

@@ -30,11 +30,17 @@ internal DiagnosticsClient(IpcEndpointConfig config) :
         {
         }
 
+        public DiagnosticsClient(string diagnosticPort) :
+            this(new DiagnosticPortIpcEndpoint(diagnosticPort))
+        {
+        }
+
         internal DiagnosticsClient(IpcEndpoint endpoint)
         {
             _endpoint = endpoint;
         }
 
+
         /// <summary>
         /// Wait for an available diagnostic endpoint to the runtime instance.
         /// </summary>

src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsIpc/IpcEndpointConfig.cs

@@ -18,7 +18,8 @@ public enum PortType
         public enum TransportType
         {
             NamedPipe,
-            UnixDomainSocket
+            UnixDomainSocket,
+            TcpClient
         }
 
         PortType _portType;
@@ -57,6 +58,12 @@ public IpcEndpointConfig(string address, TransportType transportType, PortType p
                         throw new PlatformNotSupportedException($"{UnixDomainSocketSchema} is not supported on Windows, use {NamedPipeSchema}.");
                     break;
                 }
+                case TransportType.TcpClient:
+                {
+                    if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                        throw new PlatformNotSupportedException($"TcpClient  is not supported on Windows, use {NamedPipeSchema}.");
+                    break;
+                }
                 default:
                 {
                     throw new NotSupportedException($"{transportType} not supported.");
@@ -108,7 +115,7 @@ public static IpcEndpointConfig Parse(string config)
 
             string address = "";
             PortType portType = PortType.Connect;
-            TransportType transportType = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? TransportType.NamedPipe : TransportType.UnixDomainSocket;
+            TransportType transportType = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? TransportType.NamedPipe : OperatingSystem.IsAndroid() ? TransportType.TcpClient : TransportType.UnixDomainSocket;
 
             if (!string.IsNullOrEmpty(config))
             {

src/Microsoft.Diagnostics.NETCore.Client/DiagnosticsIpc/IpcTransport.cs

@@ -7,6 +7,7 @@
 using System.IO;
 using System.IO.Pipes;
 using System.Linq;
+using System.Net.Sockets;
 using System.Runtime.InteropServices;
 using System.Security.Principal;
 using System.Threading;
@@ -69,6 +70,13 @@ public static Stream Connect(IpcEndpointConfig config, TimeSpan timeout)
                 socket.Connect(new IpcUnixDomainSocketEndPoint(config.Address), timeout);
                 return new ExposedSocketNetworkStream(socket, ownsSocket: true);
             }
+            else if (config.Transport == IpcEndpointConfig.TransportType.TcpClient)
+            {
+                var addressPort = config.Address.Split(':');
+
+                TcpClient tcpClient = new TcpClient (addressPort[0], int.Parse(addressPort[1]));
+                return tcpClient.GetStream();
+            }
             else
             {
                 throw new ArgumentException($"Unsupported IpcEndpointConfig transport type {config.Transport}");