PR comments

Author: GarrettBeatty

.autover/changes/8a5204e4-83ec-45ac-8c75-27512ae9cdf8.json

@@ -4,7 +4,7 @@
       "Name": "Amazon.Lambda.Tools",
       "Type": "Patch",
       "ChangelogMessages": [
-        "Use MSBuild to find target framework"
+        "Update logic for finding project properties to use MSBuild instead of parsing the project file directly. See https://learn.microsoft.com/en-us/visualstudio/msbuild/customize-your-build?view=vs-2022 for more details."
       ]
     }
   ]

src/Amazon.Common.DotNetCli.Tools/Utilities.cs

@@ -208,7 +208,7 @@ public static string DeterminePublishLocation(string workingDirectory, string pr
 
 
         // <summary>
-        /// Looks up specified properties from a project file.
+        /// Looks up specified properties from a project.
         /// </summary>
         /// <param name="projectLocation">The location of the project file.</param>
         /// <param name="propertyNames">The names of the properties to look up.</param>
@@ -240,41 +240,49 @@ public static Dictionary<string, string> LookupProjectProperties(string projectL
             try
             {
                 process.Start();
-                string output = process.StandardOutput.ReadToEnd();
+                string output = process.StandardOutput.ReadToEnd().Trim();
                 string error = process.StandardError.ReadToEnd();
                 process.WaitForExit(5000);
 
                 if (process.ExitCode == 0)
                 {
-                    using JsonDocument doc = JsonDocument.Parse(output);
-                    JsonElement root = doc.RootElement;
-                    JsonElement propertiesElement = root.GetProperty("Properties");
-
-                    foreach (var property in propertyNames)
+                    if (propertyNames.Length == 1)
+                    {
+                        // If only one property was requested, the output is the direct value
+                        properties[propertyNames[0]] = output;
+                    }
+                    else
                     {
-                        if (propertiesElement.TryGetProperty(property, out JsonElement propertyValue))
+                        // Multiple properties were requested, so we expect JSON output
+                        using JsonDocument doc = JsonDocument.Parse(output);
+                        JsonElement root = doc.RootElement;
+                        JsonElement propertiesElement = root.GetProperty("Properties");
+
+                        foreach (var property in propertyNames)
                         {
-                            properties[property] = propertyValue.GetString();
+                            if (propertiesElement.TryGetProperty(property, out JsonElement propertyValue))
+                            {
+                                properties[property] = propertyValue.GetString();
+                            }
                         }
                     }
                 }
                 else
                 {
-                    Console.WriteLine($"MSBuild process exited with code {process.ExitCode}. Error: {error}");
                     // Fallback to XML parsing
                     properties = LookupProjectPropertiesFromXml(projectFile, propertyNames);
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
-                Console.WriteLine($"Error executing MSBuild or parsing output: {ex.Message}");
                 // Fallback to XML parsing
                 properties = LookupProjectPropertiesFromXml(projectFile, propertyNames);
             }
 
             return properties;
         }
 
+
         private static Dictionary<string, string> LookupProjectPropertiesFromXml(string projectFile, string[] propertyNames)
         {
             var properties = new Dictionary<string, string>();
@@ -290,9 +298,8 @@ private static Dictionary<string, string> LookupProjectPropertiesFromXml(string
                     }
                 }
             }
-            catch (Exception ex)
+            catch (Exception)
             {
-                Console.WriteLine($"Error parsing project file XML: {ex.Message}");
             }
             return properties;
         }