Reduce warnings

Source/v2/Meadow.Cli.Core/Meadow.Cli.Core.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
     </ItemGroup>
 
 </Project>

Source/v2/Meadow.Cli/AppManager.cs

@@ -93,7 +93,7 @@ public static async Task DeployApplication(
         {
             var existing = deviceFiles.FirstOrDefault(f => Path.GetFileName(f.Name) == Path.GetFileName(localFile.Key));
 
-            if (existing != null)
+            if (existing != null && existing.Crc != null)
             {
                 if (uint.Parse(existing.Crc.Substring(2), System.Globalization.NumberStyles.HexNumber) == localFile.Value)
                 {
@@ -104,7 +104,7 @@ public static async Task DeployApplication(
 
         send_file:
 
-            if (!await connection?.WriteFile(localFile.Key, null, cancellationToken))
+            if (connection != null && !await connection.WriteFile(localFile.Key, null, cancellationToken))
             {
                 logger.LogWarning($"Error sending'{Path.GetFileName(localFile.Key)}'.  Retrying.");
                 await Task.Delay(100);

Source/v2/Meadow.Cli/Commands/Current/App/AppBuildCommand.cs

@@ -25,35 +25,38 @@ public AppBuildCommand(IPackageManager packageManager, ILoggerFactory loggerFact
 
     protected override async ValueTask ExecuteCommand()
     {
-        string path = Path == null
+        await Task.Run(() =>
+        {
+            string path = Path == null
             ? AppDomain.CurrentDomain.BaseDirectory
             : Path;
 
-        // is the path a file?
-        if (!File.Exists(path))
-        {
-            // is it a valid directory?
-            if (!Directory.Exists(path))
+            // is the path a file?
+            if (!File.Exists(path))
             {
-                Logger?.LogError($"Invalid application path '{path}'");
-                return;
+                // is it a valid directory?
+                if (!Directory.Exists(path))
+                {
+                    Logger?.LogError($"Invalid application path '{path}'");
+                    return;
+                }
             }
-        }
 
-        if (Configuration == null) Configuration = "Release";
+            if (Configuration == null) Configuration = "Release";
 
-        Logger?.LogInformation($"Building {Configuration} configuration of {path}...");
+            Logger?.LogInformation($"Building {Configuration} configuration of {path}...");
 
-        // TODO: enable cancellation of this call
-        var success = _packageManager.BuildApplication(path, Configuration);
+            // TODO: enable cancellation of this call
+            var success = _packageManager.BuildApplication(path, Configuration);
 
-        if (!success)
-        {
-            Logger?.LogError($"Build failed!");
-        }
-        else
-        {
-            Logger?.LogError($"Build success.");
-        }
+            if (!success)
+            {
+                Logger?.LogError($"Build failed!");
+            }
+            else
+            {
+                Logger?.LogError($"Build success.");
+            }
+        });
     }
 }

Source/v2/Meadow.Cli/Commands/Current/App/AppDebugCommand.cs

@@ -19,22 +19,11 @@ public AppDebugCommand(MeadowConnectionManager connectionManager, ILoggerFactory
 
     protected override async ValueTask ExecuteCommand()
     {
-        var connection = await GetCurrentConnection();
+        await base.ExecuteCommand();
 
-        if (connection == null)
+        if (Connection != null)
         {
-            Logger?.LogError($"No connection path is defined");
-            return;
-        }
-
-        if (connection != null)
-        {
-            connection.DeviceMessageReceived += (s, e) =>
-            {
-                Logger?.LogInformation(e.message);
-            };
-
-            using (var server = await connection.StartDebuggingSession(Port, Logger, CancellationToken))
+            using (var server = await Connection.StartDebuggingSession(Port, Logger, CancellationToken))
             {
                 if (Console != null)
                 {

Source/v2/Meadow.Cli/Commands/Current/App/AppDeployCommand.cs

@@ -20,14 +20,9 @@ public AppDeployCommand(IPackageManager packageManager, MeadowConnectionManager
 
     protected override async ValueTask ExecuteCommand()
     {
-        var connection = await GetCurrentConnection();
+        await base.ExecuteCommand();
 
-        if (connection == null)
-        {
-            return;
-        }
-
-        if (connection != null)
+        if (Connection != null)
         {
             string path = Path == null
                 ? Environment.CurrentDirectory
@@ -39,15 +34,15 @@ protected override async ValueTask ExecuteCommand()
             var lastFile = string.Empty;
 
             // in order to deploy, the runtime must be disabled
-            var wasRuntimeEnabled = await connection.IsRuntimeEnabled();
+            var wasRuntimeEnabled = await Connection.IsRuntimeEnabled();
             if (wasRuntimeEnabled)
             {
                 Logger?.LogInformation("Disabling runtime...");
 
-                await connection.RuntimeDisable(CancellationToken);
+                await Connection.RuntimeDisable(CancellationToken);
             }
 
-            connection.FileWriteProgress += (s, e) =>
+            Connection.FileWriteProgress += (s, e) =>
             {
                 var p = (e.completed / (double)e.total) * 100d;
 
@@ -94,14 +89,18 @@ protected override async ValueTask ExecuteCommand()
 
             var targetDirectory = file.DirectoryName;
 
-            await AppManager.DeployApplication(_packageManager, connection, targetDirectory, true, false, Logger, CancellationToken);
+            if (Logger != null && !string.IsNullOrEmpty(targetDirectory))
+            {
+                await AppManager.DeployApplication(_packageManager, Connection, targetDirectory, true, false, Logger, CancellationToken);
+                Console?.Output.WriteAsync("\n");
+            }
 
             if (wasRuntimeEnabled)
             {
                 // restore runtime state
-                Logger.LogInformation("Enabling runtime...");
+                Logger?.LogInformation("Enabling runtime...");
 
-                await connection.RuntimeEnable(CancellationToken);
+                await Connection.RuntimeEnable(CancellationToken);
             }
         }
     }

Source/v2/Meadow.Cli/Commands/Current/App/AppRunCommand.cs

@@ -9,7 +9,7 @@ namespace Meadow.CLI.Commands.DeviceManagement;
 public class AppRunCommand : BaseDeviceCommand<AppRunCommand>
 {
     private IPackageManager _packageManager;
-    private string _lastFile;
+    private string _lastFile = string.Empty;
 
     [CommandOption("no-prefix", 'n', IsRequired = false, Description = "When set, the message source prefix (e.g. 'stdout>') is suppressed during 'listen'")]
     public bool NoPrefix { get; set; }
@@ -28,15 +28,9 @@ public AppRunCommand(IPackageManager packageManager, MeadowConnectionManager con
 
     protected override async ValueTask ExecuteCommand()
     {
-        var connection = await GetCurrentConnection();
+        await base.ExecuteCommand();
 
-        if (connection == null)
-        {
-            Logger?.LogError($"No connection path is defined");
-            return;
-        }
-
-        if (connection != null)
+        if (Connection != null)
         {
             string path = Path == null
                 ? AppDomain.CurrentDomain.BaseDirectory
@@ -51,12 +45,12 @@ protected override async ValueTask ExecuteCommand()
             var lastFile = string.Empty;
 
             // in order to deploy, the runtime must be disabled
-            var wasRuntimeEnabled = await connection.IsRuntimeEnabled();
+            var wasRuntimeEnabled = await Connection.IsRuntimeEnabled();
             if (wasRuntimeEnabled)
             {
                 Logger?.LogInformation("Disabling runtime...");
 
-                await connection.RuntimeDisable(CancellationToken);
+                await Connection.RuntimeDisable(CancellationToken);
             }
 
             if (!await BuildApplication(path, CancellationToken))
@@ -72,16 +66,16 @@ protected override async ValueTask ExecuteCommand()
             // illink returns before all files are actually written.  That's not fun, but we must just wait a little while.
             await Task.Delay(1000);
 
-            if (!await DeployApplication(connection, path, CancellationToken))
+            if (!await DeployApplication(Connection, path, CancellationToken))
             {
                 return;
             }
 
             Logger?.LogInformation("Enabling the runtime...");
-            await connection.RuntimeEnable(CancellationToken);
+            await Connection.RuntimeEnable(CancellationToken);
 
             Logger?.LogInformation("Listening for messages from Meadow...\n");
-            connection.DeviceMessageReceived += OnDeviceMessageReceived;
+            Connection.DeviceMessageReceived += OnDeviceMessageReceived;
 
             while (!CancellationToken.IsCancellationRequested)
             {
@@ -136,10 +130,18 @@ private async Task<bool> DeployApplication(IMeadowConnection connection, string
         }
 
         var file = candidates.OrderByDescending(c => c.LastWriteTime).First();
+        var directoryName = file.DirectoryName;
 
-        Logger?.LogInformation($"Deploying app from {file.DirectoryName}...");
+        Logger?.LogInformation($"Deploying app from {directoryName}...");
 
-        await AppManager.DeployApplication(_packageManager, connection, file.DirectoryName, true, false, Logger, CancellationToken);
+        if (!string.IsNullOrEmpty(directoryName) && Logger != null)
+        {
+            await AppManager.DeployApplication(_packageManager, connection, directoryName, true, false, Logger, CancellationToken);
+        }
+        else
+        {
+            Logger?.LogError($"Invalid DirectoryName");
+        }
 
         connection.FileWriteProgress -= OnFileWriteProgress;
 

Source/v2/Meadow.Cli/Commands/Current/BaseDeviceCommand.cs

@@ -6,12 +6,18 @@ namespace Meadow.CLI.Commands.DeviceManagement;
 public abstract class BaseDeviceCommand<T> : BaseCommand<T>
 {
     protected MeadowConnectionManager ConnectionManager { get; }
+    public IMeadowConnection? Connection { get; private set; }
 
     public BaseDeviceCommand(MeadowConnectionManager connectionManager, ILoggerFactory loggerFactory) : base(loggerFactory)
     {
         ConnectionManager = connectionManager;
     }
 
+    protected override async ValueTask ExecuteCommand()
+    {
+        Connection = await GetCurrentConnection();
+    }
+
     protected async Task<IMeadowConnection?> GetCurrentConnection()
     {
         var connection = ConnectionManager.GetCurrentConnection();
@@ -23,6 +29,16 @@ public BaseDeviceCommand(MeadowConnectionManager connectionManager, ILoggerFacto
                 Logger?.LogError(e.Message);
             };
 
+            connection.ConnectionMessage += (s, message) =>
+            {
+                Logger?.LogInformation(message);
+            };
+
+            connection.DeviceMessageReceived += (s, e) =>
+            {
+                Logger?.LogInformation(e.message);
+            };
+
             try
             {
                 await connection.Attach(CancellationToken);
@@ -51,7 +67,7 @@ public BaseDeviceCommand(MeadowConnectionManager connectionManager, ILoggerFacto
         }
         else
         {
-            Logger?.LogError("Current Connnection Unavailable");
+            Logger?.LogError("Current Connnection Unavailable"); // No connection path is defined ??
         }
 
         return null;

Source/v2/Meadow.Cli/Commands/Current/BaseFileCommand.cs

@@ -7,10 +7,20 @@ namespace Meadow.CLI.Commands.DeviceManagement;
 public abstract class BaseFileCommand<T> : BaseSettingsCommand<T>
 {
     protected FileManager FileManager { get; }
+    protected IFirmwarePackageCollection? Collection { get; private set; }
 
     public BaseFileCommand(FileManager fileManager, ISettingsManager settingsManager, ILoggerFactory loggerFactory)
         : base(settingsManager, loggerFactory)
     {
         FileManager = fileManager;
     }
-}
+
+    protected override async ValueTask ExecuteCommand()
+    {
+        await FileManager.Refresh();
+
+        // for now we only support F7
+        // TODO: add switch and support for other platforms
+        Collection = FileManager.Firmware["Meadow F7"];
+    }
+}

Source/v2/Meadow.Cli/Commands/Current/Cloud/CloudLoginCommand.cs

@@ -8,8 +8,6 @@ namespace Meadow.CLI.Commands.DeviceManagement;
 [Command("cloud login", Description = "Log into the Meadow Service")]
 public class CloudLoginCommand : BaseCloudCommand<CloudLoginCommand>
 {
-    public const string DefaultHost = "https://www.meadowcloud.co";
-
     [CommandOption("host", Description = $"Optionally set a host (default is {DefaultHost})", IsRequired = false)]
     public string? Host { get; set; }
 

Source/v2/Meadow.Cli/Commands/Current/Cloud/CloudLogoutCommand.cs

@@ -20,8 +20,11 @@ public CloudLogoutCommand(
 
     protected override async ValueTask ExecuteCommand()
     {
-        Logger?.LogInformation($"Logging out of Meadow.Cloud...");
+        await Task.Run(() =>
+        {
+            Logger?.LogInformation($"Logging out of Meadow.Cloud...");
 
-        IdentityManager.Logout();
+            IdentityManager.Logout();
+        });
     }
 }

Source/v2/Meadow.Cli/Commands/Current/Cloud/Collection/CloudCollectionListCommand.cs

@@ -25,23 +25,27 @@ public CloudCollectionListCommand(
 
     protected override async ValueTask ExecuteCommand()
     {
-        if (Host == null) Host = DefaultHost;
+        if (Host == null)
+            Host = DefaultHost;
         var org = await ValidateOrg(Host, OrgId, CancellationToken);
 
-        if (org == null) return;
+        if (org == null)
+            return;
 
-        var collections = await CollectionService.GetOrgCollections(org.Id, Host, CancellationToken);
+        if (!string.IsNullOrEmpty(org.Id)) {
+            var collections = await CollectionService.GetOrgCollections(org.Id, Host, CancellationToken);
 
-        if (collections == null || collections.Count == 0)
-        {
-            Logger?.LogInformation("No collections found.");
-        }
-        else
-        {
-            Logger?.LogInformation("Collections:");
-            foreach (var collection in collections)
+            if (collections == null || collections.Count == 0)
+            {
+                Logger?.LogInformation("No collections found.");
+            }
+            else
             {
-                Logger?.LogInformation($" {collection.Id} | {collection.Name}");
+                Logger?.LogInformation("Collections:");
+                foreach (var collection in collections)
+                {
+                    Logger?.LogInformation($" {collection.Id} | {collection.Name}");
+                }
             }
         }
     }