Work extension (#260)

nanoframework · Jul 16, 2018 · 70e41d9 · 70e41d9
1 parent c5e8ae4
commit 70e41d9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 6 deletions.
diff --git a/nf-debugger b/nf-debugger
diff --git a/source/VisualStudio.Extension/NanoDeviceCommService/NanoDeviceCommService.cs b/source/VisualStudio.Extension/NanoDeviceCommService/NanoDeviceCommService.cs
@@ -49,9 +49,12 @@ public bool SelectDevice(string deviceId = null)
             Device = device;
 
             // has we'll be needing the debugger engine anyway, create it if needed
-            if (device.DebugEngine == null)
+            if (device != null)
             {
-                device.CreateDebugEngine();
+                if (device.DebugEngine == null)
+                {
+                    device.CreateDebugEngine();
+                }
             }
 
             return true;

diff --git a/source/VisualStudio.Extension/ToolWindow.DeviceExplorer/ViewModel/DeviceExplorerViewModel.cs b/source/VisualStudio.Extension/ToolWindow.DeviceExplorer/ViewModel/DeviceExplorerViewModel.cs
@@ -109,9 +109,16 @@ public void OnNanoDeviceCommServiceChanged()
             if (NanoDeviceCommService != null)
             {
                 NanoDeviceCommService.DebugClient.DeviceEnumerationCompleted += SerialDebugClient_DeviceEnumerationCompleted;
+
+                NanoDeviceCommService.DebugClient.LogMessageAvailable += DebugClient_LogMessageAvailable;
             }
         }
 
+        private void DebugClient_LogMessageAvailable(object sender, StringEventArgs e)
+        {
+            MessageCentre.InternalErrorMessage(e.EventText);
+        }
+
         private void SerialDebugClient_DeviceEnumerationCompleted(object sender, EventArgs e)
         {
             // save status

diff --git a/source/VisualStudio.Extension/VisualStudio.Extension.csproj b/source/VisualStudio.Extension/VisualStudio.Extension.csproj
@@ -364,7 +364,7 @@
       <HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="nanoFramework.Tools.Debugger, Version=0.5.0.0, Culture=neutral, PublicKeyToken=e520bb6b53f04733, processorArchitecture=MSIL">
-      <HintPath>..\packages\nanoFramework.Tools.Debugger.Net.0.5.0-preview105\lib\net46\nanoFramework.Tools.Debugger.dll</HintPath>
+      <HintPath>..\packages\nanoFramework.Tools.Debugger.Net.0.5.0-preview110\lib\net46\nanoFramework.Tools.Debugger.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>

diff --git a/source/VisualStudio.Extension/VisualStudio.Extension.previous.nugetreferenceswitcher b/source/VisualStudio.Extension/VisualStudio.Extension.previous.nugetreferenceswitcher
@@ -1 +1 @@
-nanoFramework.Tools.DebugLibrary.Net	../../nf-debugger/source/nanoFramework.Tools.DebugLibrary.Net/nanoFramework.Tools.DebugLibrary.Net.csproj	../packages/nanoFramework.Tools.Debugger.Net.0.5.0-preview103/lib/net46/nanoFramework.Tools.Debugger.dll
+nanoFramework.Tools.DebugLibrary.Net	../../nf-debugger/source/nanoFramework.Tools.DebugLibrary.Net/nanoFramework.Tools.DebugLibrary.Net.csproj	../packages/nanoFramework.Tools.Debugger.Net.0.5.0-preview109/lib/net46/nanoFramework.Tools.Debugger.dll
diff --git a/source/VisualStudio.Extension/packages.config b/source/VisualStudio.Extension/packages.config
@@ -45,7 +45,7 @@
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net46" />
   <package id="MvvmLightLibs" version="5.4.1" targetFramework="net46" />
   <package id="nanoFramework.CoreLibrary" version="1.0.0-preview054" targetFramework="net46" developmentDependency="true" />
-  <package id="nanoFramework.Tools.Debugger.Net" version="0.5.0-preview105" targetFramework="net46" />
+  <package id="nanoFramework.Tools.Debugger.Net" version="0.5.0-preview110" targetFramework="net46" />
   <package id="NETStandard.Library" version="2.0.3" targetFramework="net46" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net46" />
   <package id="PropertyChanged.Fody" version="2.5.6" targetFramework="net46" developmentDependency="true" />