Update UIX

ZuneUIXTools/Modules/UIX/DebuggerService.cs

@@ -1,5 +1,6 @@
 using Gemini.Modules.Output;
 using Microsoft.Iris.Debug;
+using Microsoft.Iris.Debug.SystemNet;
 using System;
 using System.ComponentModel.Composition;
 
@@ -11,6 +12,8 @@ public class DebuggerService
     private readonly IOutput _output;
     private IDebuggerClient _client;
 
+    public event Action Stopped;
+
     [ImportingConstructor]
     public DebuggerService(IOutput output)
     {
@@ -21,21 +24,15 @@ public class DebuggerService
 
     public IDebuggerClient Client => _client;
 
-    public void Start(string connectionUri)
+    public void Start(string connectionUri = null)
     {
         Stop();
 
-        _client = new ZmqDebuggerClient(connectionUri);
-        _client.DispatcherStep += Client_DispatcherStep;
+        _client = new NetDebuggerClient(connectionUri);
 
         _output.AppendLine($"Debugger connected to {_client.ConnectionUri}");
     }
 
-    private void Client_DispatcherStep(string obj)
-    {
-        //_output?.AppendLine($"[Dispatcher] {obj}");
-    }
-
     public void Stop()
     {
         if (_client == null)
@@ -44,8 +41,8 @@ public class DebuggerService
         if (_client is IDisposable disposable)
             disposable.Dispose();
 
-        _client.DispatcherStep -= Client_DispatcherStep;
+        Stopped?.Invoke();
         _client = null;
-        _output.AppendLine($"Debugger disconnected");
+        _output.AppendLine("Debugger disconnected");
     }
 }

ZuneUIXTools/Modules/UIXSource/UIXSourceEditorViewModel.cs

@@ -1,20 +1,19 @@
-using System;
+using Caliburn.Micro;
+using Gemini.Framework.Commands;
+using Gemini.Framework.Threading;
+using Gemini.Modules.Output;
+using Microsoft.Iris;
+using Microsoft.Iris.Debug.SystemNet;
+using Microsoft.Iris.Markup;
+using System;
 using System.ComponentModel.Composition;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
-using Gemini.Framework;
-using Gemini.Framework.Commands;
-using Gemini.Framework.Threading;
-using Microsoft.Iris;
-using Microsoft.Iris.Markup;
 using ZuneUIXTools.Modules.Shell.Commands;
 using Application = Microsoft.Iris.Application;
 using Command = Gemini.Framework.Commands.Command;
-using Microsoft.Iris.Debug;
-using Gemini.Modules.Output;
-using Caliburn.Micro;
 
 namespace ZuneUIXTools.Modules.UIXSource
 {
@@ -164,7 +163,7 @@ namespace ZuneUIXTools.Modules.UIXSource
         private void OnDebuggerServerReady(object sender, EventArgs e)
         {
             // Set up the debugger client
-            ZmqDebuggerClient debuggerClient = new(_debuggerConnectionUri);
+            NetDebuggerClient debuggerClient = new(_debuggerConnectionUri);
             debuggerClient.DispatcherStep += message =>
             {
                 _output.AppendLine($"[{DisplayName}] [Dispatcher] {message}");