[automated] Merge branch 'release/10.0.2xx' => 'main'

Directory.Packages.props

@@ -114,7 +114,7 @@
     <PackageVersion Include="runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
     <PackageVersion Include="runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
     <PackageVersion Include="runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" Version="$(MicrosoftNETCoreDotNetHostResolverPackageVersion)" />
-    <PackageVersion Include="Spectre.Console" Version="0.52.0" />
+    <PackageVersion Include="Spectre.Console" Version="0.54.0" />
     <PackageVersion Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersPackageVersion)" />
     <PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
     <PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />

sdk.slnx

@@ -23,6 +23,7 @@
     <File Path="test.sh" />
   </Folder>
   <Folder Name="/src/">
+    <Project Path="src/Microsoft.DotNet.ProjectTools/Microsoft.DotNet.ProjectTools.csproj" />
     <Project Path="src/Microsoft.DotNet.TemplateLocator/Microsoft.DotNet.TemplateLocator.csproj" />
     <Project Path="src/Microsoft.Net.Sdk.Compilers.Toolset/Microsoft.Net.Sdk.Compilers.Toolset.csproj" />
     <Project Path="src/Microsoft.Win32.Msi/Microsoft.Win32.Msi.csproj" />
@@ -57,10 +58,10 @@
     <Project Path="src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.shproj" />
     <Project Path="src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.Package.csproj" />
     <Project Path="src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.shproj" />
-    <Project Path="src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj" />
-    <Project Path="src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.shproj" />
     <Project Path="src/BuiltInTools/Watch.Aspire/Microsoft.DotNet.HotReload.Watch.Aspire.csproj" />
     <Project Path="src/BuiltInTools/Watch/Microsoft.DotNet.HotReload.Watch.csproj" />
+    <Project Path="src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj" />
+    <Project Path="src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.shproj" />
   </Folder>
   <Folder Name="/src/Cli/">
     <Project Path="src/Cli/dotnet/dotnet.csproj" />

src/BuiltInTools/Watch/Microsoft.DotNet.HotReload.Watch.csproj

@@ -36,4 +36,8 @@
     <Compile Include="$(RepoRoot)src\Common\PathUtilities.cs" LinkBase="Utilities" />
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\Microsoft.DotNet.ProjectTools\Microsoft.DotNet.ProjectTools.csproj" />
+  </ItemGroup>
+
 </Project>

src/BuiltInTools/Watch/Process/LaunchSettingsProfile.cs

@@ -1,10 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-
-using System.Diagnostics;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Microsoft.DotNet.ProjectTools;
 using Microsoft.Extensions.Logging;
 
 namespace Microsoft.DotNet.Watch
@@ -26,28 +25,19 @@ internal sealed class LaunchSettingsProfile
 
         internal static LaunchSettingsProfile? ReadLaunchProfile(string projectPath, string? launchProfileName, ILogger logger)
         {
-            var projectDirectory = Path.GetDirectoryName(projectPath);
-            Debug.Assert(projectDirectory != null);
-
-            var launchSettingsPath = GetPropertiesLaunchSettingsPath(projectDirectory, "Properties");
-            bool hasLaunchSettings = File.Exists(launchSettingsPath);
-
-            var projectNameWithoutExtension = Path.GetFileNameWithoutExtension(projectPath);
-            var runJsonPath = GetFlatLaunchSettingsPath(projectDirectory, projectNameWithoutExtension);
-            bool hasRunJson = File.Exists(runJsonPath);
-
-            if (hasLaunchSettings)
+            var launchSettingsPath = LaunchSettingsLocator.TryFindLaunchSettings(projectPath, launchProfileName, (message, isError) =>
             {
-                if (hasRunJson)
+                if (isError)
                 {
-                    logger.LogWarning("Warning: Settings from '{JsonPath}' are not used because '{LaunchSettingsPath}' has precedence.", runJsonPath, launchSettingsPath);
+                    logger.LogError(message);
                 }
-            }
-            else if (hasRunJson)
-            {
-                launchSettingsPath = runJsonPath;
-            }
-            else
+                else
+                {
+                    logger.LogWarning(message);
+                }
+            });
+
+            if (launchSettingsPath == null)
             {
                 return null;
             }
@@ -96,12 +86,6 @@ internal sealed class LaunchSettingsProfile
             return namedProfile;
         }
 
-        private static string GetPropertiesLaunchSettingsPath(string directoryPath, string propertiesDirectoryName)
-            => Path.Combine(directoryPath, propertiesDirectoryName, "launchSettings.json");
-
-        private static string GetFlatLaunchSettingsPath(string directoryPath, string projectNameWithoutExtension)
-            => Path.Join(directoryPath, $"{projectNameWithoutExtension}.run.json");
-
         private static LaunchSettingsProfile? ReadDefaultLaunchProfile(LaunchSettingsJson? launchSettings, ILogger logger)
         {
             if (launchSettings is null || launchSettings.Profiles is null)

src/BuiltInTools/dotnet-watch.slnf

@@ -23,6 +23,7 @@
       "src\\BuiltInTools\\Watch.Aspire\\Microsoft.DotNet.HotReload.Watch.Aspire.csproj",
       "src\\BuiltInTools\\Watch\\Microsoft.DotNet.HotReload.Watch.csproj",
       "src\\BuiltInTools\\dotnet-watch\\dotnet-watch.csproj",
+      "src\\Microsoft.DotNet.ProjectTools\\Microsoft.DotNet.ProjectTools.csproj",
       "test\\Microsoft.AspNetCore.Watch.BrowserRefresh.Tests\\Microsoft.AspNetCore.Watch.BrowserRefresh.Tests.csproj",
       "test\\Microsoft.DotNet.HotReload.Client.Tests\\Microsoft.DotNet.HotReload.Client.Tests.csproj",
       "test\\Microsoft.Extensions.DotNetDeltaApplier.Tests\\Microsoft.Extensions.DotNetDeltaApplier.Tests.csproj",