Merge pull request #586 from WildernessLabs/dominique-FixTrimApplicat…

…ionEdgeCase Fix edge case where passed in configuration doesn't exist in app path.
WildernessLabs · Jul 23, 2024 · 1c15780 · 1c15780
2 parents 12c04f2 + 8f6a8ea
commit 1c15780
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/Source/v2/Meadow.CLI/Commands/Current/App/AppTools.cs b/Source/v2/Meadow.CLI/Commands/Current/App/AppTools.cs
@@ -63,16 +63,25 @@ internal static async Task<bool> TrimApplication(string path,
 
         if (configuration is not null)
         {
-            file = candidates
-                .Where(c => c.DirectoryName.IndexOf(configuration, StringComparison.OrdinalIgnoreCase) >= 0)
-                .OrderByDescending(c => c.LastWriteTime)
-                .First();
+            var foundConfiguration = candidates.Where(c => c.DirectoryName?.IndexOf(configuration, StringComparison.OrdinalIgnoreCase) >= 0);
 
-            if (file == null)
+            if (foundConfiguration.Count() == 0)
             {
-                logger?.LogError($"{Strings.NoCompiledApplicationFound} at '{path}'");
+                logger?.LogError($"{Strings.NoCompiledApplicationFound} {Strings.WithConfiguration} '{configuration}' {Strings.At} '{path}'");
                 return false;
             }
+            else
+            {
+                file = foundConfiguration
+                .OrderByDescending(c => c.LastWriteTime)
+                .First();
+
+                if (file == null)
+                {
+                    logger?.LogError($"{Strings.NoCompiledApplicationFound} {Strings.At} '{path}'");
+                    return false;
+                }
+            }
         }
         else
         {

diff --git a/Source/v2/Meadow.Cli/Strings.cs b/Source/v2/Meadow.Cli/Strings.cs
@@ -70,9 +70,10 @@ public static class Strings
     public const string AppDeployFailed = "Application deploy failed";
     public const string AppDeployedSuccessfully = "Application deployed successfully";
     public const string AppTrimFailed = "Application trimming failed";
+	public const string WithConfiguration = "with configuration";
+	public const string At = "at";
 
-
-    public static class Telemetry
+	public static class Telemetry
     {
         public const string ConsentMessage = @$"
 Let's improve the Meadow experience together