WildernessLabs · CartBlanche · Jul 31, 2023 · Jul 6, 2023 · Jul 20, 2023 · Jul 24, 2023
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -1,8 +1,8 @@
 name: Meadow.CLI
 env:
-  TOOLS_RELEASE_VERSION: 1.1.1.0
-  SHORT_TOOLS_RELEASE_VERSION: 1.1.1
-  MEADOW_OS_VERSION: 1.1.0.0
+  CLI_RELEASE_VERSION: 1.2.0.0
+  IDE_TOOLS_RELEASE_VERSION: 1.2.0
+  MEADOW_OS_VERSION: 1.2.0.0
   VS_MAC_2019_VERSION: 8.10
   VS_MAC_2022_VERSION: 17.5
 
@@ -12,7 +12,7 @@ on:
   pull_request:
     branches: [ main, develop ]
 
- # Allows you to run this workflow manually from the Actions tab
+# Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 jobs:
@@ -40,23 +40,23 @@ jobs:
       name: Update CLI Version Numbers
       run: |
         $content = Get-Content main/Meadow.CLI/Meadow.CLI.csproj | Out-String
-        $newcontent = $content -replace '<PackageVersion>.*</PackageVersion>', '<PackageVersion>${{ ENV.TOOLS_RELEASE_VERSION }}</PackageVersion>'
+        $newcontent = $content -replace '<PackageVersion>.*</PackageVersion>', '<PackageVersion>${{ ENV.CLI_RELEASE_VERSION }}</PackageVersion>'
         $newcontent | Set-Content main/Meadow.CLI/Meadow.CLI.csproj
 
         $content = Get-Content main/Meadow.CLI.Core/Meadow.CLI.Core.csproj | Out-String
-        $newcontent = $content -replace '<Version>.*</Version>', '<Version>${{ ENV.TOOLS_RELEASE_VERSION }}</Version>'
+        $newcontent = $content -replace '<Version>.*</Version>', '<Version>${{ ENV.CLI_RELEASE_VERSION }}</Version>'
         $newcontent | Set-Content main/Meadow.CLI.Core/Meadow.CLI.Core.csproj
 
         $content = Get-Content main/Meadow.CLI.Core/Meadow.CLI.Core.6.0.0.csproj | Out-String
-        $newcontent = $content -replace '<Version>.*</Version>', '<Version>${{ ENV.TOOLS_RELEASE_VERSION }}</Version>'
+        $newcontent = $content -replace '<Version>.*</Version>', '<Version>${{ ENV.CLI_RELEASE_VERSION }}</Version>'
         $newcontent | Set-Content main/Meadow.CLI.Core/Meadow.CLI.Core.6.0.0.csproj
 
         $content = Get-Content main/Meadow.CLI.Core/Meadow.CLI.Core.VS2019.csproj | Out-String
-        $newcontent = $content -replace '<Version>.*</Version>', '<Version>${{ ENV.TOOLS_RELEASE_VERSION }}</Version>'
+        $newcontent = $content -replace '<Version>.*</Version>', '<Version>${{ ENV.CLI_RELEASE_VERSION }}</Version>'
         $newcontent | Set-Content main/Meadow.CLI.Core/Meadow.CLI.Core.VS2019.csproj
 
         $content = Get-Content main/Meadow.CLI.Core/Constants.cs | Out-String
-        $newcontent = $content -replace 'CLI_VERSION = \".*\";', 'CLI_VERSION = "${{ ENV.TOOLS_RELEASE_VERSION }}";'
+        $newcontent = $content -replace 'CLI_VERSION = \".*\";', 'CLI_VERSION = "${{ ENV.CLI_RELEASE_VERSION }}";'
         $newcontent | Set-Content main/Meadow.CLI.Core/Constants.cs
 
     - name: Add MSBuild to Path
@@ -71,7 +71,7 @@ jobs:
     - name: Upload nuget Artifacts for internal testing
       uses: actions/upload-artifact@v2
       with:
-        name: Meadow.CLI.nuget.${{ ENV.TOOLS_RELEASE_VERSION }}
+        name: Meadow.CLI.nuget.${{ ENV.CLI_RELEASE_VERSION }}
         path: 'main\Meadow.CLI\bin\Release\*.nupkg'
 
     - if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }}
@@ -124,7 +124,7 @@ jobs:
       name: Update VS2019 Version Numbers
       run: |
         $content = Get-Content vs-win/VS_Meadow_Extension/VS_Meadow_Extension.2019/source.extension.vsixmanifest | Out-String
-        $newcontent = $content -replace 'Version="1.*" Language="en-US" Publisher="Wilderness Labs"', 'Version="${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}" Language="en-US" Publisher="Wilderness Labs"'
+        $newcontent = $content -replace 'Version="1.*" Language="en-US" Publisher="Wilderness Labs"', 'Version="${{ ENV.IDE_TOOLS_RELEASE_VERSION }}" Language="en-US" Publisher="Wilderness Labs"'
         $newcontent | Set-Content vs-win/VS_Meadow_Extension/VS_Meadow_Extension.2019/source.extension.vsixmanifest
 
     - name: Restore VS2019 dependencies
@@ -139,7 +139,7 @@ jobs:
     - name: Upload VS2019 VSIX Artifacts
       uses: actions/upload-artifact@v2
       with:
-        name: Meadow.Win.VS2019.vsix.${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}
+        name: Meadow.Win.VS2019.vsix.${{ ENV.IDE_TOOLS_RELEASE_VERSION }}
         path: 'vs-win\VS_Meadow_Extension\VS_Meadow_Extension.2019\bin\Release\*.vsix'
 
     #- if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }}
@@ -193,7 +193,7 @@ jobs:
       name: Update VS2022 Version Numbers
       run: |
         $content = Get-Content vs-win/VS_Meadow_Extension/VS_Meadow_Extension.2022/source.extension.vsixmanifest | Out-String
-        $newcontent = $content -replace 'Version="1.*" Language="en-US" Publisher="Wilderness Labs"', 'Version="${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}" Language="en-US" Publisher="Wilderness Labs"'
+        $newcontent = $content -replace 'Version="1.*" Language="en-US" Publisher="Wilderness Labs"', 'Version="${{ ENV.IDE_TOOLS_RELEASE_VERSION }}" Language="en-US" Publisher="Wilderness Labs"'
         $newcontent | Set-Content vs-win/VS_Meadow_Extension/VS_Meadow_Extension.2022/source.extension.vsixmanifest
 
     - name: Restore VS2022 dependencies
@@ -207,7 +207,7 @@ jobs:
     - name: Upload VS2022 VSIX Artifacts
       uses: actions/upload-artifact@v2
       with:
-        name: Meadow.Win.VS2022.vsix.${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}
+        name: Meadow.Win.VS2022.vsix.${{ ENV.IDE_TOOLS_RELEASE_VERSION }}
         path: 'vs-win\VS_Meadow_Extension\VS_Meadow_Extension.2022\bin\Release\*.vsix'
 
     - if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }}
@@ -266,7 +266,7 @@ jobs:
     - if: ${{ github.event_name == 'workflow_dispatch' }}
       name: Update VS2019 Version Numbers
       run: |
-        sed -i "" "s/Version = \"1.*\"/Version = \"${{ENV.SHORT_TOOLS_RELEASE_VERSION}}\"/" vs-mac/VS4Mac_Meadow_Extension/Properties/AddinInfo.cs
+        sed -i "" "s/Version = \"1.*\"/Version = \"${{ENV.IDE_TOOLS_RELEASE_VERSION}}\"/" vs-mac/VS4Mac_Meadow_Extension/Properties/AddinInfo.cs
 
     - name: Restore our VS2019 project
       run: |
@@ -279,7 +279,7 @@ jobs:
     - name: Upload Mac VS2019 mpack Artifacts
       uses: actions/upload-artifact@v2
       with:
-        name: Meadow.Mac.2019.mpack.${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}
+        name: Meadow.Mac.2019.mpack.${{ ENV.IDE_TOOLS_RELEASE_VERSION }}
         path: 'vs-mac/VS4Mac_Meadow_Extension/bin/Release/net472/*.mpack'
 
     #- if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }}
@@ -316,8 +316,8 @@ jobs:
     #  with:
     #    owner: WildernessLabs
     #    repo: VS_Mac_Meadow_Extension
-    #    tag_name: v${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}-vsm${{ ENV.VS_MAC_2019_VERSION }}
-    #    release_name: VS Mac VS2019 Extension v${{ ENV.SHORT_TOOLS_RELEASE_VERSION }} for Meadow OS v${{ ENV.MEADOW_OS_VERSION }}
+    #    tag_name: v${{ ENV.IDE_TOOLS_RELEASE_VERSION }}-vsm${{ ENV.VS_MAC_2019_VERSION }}
+    #    release_name: VS Mac VS2019 Extension v${{ ENV.IDE_TOOLS_RELEASE_VERSION }} for Meadow OS v${{ ENV.MEADOW_OS_VERSION }}
     #    body: | 
     #      ${{ steps.commit_messages.outputs.result }}
     #    draft: true
@@ -332,7 +332,7 @@ jobs:
     #  with:
     #    upload_url: ${{ steps.create_release.outputs.upload_url }}
     #    asset_path: vs-mac/VS4Mac_Meadow_Extension/bin/Release/net472/*.mpack
-    #    asset_name: Meadow.Mac.2019.mpack.${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}
+    #    asset_name: Meadow.Mac.2019.mpack.${{ ENV.IDE_TOOLS_RELEASE_VERSION }}
     #    asset_content_type: application/zip
 
   build-vsmac-2022:
@@ -374,7 +374,7 @@ jobs:
     - if: ${{ github.event_name == 'workflow_dispatch' }}
       name: Update VS2022 Version Numbers
       run: |
-        sed -i "" "s/Version = \"1.*\"/Version = \"${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}\"/" vs-mac/VS4Mac_Meadow_Extension/Properties/AddinInfo.2022.cs
+        sed -i "" "s/Version = \"1.*\"/Version = \"${{ ENV.IDE_TOOLS_RELEASE_VERSION }}\"/" vs-mac/VS4Mac_Meadow_Extension/Properties/AddinInfo.2022.cs
 
     - name: Restore our VS2022 project
       run: |
@@ -387,7 +387,7 @@ jobs:
     - name: Upload VS2022 mpack Artifacts
       uses: actions/upload-artifact@v2
       with:
-        name: Meadow.Mac.2022.mpack.${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}
+        name: Meadow.Mac.2022.mpack.${{ ENV.IDE_TOOLS_RELEASE_VERSION }}
         path: 'vs-mac/VS4Mac_Meadow_Extension/bin/Release/net7.0/*.mpack'
 
     - if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }}
@@ -424,8 +424,8 @@ jobs:
       with:
         owner: WildernessLabs
         repo: VS_Mac_Meadow_Extension
-        tag_name: v${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}-vsm${{ ENV.VS_MAC_2022_VERSION }}
-        release_name: VS Mac VS2022 Extension v${{ ENV.SHORT_TOOLS_RELEASE_VERSION }} for Meadow OS v${{ ENV.MEADOW_OS_VERSION }}
+        tag_name: v${{ ENV.IDE_TOOLS_RELEASE_VERSION }}-vsm${{ ENV.VS_MAC_2022_VERSION }}
+        release_name: VS Mac VS2022 Extension v${{ ENV.IDE_TOOLS_RELEASE_VERSION }} for Meadow OS v${{ ENV.MEADOW_OS_VERSION }}
         body: | 
           ${{ steps.commit_messages.outputs.result }}
         draft: true
@@ -440,7 +440,7 @@ jobs:
     #  with:
     #    upload_url: ${{ steps.create_release.outputs.upload_url }}
     #    asset_path: vs-mac/VS4Mac_Meadow_Extension/bin/Release/net7.0/*.mpack
-    #    asset_name: Meadow.Mac.2022.mpack.${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}
+    #    asset_name: Meadow.Mac.2022.mpack.${{ ENV.IDE_TOOLS_RELEASE_VERSION }}
     #    asset_content_type: application/zip
 
   build-vscode:
@@ -503,7 +503,7 @@ jobs:
       name: Update VSCode Version Numbers
       run: |
         $content = Get-Content vs-code/package.json | Out-String
-        $newcontent = $content -replace '"version": "1.*",', '"version": "${{ENV.SHORT_TOOLS_RELEASE_VERSION}}",'
+        $newcontent = $content -replace '"version": "1.*",', '"version": "${{ENV.IDE_TOOLS_RELEASE_VERSION}}",'
         $newcontent | Set-Content vs-code/package.json
 
     - name: Restore VSCode Extension dependencies
@@ -535,7 +535,7 @@ jobs:
     - name: Upload VSIX Artifacts
       uses: actions/upload-artifact@v2
       with:
-        name: Meadow.VSCode.vsix.${{ ENV.SHORT_TOOLS_RELEASE_VERSION }}
+        name: Meadow.VSCode.vsix.${{ ENV.IDE_TOOLS_RELEASE_VERSION }}
         path: 'vs-code/*.vsix'
 
     - if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }}

diff --git a/.gitignore b/.gitignore
@@ -261,3 +261,5 @@ SourceVersions
 
 # NETMF
 OnBoardFlash.dat
+
+.vscode
diff --git a/Meadow.CLI.Core/CloudServices/CollectionService.cs b/Meadow.CLI.Core/CloudServices/CollectionService.cs
@@ -25,8 +25,13 @@
         _identityManager = identityManager;
     }
 
-    public async Task<List<Collection>> GetOrgCollections(string orgId, CancellationToken cancellationToken)
+    public async Task<List<Collection>> GetOrgCollections(string orgId, string host, CancellationToken cancellationToken)
     {
+        if (string.IsNullOrEmpty(host))
+        {
+            host = _config[Constants.MEADOW_CLOUD_HOST_CONFIG_NAME];
+        }
+
         var authToken = await _identityManager.GetAccessToken(cancellationToken).ConfigureAwait(false);
         if (string.IsNullOrEmpty(authToken))
         {
@@ -36,7 +41,7 @@
         HttpClient httpClient = new HttpClient();
         httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", authToken);
 
-        var result = await httpClient.GetStringAsync($"{_config["meadowCloudHost"]}/api/orgs/{orgId}/collections");
+        var result = await httpClient.GetStringAsync($"{host}/api/orgs/{orgId}/collections");
         return JsonSerializer.Deserialize<List<Collection>>(result);
     }
 }
diff --git a/Meadow.CLI.Core/CloudServices/DeviceService.cs b/Meadow.CLI.Core/CloudServices/DeviceService.cs
@@ -19,8 +19,13 @@ public DeviceService(IConfiguration config, IdentityManager identityManager) : b
             _config = config;
         }
 
-        public async Task<(bool isSuccess, string message)> AddDevice(string orgId, string id, string publicKey, string collectionId)
+        public async Task<(bool isSuccess, string message)> AddDevice(string orgId, string id, string publicKey, string collectionId, string host)
         {
+            if (string.IsNullOrEmpty(host))
+            {
+                host = _config[Constants.MEADOW_CLOUD_HOST_CONFIG_NAME];
+            }
+
             var httpClient = await AuthenticatedHttpClient();
 
             dynamic payload = new
@@ -34,7 +39,7 @@ public DeviceService(IConfiguration config, IdentityManager identityManager) : b
             var json = JsonSerializer.Serialize<dynamic>(payload);
 
             var content = new StringContent(json, Encoding.UTF8, "application/json");
-            var response  = await httpClient.PostAsync($"{_config["meadowCloudHost"]}/api/devices", content);
+            var response  = await httpClient.PostAsync($"{host}/api/devices", content);
 
             if (response.IsSuccessStatusCode)
             {

diff --git a/Meadow.CLI.Core/CloudServices/PackageService.cs b/Meadow.CLI.Core/CloudServices/PackageService.cs
@@ -19,15 +19,20 @@ public class PackageService : CloudServiceBase
     {
         IConfiguration _config;
         IdentityManager _identityManager;
-
+        
         public PackageService(IConfiguration config, IdentityManager identityManager) : base(identityManager)
         {
             _config = config;
             _identityManager = identityManager;
         }
 
-        public async Task<Package> UploadPackage(string mpakPath, string orgId, string description, CancellationToken cancellationToken)
+        public async Task<Package> UploadPackage(string mpakPath, string orgId, string description, string host, CancellationToken cancellationToken)
         {
+            if (string.IsNullOrEmpty(host))
+            {
+                host = _config[Constants.MEADOW_CLOUD_HOST_CONFIG_NAME];
+            }
+
             if (!File.Exists(mpakPath))
             {
                 throw new ArgumentException($"Invalid path: {mpakPath}");
@@ -54,7 +59,7 @@ public async Task<Package> UploadPackage(string mpakPath, string orgId, string d
                 multipartFormContent.Add(fileStreamContent, name: "file", fileName: fi.Name);
                 multipartFormContent.Add(new StringContent(json), "json");
 
-                var response = await httpClient.PostAsync($"{_config["meadowCloudHost"]}/api/packages", multipartFormContent);
+                var response = await httpClient.PostAsync($"{host}/api/packages", multipartFormContent);
                 if (response.IsSuccessStatusCode)
                 {
                     var package = JsonSerializer.Deserialize<Package>(await response.Content.ReadAsStringAsync());
@@ -68,8 +73,13 @@ public async Task<Package> UploadPackage(string mpakPath, string orgId, string d
             }
         }
 
-        public async Task PublishPackage(string packageId, string collectionId, CancellationToken cancellationToken)
+        public async Task PublishPackage(string packageId, string collectionId, string metadata, string host, CancellationToken cancellationToken)
         {
+            if (string.IsNullOrEmpty(host))
+            {
+                host = _config[Constants.MEADOW_CLOUD_HOST_CONFIG_NAME];
+            }
+
             var authToken = await _identityManager.GetAccessToken(cancellationToken).ConfigureAwait(false);
             if (string.IsNullOrEmpty(authToken))
             {
@@ -79,7 +89,9 @@ public async Task PublishPackage(string packageId, string collectionId, Cancella
             HttpClient httpClient = new HttpClient();
             httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", authToken);
 
-            var response = await httpClient.PostAsync($"{_config["meadowCloudHost"]}/api/packages/{packageId}/publish/{collectionId}", null);
+            var payload = new { metadata, collectionId };
+            var content = new StringContent(JsonSerializer.Serialize(payload), Encoding.UTF8, "application/json");
+            var response = await httpClient.PostAsync($"{host}/api/packages/{packageId}/publish", content);
 
             if (!response.IsSuccessStatusCode)
             {
@@ -88,8 +100,13 @@ public async Task PublishPackage(string packageId, string collectionId, Cancella
             }
         }
 
-        public async Task<List<Package>> GetOrgPackages(string orgId, CancellationToken cancellationToken)
+        public async Task<List<Package>> GetOrgPackages(string orgId, string host, CancellationToken cancellationToken)
         {
+            if (string.IsNullOrEmpty(host))
+            {
+                host = _config[Constants.MEADOW_CLOUD_HOST_CONFIG_NAME];
+            }
+
             var authToken = await _identityManager.GetAccessToken(cancellationToken).ConfigureAwait(false);
             if (string.IsNullOrEmpty(authToken))
             {
@@ -99,7 +116,7 @@ public async Task<List<Package>> GetOrgPackages(string orgId, CancellationToken
             HttpClient httpClient = new HttpClient();
             httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", authToken);
 
-            var result = await httpClient.GetStringAsync($"{_config["meadowCloudHost"]}/api/orgs/{orgId}/packages");
+            var result = await httpClient.GetStringAsync($"{host}/api/orgs/{orgId}/packages");
             return JsonSerializer.Deserialize<List<Package>>(result);
         }
     }

diff --git a/Meadow.CLI.Core/CloudServices/UserService.cs b/Meadow.CLI.Core/CloudServices/UserService.cs
@@ -23,16 +23,21 @@
             _config = config;
         }
 
-        public async Task<List<UserOrg>> GetUserOrgs(CancellationToken cancellationToken)
+        public async Task<List<UserOrg>> GetUserOrgs(string host, CancellationToken cancellationToken)
         {
+            if (string.IsNullOrEmpty(host))
+            {
+                host = _config[Constants.MEADOW_CLOUD_HOST_CONFIG_NAME];
+            }
+
             var httpClient = await AuthenticatedHttpClient();
 
-            var response = await httpClient.GetAsync($"{_config["meadowCloudHost"]}/api/users/me/orgs");
+            var response = await httpClient.GetAsync($"{host}/api/users/me/orgs");
 
             if (response.IsSuccessStatusCode)
             {
                var message = await response.Content.ReadAsStringAsync();
                return JsonSerializer.Deserialize<List<UserOrg>>(message);
            }
            else
            {

diff --git a/Meadow.CLI.Core/Constants.cs b/Meadow.CLI.Core/Constants.cs
@@ -7,9 +7,10 @@ namespace Meadow.CLI.Core
 {
     public static class Constants
     {
-        public const string CLI_VERSION = "1.1.1.0";
+        public const string CLI_VERSION = "1.2.0.0";
         public const ushort HCOM_PROTOCOL_PREVIOUS_VERSION_NUMBER = 0x0006;
         public const ushort HCOM_PROTOCOL_CURRENT_VERSION_NUMBER = 0x0007;         // Used for transmission
         public const string WILDERNESS_LABS_USB_VID = "2E6A";
+        public const string MEADOW_CLOUD_HOST_CONFIG_NAME = "meadowCloudHost";
     }
 }
diff --git a/Meadow.CLI.Core/Devices/IMeadowDevice.cs b/Meadow.CLI.Core/Devices/IMeadowDevice.cs
@@ -39,10 +39,7 @@ public interface IMeadowDevice : IDisposable
         public Task NshDisable(CancellationToken cancellationToken = default);
         public Task TraceEnable(CancellationToken cancellationToken = default);
         public Task SetTraceLevel(uint traceLevel, CancellationToken cancellationToken = default);
-        public Task SetDeveloper1(uint userData, CancellationToken cancellationToken = default);
-        public Task SetDeveloper2(uint userData, CancellationToken cancellationToken = default);
-        public Task SetDeveloper3(uint userData, CancellationToken cancellationToken = default);
-        public Task SetDeveloper4(uint userData, CancellationToken cancellationToken = default);
+        public Task SetDeveloper(ushort level, uint userData, CancellationToken cancellationToken = default);
         public Task Uart1Apps(CancellationToken cancellationToken = default);
         public Task Uart1Trace(CancellationToken cancellationToken = default);
         public Task TraceDisable(CancellationToken cancellationToken = default);