Usings and ProcessUtilities

Author: tmat

src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.Package.csproj

@@ -35,7 +35,8 @@
   <Import Project="..\HotReloadAgent.Data\Microsoft.DotNet.HotReload.Agent.Data.projitems" Label="Shared" />
   <Import Project="..\HotReloadAgent.PipeRpc\Microsoft.DotNet.HotReload.Agent.PipeRpc.projitems" Label="Shared" />
 
+  <!-- Make sure the shared source files do not require any global usings -->
   <ItemGroup>
-    <Compile Include="..\dotnet-watch\Utilities\ProcessUtilities.cs" />
+    <Using Remove="@(Using)" />
   </ItemGroup>
 </Project>

src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.projitems

@@ -10,6 +10,5 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)**\*.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)..\dotnet-watch\Utilities\ProcessUtilities.cs" Link="ProcessUtilities.cs" />
   </ItemGroup>
 </Project>

src/BuiltInTools/HotReloadAgent.Host/PipeListener.cs

@@ -3,10 +3,13 @@
 
 #nullable enable
 
+using System;
 using System.Diagnostics;
 using System.IO.Pipes;
 using System.Reflection;
 using System.Runtime.Loader;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace Microsoft.DotNet.HotReload;
 

src/BuiltInTools/HotReloadAgent.Host/StartupHook.cs

@@ -3,12 +3,17 @@
 
 #nullable enable
 
+using System;
 using System.Diagnostics;
+using System.IO;
 using System.IO.Pipes;
+using System.Linq;
 using System.Reflection;
+using System.Runtime.InteropServices;
 using System.Runtime.Loader;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.DotNet.HotReload;
-using Microsoft.DotNet.Watch;
 
 /// <summary>
 /// The runtime startup hook looks for top-level type named "StartupHook".
@@ -94,7 +99,27 @@ private static void RegisterSignalHandlers()
     {
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
-            ProcessUtilities.EnableWindowsCtrlCHandling(Log);
+            // Enables handling of Ctrl+C in a process where it was disabled.
+            // 
+            // If a process is launched with CREATE_NEW_PROCESS_GROUP flag
+            // it allows the parent process to send Ctrl+C event to the child process,
+            // but also disables Ctrl+C handlers.
+            // 
+            // "If the HandlerRoutine parameter is NULL, a TRUE value causes the calling process to ignore CTRL+C input,
+            // and a FALSE value restores normal processing of CTRL+C input.
+            // This attribute of ignoring or processing CTRL+C is inherited by child processes."
+
+            if (SetConsoleCtrlHandler(null, false))
+            {
+                Log("Windows Ctrl+C handling enabled.");
+            }
+            else
+            {
+                Log($"Failed to enable Ctrl+C handling: {GetLastPInvokeErrorMessage()}");
+            }
+
+            [DllImport("kernel32.dll", SetLastError = true)]
+            static extern bool SetConsoleCtrlHandler(Delegate? handler, bool add);
         }
         else
         {
@@ -120,6 +145,16 @@ private static void RegisterSignalHandlers()
         }
     }
 
+    private static string GetLastPInvokeErrorMessage()
+    {
+        var error = Marshal.GetLastPInvokeError();
+#if NET10_0_OR_GREATER
+        return $"{Marshal.GetPInvokeErrorMessage(error)} (code {error})";
+#else
+        return $"error code {error}";
+#endif
+    }
+
     private static void Log(string message)
     {
         var prefix = s_standardOutputLogPrefix;

src/BuiltInTools/Web.Middleware/BlazorWasmHotReloadMiddleware.cs

@@ -3,7 +3,9 @@
 
 #nullable enable
 
+using System.Collections.Generic;
 using System.Text.Json;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 

src/BuiltInTools/Web.Middleware/BrowserRefreshMiddleware.cs

@@ -3,6 +3,10 @@
 
 #nullable enable
 
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.Extensions.Logging;

src/BuiltInTools/Web.Middleware/BrowserScriptMiddleware.cs

@@ -3,7 +3,11 @@
 
 #nullable enable
 
+using System;
 using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 

src/BuiltInTools/Web.Middleware/HostingStartup.cs

@@ -3,6 +3,8 @@
 
 #nullable enable
 
+using System;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;

src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj

@@ -33,4 +33,9 @@
     <FrameworkReference Update="Microsoft.AspNetCore.App" TargetingPackVersion="6.0.2" />
     <FrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="6.0.0" />
   </ItemGroup>
+
+  <!-- Make sure the shared source files do not require any global usings -->
+  <ItemGroup>
+    <Using Remove="@(Using)" />
+  </ItemGroup>
 </Project>

src/BuiltInTools/Web.Middleware/ResponseStreamWrapper.cs

@@ -3,9 +3,14 @@
 
 #nullable enable
 
+using System;
 using System.Diagnostics;
+using System.IO;
 using System.IO.Compression;
 using System.IO.Pipelines;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;