Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix delete bug on deploy + version bump + minor cleanup #569

Merged
merged 1 commit into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/v2/Meadow.Cli/Meadow.CLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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";
}
5 changes: 2 additions & 3 deletions Source/v2/Meadow.Hcom/Debugging/DebuggingServer.cs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Source/v2/Meadow.Tooling.Core/App/AppManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Loading