Merge pull request #485 from WildernessLabs/develop

Merge to main for v2.x release
WildernessLabs · Feb 27, 2024 · f2b7ca2 · f2b7ca2
2 parents d90d702 + 6f59831
commit f2b7ca2
Show file tree

Hide file tree

Showing 211 changed files with 3,878 additions and 1,987 deletions.
diff --git a/.github/workflows/dotnet-ci.yml b/.github/workflows/dotnet-ci.yml
@@ -51,4 +51,7 @@ jobs:
     - name: Build CLI v2
       run: dotnet build -c Release Meadow.CLI/Source/v2/Meadow.CLI.v2.sln
 
+    - name: Unit Test CLI v2
+      run: dotnet test -c Release --no-build --no-restore --filter "FullyQualifiedName~.Unit.Tests" .\Meadow.CLI\Source\v2\Meadow.CLI.v2.sln
+
 
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -1,8 +1,9 @@
 name: Meadow.CLI Packaging
 env:
-  CLI_RELEASE_VERSION: 1.5.0.0
-  IDE_TOOLS_RELEASE_VERSION: 1.5.0
-  MEADOW_OS_VERSION: 1.5.0.0
+  CLI_RELEASE_VERSION_1: 1.9.0.0
+  CLI_RELEASE_VERSION_2: 2.0.17.0
+  IDE_TOOLS_RELEASE_VERSION: 1.9.0
+  MEADOW_OS_VERSION: 1.9.0.0
   VS_MAC_2019_VERSION: 8.10
   VS_MAC_2022_VERSION: 17.6
 
@@ -43,12 +44,13 @@ jobs:
         path: Meadow.Units
         ref: main
 
-    - name: Setup .NET Core SDK 6.0.x & 7.0.x
+    - name: Setup .NET Core SDK 6.0.x, 7.0.x & 8.0.x
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: |
           6.0.x
           7.0.x
+          8.0.x
 
     - name: Setup NuGet
       uses: NuGet/[email protected]
@@ -57,23 +59,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.CLI_RELEASE_VERSION }}</PackageVersion>'
+        $newcontent = $content -replace '<PackageVersion>.*</PackageVersion>', '<PackageVersion>${{ ENV.CLI_RELEASE_VERSION_1 }}</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.CLI_RELEASE_VERSION }}</Version>'
+        $newcontent = $content -replace '<Version>.*</Version>', '<Version>${{ ENV.CLI_RELEASE_VERSION_1 }}</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.CLI_RELEASE_VERSION }}</Version>'
+        $newcontent = $content -replace '<Version>.*</Version>', '<Version>${{ ENV.CLI_RELEASE_VERSION_1 }}</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.CLI_RELEASE_VERSION }}</Version>'
+        $newcontent = $content -replace '<Version>.*</Version>', '<Version>${{ ENV.CLI_RELEASE_VERSION_1 }}</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.CLI_RELEASE_VERSION }}";'
+        $newcontent = $content -replace 'CLI_VERSION = \".*\";', 'CLI_VERSION = "${{ ENV.CLI_RELEASE_VERSION_1 }}";'
         $newcontent | Set-Content main/Meadow.CLI.Core/Constants.cs
 
     - name: Add MSBuild to Path
@@ -88,7 +90,7 @@ jobs:
     - name: Upload nuget Artifacts for internal testing
       uses: actions/upload-artifact@v2
       with:
-        name: Meadow.CLI.Classic.nuget.${{ ENV.CLI_RELEASE_VERSION }}
+        name: Meadow.CLI.Classic.nuget.${{ ENV.CLI_RELEASE_VERSION_1 }}
         path: 'main\Meadow.CLI.Classic\bin\Release\*.nupkg'
 
     - name: Restore normal dependencies
@@ -100,7 +102,7 @@ jobs:
     - name: Upload nuget Artifacts for internal testing
       uses: actions/upload-artifact@v2
       with:
-        name: Meadow.CLI.nuget.${{ ENV.CLI_RELEASE_VERSION }}
+        name: Meadow.CLI.nuget.${{ ENV.CLI_RELEASE_VERSION_1 }}
         path: 'main\Meadow.CLI\bin\Release\*.nupkg'
 
     - if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }}
@@ -117,7 +119,7 @@ jobs:
     - name: Upload nuget Artifacts for internal testing
       uses: actions/upload-artifact@v2
       with:
-        name: Meadow.CLI.V2.nuget.2.0.0
+        name: Meadow.CLI.nuget.${{ ENV.CLI_RELEASE_VERSION_2 }}
         path: 'main\Source\v2\Meadow.CLI\bin\Release\*.nupkg'
 
     #- if: ${{ github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/main' }}
@@ -156,9 +158,9 @@ jobs:
   #     uses: actions/setup-dotnet@v1
   #     with:
   #       dotnet-version: |
-  #         5.0.x
   #         6.0.x
   #         7.0.x
+  #         8.0.x
 
   #   - name: Setup NuGet
   #     uses: NuGet/[email protected]
@@ -220,12 +222,13 @@ jobs:
         repository: WildernessLabs/VS_Win_Meadow_Extension
         path: vs-win
 
-    - name: Setup .NET Core SDK 6.0.x & 7.0.x
+    - name: Setup .NET Core SDK 6.0.x, 7.0.x, 8.0.x
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: |
           6.0.x
           7.0.x
+          8.0.x
 
     - name: Setup NuGet
       uses: NuGet/[email protected]
@@ -297,9 +300,9 @@ jobs:
   #     uses: actions/setup-dotnet@v1
   #     with:
   #       dotnet-version: |
-  #         5.0.x
   #         6.0.x
   #         7.0.x
+  #         8.0.x
 
   #   - name: Setup NuGet
   #     uses: NuGet/[email protected]
@@ -407,12 +410,13 @@ jobs:
         repository: WildernessLabs/VS_Mac_Meadow_Extension
         path: vs-mac
 
-    - name: Setup .NET Core SDK 6.0.x & 7.0.x
+    - name: Setup .NET Core SDK 6.0.x, 7.0.x & 8.0.x
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: |
           6.0.x
           7.0.x
+          8.0.x
 
     - name: Setup NuGet
       uses: NuGet/[email protected]
@@ -517,12 +521,13 @@ jobs:
         path: vs-code
         submodules: true
 
-    - name: Setup .NET Core SDK 6.0.x & 7.0.x
+    - name: Setup .NET Core SDK 6.0.x, 7.0.x & 8.0.x
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: |
           6.0.x
           7.0.x
+          8.0.x
 
     - name: Setup Nuget
       uses: Nuget/[email protected]

diff --git a/.gitignore b/.gitignore
@@ -159,6 +159,7 @@ PublishScripts/
 !**/packages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
 #!**/packages/repositories.config
+!**/Source/v2/Meadow.Cloud.Client/**/packages/*
 # NuGet v3's project.json files produces more ignoreable files
 *.nuget.props
 *.nuget.targets

diff --git a/Meadow.CLI.Core/Constants.cs b/Meadow.CLI.Core/Constants.cs
@@ -7,9 +7,9 @@ namespace Meadow.CLI.Core
 {
     public static class Constants
     {
-        public const string CLI_VERSION = "1.5.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 CLI_VERSION = "1.9.0.0";
+        public const ushort HCOM_PROTOCOL_PREVIOUS_VERSION_NUMBER = 0x0007;
+        public const ushort HCOM_PROTOCOL_CURRENT_VERSION_NUMBER = 0x0008;         // 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/Managers/PackageManager.cs b/Meadow.CLI.Core/Managers/PackageManager.cs
@@ -45,7 +45,7 @@ private void BuildProject(string projectPath)
         {
             var proc = new Process();
             proc.StartInfo.FileName = "dotnet";
-            proc.StartInfo.Arguments = $"build {projectPath}";
+            proc.StartInfo.Arguments = $"build \"{projectPath}\"";
 
             proc.StartInfo.CreateNoWindow = true;
             proc.StartInfo.ErrorDialog = false;

diff --git a/Meadow.CLI.Core/Meadow.CLI.Core.6.0.0.csproj b/Meadow.CLI.Core/Meadow.CLI.Core.6.0.0.csproj
@@ -11,7 +11,7 @@
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.5.0.0</Version>
+    <Version>1.9.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/Meadow.CLI.Core/Meadow.CLI.Core.Classic.csproj b/Meadow.CLI.Core/Meadow.CLI.Core.Classic.csproj
@@ -11,7 +11,7 @@
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.5.0.0</Version>
+    <Version>1.9.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/Meadow.CLI.Core/Meadow.CLI.Core.VS2019.csproj b/Meadow.CLI.Core/Meadow.CLI.Core.VS2019.csproj
@@ -11,7 +11,7 @@
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.5.0.0</Version>
+    <Version>1.9.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/Meadow.CLI.Core/Meadow.CLI.Core.csproj b/Meadow.CLI.Core/Meadow.CLI.Core.csproj
@@ -11,7 +11,7 @@
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.5.0.0</Version>
+    <Version>1.9.0.0</Version>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/Meadow.CLI/Meadow.CLI.Classic.csproj b/Meadow.CLI/Meadow.CLI.Classic.csproj
@@ -10,7 +10,7 @@
     <Authors>Peter Moody, Adrian Stevens, Brian Kim, Pete Garafano, Dominique Louis</Authors>
     <Company>Wilderness Labs, Inc</Company>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageVersion>1.5.0.0</PackageVersion>
+    <PackageVersion>1.9.0.0</PackageVersion>
     <Platforms>AnyCPU</Platforms>
     <PackageProjectUrl>http://developer.wildernesslabs.co/Meadow/Meadow.Foundation/</PackageProjectUrl>
     <PackageIcon>icon.png</PackageIcon>

diff --git a/Meadow.CLI/Meadow.CLI.csproj b/Meadow.CLI/Meadow.CLI.csproj
@@ -10,7 +10,7 @@
     <Authors>Peter Moody, Adrian Stevens, Brian Kim, Pete Garafano, Dominique Louis</Authors>
     <Company>Wilderness Labs, Inc</Company>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageVersion>1.5.0.0</PackageVersion>
+    <PackageVersion>1.9.0.0</PackageVersion>
     <Platforms>AnyCPU</Platforms>
     <PackageProjectUrl>http://developer.wildernesslabs.co/Meadow/Meadow.Foundation/</PackageProjectUrl>
     <PackageIcon>icon.png</PackageIcon>

diff --git a/README.md b/README.md
@@ -33,7 +33,22 @@ meadow firmware download
 meadow firmware write
 ```
 
+### List available Meadow devices
+
+```
+meadow list ports
+```
+
+You can then specify which port to use for future commands (replace `{port-name}` to your desired device port, such as `COM3` on Windows or `/dev/tty.usbmodem336F336D30361` on macOS).
+
+```
+meadow config route {port-name}
+```
+
 ### Listen for Meadow Console.WriteLine
+
+After configuring a route to the desired Meadow device.
+
 ```
 meadow listen
 ```
@@ -83,5 +98,7 @@ dotnet tool install WildernessLabs.Meadow.CLI --global
 
 If you need to find or clear out any of the OS download files retrieved by Meadow.CLI, they are located in a WildernessLabs folder in the user directory.
 
-macOS: `~/.local/share/WildernessLabs/Firmware/`
-Windows: `%LOCALAPPDATA%\WildernessLabs\Firmware`
+* Windows: `%LOCALAPPDATA%\WildernessLabs\Firmware`
+* macOS
+  * .NET 8 or newer: `~/Library/Application Support/WildernessLabs/Firmware`
+  * .NET 7 or earlier: `~/.local/share/WildernessLabs/Firmware/`
diff --git a/Source/v2/Meadow.CLI.Core/Meadow.CLI.Core.csproj b/Source/v2/Meadow.CLI.Core/Meadow.CLI.Core.csproj