Merge pull request #569 from WildernessLabs/delete_bug_fix

Fix delete bug on deploy + version bump + minor cleanup
WildernessLabs · May 22, 2024 · 95c80e6 · 95c80e6
2 parents 8c946ae + f10c843
commit 95c80e6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/Source/v2/Meadow.Cli/Meadow.CLI.csproj b/Source/v2/Meadow.Cli/Meadow.CLI.csproj
@@ -10,7 +10,7 @@
     <Authors>Wilderness Labs, Inc</Authors>
     <Company>Wilderness Labs, Inc</Company>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageVersion>2.0.42.0-beta</PackageVersion>
+    <PackageVersion>2.0.43.0</PackageVersion>
     <Platforms>AnyCPU</Platforms>
     <PackageProjectUrl>http://developer.wildernesslabs.co/Meadow/Meadow.CLI/</PackageProjectUrl>
     <RepositoryUrl>https://github.com/WildernessLabs/Meadow.CLI</RepositoryUrl>

diff --git a/Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs b/Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs
@@ -6,5 +6,5 @@ namespace Meadow.CLI;
 
 public static class Constants
 {
-    public const string CLI_VERSION = "2.0.42.0";
+    public const string CLI_VERSION = "2.0.43.0";
 }
diff --git a/Source/v2/Meadow.Hcom/Debugging/DebuggingServer.cs b/Source/v2/Meadow.Hcom/Debugging/DebuggingServer.cs
@@ -1,5 +1,4 @@
-using Microsoft.Extensions.Logging;
-using System.Buffers;
+using System.Buffers;
 using System.Collections.Concurrent;
 using System.Net;
 using System.Net.Sockets;
@@ -171,7 +170,7 @@ private class ActiveClient : IDisposable
         private readonly Task _receiveMeadowDebugDataTask;
         private readonly ILogger? _logger;
         public bool Disposed = false;
-        private BlockingCollection<byte[]> _debuggerMessages = new();
+        private readonly BlockingCollection<byte[]> _debuggerMessages = new();
 
         // Constructor
         internal ActiveClient(IMeadowConnection connection, TcpClient tcpClient, ILogger? logger, CancellationToken? cancellationToken)

diff --git a/Source/v2/Meadow.Tooling.Core/App/AppManager.cs b/Source/v2/Meadow.Tooling.Core/App/AppManager.cs
@@ -133,7 +133,7 @@ public static async Task DeployApplication(
         foreach (var file in removeFiles)
         {
             logger?.LogInformation($"Deleting file '{file}'...");
-            var folder = string.IsNullOrEmpty(file.Path) ? $"/{MeadowRootFolder}/" : $"/{MeadowRootFolder}/{file.Path}/";
+            var folder = string.IsNullOrEmpty(file.Path) ? $"/{MeadowRootFolder}/" : $"{file.Path}";
 
             await connection.DeleteFile($"{folder}{file.Name}", cancellationToken);
         }