From f10c84319c6dd7a17d5f437957c328a39eaea863 Mon Sep 17 00:00:00 2001 From: Adrian Stevens Date: Wed, 22 May 2024 13:39:34 -0700 Subject: [PATCH] Fix delete bug on deploy + version bump + minor cleanup --- Source/v2/Meadow.Cli/Meadow.CLI.csproj | 2 +- Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs | 2 +- Source/v2/Meadow.Hcom/Debugging/DebuggingServer.cs | 5 ++--- Source/v2/Meadow.Tooling.Core/App/AppManager.cs | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Source/v2/Meadow.Cli/Meadow.CLI.csproj b/Source/v2/Meadow.Cli/Meadow.CLI.csproj index 3e00959d..d15aab1f 100644 --- a/Source/v2/Meadow.Cli/Meadow.CLI.csproj +++ b/Source/v2/Meadow.Cli/Meadow.CLI.csproj @@ -10,7 +10,7 @@ Wilderness Labs, Inc Wilderness Labs, Inc true - 2.0.42.0-beta + 2.0.43.0 AnyCPU http://developer.wildernesslabs.co/Meadow/Meadow.CLI/ https://github.com/WildernessLabs/Meadow.CLI diff --git a/Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs b/Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs index 4fc1f7ca..d4dcb1f7 100644 --- 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"; } \ No newline at end of file diff --git a/Source/v2/Meadow.Hcom/Debugging/DebuggingServer.cs b/Source/v2/Meadow.Hcom/Debugging/DebuggingServer.cs index 997caecc..f23373bf 100644 --- 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 _debuggerMessages = new(); + private readonly BlockingCollection _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 index ed5febb1..ed4da25a 100644 --- 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); }