Feedback

Author: tmat

src/BuiltInTools/DotNetDeltaApplier/Microsoft.Extensions.DotNetDeltaApplier.csproj

@@ -6,6 +6,8 @@
     <!--
       dotnet-watch may inject this assembly to .NET 6.0+ app, so we can't target a newer version.
       At the same time source build requires us to not target 6.0, so we fall back to netstandard.
+
+      When updating these also update ProjectReferences in dotnet-watch.csproj.
      -->
     <TargetFrameworks>netstandard2.1;net10.0</TargetFrameworks>
     <StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>

src/BuiltInTools/DotNetDeltaApplier/StartupHook.cs

@@ -16,11 +16,7 @@ internal sealed class StartupHook
     private static readonly string? s_namedPipeName = Environment.GetEnvironmentVariable(AgentEnvironmentVariables.DotNetWatchHotReloadNamedPipeName);
 
 #if NET10_0_OR_GREATER
-    private const string TargetFramework = "net10.0";
-
     private static PosixSignalRegistration? s_signalRegistration;
-#else
-    private const string TargetFramework = "netstandard2.1";
 #endif
 
     /// <summary>
@@ -30,7 +26,7 @@ public static void Initialize()
     {
         var processPath = Environment.GetCommandLineArgs().FirstOrDefault();
 
-        Log($"Loaded into process: {processPath} ({TargetFramework})");
+        Log($"Loaded into process: {processPath} ({typeof(StartupHook).Assembly.Location})");
 
         HotReloadAgent.ClearHotReloadEnvironmentVariables(typeof(StartupHook));
 

src/BuiltInTools/dotnet-watch/Process/ProcessRunner.cs

@@ -249,12 +249,12 @@ private static async ValueTask<bool> WaitForExitAsync(Process process, ProcessSt
 
             var task = process.WaitForExitAsync(cancellationToken);
 
-            if (timeout.HasValue)
+            if (timeout is { } timeoutValue)
             {
                 try
                 {
-                    reporter.Verbose($"Waiting for process {state.ProcessId} to exit within {timeout.Value.TotalSeconds}s.");
-                    await task.WaitAsync(timeout.Value, cancellationToken);
+                    reporter.Verbose($"Waiting for process {state.ProcessId} to exit within {timeoutValue.TotalSeconds}s.");
+                    await task.WaitAsync(timeoutValue, cancellationToken);
                 }
                 catch (TimeoutException)
                 {