Json parsing feedback

src/Microsoft.DotNet.ProjectTools/LaunchSettings/ExecutableLaunchProfile.cs

@@ -1,13 +1,18 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Text.Json.Serialization;
+
 namespace Microsoft.DotNet.ProjectTools;
 
 public sealed class ExecutableLaunchProfile : LaunchProfile
 {
     public const string WorkingDirectoryPropertyName = "workingDirectory";
     public const string ExecutablePathPropertyName = "executablePath";
 
+    [JsonPropertyName("executablePath")]
     public required string ExecutablePath { get; init; }
+
+    [JsonPropertyName("workingDirectory")]
     public string? WorkingDirectory { get; init; }
 }

src/Microsoft.DotNet.ProjectTools/LaunchSettings/ExecutableLaunchProfileParser.cs

@@ -3,33 +3,11 @@
 
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 
 namespace Microsoft.DotNet.ProjectTools;
 
 internal sealed class ExecutableLaunchProfileParser : LaunchProfileParser
 {
-    private sealed class Json
-    {
-        [JsonPropertyName("commandName")]
-        public string? CommandName { get; set; }
-
-        [JsonPropertyName("executablePath")]
-        public string? ExecutablePath { get; set; }
-
-        [JsonPropertyName("commandLineArgs")]
-        public string? CommandLineArgs { get; set; }
-
-        [JsonPropertyName("workingDirectory")]
-        public string? WorkingDirectory { get; set; }
-
-        [JsonPropertyName("dotnetRunMessages")]
-        public bool DotNetRunMessages { get; set; }
-
-        [JsonPropertyName("environmentVariables")]
-        public Dictionary<string, string>? EnvironmentVariables { get; set; }
-    }
-
     public const string CommandName = "Executable";
 
     public static readonly ExecutableLaunchProfileParser Instance = new();
@@ -40,21 +18,12 @@ private ExecutableLaunchProfileParser()
 
     public override LaunchProfileParseResult ParseProfile(string launchSettingsPath, string? launchProfileName, string json)
     {
-        var profile = JsonSerializer.Deserialize<Json>(json);
+        var profile = JsonSerializer.Deserialize<ExecutableLaunchProfile>(json);
         if (profile == null)
         {
             return LaunchProfileParseResult.Failure(Resources.LaunchProfileIsNotAJsonObject);
         }
 
-        if (profile.ExecutablePath == null)
-        {
-            return LaunchProfileParseResult.Failure(
-                string.Format(
-                    Resources.LaunchProfile0IsMissingProperty1,
-                    LaunchProfileParser.GetLaunchProfileDisplayName(launchProfileName),
-                    ExecutableLaunchProfile.ExecutablePathPropertyName));
-        }
-
         if (!TryParseWorkingDirectory(launchSettingsPath, profile.WorkingDirectory, out var workingDirectory, out var error))
         {
             return LaunchProfileParseResult.Failure(error);

src/Microsoft.DotNet.ProjectTools/LaunchSettings/LaunchProfile.cs

@@ -2,16 +2,21 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Immutable;
+using System.Text.Json.Serialization;
 
 namespace Microsoft.DotNet.ProjectTools;
 
 public abstract class LaunchProfile
 {
+    [JsonIgnore]
     public string? LaunchProfileName { get; init; }
 
+    [JsonPropertyName("dotnetRunMessages")]
     public bool DotNetRunMessages { get; init; }
 
+    [JsonPropertyName("commandLineArgs")]
     public string? CommandLineArgs { get; init; }
 
-    public required ImmutableDictionary<string, string> EnvironmentVariables { get; init; }
+    [JsonPropertyName("environmentVariables")]
+    public ImmutableDictionary<string, string> EnvironmentVariables { get; init; } = [];
 }

src/Microsoft.DotNet.ProjectTools/LaunchSettings/LaunchProfileParser.cs

@@ -15,11 +15,11 @@ internal abstract class LaunchProfileParser
     public static string GetLaunchProfileDisplayName(string? launchProfile)
         => string.IsNullOrEmpty(launchProfile) ? Resources.DefaultLaunchProfileDisplayName : launchProfile;
 
-    protected static ImmutableDictionary<string, string> ParseEnvironmentVariables(Dictionary<string, string>? values)
+    protected static ImmutableDictionary<string, string> ParseEnvironmentVariables(ImmutableDictionary<string, string> values)
     {
-        if (values is null or { Count: 0 })
+        if (values.Count == 0)
         {
-            return [];
+            return values;
         }
 
         var builder = ImmutableDictionary.CreateBuilder<string, string>(StringComparer.Ordinal);

src/Microsoft.DotNet.ProjectTools/LaunchSettings/ProjectLaunchProfile.cs

@@ -1,11 +1,18 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Text.Json.Serialization;
+
 namespace Microsoft.DotNet.ProjectTools;
 
 public sealed class ProjectLaunchProfile : LaunchProfile
 {
+    [JsonPropertyName("launchBrowser")]
     public bool LaunchBrowser { get; init; }
+
+    [JsonPropertyName("launchUrl")]
     public string? LaunchUrl { get; init; }
+
+    [JsonPropertyName("applicationUrl")]
     public string? ApplicationUrl { get; init; }
 }

src/Microsoft.DotNet.ProjectTools/LaunchSettings/ProjectLaunchProfileParser.cs

@@ -2,36 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Text.Json;
-using System.Text.Json.Serialization;
 
 namespace Microsoft.DotNet.ProjectTools;
 
 internal sealed class ProjectLaunchProfileParser : LaunchProfileParser
 {
-    internal sealed class Json
-    {
-        [JsonPropertyName("commandName")]
-        public string? CommandName { get; set; }
-
-        [JsonPropertyName("commandLineArgs")]
-        public string? CommandLineArgs { get; set; }
-
-        [JsonPropertyName("launchBrowser")]
-        public bool LaunchBrowser { get; set; }
-
-        [JsonPropertyName("launchUrl")]
-        public string? LaunchUrl { get; set; }
-
-        [JsonPropertyName("applicationUrl")]
-        public string? ApplicationUrl { get; set; }
-
-        [JsonPropertyName("dotnetRunMessages")]
-        public bool DotNetRunMessages { get; set; }
-
-        [JsonPropertyName("environmentVariables")]
-        public Dictionary<string, string>? EnvironmentVariables { get; set; }
-    }
-
     public const string CommandName = "Project";
 
     public static readonly ProjectLaunchProfileParser Instance = new();
@@ -42,7 +17,7 @@ private ProjectLaunchProfileParser()
 
     public override LaunchProfileParseResult ParseProfile(string launchSettingsPath, string? launchProfileName, string json)
     {
-        var profile = JsonSerializer.Deserialize<Json>(json);
+        var profile = JsonSerializer.Deserialize<ProjectLaunchProfile>(json);
         if (profile == null)
         {
             return LaunchProfileParseResult.Failure(Resources.LaunchProfileIsNotAJsonObject);

src/Microsoft.DotNet.ProjectTools/Resources.resx

@@ -131,9 +131,6 @@
   <data name="LaunchProfilesCollectionIsNotAJsonObject" xml:space="preserve">
     <value>The 'profiles' property of the launch settings document is not a JSON object.</value>
   </data>
-  <data name="LaunchProfile0IsMissingProperty1" xml:space="preserve">
-    <value>Launch profile '{0}' is missing property '{1}'</value>
-  </data>
   <data name="DuplicateCaseInsensitiveLaunchProfileNames" xml:space="preserve">
     <value>There are several launch profiles with case-sensitive names, which isn't permitted:
 {0}

test/dotnet.Tests/ProjectTools/LaunchSettingsParserTests.cs

@@ -29,14 +29,11 @@ public void MissingExecutablePath()
     {
         var parser = ExecutableLaunchProfileParser.Instance;
 
-        var result = parser.ParseProfile("path", "Execute", """
+        Assert.Throws<JsonException>(() => parser.ParseProfile("path", "Execute", """
             {
                 "commandName": "Executable"
             }
-            """);
-
-        Assert.False(result.Successful);
-        Assert.Equal(string.Format(Resources.LaunchProfile0IsMissingProperty1, "Execute", "executablePath"), result.FailureReason);
+            """));
     }
 
     [Theory]