From 04896c7b8392ea40149d5e6499dcfcc2dac7c8da Mon Sep 17 00:00:00 2001
From: Adrian Stevens <adrian.stevens@gmail.com>
Date: Fri, 15 Mar 2024 16:07:33 -0700
Subject: [PATCH] Remove auth from firmware download, minor defensive coding,
 version bump

---
 .../Current/Firmware/FirmwareDownloadCommand.cs   |  1 +
 Source/v2/Meadow.Cli/Meadow.CLI.csproj            |  2 +-
 Source/v2/Meadow.Cli/Properties/AssemblyInfo.cs   |  2 +-
 .../v2/Meadow.Cli/Properties/launchSettings.json  |  8 ++++----
 .../Meadow.Tooling.Core/Package/PackageManager.cs | 15 +++++++++------
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/Source/v2/Meadow.Cli/Commands/Current/Firmware/FirmwareDownloadCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/Firmware/FirmwareDownloadCommand.cs
index ee97fedf..883f566b 100644
--- a/Source/v2/Meadow.Cli/Commands/Current/Firmware/FirmwareDownloadCommand.cs
+++ b/Source/v2/Meadow.Cli/Commands/Current/Firmware/FirmwareDownloadCommand.cs
@@ -17,6 +17,7 @@ public FirmwareDownloadCommand(
         : base(meadowCloudClient, loggerFactory)
     {
         _fileManager = fileManager;
+        RequiresAuthentication = false;
     }
 
     [CommandOption("force", 'f', IsRequired = false)]
diff --git a/Source/v2/Meadow.Cli/Meadow.CLI.csproj b/Source/v2/Meadow.Cli/Meadow.CLI.csproj
index b17e2437..2181de0c 100644
--- 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.27.0</PackageVersion>
+	  <PackageVersion>2.0.29.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
index 4abd82f0..d07705c4 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.27.0";
+    public const string CLI_VERSION = "2.0.29.0";
 }
\ No newline at end of file
diff --git a/Source/v2/Meadow.Cli/Properties/launchSettings.json b/Source/v2/Meadow.Cli/Properties/launchSettings.json
index c78964a3..ead96fa7 100644
--- a/Source/v2/Meadow.Cli/Properties/launchSettings.json
+++ b/Source/v2/Meadow.Cli/Properties/launchSettings.json
@@ -189,7 +189,7 @@
     },
     "App Trim": {
       "commandName": "Project",
-      "commandLineArgs": "app trim C:\\repos\\wilderness\\Meadow.Core.Samples\\Source\\Blinky\\BlinkyCS --nolink Meadow.Core Meadow.Contracts"
+      "commandLineArgs": "app trim H:\\WL\\Blinky\\Blinky\\BlinkyCs --nolink BlinkyLib"
     },
     "Dfu Install": {
       "commandName": "Project",
@@ -201,15 +201,15 @@
     },
     "App Deploy (project folder)": {
       "commandName": "Project",
-      "commandLineArgs": "app deploy H:\\WL\\Meadow.ProjectLab\\Source\\ProjectLab_Demo\\bin\\Debug\\netstandard2.1\\postlink_bin"
+      "commandLineArgs": "app deploy H:\\WL\\Blinky\\Blinky\\BlinkyCs"
     },
     "App Deploy (untrimmed output)": {
       "commandName": "Project",
       "commandLineArgs": "app deploy F:\\temp\\MeadowApplication1\\bin\\Debug\\netstandard2.1"
     },
-    "App run": {
+    "App Run": {
       "commandName": "Project",
-      "commandLineArgs": "app run F:\\temp\\MeadowApplication1"
+      "commandLineArgs": "app run H:\\WL\\Blinky\\Blinky\\BlinkyCs"
     },
     "Flash erase": {
       "commandName": "Project",
diff --git a/Source/v2/Meadow.Tooling.Core/Package/PackageManager.cs b/Source/v2/Meadow.Tooling.Core/Package/PackageManager.cs
index 76c3e437..05eb449b 100644
--- a/Source/v2/Meadow.Tooling.Core/Package/PackageManager.cs
+++ b/Source/v2/Meadow.Tooling.Core/Package/PackageManager.cs
@@ -152,13 +152,16 @@ public Task TrimApplication(
                 .Build();
             var opts = deserializer.Deserialize<BuildOptions>(yaml);
 
-            if (opts.Deploy.NoLink != null && opts.Deploy.NoLink.Count > 0)
+            if (opts != null && opts.Deploy != null)
             {
-                noLink = opts.Deploy.NoLink;
-            }
-            if (opts.Deploy.IncludePDBs != null)
-            {
-                includePdbs = opts.Deploy.IncludePDBs.Value;
+                if (opts.Deploy.NoLink != null && opts.Deploy.NoLink.Count > 0)
+                {
+                    noLink = opts.Deploy.NoLink;
+                }
+                if (opts.Deploy.IncludePDBs != null)
+                {
+                    includePdbs = opts.Deploy.IncludePDBs.Value;
+                }
             }
         }