Change to support v2.

.github/workflows/dotnet.yml

@@ -1,6 +1,6 @@
 name: VS4Mac Extension
 env:
-  IDE_TOOLS_RELEASE_VERSION: 1.9.4
+  IDE_TOOLS_RELEASE_VERSION: 2.0.0
   MEADOW_OS_VERSION: 2.0.0.0
   VS_MAC_2022_VERSION: 17.6
 
@@ -14,89 +14,39 @@ on:
   workflow_dispatch:
 
 jobs:
-  build-mac-2019:
-
-    runs-on: macos-11
-
-    steps:
-    - name: Checkout current repo
-      uses: actions/checkout@v3
-      with:
-        path: main
-
-    - name: Checkout Meadow.CLI.Core side-by-side
-      uses: actions/checkout@v3
-      with:
-        repository: WildernessLabs/Meadow.CLI
-        path: Meadow.CLI
-        ref: develop
-
-    - name: Set default Xamarin SDK versions
-      run: |
-        $VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --mac=8.2
-
-    - name: Setup .NET Core SDK 5.0.x and 6.0.x
-      uses: actions/setup-dotnet@v2
-      with:
-        dotnet-version: |
-          5.0.x
-          6.0.x
-
-    - name: Setup NuGet
-      uses: NuGet/[email protected]
-
-    - name: Rename VS so we pick up VS2019 IDE
-      run: |
-        mv "/Applications/Visual Studio.app" "/Applications/Visual Studio 2022.app"
-        mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app"
-
-    - if: ${{ github.event_name == 'workflow_dispatch' }}
-      name: Update VS2019 Version Numbers
-      run: |
-        sed -i "" "s/Version = \"1.*\"/Version = \"${{ENV.IDE_TOOLS_RELEASE_VERSION}}\"/" main/VS4Mac_Meadow_Extension/Properties/AddinInfo.cs
-
-    - name: Restore our VS2019 project
-      run: |
-        msbuild main/VS4Mac_Meadow_Extension/Meadow.Sdks.IdeExtensions.Vs4Mac.csproj /t:Restore /p:Configuration=Release
-
-    - name: Build and Package the VS2019 Extension
-      run: |
-        msbuild main/VS4Mac_Meadow_Extension/Meadow.Sdks.IdeExtensions.Vs4Mac.csproj /t:Build /p:Configuration=Release /p:CreatePackage=true
-
-    - name: Upload mpack Artifacts
-      uses: actions/upload-artifact@v2
-      with:
-        name: Meadow.Mac.2019.mpack.${{ ENV.IDE_TOOLS_RELEASE_VERSION }}
-        path: 'main/VS4Mac_Meadow_Extension/bin/Release/net472/*.mpack'
-
   build-mac-2022:
     runs-on: macos-12
 
     steps:
     - name: Checkout current repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: main
 
-    - name: Checkout Meadow.CLI.Core side-by-side
-      uses: actions/checkout@v3
+    - name: Checkout Meadow.CLI side-by-side
+      uses: actions/checkout@v4
       with:
         repository: WildernessLabs/Meadow.CLI
         path: Meadow.CLI
-        ref: develop
-
-    - name: Set default Xamarin SDK versions
-      run: |
-        $VM_ASSETS/select-xamarin-sdk-v2.sh --mono=6.12 --mac=8.2
+        ref: dominique-TestDebugging
+
+    - name: Checkout Meadow.Contracts side-by-side
+      uses: actions/checkout@v4
+      with:
+        repository: WildernessLabs/Meadow.Contracts
+        path: Meadow.Contracts
+        ref: main
 
-    - name: Setup .NET Core 6.0.x
-      uses: actions/setup-dotnet@v2
+    - name: Setup .NET Core 6.0.x, 7.0.x and 8.0.x
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
           6.0.x
+          7.0.x
+          8.0.x
 
     - name: Setup NuGet
-      uses: NuGet/setup-nuget@v1.0.5
+      uses: NuGet/setup-nuget@v2
 
     - if: ${{ github.event_name == 'workflow_dispatch' }}
       name: Update VS2022 Version Numbers
@@ -112,7 +62,7 @@ jobs:
         dotnet msbuild main/VS4Mac_Meadow_Extension/Meadow.Sdks.IdeExtensions.Vs4Mac.2022.csproj /t:Build /p:Configuration=Release /p:CreatePackage=true
 
     - name: Upload mpack Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: Meadow.Mac.2022.mpack.${{ ENV.IDE_TOOLS_RELEASE_VERSION }}
         path: 'main/VS4Mac_Meadow_Extension/bin/Release/net7.0/*.mpack'

VS4Mac_Meadow_Extension/DeploymentTargetsManager.cs

@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Meadow.CLI.Commands.DeviceManagement;
 
 namespace Meadow.Sdks.IdeExtensions.Vs4Mac
 {
@@ -18,7 +19,7 @@ public static class DeploymentTargetsManager
         public static List<MeadowDeviceExecutionTarget> Targets { get; private set; } = new List<MeadowDeviceExecutionTarget>();
 
         private static bool isPolling;
-        private static CancellationTokenSource cts;
+        private static CancellationTokenSource cancellationTokenSource = null;
 
         public static event Action<object> DeviceListChanged;
 
@@ -30,11 +31,14 @@ public static async Task StartPollingForDevices()
 
             isPolling = true;
 
-            cts = new CancellationTokenSource();
+            if (cancellationTokenSource == null)
+            {
+                cancellationTokenSource = new CancellationTokenSource();
+            }
 
-            while (cts.IsCancellationRequested == false)
+            while (cancellationTokenSource.IsCancellationRequested == false)
             {
-                await Task.Run(()=> UpdateTargetsList(GetMeadowSerialPorts(), cts.Token));
+                await Task.Run(async ()=> UpdateTargetsList(await MeadowConnectionManager.GetSerialPorts(), cancellationTokenSource.Token));
                 await Task.Delay(5000);
             }
 
@@ -43,75 +47,18 @@ public static async Task StartPollingForDevices()
 
         public static void StopPollingForDevices()
         {
-            cts?.Cancel();
-        }
-
-        //Experiemental use of ioreg to find serial ports for connected Meadow devices
-        //Relies on string parsing - may break if macOS moves ioreg or the output of ioreg changes signifigantly
-        //Adrian - my guess is, this is fairly stable 
-        static List<string> GetMeadowSerialPorts()
-        {
-            Debug.WriteLine("Get Meadow Serial ports");
-            var ports = new List<string>();
-
-            var psi = new ProcessStartInfo
-            {
-                FileName = "/usr/sbin/ioreg",
-                UseShellExecute = false,
-                RedirectStandardOutput = true,
-                Arguments = "-r -c IOUSBHostDevice -l"
-            };
-
-            string output = string.Empty;
-
-            using (var p = Process.Start(psi))
-            {
-                if (p != null)
-                {
-                    output = p.StandardOutput.ReadToEnd();
-                    p.WaitForExit();
-                }
-            }
-
-            //split into lines
-            var lines = output.Split("\n\r".ToCharArray(), StringSplitOptions.RemoveEmptyEntries);
-
-            bool foundMeadow = false;
-            for (int i = 0; i < lines.Length; i++)
-            {
-                if (lines[i].Contains("Meadow F7 Micro"))
-                {
-                    foundMeadow = true;
-                }
-                else if (lines[i].IndexOf("+-o") == 0)
-                {
-                    foundMeadow = false;
-                }
-
-                //now find the IODialinDevice entry which contains the serial port name
-                if (foundMeadow && lines[i].Contains("IODialinDevice"))
-                {
-                    int startIndex = lines[i].IndexOf("/");
-                    int endIndex = lines[i].IndexOf("\"", startIndex + 1);
-                    var port = lines[i].Substring(startIndex, endIndex - startIndex);
-                    Debug.WriteLine($"Found Meadow at {port}");
-
-                    ports.Add(port);
-                    foundMeadow = false;
-                }
-            }
-            return ports;
+            cancellationTokenSource?.Cancel();
         }
 
-        private static void UpdateTargetsList(List<string> serialPorts, CancellationToken ct)
+        private static void UpdateTargetsList(IList<string> serialPorts, CancellationToken cancellationToken)
         {
             Debug.WriteLine("Update targets list");
             //var serialPorts = MeadowDeviceManager.FindSerialDevices();
             //use the local hack version that leverages ioreg
 
             foreach (var port in serialPorts)
             {
-                if (ct.IsCancellationRequested)
+                if (cancellationToken.IsCancellationRequested)
                 { break; }
 
                 if (Targets.Any(t => t.Id == port))

VS4Mac_Meadow_Extension/Meadow.Sdks.IdeExtensions.Vs4Mac.2022.csproj

@@ -7,8 +7,9 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudioMac.Sdk" Version="17.5.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="7.*" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.*" />
+    <PackageReference Include="System.IO.Ports" Version="8.*" />
   </ItemGroup>
   <ItemGroup>
     <None Update="WildernessLabs.Meadow.Template.1.1.0.nupkg">
@@ -23,6 +24,8 @@
     <Compile Remove="Properties\AddinInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Meadow.CLI\Meadow.CLI.Core\Meadow.CLI.Core.6.0.0.csproj" />
+    <ProjectReference Include="..\..\Meadow.CLI\Source\v2\Meadow.Tooling.Core\Meadow.Tooling.Core.csproj" />
+    <ProjectReference Include="..\..\Meadow.CLI\Source\v2\Meadow.SoftwareManager\Meadow.SoftwareManager.csproj" />
+    <ProjectReference Include="..\..\Meadow.CLI\Source\v2\Meadow.HCom\Meadow.HCom.csproj" />
   </ItemGroup>
-</Project>
+</Project>