Merge branch 'main' into copilot/fix-49206

Author: marcpopMSFT

.github/copilot-instructions.md

@@ -12,4 +12,7 @@ Output Considerations:
 
 Localization:
 - Avoid modifying .xlf files and instead prompt the user to update them using the `/t:UpdateXlf` target on MSBuild.
-- Consider localizing strings in .resx files when possible.
+- Consider localizing strings in .resx files when possible.
+
+Documentation:
+- Do not manually edit files under documentation/manpages/sdk as these are generated based on documentation and should not be manually modified.

.vsts-ci.yml

@@ -107,7 +107,7 @@ extends:
             templateFolderName: templates-official
             publishTaskPrefix: 1ES.
           runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
-          locBranch: release/9.0.3xx
+          locBranch: main
           # WORKAROUND: BinSkim requires the folder exist prior to scanning.
           preSteps:
           - powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force

eng/Version.Details.xml

@@ -14,8 +14,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25315.102",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25315.102",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25316.103",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25316.103",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0"
   }

eng/Versions.props

@@ -9,6 +9,7 @@ internal sealed class DotNetWatchContext
         public required GlobalOptions Options { get; init; }
         public required EnvironmentOptions EnvironmentOptions { get; init; }
         public required IReporter Reporter { get; init; }
+        public required ProcessRunner ProcessRunner { get; init; }
 
         public required ProjectOptions RootProjectOptions { get; init; }
     }

global.json

@@ -81,7 +81,7 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke
 
                 fileSetWatcher.WatchContainingDirectories(evaluationResult.Files.Keys, includeSubdirectories: true);
 
-                var processTask = ProcessRunner.RunAsync(processSpec, Context.Reporter, isUserApplication: true, launchResult: null, combinedCancellationSource.Token);
+                var processTask = Context.ProcessRunner.RunAsync(processSpec, Context.Reporter, isUserApplication: true, launchResult: null, combinedCancellationSource.Token);
 
                 Task<ChangedFile?> fileSetTask;
                 Task finishedTask;

src/BuiltInTools/dotnet-watch/DotNetWatchContext.cs

@@ -17,6 +17,7 @@ internal sealed class CompilationHandler : IDisposable
         public readonly EnvironmentOptions EnvironmentOptions;
         private readonly IReporter _reporter;
         private readonly WatchHotReloadService _hotReloadService;
+        private readonly ProcessRunner _processRunner;
 
         /// <summary>
         /// Lock to synchronize:
@@ -36,17 +37,15 @@ internal sealed class CompilationHandler : IDisposable
         /// </summary>
         private ImmutableList<WatchHotReloadService.Update> _previousUpdates = [];
 
-        private readonly CancellationToken _shutdownCancellationToken;
-
         private bool _isDisposed;
 
-        public CompilationHandler(IReporter reporter, EnvironmentOptions environmentOptions, CancellationToken shutdownCancellationToken)
+        public CompilationHandler(IReporter reporter, ProcessRunner processRunner, EnvironmentOptions environmentOptions)
         {
             _reporter = reporter;
+            _processRunner = processRunner;
             EnvironmentOptions = environmentOptions;
             Workspace = new IncrementalMSBuildWorkspace(reporter);
             _hotReloadService = new WatchHotReloadService(Workspace.CurrentSolution.Services, () => ValueTask.FromResult(GetAggregateCapabilities()));
-            _shutdownCancellationToken = shutdownCancellationToken;
         }
 
         public void Dispose()
@@ -88,7 +87,6 @@ public void DiscardProjectBaselines(ImmutableDictionary<ProjectId, string> proje
         public void UpdateProjectBaselines(ImmutableDictionary<ProjectId, string> projectsToBeRebuilt, CancellationToken cancellationToken)
         {
             _hotReloadService.UpdateBaselines(Workspace.CurrentSolution, projectsToBeRebuilt.Keys.ToImmutableArray());
-            _reporter.Report(MessageDescriptor.ProjectBaselinesUpdated);
         }
 
         public async ValueTask StartSessionAsync(CancellationToken cancellationToken)
@@ -138,7 +136,7 @@ public async ValueTask StartSessionAsync(CancellationToken cancellationToken)
             };
 
             var launchResult = new ProcessLaunchResult();
-            var runningProcess = ProcessRunner.RunAsync(processSpec, processReporter, isUserApplication: true, launchResult, processTerminationSource.Token);
+            var runningProcess = _processRunner.RunAsync(processSpec, processReporter, isUserApplication: true, launchResult, processTerminationSource.Token);
             if (launchResult.ProcessId == null)
             {
                 // error already reported
@@ -152,7 +150,6 @@ public async ValueTask StartSessionAsync(CancellationToken cancellationToken)
             var runningProject = new RunningProject(
                 projectNode,
                 projectOptions,
-                EnvironmentOptions,
                 deltaApplier,
                 processReporter,
                 browserRefreshServer,
@@ -659,7 +656,7 @@ public bool TryGetRunningProject(string projectPath, out ImmutableArray<RunningP
         private async ValueTask<IReadOnlyList<int>> TerminateRunningProjects(IEnumerable<RunningProject> projects, CancellationToken cancellationToken)
         {
             // wait for all tasks to complete:
-            return await Task.WhenAll(projects.Select(p => p.TerminateAsync(_shutdownCancellationToken).AsTask())).WaitAsync(cancellationToken);
+            return await Task.WhenAll(projects.Select(p => p.TerminateAsync().AsTask())).WaitAsync(cancellationToken);
         }
 
         private static Task ForEachProjectAsync(ImmutableDictionary<string, ImmutableArray<RunningProject>> projects, Func<RunningProject, CancellationToken, Task> action, CancellationToken cancellationToken)

src/BuiltInTools/dotnet-watch/DotNetWatcher.cs

@@ -12,7 +12,6 @@ namespace Microsoft.DotNet.Watch
     internal sealed class RunningProject(
         ProjectGraphNode projectNode,
         ProjectOptions options,
-        EnvironmentOptions environmentOptions,
         DeltaApplier deltaApplier,
         IReporter reporter,
         BrowserRefreshServer? browserRefreshServer,
@@ -70,21 +69,8 @@ public async ValueTask WaitForProcessRunningAsync(CancellationToken cancellation
             await DeltaApplier.WaitForProcessRunningAsync(cancellationToken);
         }
 
-        public async ValueTask<int> TerminateAsync(CancellationToken shutdownCancellationToken)
+        public async ValueTask<int> TerminateAsync()
         {
-            if (shutdownCancellationToken.IsCancellationRequested)
-            {
-                // Ctrl+C sent, wait for the process to exit
-                try
-                {
-                    _ = await RunningProcess.WaitAsync(environmentOptions.ProcessCleanupTimeout, CancellationToken.None);
-                }
-                catch (TimeoutException)
-                {
-                    // nop
-                }
-            }
-
             ProcessTerminationSource.Cancel();
             return await RunningProcess;
         }

src/BuiltInTools/dotnet-watch/HotReload/CompilationHandler.cs

@@ -100,7 +100,7 @@ public override async Task WatchAsync(CancellationToken shutdownCancellationToke
                     }
 
                     var projectMap = new ProjectNodeMap(evaluationResult.ProjectGraph, Context.Reporter);
-                    compilationHandler = new CompilationHandler(Context.Reporter, Context.EnvironmentOptions, shutdownCancellationToken);
+                    compilationHandler = new CompilationHandler(Context.Reporter, Context.ProcessRunner, Context.EnvironmentOptions);
                     var scopedCssFileHandler = new ScopedCssFileHandler(Context.Reporter, projectMap, browserConnector);
                     var projectLauncher = new ProjectLauncher(Context, projectMap, browserConnector, compilationHandler, iteration);
                     var outputDirectories = GetProjectOutputDirectories(evaluationResult.ProjectGraph);
@@ -369,6 +369,8 @@ void FileChangedCallback(ChangedPath change)
 
                             // Update project baselines to reflect changes to the restarted projects.
                             compilationHandler.UpdateProjectBaselines(projectsToRebuild, iterationCancellationToken);
+
+                            Context.Reporter.Report(MessageDescriptor.ProjectsRebuilt, projectsToRebuild.Count);
                         }
 
                         if (projectsToRestart is not [])
@@ -392,6 +394,8 @@ await Task.WhenAll(
                                     }
                                 }))
                                 .WaitAsync(shutdownCancellationToken);
+
+                            Context.Reporter.Report(MessageDescriptor.ProjectsRestarted, projectsToRestart.Length);
                         }
 
                         async Task<ImmutableList<ChangedFile>> CaptureChangedFilesSnapshot(ImmutableDictionary<ProjectId, string>? rebuiltProjects)
@@ -455,6 +459,8 @@ async Task<ImmutableList<ChangedFile>> CaptureChangedFilesSnapshot(ImmutableDict
                                 changedFiles = changedFiles
                                     .Select(f => evaluationResult.Files.TryGetValue(f.Item.FilePath, out var evaluatedFile) ? f with { Item = evaluatedFile } : f)
                                     .ToImmutableList();
+
+                                Context.Reporter.Report(MessageDescriptor.ReEvaluationCompleted);
                             }
 
                             if (rebuiltProjects != null)
@@ -527,7 +533,7 @@ async Task<ImmutableList<ChangedFile>> CaptureChangedFilesSnapshot(ImmutableDict
 
                     if (rootRunningProject != null)
                     {
-                        await rootRunningProject.TerminateAsync(shutdownCancellationToken);
+                        await rootRunningProject.TerminateAsync();
                     }
 
                     if (runtimeProcessLauncher != null)
@@ -831,7 +837,7 @@ await FileWatcher.WaitForFileChangeAsync(
 
             Context.Reporter.Output($"Building {projectPath} ...");
 
-            var exitCode = await ProcessRunner.RunAsync(processSpec, Context.Reporter, isUserApplication: false, launchResult: null, cancellationToken);
+            var exitCode = await Context.ProcessRunner.RunAsync(processSpec, Context.Reporter, isUserApplication: false, launchResult: null, cancellationToken);
             return (exitCode == 0, buildOutput.ToImmutableArray(), projectPath);
         }