Add support for flat launch settings

src/BuiltInTools/dotnet-watch/Browser/BrowserConnector.cs

@@ -299,11 +299,8 @@ public bool IsServerSupported(ProjectGraphNode projectNode, HotReloadAppModel ap
 
         private LaunchSettingsProfile GetLaunchProfile(ProjectOptions projectOptions)
         {
-            var projectDirectory = Path.GetDirectoryName(projectOptions.ProjectPath);
-            Debug.Assert(projectDirectory != null);
-
             return (projectOptions.NoLaunchProfile == true
-                ? null : LaunchSettingsProfile.ReadLaunchProfile(projectDirectory, projectOptions.LaunchProfileName, context.Reporter)) ?? new();
+                ? null : LaunchSettingsProfile.ReadLaunchProfile(projectOptions.ProjectPath, projectOptions.LaunchProfileName, context.Reporter)) ?? new();
         }
     }
 }

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

@@ -2,8 +2,11 @@
 // 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.Cli.Commands;
+using Microsoft.DotNet.Cli.Commands.Run;
 
 namespace Microsoft.DotNet.Watch
 {
@@ -22,10 +25,30 @@ internal sealed class LaunchSettingsProfile
         public bool LaunchBrowser { get; init; }
         public string? LaunchUrl { get; init; }
 
-        internal static LaunchSettingsProfile? ReadLaunchProfile(string projectDirectory, string? launchProfileName, IReporter reporter)
+        internal static LaunchSettingsProfile? ReadLaunchProfile(string projectPath, string? launchProfileName, IReporter reporter)
         {
-            var launchSettingsPath = Path.Combine(projectDirectory, "Properties", "launchSettings.json");
-            if (!File.Exists(launchSettingsPath))
+            var projectDirectory = Path.GetDirectoryName(projectPath);
+            Debug.Assert(projectDirectory != null);
+
+            var launchSettingsPath = CommonRunHelpers.GetPropertiesLaunchSettingsPath(projectDirectory, "Properties");
+            bool hasLaunchSettings = File.Exists(launchSettingsPath);
+
+            var projectNameWithoutExtension = Path.GetFileNameWithoutExtension(projectPath);
+            var runJsonPath = CommonRunHelpers.GetFlatLaunchSettingsPath(projectDirectory, projectNameWithoutExtension);
+            bool hasRunJson = File.Exists(runJsonPath);
+
+            if (hasLaunchSettings)
+            {
+                if (hasRunJson)
+                {
+                    reporter.Warn(string.Format(CliCommandStrings.RunCommandWarningRunJsonNotUsed, runJsonPath, launchSettingsPath));
+                }
+            }
+            else if (hasRunJson)
+            {
+                launchSettingsPath = runJsonPath;
+            }
+            else
             {
                 return null;
             }
@@ -39,7 +62,7 @@ internal sealed class LaunchSettingsProfile
             }
             catch (Exception ex)
             {
-                reporter.Verbose($"Error reading launchSettings.json: {ex}.");
+                reporter.Verbose($"Error reading '{launchSettingsPath}': {ex}.");
                 return null;
             }
 

src/Cli/dotnet/Commands/CliCommandStrings.resx

@@ -692,7 +692,8 @@ dotnet.config is a name don't translate.</comment>
     <value>Do not use arguments specified in launch profile to run the application.</value>
   </data>
   <data name="CommandOptionNoLaunchProfileDescription" xml:space="preserve">
-    <value>Do not attempt to use launchSettings.json to configure the application.</value>
+    <value>Do not attempt to use launchSettings.json or [app].run.json to configure the application.</value>
+    <comment>{Locked="launchSettings.json"}{Locked=".run.json"}</comment>
   </data>
   <data name="CommandOptionProjectDescription" xml:space="preserve">
     <value>The path to the project file to run (defaults to the current directory if there is only one project).</value>
@@ -766,8 +767,8 @@ dotnet.config is a name don't translate.</comment>
     <value>Description</value>
   </data>
   <data name="DeserializationExceptionMessage" xml:space="preserve">
-    <value>An error was encountered when reading launchSettings.json.
-{0}</value>
+    <value>An error was encountered when reading '{0}': {1}</value>
+    <comment>{0} is file path. {1} is exception message.</comment>
   </data>
   <data name="DetailDescription" xml:space="preserve">
     <value>Show detail result of the query.</value>
@@ -1743,7 +1744,12 @@ The default is to publish a framework-dependent application.</value>
 {1}</value>
   </data>
   <data name="RunCommandExceptionCouldNotLocateALaunchSettingsFile" xml:space="preserve">
-    <value>The specified launch profile '{0}' could not be located.</value>
+    <value>Cannot use launch profile '{0}' because the launch settings file could not be located. Locations tried:
+{1}</value>
+  </data>
+  <data name="RunCommandWarningRunJsonNotUsed" xml:space="preserve">
+    <value>Warning: Settings from '{0}' are not used because '{1}' has precedence.</value>
+    <comment>{0} is an app.run.json file path. {1} is a launchSettings.json file path.</comment>
   </data>
   <data name="RunCommandExceptionMultipleProjects" xml:space="preserve">
     <value>Specify which project file to use because {0} contains more than one project file.</value>

src/Cli/dotnet/Commands/Run/CommonRunHelpers.cs

@@ -36,4 +36,10 @@ public static Dictionary<string, string> GetGlobalPropertiesFromArgs(string[] ar
         }
         return globalProperties;
     }
+
+    public static string GetPropertiesLaunchSettingsPath(string directoryPath, string propertiesDirectoryName)
+        => Path.Combine(directoryPath, propertiesDirectoryName, "launchSettings.json");
+
+    public static string GetFlatLaunchSettingsPath(string directoryPath, string projectNameWithoutExtension)
+        => Path.Join(directoryPath, $"{projectNameWithoutExtension}.run.json");
 }

src/Cli/dotnet/Commands/Run/LaunchSettings/LaunchSettingsManager.cs

@@ -22,8 +22,9 @@ static LaunchSettingsManager()
         };
     }
 
-    public static LaunchSettingsApplyResult TryApplyLaunchSettings(string launchSettingsJsonContents, string? profileName = null)
+    public static LaunchSettingsApplyResult TryApplyLaunchSettings(string launchSettingsPath, string? profileName = null)
     {
+        var launchSettingsJsonContents = File.ReadAllText(launchSettingsPath);
         try
         {
             var jsonDocumentOptions = new JsonDocumentOptions
@@ -115,7 +116,7 @@ public static LaunchSettingsApplyResult TryApplyLaunchSettings(string launchSett
         }
         catch (JsonException ex)
         {
-            return new LaunchSettingsApplyResult(false, string.Format(CliCommandStrings.DeserializationExceptionMessage, ex.Message));
+            return new LaunchSettingsApplyResult(false, string.Format(CliCommandStrings.DeserializationExceptionMessage, launchSettingsPath, ex.Message));
         }
     }
 

src/Cli/dotnet/Commands/Run/RunCommand.cs

@@ -202,13 +202,9 @@ internal bool TryGetLaunchProfileSettingsIfNeeded(out ProjectLaunchSettingsModel
             return true;
         }
 
-        var launchSettingsPath = ReadCodeFromStdin ? null : TryFindLaunchSettings(ProjectFileFullPath ?? EntryPointFileFullPath!);
-        if (!File.Exists(launchSettingsPath))
+        var launchSettingsPath = ReadCodeFromStdin ? null : TryFindLaunchSettings(projectOrEntryPointFilePath: ProjectFileFullPath ?? EntryPointFileFullPath!, launchProfile: LaunchProfile);
+        if (launchSettingsPath is null)
         {
-            if (!string.IsNullOrEmpty(LaunchProfile))
-            {
-                Reporter.Error.WriteLine(string.Format(CliCommandStrings.RunCommandExceptionCouldNotLocateALaunchSettingsFile, launchSettingsPath).Bold().Red());
-            }
             return true;
         }
 
@@ -221,8 +217,7 @@ internal bool TryGetLaunchProfileSettingsIfNeeded(out ProjectLaunchSettingsModel
 
         try
         {
-            var launchSettingsFileContents = File.ReadAllText(launchSettingsPath);
-            var applyResult = LaunchSettingsManager.TryApplyLaunchSettings(launchSettingsFileContents, LaunchProfile);
+            var applyResult = LaunchSettingsManager.TryApplyLaunchSettings(launchSettingsPath, LaunchProfile);
             if (!applyResult.Success)
             {
                 Reporter.Error.WriteLine(string.Format(CliCommandStrings.RunCommandExceptionCouldNotApplyLaunchSettings, profileName, applyResult.FailureReason).Bold().Red());
@@ -241,13 +236,9 @@ internal bool TryGetLaunchProfileSettingsIfNeeded(out ProjectLaunchSettingsModel
 
         return true;
 
-        static string? TryFindLaunchSettings(string projectOrEntryPointFilePath)
+        static string? TryFindLaunchSettings(string projectOrEntryPointFilePath, string? launchProfile)
         {
-            var buildPathContainer = File.Exists(projectOrEntryPointFilePath) ? Path.GetDirectoryName(projectOrEntryPointFilePath) : projectOrEntryPointFilePath;
-            if (buildPathContainer is null)
-            {
-                return null;
-            }
+            var buildPathContainer = Path.GetDirectoryName(projectOrEntryPointFilePath)!;
 
             string propsDirectory;
 
@@ -263,8 +254,37 @@ internal bool TryGetLaunchProfileSettingsIfNeeded(out ProjectLaunchSettingsModel
                 propsDirectory = "Properties";
             }
 
-            var launchSettingsPath = Path.Combine(buildPathContainer, propsDirectory, "launchSettings.json");
-            return launchSettingsPath;
+            string launchSettingsPath = CommonRunHelpers.GetPropertiesLaunchSettingsPath(buildPathContainer, propsDirectory);
+            bool hasLaunchSetttings = File.Exists(launchSettingsPath);
+
+            string appName = Path.GetFileNameWithoutExtension(projectOrEntryPointFilePath);
+            string runJsonPath = CommonRunHelpers.GetFlatLaunchSettingsPath(buildPathContainer, appName);
+            bool hasRunJson = File.Exists(runJsonPath);
+
+            if (hasLaunchSetttings)
+            {
+                if (hasRunJson)
+                {
+                    Reporter.Output.WriteLine(string.Format(CliCommandStrings.RunCommandWarningRunJsonNotUsed, runJsonPath, launchSettingsPath).Yellow());
+                }
+
+                return launchSettingsPath;
+            }
+
+            if (hasRunJson)
+            {
+                return runJsonPath;
+            }
+
+            if (!string.IsNullOrEmpty(launchProfile))
+            {
+                Reporter.Error.WriteLine(string.Format(CliCommandStrings.RunCommandExceptionCouldNotLocateALaunchSettingsFile, launchProfile, $"""
+                    {launchSettingsPath}
+                    {runJsonPath}
+                    """).Bold().Red());
+            }
+
+            return null;
         }
     }
 
@@ -573,6 +593,7 @@ public static RunCommand FromParseResult(ParseResult parseResult)
             out string? entryPointFilePath);
 
         bool noBuild = parseResult.HasOption(RunCommandParser.NoBuildOption);
+        string launchProfile = parseResult.GetValue(RunCommandParser.LaunchProfileOption) ?? string.Empty;
 
         if (readCodeFromStdin && entryPointFilePath != null)
         {
@@ -583,6 +604,11 @@ public static RunCommand FromParseResult(ParseResult parseResult)
                 throw new GracefulException(CliCommandStrings.InvalidOptionForStdin, RunCommandParser.NoBuildOption.Name);
             }
 
+            if (!string.IsNullOrWhiteSpace(launchProfile))
+            {
+                throw new GracefulException(CliCommandStrings.InvalidOptionForStdin, RunCommandParser.LaunchProfileOption.Name);
+            }
+
             // If '-' is specified as the input file, read all text from stdin into a temporary file and use that as the entry point.
             // We create a new directory for each file so other files are not included in the compilation.
             // We fail if the file already exists to avoid reusing the same file for multiple stdin runs (in case the random name is duplicate).
@@ -605,7 +631,7 @@ public static RunCommand FromParseResult(ParseResult parseResult)
             noBuild: noBuild,
             projectFileFullPath: projectFilePath,
             entryPointFileFullPath: entryPointFilePath,
-            launchProfile: parseResult.GetValue(RunCommandParser.LaunchProfileOption) ?? string.Empty,
+            launchProfile: launchProfile,
             noLaunchProfile: parseResult.HasOption(RunCommandParser.NoLaunchProfileOption),
             noLaunchProfileArguments: parseResult.HasOption(RunCommandParser.NoLaunchProfileArgumentsOption),
             noRestore: parseResult.HasOption(RunCommandParser.NoRestoreOption) || parseResult.HasOption(RunCommandParser.NoBuildOption),

src/Cli/dotnet/Commands/Test/SolutionAndProjectUtility.cs

@@ -248,7 +248,7 @@ public static IEnumerable<ParallelizableTestModuleGroupWithSequentialInnerModule
         string projectFullPath = project.GetPropertyValue(ProjectProperties.ProjectFullPath);
 
         // TODO: Support --launch-profile and pass it here.
-        var launchSettings = TryGetLaunchProfileSettings(Path.GetDirectoryName(projectFullPath)!, project.GetPropertyValue(ProjectProperties.AppDesignerFolder), noLaunchProfile, profileName: null);
+        var launchSettings = TryGetLaunchProfileSettings(Path.GetDirectoryName(projectFullPath)!, Path.GetFileNameWithoutExtension(projectFullPath), project.GetPropertyValue(ProjectProperties.AppDesignerFolder), noLaunchProfile, profileName: null);
 
         return new TestModule(runProperties, PathUtility.FixFilePath(projectFullPath), targetFramework, isTestingPlatformApplication, isTestProject, launchSettings, project.GetPropertyValue(ProjectProperties.TargetPath));
 
@@ -270,20 +270,36 @@ static RunProperties GetRunProperties(ProjectInstance project, ICollection<ILogg
         }
     }
 
-    private static ProjectLaunchSettingsModel? TryGetLaunchProfileSettings(string projectDirectory, string appDesignerFolder, bool noLaunchProfile, string? profileName)
+    private static ProjectLaunchSettingsModel? TryGetLaunchProfileSettings(string projectDirectory, string projectNameWithoutExtension, string appDesignerFolder, bool noLaunchProfile, string? profileName)
     {
         if (noLaunchProfile)
         {
             return null;
         }
 
-        var launchSettingsPath = Path.Combine(projectDirectory, appDesignerFolder, "launchSettings.json");
-        if (!File.Exists(launchSettingsPath))
+        var launchSettingsPath = CommonRunHelpers.GetPropertiesLaunchSettingsPath(projectDirectory, appDesignerFolder);
+        bool hasLaunchSettings = File.Exists(launchSettingsPath);
+
+        var runJsonPath = CommonRunHelpers.GetFlatLaunchSettingsPath(projectDirectory, projectNameWithoutExtension);
+        bool hasRunJson = File.Exists(runJsonPath);
+
+        if (hasLaunchSettings)
+        {
+            if (hasRunJson)
+            {
+                Reporter.Output.WriteLine(string.Format(CliCommandStrings.RunCommandWarningRunJsonNotUsed, runJsonPath, launchSettingsPath).Yellow());
+            }
+        }
+        else if (hasRunJson)
+        {
+            launchSettingsPath = runJsonPath;
+        }
+        else
         {
             return null;
         }
 
-        var result = LaunchSettingsManager.TryApplyLaunchSettings(File.ReadAllText(launchSettingsPath), profileName);
+        var result = LaunchSettingsManager.TryApplyLaunchSettings(launchSettingsPath, profileName);
         if (!result.Success)
         {
             Reporter.Error.WriteLine(string.Format(CliCommandStrings.RunCommandExceptionCouldNotApplyLaunchSettings, profileName, result.FailureReason).Bold().Red());