Switch client/server to anonymous

src/Scaffolding/VS.Web.CG.Core/ActionInvoker.cs

@@ -27,7 +27,7 @@ public ActionDescriptor ActionDescriptor
             private set;
         }
 
-        public void Execute(string[] args)
+        public async Task ExecuteAsync(string[] args)
         {
             var app = new CommandLineApplication();
 
@@ -37,7 +37,8 @@ public void Execute(string[] args)
                 BuildCommandLine(c);
             });
 
-            app.Execute(args);
+            // until #1760
+            await Task.Run(() => app.Execute(args));
         }
 
         internal void BuildCommandLine(CommandLineApplication command)

src/Scaffolding/VS.Web.CG.Design/CodeGenCommandExecutor.cs

@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.DotNet.Scaffolding.Shared;
 using Microsoft.DotNet.Scaffolding.Shared.ProjectModel;
@@ -45,7 +46,7 @@ public CodeGenCommandExecutor(IProjectContext projectInformation, string[] codeG
             _isSimulationMode = isSimulationMode;
         }
 
-        public int Execute(Action<IEnumerable<FileSystemChangeInformation>> simModeAction = null)
+        public async Task<int> ExecuteAsync(Action<IEnumerable<FileSystemChangeInformation>> simModeAction = null)
         {
             var serviceProvider = new ServiceProvider();
             AddFrameworkServices(serviceProvider, _projectInformation);
@@ -54,7 +55,7 @@ public int Execute(Action<IEnumerable<FileSystemChangeInformation>> simModeActio
 
             try
             {
-                codeGenCommand.Execute(_codeGenArguments);
+                await codeGenCommand.ExecuteAsync(_codeGenArguments);
 
                 if (_isSimulationMode && simModeAction != null)
                 {

src/Scaffolding/VS.Web.CG.Design/Program.cs

@@ -67,8 +67,8 @@ private static void Execute(string[] args, ConsoleLogger logger)
                     project = Path.GetFullPath(project);
                     var configuration = appConfiguration.Value();
 
-                    var portNumber = int.Parse(port.Value());
-                    using (var client = await ScaffoldingClient.Connect(portNumber, logger))
+                    var portNumber = port.Value();
+                    using (var client = ScaffoldingClient.Connect(portNumber, logger))
                     {
                         var messageOrchestrator = new MessageOrchestrator(client, logger);
                         var projectInformation = messageOrchestrator.GetProjectInformation();
@@ -83,7 +83,7 @@ private static void Execute(string[] args, ConsoleLogger logger)
                             logger,
                             isSimulationMode);
 
-                        exitCode = executor.Execute((changes) => messageOrchestrator.SendFileSystemChangeInformation(changes));
+                        exitCode = await executor.ExecuteAsync((changes) => messageOrchestrator.SendFileSystemChangeInformation(changes));
 
                         messageOrchestrator.SendScaffoldingCompletedMessage();
                     }

src/Scaffolding/VS.Web.CG.Design/ScaffoldingClient.cs

@@ -6,8 +6,7 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
-using System.Net;
-using System.Net.Sockets;
+using System.IO.Pipes;
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.DotNet.Scaffolding.Shared;
@@ -21,8 +20,7 @@ public class ScaffoldingClient : IDisposable, IMessageSender
     {
         private static readonly string HostId = typeof(ScaffoldingClient).GetTypeInfo().Assembly.GetName().Name;
 
-        private int _port;
-        private TcpClient _client;
+        private string _port;
         private BinaryWriter _writer;
         private BinaryReader _reader;
 
@@ -34,39 +32,35 @@ public class ScaffoldingClient : IDisposable, IMessageSender
 
         public int CurrentProtocolVersion => 1;
 
-        public static async Task<ScaffoldingClient> Connect(int port, ILogger logger)
+        public static ScaffoldingClient Connect(string port, ILogger logger)
         {
-            TcpClient client = new TcpClient();
-            await client.ConnectAsync(IPAddress.Loopback, port);
-
-            return new ScaffoldingClient(client, logger, port);
+            return new ScaffoldingClient(logger, port);
         }
 
-        public ScaffoldingClient(TcpClient client, ILogger logger, int port)
+        public ScaffoldingClient(ILogger logger, string port)
         {
             if (logger == null)
             {
                 throw new ArgumentNullException(nameof(logger));
             }
-            _client = client;
-            _logger = logger;
-            _port = port;
+            this._logger = logger;
+            this._port = port;
             Init();
         }
 
         public void Init()
         {
-            if (_client.Connected)
-            {
-                var stream = _client.GetStream();
-                _writer = new BinaryWriter(stream);
-                _reader = new BinaryReader(stream);
-                return;
-            }
-            else
-            {
-                throw new InvalidOperationException(string.Format(Resources.ConnectToServerError, _port));
-            }
+            var ports = this._port.Split(':');
+            if (0X2 != ports.Length) throw new ArgumentException("port", "Expected input:output");
+            var stream = new AnonymousPipeClientStream(PipeDirection.Out, ports[0X0]);
+            try {
+                this._writer = new BinaryWriter(stream);
+                stream = null;
+            } finally { using (stream) {} }
+            try {
+                this._reader = new BinaryReader(stream = new AnonymousPipeClientStream(PipeDirection.In, ports[0X1]));
+                stream = null;
+            } finally { using (stream) {} }
         }
 
         [SuppressMessage("supressing re-throw exception", "CA2200")]

src/Scaffolding/VS.Web.CG/CodeGenCommand.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Threading.Tasks;
 using Microsoft.DotNet.Scaffolding.Shared;
 
 namespace Microsoft.VisualStudio.Web.CodeGeneration
@@ -30,7 +31,7 @@ public CodeGenCommand(ILogger logger, ICodeGeneratorLocator locator)
             _logger = logger;
         }
 
-        public int Execute(string [] args)
+        public async Task<int> ExecuteAsync(string [] args)
         {
             if (args == null || args.Length == 0 || IsHelpArgument(args[0]))
             {
@@ -46,7 +47,7 @@ public int Execute(string [] args)
                 var actionInvoker = new ActionInvoker(generatorDescriptor.CodeGeneratorAction);
 
                 _logger.LogMessage("Running the generator '" + codeGeneratorName + "'...");
-                actionInvoker.Execute(args);
+                await actionInvoker.ExecuteAsync(args);
             }
             catch (Exception ex)
             {

src/Shared/Microsoft.DotNet.Scaffolding.Shared/Cli.Utils/Command.cs

@@ -63,31 +63,43 @@ public Command WithEnvironmentVariable(string name, string value)
             return this;
         }
 
-        public CommandResult Execute()
+        public Command Start()
         {
-            ThrowIfRunning();
-            _running = true;
-            _process.EnableRaisingEvents = true;
+            var process = this._process;
+            var psi = process.StartInfo;
+
+            this.ThrowIfRunning();
+            this._running = true;
+            process.EnableRaisingEvents = true;
+
+            process.OutputDataReceived += OnOutputReceived;
+            process.ErrorDataReceived += OnErrorReceived;
+
+            process.Start();
+            if (psi.RedirectStandardOutput) process.BeginOutputReadLine();
+            if (psi.RedirectStandardError) process.BeginErrorReadLine();
 
-            _process.OutputDataReceived += OnOutputReceived;
-            _process.ErrorDataReceived += OnErrorReceived;
+            return this;
+        }
 
-            _process.Start();
-            _process.BeginOutputReadLine();
-            _process.BeginErrorReadLine();
+        public CommandResult WaitForExit()
+        {
+            var process = this._process;
 
-            _process.WaitForExit();
+            process.WaitForExit();
 
-            var exitCode = _process.ExitCode;
+            var exitCode = process.ExitCode;
 
-            _process.OutputDataReceived -= OnOutputReceived;
-            _process.ErrorDataReceived -= OnErrorReceived;
+            process.OutputDataReceived -= OnOutputReceived;
+            process.ErrorDataReceived -= OnErrorReceived;
 
             return new CommandResult(
-                _process.StartInfo,
+                process.StartInfo,
                 exitCode);
         }
 
+        public CommandResult Execute() => this.Start().WaitForExit();
+
         private void OnErrorReceived(object sender, DataReceivedEventArgs e)
         {
             if (e.Data != null)

test/Scaffolding/VS.Web.CG.Core.Test/ActionInvokerTests.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Reflection;
+using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using Xunit;
@@ -12,7 +13,7 @@ namespace Microsoft.VisualStudio.Web.CodeGeneration.Core.Test
     public class ActionInvokerTests
     {
         [Fact]
-        public void ActionInvoker_Invokes_GenerateCode_Method_With_Right_ActionModel()
+        public async Task ActionInvoker_Invokes_GenerateCode_Method_With_Right_ActionModel()
         {
             //Arrange
             bool methodCalled = false;
@@ -41,7 +42,7 @@ public void ActionInvoker_Invokes_GenerateCode_Method_With_Right_ActionModel()
             var actionInvoker = new ActionInvoker(actionDescriptor);
 
             //Act
-            actionInvoker.Execute("CodeGeneratorSample StringValuePassed --BoolProperty".Split(' '));
+            await actionInvoker.ExecuteAsync("CodeGeneratorSample StringValuePassed --BoolProperty".Split(' '));
 
             //Assert
             Assert.True(methodCalled);
@@ -51,7 +52,7 @@ public void ActionInvoker_Invokes_GenerateCode_Method_With_Right_ActionModel()
         }
 
                 [Fact]
-        public void ActionInvoker_Throws_With_Inner_Exception()
+        public async Task ActionInvoker_Throws_With_Inner_Exception()
         {
             //Arrange
             const string NOT_IMPLEMENTED_MESSAGE = "This action is intentionally not implemented.";
@@ -77,9 +78,9 @@ public void ActionInvoker_Throws_With_Inner_Exception()
             var actionInvoker = new ActionInvoker(actionDescriptor);
 
             //Act
-            var ex =
-                Assert.Throws<InvalidOperationException>(
-                () => actionInvoker.Execute("CodeGeneratorSample StringValuePassed --BoolProperty".Split(' ')));
+            var ex = await
+                Assert.ThrowsAsync<InvalidOperationException>(
+                async () => await actionInvoker.ExecuteAsync("CodeGeneratorSample StringValuePassed --BoolProperty".Split(' ')));
 
             //Assert
             Assert.Equal(NOT_IMPLEMENTED_MESSAGE, ex.InnerException.Message);

tools/dotnet-aspnet-codegenerator/Program.cs

@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Threading.Tasks;
 using System.Linq;
 using System.Reflection;
 using Microsoft.Extensions.Internal;
@@ -184,29 +185,30 @@ internal int Execute(string[] args, bool isNoBuild)
             }
 
             // Start server
-            var server = StartServer(logger, context);
-            try
+            using (var server = StartServer(logger, context))
             {
+                // The command must be started before the server starts accepting
                 var command = CreateDipatchCommand(
                     context,
                     args,
                     buildBasePath,
                     configuration,
                     tfmMoniker,
                     shortFramework,
-                    server);
-
-                var exitCode = command
+                    server)
                     .OnErrorLine(e => logger.LogMessage(e, LogMessageLevel.Error))
                     .OnOutputLine(e => logger.LogMessage(e, LogMessageLevel.Information))
-                    .Execute()
-                    .ExitCode;
+                    .Start();
 
-                return exitCode;
-            }
-            finally
-            {
-                server.WaitForExit(TimeSpan.FromSeconds(ServerWaitTimeForExit));
+                using (var serverTask = server.Accept()) {
+                    if (default == serverTask.Status) serverTask.Start();
+                    try {
+                        return command.WaitForExit().ExitCode;
+                    }
+                    finally {
+                        serverTask.Wait(TimeSpan.FromSeconds(ServerWaitTimeForExit));
+                    }
+                }
             }
         }
 
@@ -256,7 +258,7 @@ internal int Execute(string[] args, bool isNoBuild)
             var dependencyArgs = ToolCommandLineHelper.GetProjectDependencyCommandArgs(
                      args,
                      shortFramework,
-                     server.Port.ToString());
+                     string.Join(':', server.Port));
 
             return DotnetToolDispatcher.CreateDispatchCommand(
                     runtimeConfigPath: runtimeConfigPath,
@@ -341,7 +343,6 @@ private ScaffoldingServer StartServer(ILogger logger, IProjectContext projectInf
             server = ScaffoldingServer.Listen(logger);
             server.AddHandler(new ProjectInformationMessageHandler(projectInformation, logger));
             server.AddHandler(new FileSystemChangeMessageHandler(logger));
-            server.Accept();
             return server;
         }
     }