Cleanup

Author: tmat

src/Cli/dotnet/Commands/CliCommandStrings.resx

@@ -1042,6 +1042,9 @@ Make the profile names distinct.</value>
   <data name="LaunchProfileIsNotAJsonObject" xml:space="preserve">
     <value>A profile with the specified name isn't a valid JSON object.</value>
   </data>
+  <data name="LaunchProfile0IsMissingProperty1" xml:space="preserve">
+    <value>Launch profile '{0}' is missing property '{1}'</value>
+  </data>
   <data name="LaunchProfilesCollectionIsNotAJsonObject" xml:space="preserve">
     <value>The 'profiles' property of the launch settings document is not a JSON object.</value>
   </data>
@@ -1746,6 +1749,9 @@ Your project targets multiple frameworks. Specify which framework to run using '
   <data name="RunCommandSpecifiedFileIsNotAValidProject" xml:space="preserve">
     <value>'{0}' is not a valid project file.</value>
   </data>
+  <data name="Path0SpecifiedIn1IsInvalid" xml:space="preserve">
+    <value>Path '{0}' specified in '{1}' is invalid.</value>
+  </data>
   <data name="RunConfigurationOptionDescription" xml:space="preserve">
     <value>The configuration to run for. The default for most projects is 'Debug'.</value>
   </data>

src/Cli/dotnet/Commands/Run/Api/RunApiCommand.cs

@@ -111,9 +111,8 @@ public override RunApiOutput Execute()
                 environmentVariables: ReadOnlyDictionary<string, string>.Empty,
                 msbuildRestoreProperties: ReadOnlyDictionary<string, string>.Empty);
 
-            runCommand.TryGetLaunchProfileSettingsIfNeeded(out var launchSettings);
-            var targetCommand = (Utils.Command)runCommand.GetTargetCommand(buildCommand.CreateProjectInstance, cachedRunProperties: null);
-            runCommand.ApplyLaunchSettingsProfileToCommand(targetCommand, launchSettings);
+            var result = runCommand.ReadLaunchProfileSettings();
+            var targetCommand = (Utils.Command)runCommand.GetTargetCommand(result.Model, buildCommand.CreateProjectInstance, cachedRunProperties: null);
 
             return new RunApiOutput.RunCommand
             {

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

@@ -19,6 +19,9 @@ internal class ExecutableLaunchProfileJson
     [JsonPropertyName("workingDirectory")]
     public string? WorkingDirectory { get; set; }
 
+    [JsonPropertyName("dotnetRunMessages")]
+    public string? DotNetRunMessages { get; set; }
+
     [JsonPropertyName("environmentVariables")]
     public Dictionary<string, string>? EnvironmentVariables { get; set; }
 }

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

@@ -3,11 +3,11 @@
 
 namespace Microsoft.DotNet.Cli.Commands.Run.LaunchSettings;
 
-public class ExecutableLaunchSettingsModel : LaunchSettingsModel
+public sealed class ExecutableLaunchSettingsModel : LaunchSettingsModel
 {
-    public string? ExecutablePath { get; set; }
+    public const string WorkingDirectoryPropertyName = "workingDirectory";
+    public const string ExecutablePathPropertyName = "executablePath";
 
-    public string? WorkingDirectory { get; set; }
-
-    public override LaunchProfileKind ProfileKind => LaunchProfileKind.Executable;
+    public required string ExecutablePath { get; init; }
+    public string? WorkingDirectory { get; init; }
 }

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

@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Immutable;
+using System.Text.Json;
+
+namespace Microsoft.DotNet.Cli.Commands.Run.LaunchSettings;
+
+internal sealed class ExecutableLaunchSettingsParser : LaunchProfileParser
+{
+    public const string CommandName = "Executable";
+
+    public override LaunchProfileSettings ParseProfile(string launchSettingsPath, string? launchProfileName, string json)
+    {
+        var profile = JsonSerializer.Deserialize<ExecutableLaunchProfileJson>(json);
+        if (profile == null)
+        {
+            return LaunchProfileSettings.Failure(CliCommandStrings.LaunchProfileIsNotAJsonObject);
+        }
+
+        if (profile.ExecutablePath == null)
+        {
+            return LaunchProfileSettings.Failure(
+                string.Format(
+                    CliCommandStrings.LaunchProfile0IsMissingProperty1,
+                    RunCommand.GetLaunchProfileDisplayName(launchProfileName),
+                    ExecutableLaunchSettingsModel.ExecutablePathPropertyName));
+        }
+
+        return LaunchProfileSettings.Success(new ExecutableLaunchSettingsModel
+        {
+            LaunchSettingsPath = launchSettingsPath,
+            LaunchProfileName = launchProfileName,
+            ExecutablePath = profile.ExecutablePath,
+            CommandLineArgs = profile.CommandLineArgs,
+            WorkingDirectory = profile.WorkingDirectory,
+            DotNetRunMessages = ParseDotNetRunMessages(profile.DotNetRunMessages),
+            EnvironmentVariables = ParseEnvironmentVariables(profile.EnvironmentVariables),
+        });
+    }
+}

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

@@ -0,0 +1,31 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Immutable;
+
+namespace Microsoft.DotNet.Cli.Commands.Run.LaunchSettings;
+
+internal abstract class LaunchProfileParser
+{
+    public abstract LaunchProfileSettings ParseProfile(string launchSettingsPath, string? launchProfileName, string json);
+
+    protected static bool ParseDotNetRunMessages(string? value)
+        => string.Equals(value, "true", StringComparison.OrdinalIgnoreCase);
+
+    protected static ImmutableDictionary<string, string> ParseEnvironmentVariables(Dictionary<string, string>? values)
+    {
+        if (values is null or { Count: 0 })
+        {
+            return [];
+        }
+
+        var builder = ImmutableDictionary.CreateBuilder<string, string>(StringComparer.Ordinal);
+        foreach (var (key, value) in values)
+        {
+            // override previously set variables:
+            builder[key] = value;
+        }
+
+        return builder.ToImmutable();
+    }
+}

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

@@ -0,0 +1,29 @@
+// 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.CodeAnalysis;
+
+namespace Microsoft.DotNet.Cli.Commands.Run.LaunchSettings;
+
+public sealed class LaunchProfileSettings
+{
+    public string? FailureReason { get; }
+
+    public LaunchSettingsModel? Model { get; }
+
+    private LaunchProfileSettings(string? failureReason, LaunchSettingsModel? launchSettings)
+    {
+        FailureReason = failureReason;
+        Model = launchSettings;
+    }
+
+    [MemberNotNullWhen(false, nameof(FailureReason))]
+    public bool Successful
+        => FailureReason == null;
+
+    public static LaunchProfileSettings Failure(string reason)
+        => new(reason, launchSettings: null);
+
+    public static LaunchProfileSettings Success(LaunchSettingsModel? model)
+        => new(failureReason: null, launchSettings: model);
+}