Skip to content

Commit

Permalink
Remove auth from firmware download, minor defensive coding, version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianstevens committed Mar 15, 2024
1 parent 68db664 commit 04896c7
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ public FirmwareDownloadCommand(
: base(meadowCloudClient, loggerFactory)
{
_fileManager = fileManager;
RequiresAuthentication = false;
}

[CommandOption("force", 'f', IsRequired = false)]
Expand Down
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.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>
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.27.0";
public const string CLI_VERSION = "2.0.29.0";
}
8 changes: 4 additions & 4 deletions Source/v2/Meadow.Cli/Properties/launchSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
15 changes: 9 additions & 6 deletions Source/v2/Meadow.Tooling.Core/Package/PackageManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}

Expand Down

0 comments on commit 04896c7

Please sign in to comment.