Fixes

Author: tmat

src/BuiltInTools/Watch.Aspire/DotNetWatchLauncher.cs

@@ -59,7 +59,7 @@ public static async Task<bool> RunAsync(string workingDirectory, DotNetWatchOpti
             EnvironmentOptions = environmentOptions,
             RootProjectOptions = rootProjectOptions,
             BrowserRefreshServerFactory = new BrowserRefreshServerFactory(),
-            BrowserLauncher = new BrowserLauncher(logger, environmentOptions),
+            BrowserLauncher = new BrowserLauncher(logger, reporter, environmentOptions),
         };
 
         using var shutdownHandler = new ShutdownHandler(console, logger);

src/BuiltInTools/Watch/Build/EvaluationResult.cs

@@ -36,7 +36,7 @@ public static ImmutableDictionary<string, string> GetGlobalBuildOptions(IEnumera
     {
         // See https://github.com/dotnet/project-system/blob/main/docs/well-known-project-properties.md
 
-        return CommandLineOptions.ParseBuildProperties(buildArguments)
+        return BuildUtilities.ParseBuildProperties(buildArguments)
             .ToImmutableDictionary(keySelector: arg => arg.key, elementSelector: arg => arg.value)
             .SetItem(PropertyNames.DotNetWatchBuild, "true")
             .SetItem(PropertyNames.DesignTimeBuild, "true")

src/BuiltInTools/Watch/Build/ProjectGraphUtilities.cs

@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Runtime.Versioning;
 using Microsoft.Build.Execution;
 using Microsoft.Build.Graph;
 

src/BuiltInTools/dotnet-watch/Watch/MsBuildFileSetFactory.cs

@@ -31,7 +31,7 @@ internal class MSBuildFileSetFactory(
         private ILogger Logger => buildReporter.Logger;
 
         private readonly ProjectGraphFactory _buildGraphFactory = new(
-            globalOptions: CommandLineOptions.ParseBuildProperties(buildArguments).ToImmutableDictionary(keySelector: arg => arg.key, elementSelector: arg => arg.value));
+            globalOptions: BuildUtilities.ParseBuildProperties(buildArguments).ToImmutableDictionary(keySelector: arg => arg.key, elementSelector: arg => arg.value));
 
         internal sealed class EvaluationResult(IReadOnlyDictionary<string, FileItem> files, ProjectGraph? projectGraph)
         {

test/dotnet-watch.Tests/TestUtilities/TestLogger.cs renamed to test/Microsoft.DotNet.HotReload.Test.Utilities/TestLogger.cs

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\dotnet-watch.Tests\TestUtilities\AssertEx.cs" Link="Utilities\AssertEx.cs" />
-    <Compile Include="..\dotnet-watch.Tests\TestUtilities\TestLogger.cs" Link="Mocks\TestLogger.cs" />
+    <Compile Include="..\Microsoft.DotNet.HotReload.Test.Utilities\AssertEx.cs" Link="Utilities\AssertEx.cs" />
+    <Compile Include="..\Microsoft.DotNet.HotReload.Test.Utilities\TestLogger.cs" Link="Mocks\TestLogger.cs" />
   </ItemGroup>
 
   <ItemGroup>

test/Microsoft.Extensions.DotNetDeltaApplier.Tests/Microsoft.Extensions.DotNetDeltaApplier.Tests.csproj

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\dotnet-watch.Tests\TestUtilities\AssertEx.cs" Link="Utilities\AssertEx.cs" />
+    <Compile Include="..\Microsoft.DotNet.HotReload.Test.Utilities\AssertEx.cs" Link="Utilities\AssertEx.cs" />
   </ItemGroup>
 
   <Import Project="..\..\src\BuiltInTools\AspireService\Microsoft.WebTools.AspireService.projitems" Label="Shared" />