Merge 99a5b7728c into 75465614e6

docs/reference/commandline/tye-run.md

@@ -7,7 +7,7 @@
 ## Synopsis
 
 ```text
-tye run [-?|-h|--help] [--no-build] [--port <port>] [--logs <logs>] [--dtrace <trace>] [--metrics <metrics>] [--debug <service>] [--docker] [--dashboard] [--watch] [-f|--framework <framework>] [--tags <tags>] [-v|--verbosity <Debug|Info|Quiet>] [<PATH>]
+tye run [-?|-h|--help] [--no-build] [--port <port>] [--logs <logs>] [--dtrace <trace>] [--metrics <metrics>] [--debug <service>] [--docker] [--dashboard] [--watch <service>] [-f|--framework <framework>] [--tags <tags>] [-v|--verbosity <Debug|Info|Quiet>] [<PATH>]
 ```
 
 ## Description
@@ -49,7 +49,7 @@ If a directory path is specified, `tye run` will default to using these files, i
 
 - `--debug <service>`
 
-    Waits for debugger attach to service. Specify `*` to wait to attach to all services.
+    Waits for debugger attach to dotnet service. Specify `*` to wait to attach to all dotnet services.
 
 - `--docker`
 
@@ -59,9 +59,9 @@ If a directory path is specified, `tye run` will default to using these files, i
 
     Launch dashboard on run.
 
-- `--watch`
+- `--watch <service>`
 
-    Watches for file changes in all projects that are built by tye. Uses [`dotnet watch`](https://docs.microsoft.com/en-us/aspnet/core/tutorials/dotnet-watch?view=aspnetcore-3.1) to monitor for file changes.
+    Watches for file changes in a dotnet project that is built by tye. Uses [`dotnet watch`](https://docs.microsoft.com/en-us/aspnet/core/tutorials/dotnet-watch?view=aspnetcore-3.1) to monitor for file changes. Specify `*` to watch all dotnet services.
 
 - `-f|--framework <framework>`
 

src/Microsoft.Tye.Core/HostOptions.cs

@@ -11,6 +11,7 @@ namespace Microsoft.Tye
         public bool Dashboard { get; set; }
 
         public List<string> Debug { get; } = new List<string>();
+        public List<string> Watch { get; } = new List<string>();
 
         public string? DistributedTraceProvider { get; set; }
 
@@ -25,7 +26,5 @@ namespace Microsoft.Tye
         public int? Port { get; set; }
 
         public Verbosity LogVerbosity { get; set; } = Verbosity.Debug;
-
-        public bool Watch { get; set; }
     }
 }

src/Microsoft.Tye.Hosting/ProcessRunner.cs

@@ -218,7 +218,7 @@ namespace Microsoft.Tye.Hosting
 
                 application.PopulateEnvironment(service, (k, v) => environment[k] = v);
 
-                if (_options.DebugMode && (_options.DebugAllServices || _options.ServicesToDebug!.Contains(serviceName, StringComparer.OrdinalIgnoreCase)))
+                if (_options.ShouldDebugService(serviceName))
                 {
                     environment["DOTNET_STARTUP_HOOKS"] = typeof(Hosting.Runtime.HostingRuntimeHelpers).Assembly.Location;
                 }
@@ -267,7 +267,7 @@ namespace Microsoft.Tye.Hosting
                     status.StoppingTokenSource = stoppingCts;
                     await using var _ = processInfo.StoppedTokenSource.Token.Register(() => status.StoppingTokenSource.Cancel());
 
-                    if (!_options.Watch)
+                    if (!_options.ShouldWatchService(serviceName))
                     {
                         service.Replicas[replica] = status;
                         service.ReplicaEvents.OnNext(new ReplicaEvent(ReplicaState.Added, status));
@@ -327,7 +327,7 @@ namespace Microsoft.Tye.Hosting
 
                                 WriteReplicaToStore(pid.ToString());
 
-                                if (_options.Watch)
+                                if (_options.ShouldWatchService(serviceName))
                                 {
                                     // OnStart/OnStop will be called multiple times for watch.
                                     // Watch will constantly be adding and removing from the list, so only add here for watch.
@@ -346,7 +346,7 @@ namespace Microsoft.Tye.Hosting
                                     service.ReplicaEvents.OnNext(new ReplicaEvent(ReplicaState.Stopped, status));
                                 }
 
-                                if (!_options.Watch)
+                                if (!_options.ShouldWatchService(serviceName))
                                 {
                                     // Only increase backoff when not watching project as watch will wait for file changes before rebuild.
                                     backOff *= 2;
@@ -375,7 +375,7 @@ namespace Microsoft.Tye.Hosting
                             }
                         };
 
-                        if (_options.Watch && (service.Description.RunInfo is ProjectRunInfo runInfo))
+                        if (_options.ShouldWatchService(serviceName) && (service.Description.RunInfo is ProjectRunInfo runInfo))
                         {
                             var projectFile = runInfo.ProjectFile.FullName;
                             var fileSetFactory = new MsBuildFileSetFactory(_logger,
@@ -387,7 +387,7 @@ namespace Microsoft.Tye.Hosting
                             await new DotNetWatcher(_logger)
                                 .WatchAsync(processInfo, fileSetFactory, replica, status.StoppingTokenSource.Token);
                         }
-                        else if (_options.Watch && (service.Description.RunInfo is AzureFunctionRunInfo azureFunctionRunInfo) && !string.IsNullOrEmpty(azureFunctionRunInfo.ProjectFile))
+                        else if (_options.ShouldWatchService(serviceName) && (service.Description.RunInfo is AzureFunctionRunInfo azureFunctionRunInfo) && !string.IsNullOrEmpty(azureFunctionRunInfo.ProjectFile))
                         {
                             var projectFile = azureFunctionRunInfo.ProjectFile;
                             var fileSetFactory = new MsBuildFileSetFactory(_logger,
@@ -408,7 +408,7 @@ namespace Microsoft.Tye.Hosting
                     {
                         _logger.LogError(0, ex, "Failed to launch process for service {ServiceName}", replica);
 
-                        if (!_options.Watch)
+                        if (!_options.ShouldWatchService(serviceName))
                         {
                             // Only increase backoff when not watching project as watch will wait for file changes before rebuild.
                             backOff *= 2;

src/Microsoft.Tye.Hosting/ProcessRunnerOptions.cs

@@ -9,21 +9,33 @@ namespace Microsoft.Tye.Hosting
 {
     public class ProcessRunnerOptions
     {
-        public bool DebugMode { get; set; }
+        public const string AllServices = "*";
+
         public bool BuildProjects { get; set; }
+
+        public bool DebugMode { get; set; }
         public string[]? ServicesToDebug { get; set; }
         public bool DebugAllServices { get; set; }
-        public bool Watch { get; set; }
+        public bool ShouldDebugService (string serviceName) => DebugMode && (DebugAllServices || ServicesToDebug!.Contains(serviceName, StringComparer.OrdinalIgnoreCase));
+
+        public bool WatchMode { get; set; }
+        public string[]? ServicesToWatch { get; set; }
+        public bool WatchAllServices { get; set; }
+        public bool ShouldWatchService(string serviceName) => WatchMode && (WatchAllServices || ServicesToWatch!.Contains(serviceName, StringComparer.OrdinalIgnoreCase));
 
         public static ProcessRunnerOptions FromHostOptions(HostOptions options)
         {
             return new ProcessRunnerOptions
             {
                 BuildProjects = !options.NoBuild,
+                
                 DebugMode = options.Debug.Any(),
                 ServicesToDebug = options.Debug.ToArray(),
-                DebugAllServices = options.Debug?.Contains("*", StringComparer.OrdinalIgnoreCase) ?? false,
+                DebugAllServices = options.Debug?.Contains(AllServices, StringComparer.OrdinalIgnoreCase) ?? false,
-                Watch = options.Watch
+                
+                WatchMode = options.Watch.Any(),
+                ServicesToWatch = options.Watch.ToArray(),
+                WatchAllServices = options.Watch?.Contains(AllServices, StringComparer.OrdinalIgnoreCase) ?? false,
             };
         }
     }

src/tye/Program.RunCommand.cs

@@ -3,11 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
 using System.CommandLine;
 using System.CommandLine.Invocation;
 using System.IO;
-using System.Linq;
 using System.Threading;
 using Microsoft.Tye.Hosting;
 
@@ -56,7 +54,7 @@ namespace Microsoft.Tye
                     {
                         Arity = ArgumentArity.ZeroOrMore,
                     },
-                    Description = "Wait for debugger attach to specific service. Specify \"*\" to wait for all services.",
+                    Description = $"Wait for debugger attach to specific service. Specify {ProcessRunnerOptions.AllServices} to wait for all services.",
                     Required = false
                 },
                 new Option("--docker")
@@ -71,7 +69,11 @@ namespace Microsoft.Tye
                 },
                 new Option("--watch")
                 {
-                    Description = "Watches for code changes for all dotnet projects.",
+                    Argument = new Argument<string[]>("service")
+                    {
+                        Arity = ArgumentArity.ZeroOrMore,
+                    },
+                    Description = $"Watches a specific dotnet service for code changes. Specify {ProcessRunnerOptions.AllServices} to watch for all dotnet services.",
                     Required = false
                 },
                 StandardOptions.Framework,
@@ -111,9 +113,9 @@ namespace Microsoft.Tye
                     LoggingProvider = args.Logs,
                     MetricsProvider = args.Metrics,
                     LogVerbosity = args.Verbosity,
-                    Watch = args.Watch
                 };
                 options.Debug.AddRange(args.Debug);
+                options.Watch.AddRange(args.Watch);
 
                 await application.ProcessExtensionsAsync(options, output, ExtensionContext.OperationKind.LocalRun);
 
@@ -170,7 +172,7 @@ namespace Microsoft.Tye
 
             public Verbosity Verbosity { get; set; }
 
-            public bool Watch { get; set; }
+            public string[] Watch { get; set; } = Array.Empty<string>();
 
             public string Framework { get; set; } = default!;
 

test/E2ETest/TyeRunTests.cs

@@ -19,7 +19,6 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Extensions.Primitives;
 using Microsoft.Tye;
 using Microsoft.Tye.Hosting;
 using Microsoft.Tye.Hosting.Model;
@@ -353,7 +352,10 @@ services:
 
             var client = new HttpClient(new RetryHandler(handler));
 
-            await RunHostingApplication(application, new HostOptions() { Watch = true }, async (app, uri) =>
+            var hostOptions = new HostOptions();
+            hostOptions.Watch.Add(ProcessRunnerOptions.AllServices);
+
+            await RunHostingApplication(application, hostOptions, async (app, uri) =>
             {
                 // make sure both are running
                 var frontendUri = await GetServiceUrl(client, uri, "frontend");
@@ -404,7 +406,10 @@ services:
 
             var client = new HttpClient(new RetryHandler(handler));
 
-            await RunHostingApplication(application, new HostOptions() { Watch = true }, async (app, uri) =>
+            var hostOptions = new HostOptions();
+            hostOptions.Watch.Add(ProcessRunnerOptions.AllServices);
+
+            await RunHostingApplication(application, hostOptions, async (app, uri) =>
             {
                 // make sure app is running
                 var appUri = await GetServiceUrl(client, uri, "web-app");