Merge pull request #460 from doingnz/develop-support-mpakname-cli-par…

…ameter Add support to set created mpak file name from CLI
WildernessLabs · Feb 10, 2024 · 227fbdf · 227fbdf
2 parents 0dcdee8 + 6c16788
commit 227fbdf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/Source/v2/Meadow.Cli/Commands/Current/Cloud/Package/CloudPackageCreateCommand.cs b/Source/v2/Meadow.Cli/Commands/Current/Cloud/Package/CloudPackageCreateCommand.cs
@@ -78,7 +78,7 @@ protected override async ValueTask ExecuteCommand()
         var postlinkDir = Path.Combine(file.Directory?.FullName ?? string.Empty, PackageManager.PostLinkDirectoryName);
 
         Logger?.LogInformation($"Assembling the MPAK...");
-        var packagePath = await _packageManager.AssemblePackage(postlinkDir, packageDir, osVersion, Filter, true, CancellationToken);
+        var packagePath = await _packageManager.AssemblePackage(postlinkDir, packageDir, osVersion, MpakName, Filter, true, CancellationToken);
 
         if (packagePath != null)
         {

diff --git a/Source/v2/Meadow.Package/IPackageManager.cs b/Source/v2/Meadow.Package/IPackageManager.cs
@@ -16,10 +16,10 @@ Task TrimApplication(
         IList<string>? noLink = null,
         CancellationToken? cancellationToken = null);
 
-    Task<string> AssemblePackage(
-        string contentSourceFolder,
+    Task<string> AssemblePackage(string contentSourceFolder,
         string outputFolder,
         string osVersion,
+        string? mpakName = null,
         string filter = "*",
         bool overwrite = false,
         CancellationToken? cancellationToken = null);

diff --git a/Source/v2/Meadow.Package/PackageManager.cs b/Source/v2/Meadow.Package/PackageManager.cs
@@ -165,10 +165,10 @@ public Task TrimApplication(
 
     public const string PackageMetadataFileName = "info.json";
 
-    public Task<string> AssemblePackage(
-        string contentSourceFolder,
+    public Task<string> AssemblePackage(string contentSourceFolder,
         string outputFolder,
         string osVersion,
+        string? mpakName = null,
         string filter = "*",
         bool overwrite = false,
         CancellationToken? cancellationToken = null)
@@ -179,7 +179,8 @@ public Task<string> AssemblePackage(
             di.Create();
         }
 
-        var mpakName = Path.Combine(outputFolder, $"{DateTime.UtcNow:yyyyMMddff}.mpak");
+        // uncomment to force ".mpak" extension. mpakName = Path.ChangeExtension(mpakName, ".mpak");
+        mpakName = Path.Combine(outputFolder, string.IsNullOrWhiteSpace(mpakName) ? $"{DateTime.UtcNow:yyyyMMddff}.mpak" : mpakName);
 
         if (File.Exists(mpakName))
         {