diff --git a/.gitignore b/.gitignore
index ce3e1b1c..21e5df70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -253,3 +253,6 @@ paket-files/
 
 #SoundCloud
 *.sonarqube/
+
+#VS Code
+.vscode
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 7feff0a1..7b41e313 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,3 +1,3 @@
 # Contributor Code of Conduct
 
-Please refer to the contributor Code of Conduct at the Home repository [here](https://github.com/nanoframework/Home/blob/master/CODE_OF_CONDUCT.md.
+Please refer to the contributor Code of Conduct at the Home repository [here](https://github.com/nanoframework/Home/blob/main/CODE_OF_CONDUCT.md.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5a6a6c10..bf714b60 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,3 @@
 # Contributing to **nanoFramework**
 
-Please refer to the contribution guidelines at the Home repository [here](https://github.com/nanoframework/Home/blob/master/CONTRIBUTING.md).
+Please refer to the contribution guidelines at the Home repository [here](https://github.com/nanoframework/Home/blob/main/CONTRIBUTING.md).
diff --git a/README.md b/README.md
index df45f1c9..cd453daf 100644
--- a/README.md
+++ b/README.md
@@ -1,26 +1,25 @@
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_nf-debugger&metric=alert_status)](https://sonarcloud.io/dashboard?id=nanoframework_nf-debugger) [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_nf-debugger&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=nanoframework_nf-debugger) [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/nanoframework/Home/blob/master/LICENSE) [![#yourfirstpr](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://github.com/nanoframework/Home/blob/master/CONTRIBUTING.md) [![Discord](https://img.shields.io/discord/478725473862549535.svg)](https://discord.gg/gCyBu8T)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_nf-debugger&metric=alert_status)](https://sonarcloud.io/dashboard?id=nanoframework_nf-debugger) [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=nanoframework_nf-debugger&metric=reliability_rating)](https://sonarcloud.io/dashboard?id=nanoframework_nf-debugger) [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/nanoframework/Home/blob/main/LICENSE) [![#yourfirstpr](https://img.shields.io/badge/first--timers--only-friendly-blue.svg)](https://github.com/nanoframework/Home/blob/main/CONTRIBUTING.md) [![Discord](https://img.shields.io/discord/478725473862549535.svg)](https://discord.gg/gCyBu8T)
 
 
-![nanoFramework logo](https://github.com/nanoframework/Home/blob/master/resources/logo/nanoFramework-repo-logo.png)
+![nanoFramework logo](https://github.com/nanoframework/Home/blob/main/resources/logo/nanoFramework-repo-logo.png)
 
 -----
 
 ### Welcome to the **nanoFramework** debugger libraries repository!
 
-The debugger library provides debugging and communication capabilities for .NET and UWP applications to debug and communicate with **nanoFramework** devices.
-It's provided as source code and as a Nuget package that can be integrated on any application.
+The debugger library provides debugging and communication capabilities to .NET applications and allows debugging and communicate with .NET **nanoFramework** devices.
+It's provided as source code and as a NuGet package that can be integrated on any application.
 
 This repo contains:
 
-- **nanoFramework** debugger library for UWP
 - **nanoFramework** debugger library for .NET
 
 ## Build status
 
-| Component | Build Status | NuGet Package (.NET) | NuGet Package (.UWP) |
-|:-|---|---|---|
-| Debugger Library | [![Build Status](https://dev.azure.com/nanoframework/debugger/_apis/build/status/nanoframework.nf-debugger?branchName=develop)](https://dev.azure.com/nanoframework/debugger/_build/latest?definitionId=33?branchName=master) | [![NuGet](https://img.shields.io/nuget/vpre/nanoFramework.Tools.Debugger.Net.svg)](https://www.nuget.org/packages/nanoFramework.Tools.Debugger.Net/) | [![NuGet](https://img.shields.io/nuget/vpre/nanoFramework.Tools.Debugger.UWP.svg)](https://www.nuget.org/packages/nanoFramework.Tools.Debugger.UWP/)
-| Debugger Library (preview) |[![Build Status](https://dev.azure.com/nanoframework/debugger/_apis/build/status/nanoframework.nf-debugger?branchName=develop)](https://dev.azure.com/nanoframework/debugger/_build/latest?definitionId=33?branchName=develop) | [![](https://badgen.net/badge/NuGet/preview/D7B023?icon=https://simpleicons.now.sh/azuredevops/fff)](https://dev.azure.com/nanoframework/feed/_packaging?_a=package&feed=sandbox&package=nanoFramework.Tools.Debugger.Net&protocolType=NuGet&view=overview) | [![](https://badgen.net/badge/NuGet/preview/D7B023?icon=https://simpleicons.now.sh/azuredevops/fff)](https://dev.azure.com/nanoframework/feed/_packaging?_a=package&feed=sandbox&package=nanoFramework.Tools.Debugger.UWP&protocolType=NuGet&view=overview)
+| Component | Build Status | NuGet Package (.NET) |
+|:-|---|---|
+| Debugger Library | [![Build Status](https://dev.azure.com/nanoframework/debugger/_apis/build/status/nanoframework.nf-debugger?repoName=nanoframework%2Fnf-debugger&branchName=main)](https://dev.azure.com/nanoframework/debugger/_build/latest?definitionId=33&repoName=nanoframework%2Fnf-debugger&branchName=main) | [![NuGet](https://img.shields.io/nuget/v/nanoFramework.Tools.Debugger.Net.svg)](https://www.nuget.org/packages/nanoFramework.Tools.Debugger.Net/) | 
+| Debugger Library (preview) | [![Build Status](https://dev.azure.com/nanoframework/debugger/_apis/build/status/nanoframework.nf-debugger?repoName=nanoframework%2Fnf-debugger&branchName=develop)](https://dev.azure.com/nanoframework/debugger/_build/latest?definitionId=33&repoName=nanoframework%2Fnf-debugger&branchName=develop) | [![NuGet](https://img.shields.io/nuget/vpre/nanoFramework.Tools.Debugger.Net.svg)](https://www.nuget.org/packages/nanoFramework.Tools.Debugger.Net/) |
 
 ## Feedback and documentation
 
@@ -30,7 +29,7 @@ Join our Discord community [here](https://discord.gg/gCyBu8T).
 
 ## Credits
 
-The list of contributors to this project can be found at [CONTRIBUTORS](https://github.com/nanoframework/Home/blob/master/CONTRIBUTORS.md).
+The list of contributors to this project can be found at [CONTRIBUTORS](https://github.com/nanoframework/Home/blob/main/CONTRIBUTORS.md).
 
 ## License
 
diff --git a/Serial Test App UWP/App.xaml b/Serial Test App UWP/App.xaml
deleted file mode 100644
index 598f329b..00000000
--- a/Serial Test App UWP/App.xaml	
+++ /dev/null
@@ -1,8 +0,0 @@
-<Application
-    x:Class="Test_App_UWP.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Test_App_UWP"
-    RequestedTheme="Light">
-
-</Application>
diff --git a/Serial Test App UWP/App.xaml.cs b/Serial Test App UWP/App.xaml.cs
deleted file mode 100644
index a937c145..00000000
--- a/Serial Test App UWP/App.xaml.cs	
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-using nanoFramework.Tools.Debugger;
-using System;
-using System.Diagnostics;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
-
-namespace Test_App_UWP
-{
-    /// <summary>
-    /// Provides application-specific behavior to supplement the default Application class.
-    /// </summary>
-    sealed partial class App : Application
-    {
-        internal static PortBase NanoFrameworkSerialDebugClient;
-
-
-        /// <summary>
-        /// Initializes the singleton application object.  This is the first line of authored code
-        /// executed, and as such is the logical equivalent of main() or WinMain().
-        /// </summary>
-        public App()
-        {
-            InitializeComponent();
-            Suspending += OnSuspending;
-        }
-
-        /// <summary>
-        /// Invoked when the application is launched normally by the end user.  Other entry points
-        /// will be used such as when the application is launched to open a specific file.
-        /// </summary>
-        /// <param name="e">Details about the launch request and process.</param>
-        protected override void OnLaunched(LaunchActivatedEventArgs e)
-        {
-
-#if DEBUG
-            if (Debugger.IsAttached)
-            {
-                DebugSettings.EnableFrameRateCounter = true;
-            }
-#endif
-
-            Frame rootFrame = Window.Current.Content as Frame;
-
-            // Do not repeat app initialization when the Window already has content,
-            // just ensure that the window is active
-            if (rootFrame == null)
-            {
-                // Create a Frame to act as the navigation context and navigate to the first page
-                rootFrame = new Frame();
-
-                rootFrame.NavigationFailed += OnNavigationFailed;
-
-                if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
-                {
-                    //TODO: Load state from previously suspended application
-                }
-
-                // Place the frame in the current Window
-                Window.Current.Content = rootFrame;
-            }
-
-            if (rootFrame.Content == null)
-            {
-                // When the navigation stack isn't restored navigate to the first page,
-                // configuring the new page by passing required information as a navigation
-                // parameter
-                rootFrame.Navigate(typeof(MainPage), e.Arguments);
-            }
-            // Ensure the current window is active
-            Window.Current.Activate();
-
-            NanoFrameworkSerialDebugClient = PortBase.CreateInstanceForSerial("", this) as PortBase;
-            NanoFrameworkSerialDebugClient.DeviceEnumerationCompleted += UsbDebugClient_DeviceEnumerationCompleted;
-        }
-
-        private void UsbDebugClient_DeviceEnumerationCompleted(object sender, EventArgs e)
-        {
-            Debug.WriteLine("Serial device enumeration complete, Found {0} devices", NanoFrameworkSerialDebugClient.NanoFrameworkDevices.Count);
-        }
-
-        /// <summary>
-        /// Invoked when Navigation to a certain page fails
-        /// </summary>
-        /// <param name="sender">The Frame which failed navigation</param>
-        /// <param name="e">Details about the navigation failure</param>
-        void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
-        {
-            throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
-        }
-
-        /// <summary>
-        /// Invoked when application execution is being suspended.  Application state is saved
-        /// without knowing whether the application will be terminated or resumed with the contents
-        /// of memory still intact.
-        /// </summary>
-        /// <param name="sender">The source of the suspend request.</param>
-        /// <param name="e">Details about the suspend request.</param>
-        private void OnSuspending(object sender, SuspendingEventArgs e)
-        {
-            var deferral = e.SuspendingOperation.GetDeferral();
-            //TODO: Save application state and stop any background activity
-            deferral.Complete();
-        }
-    }
-}
diff --git a/Serial Test App UWP/Assets/LockScreenLogo.scale-200.png b/Serial Test App UWP/Assets/LockScreenLogo.scale-200.png
deleted file mode 100644
index 735f57ad..00000000
Binary files a/Serial Test App UWP/Assets/LockScreenLogo.scale-200.png and /dev/null differ
diff --git a/Serial Test App UWP/Assets/SplashScreen.scale-200.png b/Serial Test App UWP/Assets/SplashScreen.scale-200.png
deleted file mode 100644
index 023e7f1f..00000000
Binary files a/Serial Test App UWP/Assets/SplashScreen.scale-200.png and /dev/null differ
diff --git a/Serial Test App UWP/Assets/Square150x150Logo.scale-200.png b/Serial Test App UWP/Assets/Square150x150Logo.scale-200.png
deleted file mode 100644
index af49fec1..00000000
Binary files a/Serial Test App UWP/Assets/Square150x150Logo.scale-200.png and /dev/null differ
diff --git a/Serial Test App UWP/Assets/Square44x44Logo.scale-200.png b/Serial Test App UWP/Assets/Square44x44Logo.scale-200.png
deleted file mode 100644
index ce342a2e..00000000
Binary files a/Serial Test App UWP/Assets/Square44x44Logo.scale-200.png and /dev/null differ
diff --git a/Serial Test App UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/Serial Test App UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
deleted file mode 100644
index f6c02ce9..00000000
Binary files a/Serial Test App UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ
diff --git a/Serial Test App UWP/Assets/StoreLogo.png b/Serial Test App UWP/Assets/StoreLogo.png
deleted file mode 100644
index 7385b56c..00000000
Binary files a/Serial Test App UWP/Assets/StoreLogo.png and /dev/null differ
diff --git a/Serial Test App UWP/Assets/Wide310x150Logo.scale-200.png b/Serial Test App UWP/Assets/Wide310x150Logo.scale-200.png
deleted file mode 100644
index 288995b3..00000000
Binary files a/Serial Test App UWP/Assets/Wide310x150Logo.scale-200.png and /dev/null differ
diff --git a/Serial Test App UWP/MainPage.xaml b/Serial Test App UWP/MainPage.xaml
deleted file mode 100644
index 08ca7256..00000000
--- a/Serial Test App UWP/MainPage.xaml	
+++ /dev/null
@@ -1,24 +0,0 @@
-<Page
-    x:Class="Test_App_UWP.MainPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Test_App_UWP"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Button x:Name="connectButton" Content="Connect" HorizontalAlignment="Left" Margin="82,82,0,0" VerticalAlignment="Top" Click="connectButton_Click"/>
-        <Button x:Name="pingButton" Content="Ping device" HorizontalAlignment="Left" Margin="82,149,0,0" VerticalAlignment="Top" Click="pingButton_Click"/>
-        <Button x:Name="printMemoryMapButton" Content="Memory Map" HorizontalAlignment="Left" Margin="82,221,0,0" VerticalAlignment="Top" Click="printMemoryMapButton_Click" />
-        <Button x:Name="printFlashSectorMapButton" Content="Flash Sector Map" HorizontalAlignment="Left" Margin="82,292,0,0" VerticalAlignment="Top" Click="printFlashSectorMapButton_Click" />
-        <Button x:Name="oemInfoButton" Content="OEM Info" HorizontalAlignment="Left" Margin="82,367,0,0" VerticalAlignment="Top" Click="oemInfoButton_Click" />
-        <Button x:Name="deployFileButton" Content="Deploy File" HorizontalAlignment="Left" Margin="82,417,0,0" VerticalAlignment="Top" Click="deployFileButton_Click" />
-        <Button x:Name="disconnectButton" Content="Disconnect" HorizontalAlignment="Left" Margin="248,82,0,0" VerticalAlignment="Top" Click="disconnectButton_Click"/>
-
-        <Button x:Name="IsInitButton" Content="Is Initialized" HorizontalAlignment="Left" Margin="82,472,0,0" VerticalAlignment="Top" Click="IsInitButton_Click" />
-        <Button x:Name="DeployTestButton" Content="Deploy Test" HorizontalAlignment="Left" Margin="82,534,0,0" VerticalAlignment="Top" Click="DeployTestButton_Click" />
-        <Button x:Name="DeviceInfoButton" Content="Device Info" HorizontalAlignment="Left" Margin="245,534,0,0" VerticalAlignment="Top" Click="DeviceInfoButton_Click" />
-
-    </Grid>
-</Page>
diff --git a/Serial Test App UWP/MainPage.xaml.cs b/Serial Test App UWP/MainPage.xaml.cs
deleted file mode 100644
index 7da365c6..00000000
--- a/Serial Test App UWP/MainPage.xaml.cs	
+++ /dev/null
@@ -1,241 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-using nanoFramework.Tools.Debugger.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Threading;
-using Windows.ApplicationModel;
-using Windows.Storage;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
-
-namespace Test_App_UWP
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class MainPage : Page
-    {
-        public MainPage()
-        {
-            InitializeComponent();
-        }
-
-        private async void connectButton_Click(object sender, RoutedEventArgs e)
-        {
-            // disable button
-            (sender as Button).IsEnabled = false;
-
-            bool connectResult = await App.NanoFrameworkSerialDebugClient.NanoFrameworkDevices[0].DebugEngine.ConnectAsync(3000, true);
-
-            var di = App.NanoFrameworkSerialDebugClient.NanoFrameworkDevices[0].GetDeviceInfo();
-
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-            Debug.WriteLine(di.ToString());
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-
-            // enable button
-            (sender as Button).IsEnabled = true;
-
-            
-        }
-
-        private async System.Threading.Tasks.Task button1_ClickAsync(object sender, RoutedEventArgs e)
-        {
-            var s = await App.NanoFrameworkSerialDebugClient.NanoFrameworkDevices[0].DebugEngine.SendBufferAsync(new byte[] { (byte)'x', (byte)'x' }, TimeSpan.FromMilliseconds(1000), new CancellationToken());
-
-            var r = await App.NanoFrameworkSerialDebugClient.NanoFrameworkDevices[0].DebugEngine.ReadBufferAsync(10, TimeSpan.FromMilliseconds(1000), new CancellationToken());
-        }
-
-        private void pingButton_Click(object sender, RoutedEventArgs e)
-        {
-            // disable button
-            (sender as Button).IsEnabled = false;
-            var p = App.NanoFrameworkSerialDebugClient.NanoFrameworkDevices[0].Ping();
-
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-            Debug.WriteLine("Ping response: " + p.ToString());
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-
-            // enable button
-            (sender as Button).IsEnabled = true;
-        }
-
-        private void printMemoryMapButton_Click(object sender, RoutedEventArgs e)
-        {
-            // disable button
-            (sender as Button).IsEnabled = false;
-
-            var mm = App.NanoFrameworkSerialDebugClient.NanoFrameworkDevices[0].DebugEngine.GetMemoryMap();
-
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-            Debug.WriteLine(mm.ToStringForOutput());
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-
-            // enable button
-            (sender as Button).IsEnabled = true;
-        }
-
-        private void printFlashSectorMapButton_Click(object sender, RoutedEventArgs e)
-        {
-            // disable button
-            (sender as Button).IsEnabled = false;
-
-            var fm = App.NanoFrameworkSerialDebugClient.NanoFrameworkDevices[0].DebugEngine.GetFlashSectorMap();
-            //var fm = await App.NETMFUsbDebugClient.MFDevices[0].DebugEngine.GetAssembliesAsync();
-
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-            Debug.WriteLine(fm.ToStringForOutput());
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-
-            // enable button
-            (sender as Button).IsEnabled = true;
-        }
-
-        private async void deployFileButton_Click(object sender, RoutedEventArgs e)
-        {
-            // disable button
-            (sender as Button).IsEnabled = false;
-
-            //// for this to work first need to copy the files nanoCLR.bin and nanoCLR.hex to Documents folder
-            //string hexFile = Path.Combine(
-            //                            Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
-            //                            "nanoCLR.hex");
-
-            //var reply = await App.NanoFrameworkSerialDebugClient.NanoFrameworkDevices[0].DeploySrecFileAsync(hexFile, CancellationToken.None, null);
-
-
-            // now the BIN file
-            string binFile = Path.Combine(
-                                        Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
-                                        "nanoCLR.bin");
-
-            ////////////////////////////////////////////////////////////////////////////////
-            // MAKE sure to adjust this to the appropriate flash address of the CLR block //
-            uint flashAddress = 0x08004000;
-            ////////////////////////////////////////////////////////////////////////////////
-
-            var reply1 = await App.NanoFrameworkSerialDebugClient.NanoFrameworkDevices[0].DeployBinaryFileAsync(binFile, flashAddress, CancellationToken.None, null);
-
-            // enable button
-            (sender as Button).IsEnabled = true;
-        }
-
-        private void disconnectButton_Click(object sender, RoutedEventArgs e)
-        {
-            // disable button
-            (sender as Button).IsEnabled = false;
-
-            App.NanoFrameworkSerialDebugClient.NanoFrameworkDevices[0].Disconnect();
-
-            // enable button
-            (sender as Button).IsEnabled = true;
-        }
-
-        private void oemInfoButton_Click(object sender, RoutedEventArgs e)
-        {
-            // disable button
-            (sender as Button).IsEnabled = false;
-
-            var oemInfo = App.NanoFrameworkSerialDebugClient.NanoFrameworkDevices[0].DebugEngine.GetMonitorOemInfo();
-
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-            Debug.WriteLine($"{oemInfo.ToString()}");
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-
-            // enable button
-            (sender as Button).IsEnabled = true;
-        }
-
-        private void IsInitButton_Click(object sender, RoutedEventArgs e)
-        {
-            // disable button
-            (sender as Button).IsEnabled = false;
-
-            var result = App.NanoFrameworkSerialDebugClient.NanoFrameworkDevices[0].DebugEngine.IsDeviceInInitializeState();
-
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-            Debug.WriteLine($">>> Device is in initialized state: {result} <<<<");
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-
-            // enable button
-            (sender as Button).IsEnabled = true;
-        }
-
-        private async void DeployTestButton_Click(object sender, RoutedEventArgs e)
-        {
-            // disable button
-            (sender as Button).IsEnabled = false;
-
-
-            List<byte[]> assemblies = new List<byte[]>();
-
-
-            try
-            {
-                string assemblyPath = @"assets\mscorlib.pe";
-
-                var file = await Package.Current.InstalledLocation.GetFileAsync("mscorlib.pe");
-                
-                using (var streamReader = await file.OpenStreamForReadAsync())
-                {
-                    Debug.WriteLine($"Adding pe file {assemblyPath} to deployment bundle");
-                    long length = (streamReader.Length + 3) / 4 * 4;
-                    byte[] buffer = new byte[length];
-
-                    streamReader.Read(buffer, 0, (int)streamReader.Length);
-                    assemblies.Add(buffer);
-                }
-
-                var result = App.NanoFrameworkSerialDebugClient.NanoFrameworkDevices[0].DebugEngine.DeploymentExecute(assemblies, false);
-
-                Debug.WriteLine("");
-                Debug.WriteLine($">>> Deployment result: {result} <<<<");
-                Debug.WriteLine("");
-
-            }
-            catch
-            {
-
-            }
-
-            // enable button
-            (sender as Button).IsEnabled = true;
-        }
-
-        private void DeviceInfoButton_Click(object sender, RoutedEventArgs e)
-        {
-            // disable button
-            (sender as Button).IsEnabled = false;
-
-            var di = App.NanoFrameworkSerialDebugClient.NanoFrameworkDevices[0].GetDeviceInfo(true);
-
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-            Debug.WriteLine(di.ToString());
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-
-            // enable button
-            (sender as Button).IsEnabled = true;
-        }
-    }
-}
diff --git a/Serial Test App UWP/Package.appxmanifest b/Serial Test App UWP/Package.appxmanifest
deleted file mode 100644
index e42ed61d..00000000
--- a/Serial Test App UWP/Package.appxmanifest	
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="22C5A032-C8C0-46BA-ADEC-EF03940A2A12" Publisher="CN=nanoframework" Version="1.0.0.0" />
-  <mp:PhoneIdentity PhoneProductId="6759b2f1-111c-4917-a2cf-172b4f91d3eb" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
-  <Properties>
-    <DisplayName>Test App UWP</DisplayName>
-    <PublisherDisplayName>jassimoes</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-  </Dependencies>
-  <Resources>
-    <Resource Language="x-generate" />
-  </Resources>
-  <Applications>
-    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="Test_App_UWP.App">
-      <uap:VisualElements DisplayName="NanoFramework Serial Debug Client Test App UWP" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="NanoFramework Serial Debug Client Test App UWP" BackgroundColor="transparent">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
-        </uap:DefaultTile>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-      </uap:VisualElements>
-    </Application>
-  </Applications>
-  <Capabilities>
-    <Capability Name="internetClient" />
-    <DeviceCapability Name="serialcommunication">
-      <Device Id="any">
-        <Function Type="name:serialPort" />
-      </Device>
-    </DeviceCapability>
-  </Capabilities>
-</Package>
\ No newline at end of file
diff --git a/Serial Test App UWP/Properties/AssemblyInfo.cs b/Serial Test App UWP/Properties/AssemblyInfo.cs
deleted file mode 100644
index d51f721f..00000000
--- a/Serial Test App UWP/Properties/AssemblyInfo.cs	
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("UWP Test App for nanoFramework serial debug")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("nanoFramework")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and Contributors")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Serial Test App UWP/Properties/Default.rd.xml b/Serial Test App UWP/Properties/Default.rd.xml
deleted file mode 100644
index 80a960ce..00000000
--- a/Serial Test App UWP/Properties/Default.rd.xml	
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
-    developers. However, you can modify these parameters to modify the behavior of the .NET Native
-    optimizer.
-
-    Runtime Directives are documented at http://go.microsoft.com/fwlink/?LinkID=391919
-
-    To fully enable reflection for App1.MyClass and all of its public/private members
-    <Type Name="App1.MyClass" Dynamic="Required All"/>
-
-    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
-    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
-
-    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
--->
-
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Application>
-    <!--
-      An Assembly element with Name="*Application*" applies to all assemblies in
-      the application package. The asterisks are not wildcards.
-    -->
-    <Assembly Name="*Application*" Dynamic="Required All" />
-    
-    
-    <!-- Add your application specific runtime directives here. -->
-
-
-  </Application>
-</Directives>
\ No newline at end of file
diff --git a/Serial Test App UWP/Serial Test App UWP.csproj b/Serial Test App UWP/Serial Test App UWP.csproj
deleted file mode 100644
index 079ae4cb..00000000
--- a/Serial Test App UWP/Serial Test App UWP.csproj	
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{7E524678-9200-46C8-AB75-EFA8CB35F437}</ProjectGuid>
-    <OutputType>AppContainerExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Test_App_UWP</RootNamespace>
-    <AssemblyName>nanoFramework Serial Debug Client Test App UWP</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>16</MinimumVisualStudioVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>Serial Test App UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>7A1DC574AE40F8B617034105790116ABAEB2E585</PackageCertificateThumbprint>
-    <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <Content Include="mscorlib.pe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <None Include="Serial Test App UWP_TemporaryKey.pfx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MainPage.xaml.cs">
-      <DependentUpon>MainPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Properties\Default.rd.xml" />
-    <Content Include="Assets\LockScreenLogo.scale-200.png" />
-    <Content Include="Assets\SplashScreen.scale-200.png" />
-    <Content Include="Assets\Square150x150Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="Assets\StoreLogo.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="MainPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\nanoFramework.Tools.DebugLibrary.UWP\nanoFramework.Tools.DebugLibrary.UWP.csproj">
-      <Project>{21e5a6a5-f4f7-411a-80dc-f49e62d8a7c3}</Project>
-      <Name>nanoFramework.Tools.DebugLibrary.UWP</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.11</Version>
-    </PackageReference>
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/Serial Test App UWP/mscorlib.pe b/Serial Test App UWP/mscorlib.pe
deleted file mode 100644
index 58b69073..00000000
Binary files a/Serial Test App UWP/mscorlib.pe and /dev/null differ
diff --git a/USB Debug Client/AssemblyInfo.cs b/USB Debug Client/AssemblyInfo.cs
deleted file mode 100644
index 14923c5f..00000000
--- a/USB Debug Client/AssemblyInfo.cs	
+++ /dev/null
@@ -1,30 +0,0 @@
-using System.Resources;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("ClassLibrary1")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ClassLibrary1")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/USB Debug Client/EventHandlerForUsbDevice.cs b/USB Debug Client/EventHandlerForUsbDevice.cs
deleted file mode 100644
index 98fbfc78..00000000
--- a/USB Debug Client/EventHandlerForUsbDevice.cs	
+++ /dev/null
@@ -1,605 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// This file is part of the Microsoft .NET Micro Framework and is unsupported. 
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use these files except in compliance with the License.
-// You may obtain a copy of the License at:
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing
-// permissions and limitations under the License.
-// 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-using System;
-using System.Threading.Tasks;
-using Windows.Devices.Enumeration;
-using Windows.Devices.Usb;
-using Windows.Foundation;
-using Windows.UI.Xaml;
-
-namespace Microsoft.NetMicroFramework.Tools.UsbDebug
-{
-    /// <summary>
-    /// This class handles the required changes and operation of an UsbDevice when a specific app event
-    /// is raised (app suspension and resume) or when the device is disconnected. The device watcher events are also handled here.
-    /// </summary>
-    public class EventHandlerForUsbDevice
-    {
-        /// <summary>
-        /// Allows for singleton EventHandlerForUSBEclo
-        /// </summary>
-        private static volatile EventHandlerForUsbDevice eventHandlerForNetMFDevice;
-
-        /// <summary>
-        /// Used to synchronize threads to avoid multiple instantiations of eventHandlerForUSBEclo.
-        /// </summary>
-        private static object singletonCreationLock = new Object();
-
-        private string deviceSelector;
-        private DeviceWatcher deviceWatcher;
-
-        private DeviceInformation deviceInformation;
-        private DeviceAccessInformation deviceAccessInformation;
-        private Windows.Devices.Usb.UsbDevice device;
-
-        private SuspendingEventHandler appSuspendCallback;
-
-        private SuspendingEventHandler appSuspendEventHandler;
-        private EventHandler<Object> appResumeEventHandler;
-
-        private TypedEventHandler<EventHandlerForUsbDevice, DeviceInformation> deviceCloseCallback;
-        private TypedEventHandler<EventHandlerForUsbDevice, DeviceInformation> deviceConnectedCallback;
-
-        private TypedEventHandler<DeviceWatcher, DeviceInformation> deviceAddedEventHandler;
-        private TypedEventHandler<DeviceWatcher, DeviceInformationUpdate> deviceRemovedEventHandler;
-        private TypedEventHandler<DeviceAccessInformation, DeviceAccessChangedEventArgs> deviceAccessEventHandler;
-
-        private Boolean watcherSuspended;
-        private Boolean watcherStarted;
-
-        private Boolean isBackgroundTask;
-        private Boolean isEnabledAutoReconnect;
-
-        // A pointer back to the calling app.  This is needed to reach methods and events there 
-        private static Application _callerApp;
-        public static Application CallerApp
-        {
-            private get { return _callerApp; }
-            set { _callerApp = value; }
-        }
-
-        /// <summary>
-        /// Enforces the singleton pattern so that there is only one object handling app events
-        /// as it relates to the UsbDevice because this sample app only supports communicating with one device at a time. 
-        ///
-        /// An instance of EventHandlerForUSBEclo is globally available because the device needs to persist across scenario pages.
-        ///
-        /// If there is no instance of EventHandlerForUSBEclo created before this property is called,
-        /// an EventHandlerForUSBEclo will be created; the EventHandlerForUSBEclo created this way
-        /// is not meant for BackgroundTasks.
-        /// </summary>
-        public static EventHandlerForUsbDevice Current
-        {
-            get
-            {
-                lock (singletonCreationLock)
-                {
-                    if (eventHandlerForNetMFDevice == null)
-                    {
-                        CreateNewEventHandlerForDevice();
-                    }
-                }
-
-                return eventHandlerForNetMFDevice;
-            }
-        }
-
-        /// <summary>
-        /// Creates a new instance of EventHandlerForUSBEclo, enables auto reconnect, and uses it as the Current instance.
-        /// </summary>
-        public static void CreateNewEventHandlerForDevice()
-        {
-            eventHandlerForNetMFDevice = new EventHandlerForUsbDevice(false);
-        }
-
-        /// <summary>
-        /// Creates a new instance of EventHandlerForUSBEclo, disables auto reconnect, and uses it as the Current instance.
-        /// Background tasks do not need to worry about app events, so we will not be registering for app events
-        /// </summary>
-        public static void CreateNewEventHandlerForDeviceForBackgroundTasks()
-        {
-            eventHandlerForNetMFDevice = new EventHandlerForUsbDevice(true);
-        }
-
-        public SuspendingEventHandler OnAppSuspendCallback
-        {
-            get
-            {
-                return appSuspendCallback;
-            }
-
-            set
-            {
-                appSuspendCallback = value;
-            }
-        }
-
-        public TypedEventHandler<EventHandlerForUsbDevice, DeviceInformation> OnDeviceClose
-        {
-            get
-            {
-                return deviceCloseCallback;
-            }
-
-            set
-            {
-                deviceCloseCallback = value;
-            }
-        }
-
-        public TypedEventHandler<EventHandlerForUsbDevice, DeviceInformation> OnDeviceConnected
-        {
-            get
-            {
-                return deviceConnectedCallback;
-            }
-
-            set
-            {
-                deviceConnectedCallback = value;
-            }
-        }
-
-        public Boolean IsDeviceConnected
-        {
-            get
-            {
-                return (device != null);
-            }
-        }
-
-        public Windows.Devices.Usb.UsbDevice Device
-        {
-            get
-            {
-                return device;
-            }
-        }
-
-        /// <summary>
-        /// This DeviceInformation represents which device is connected or which device will be reconnected when
-        /// the device is plugged in again (if IsEnabledAutoReconnect is true);.
-        /// </summary>
-        public DeviceInformation DeviceInformation
-        {
-            get
-            {
-                return deviceInformation;
-            }
-        }
-
-        /// <summary>
-        /// Returns DeviceAccessInformation for the device that is currently connected using this EventHandlerForUSBEclo
-        /// object.
-        /// </summary>
-        public DeviceAccessInformation DeviceAccessInformation
-        {
-            get
-            {
-                return deviceAccessInformation;
-            }
-        }
-
-        /// <summary>
-        /// DeviceSelector AQS used to find this device
-        /// </summary>
-        public String DeviceSelector
-        {
-            get
-            {
-                return deviceSelector;
-            }
-        }
-
-        /// <summary>
-        /// True if EventHandlerForUSBEclo will attempt to reconnect to the device once it is plugged into the computer again
-        /// </summary>
-        public Boolean IsEnabledAutoReconnect
-        {
-            get
-            {
-                return isEnabledAutoReconnect;
-            }
-            set
-            {
-                isEnabledAutoReconnect = value;
-            }
-        }
-
-        /// <summary>
-        /// This method opens the device using the WinRT Usb API. After the device is opened, save the device
-        /// so that it can be used across scenarios.
-        ///
-        /// It is important that the FromIdAsync call is made on the UI thread because the consent prompt can only be displayed
-        /// on the UI thread.
-        /// 
-        /// This method is used to reopen the device after the device reconnects to the computer and when the app resumes.
-        /// </summary>
-        /// <param name="deviceInfo">Device information of the device to be opened</param>
-        /// <param name="deviceSelector">The AQS used to find this device</param>
-        /// <returns>True if the device was successfully opened, false if the device could not be opened for well known reasons.
-        /// An exception may be thrown if the device could not be opened for extraordinary reasons.</returns>
-        public async Task<Boolean> OpenDeviceAsync(DeviceInformation deviceInfo, String deviceSelector)
-        {
-            device = await Windows.Devices.Usb.UsbDevice.FromIdAsync(deviceInfo.Id);
-
-            Boolean successfullyOpenedDevice = false;
-            //NotifyType notificationStatus;
-            String notificationMessage = null;
-
-            // Device could have been blocked by user or the device has already been opened by another app.
-            if (device != null)
-            {
-                successfullyOpenedDevice = true;
-
-                deviceInformation = deviceInfo;
-                this.deviceSelector = deviceSelector;
-
-                //notificationStatus = NotifyType.StatusMessage;
-                notificationMessage = "Device " + deviceInformation.Id + " opened";
-
-                // Notify registered callback handle that the device has been opened
-                if (deviceConnectedCallback != null)
-                {
-                    deviceConnectedCallback(this, deviceInformation);
-                }
-
-                // Background tasks are not part of the app, so app events will not have an affect on the device
-                if (!isBackgroundTask && (appSuspendEventHandler == null || appResumeEventHandler == null))
-                {
-                    RegisterForAppEvents();
-                }
-
-                // User can block the device after it has been opened in the Settings charm. We can detect this by registering for the 
-                // DeviceAccessInformation.AccessChanged event
-                if (deviceAccessEventHandler == null)
-                {
-                    RegisterForDeviceAccessStatusChange();
-                }
-
-                // Create and register device watcher events for the device to be opened unless we're reopening the device
-                if (deviceWatcher == null)
-                {
-                    deviceWatcher = DeviceInformation.CreateWatcher(deviceSelector);
-
-                    RegisterForDeviceWatcherEvents();
-                }
-
-                if (!watcherStarted)
-                {
-                    // Start the device watcher after we made sure that the device is opened.
-                    StartDeviceWatcher();
-                }
-            }
-            else
-            {
-                successfullyOpenedDevice = false;
-
-                //notificationStatus = NotifyType.ErrorMessage;
-
-                var deviceAccessStatus = DeviceAccessInformation.CreateFromId(deviceInfo.Id).CurrentStatus;
-
-                switch (deviceAccessStatus)
-                {
-                    case DeviceAccessStatus.DeniedByUser:
-                        notificationMessage = "Access to the device was blocked by the user : " + deviceInfo.Id;
-                        break;
-
-                    case DeviceAccessStatus.DeniedBySystem:
-                        // This status is most likely caused by app permissions (did not declare the device in the app's package.appxmanifest)
-                        // This status does not cover the case where the device is already opened by another app.
-                        notificationMessage = "Access to the device was blocked by the system : " + deviceInfo.Id;
-                        break;
-
-                    default:
-                        // Most likely the device is opened by another app, but cannot be sure
-                        notificationMessage = "Unknown error, possibly opened by another app : " + deviceInfo.Id;
-                        break;
-                }
-            }
-
-            //MainPage.Current.NotifyUser(notificationMessage, notificationStatus);
-
-            return successfullyOpenedDevice;
-        }
-
-        /// <summary>
-        /// Closes the device, stops the device watcher, stops listening for app events, and resets object state to before a device
-        /// was ever connected.
-        /// </summary>
-        public void CloseDevice()
-        {
-            if (IsDeviceConnected)
-            {
-                CloseCurrentlyConnectedDevice();
-            }
-
-            if (deviceWatcher != null)
-            {
-                if (watcherStarted)
-                {
-                    StopDeviceWatcher();
-
-                    UnregisterFromDeviceWatcherEvents();
-                }
-
-                deviceWatcher = null;
-            }
-
-            if (deviceAccessInformation != null)
-            {
-                UnregisterFromDeviceAccessStatusChange();
-
-                deviceAccessInformation = null;
-            }
-
-            if (appSuspendEventHandler != null || appResumeEventHandler != null)
-            {
-                UnregisterFromAppEvents();
-            }
-
-            deviceInformation = null;
-            deviceSelector = null;
-
-            deviceConnectedCallback = null;
-            deviceCloseCallback = null;
-            appSuspendCallback = null;
-
-            isEnabledAutoReconnect = true;
-        }
-
-        /// <summary>
-        /// If this event handler will be running in a background task, app events will not be registered for because they are of
-        /// no use to the background task.
-        /// </summary>
-        /// <param name="isBackgroundTask">Whether or not the event handler will be running as a background task</param>
-        private EventHandlerForUsbDevice(Boolean isBackgroundTask)
-        {
-            watcherStarted = false;
-            watcherSuspended = false;
-            isEnabledAutoReconnect = true;
-            this.isBackgroundTask = isBackgroundTask;
-        }
-
-        /// <summary>
-        /// This method closes the device properly using the WinRT Usb API.
-        ///
-        /// When the UsbDevice is closing, it will cancel all IO operations that are still pending (not complete).
-        /// The close will not wait for any IO completion callbacks to be called, so the close call may complete before any of
-        /// the IO completion callbacks are called.
-        /// The pending IO operations will still call their respective completion callbacks with either a task 
-        /// canceled error or the operation completed.
-        /// </summary>
-        private void CloseCurrentlyConnectedDevice()
-        {
-            if (device != null)
-            {
-                // Notify callback that we're about to close the device
-                if (deviceCloseCallback != null)
-                {
-                    deviceCloseCallback(this, deviceInformation);
-                }
-
-                // This closes the handle to the device
-                device.Dispose();
-
-                device = null;
-
-                // Save the deviceInformation.Id in case deviceInformation is set to null when closing the
-                // device
-                String deviceId = deviceInformation.Id;
-
-                //await rootPage.Dispatcher.RunAsync(
-                //    CoreDispatcherPriority.Normal,
-                //    new DispatchedHandler(() =>
-                //    {
-                //        MainPage.Current.NotifyUser(deviceId + " is closed", NotifyType.StatusMessage);
-                //    }));
-            }
-        }
-
-        /// <summary>
-        /// Register for app suspension/resume events. See the comments
-        /// for the event handlers for more information on what is being done to the device.
-        ///
-        /// We will also register for when the app exists so that we may close the device handle.
-        /// </summary>
-        private void RegisterForAppEvents()
-        {
-            appSuspendEventHandler = new SuspendingEventHandler(EventHandlerForUsbDevice.Current.OnAppSuspension);
-            appResumeEventHandler = new EventHandler<Object>(EventHandlerForUsbDevice.Current.OnAppResume);
-
-            // This event is raised when the app is exited and when the app is suspended
-            _callerApp.Suspending += appSuspendEventHandler;
-
-            _callerApp.Resuming += appResumeEventHandler;
-        }
-
-        private void UnregisterFromAppEvents()
-        {
-            // This event is raised when the app is exited and when the app is suspended
-            _callerApp.Suspending -= appSuspendEventHandler;
-            appSuspendEventHandler = null;
-
-            _callerApp.Resuming -= appResumeEventHandler;
-            appResumeEventHandler = null;
-        }
-
-        /// <summary>
-        /// Register for Added and Removed events.
-        /// Note that, when disconnecting the device, the device may be closed by the system before the OnDeviceRemoved callback is invoked.
-        /// </summary>
-        private void RegisterForDeviceWatcherEvents()
-        {
-            deviceAddedEventHandler = new TypedEventHandler<DeviceWatcher, DeviceInformation>(this.OnDeviceAdded);
-
-            deviceRemovedEventHandler = new TypedEventHandler<DeviceWatcher, DeviceInformationUpdate>(this.OnDeviceRemoved);
-
-            deviceWatcher.Added += deviceAddedEventHandler;
-
-            deviceWatcher.Removed += deviceRemovedEventHandler;
-        }
-
-        private void UnregisterFromDeviceWatcherEvents()
-        {
-            deviceWatcher.Added -= deviceAddedEventHandler;
-            deviceAddedEventHandler = null;
-
-            deviceWatcher.Removed -= deviceRemovedEventHandler;
-            deviceRemovedEventHandler = null;
-        }
-
-        /// <summary>
-        /// Listen for any changed in device access permission. The user can block access to the device while the device is in use.
-        /// If the user blocks access to the device while the device is opened, the device's handle will be closed automatically by
-        /// the system; it is still a good idea to close the device explicitly so that resources are cleaned up.
-        /// 
-        /// Note that by the time the AccessChanged event is raised, the device handle may already be closed by the system.
-        /// </summary>
-        private void RegisterForDeviceAccessStatusChange()
-        {
-            deviceAccessInformation = DeviceAccessInformation.CreateFromId(deviceInformation.Id);
-
-            deviceAccessEventHandler = new TypedEventHandler<DeviceAccessInformation, DeviceAccessChangedEventArgs>(this.OnDeviceAccessChanged);
-            deviceAccessInformation.AccessChanged += deviceAccessEventHandler;
-        }
-
-        private void UnregisterFromDeviceAccessStatusChange()
-        {
-            deviceAccessInformation.AccessChanged -= deviceAccessEventHandler;
-
-            deviceAccessEventHandler = null;
-        }
-
-        private void StartDeviceWatcher()
-        {
-            watcherStarted = true;
-
-            if ((deviceWatcher.Status != DeviceWatcherStatus.Started)
-                && (deviceWatcher.Status != DeviceWatcherStatus.EnumerationCompleted))
-            {
-                deviceWatcher.Start();
-            }
-        }
-
-        private void StopDeviceWatcher()
-        {
-            if ((deviceWatcher.Status == DeviceWatcherStatus.Started)
-                || (deviceWatcher.Status == DeviceWatcherStatus.EnumerationCompleted))
-            {
-                deviceWatcher.Stop();
-            }
-
-            watcherStarted = false;
-        }
-
-        /// <summary>
-        /// If a UsbDevice object has been instantiated (a handle to the device is opened), we must close it before the app 
-        /// goes into suspension because the API automatically closes it for us if we don't. When resuming, the API will
-        /// not reopen the device automatically, so we need to explicitly open the device in that situation.
-        ///
-        /// Since we have to reopen the device ourselves when the app resumes, it is good practice to explicitly call the close
-        /// in the app as well (For every open there is a close).
-        /// 
-        /// We must stop the DeviceWatcher because it will continue to raise events even if
-        /// the app is in suspension, which is not desired (drains battery). We resume the device watcher once the app resumes again.
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="eventArgs"></param>
-        private void OnAppSuspension(Object sender, Windows.ApplicationModel.SuspendingEventArgs args)
-        {
-            if (watcherStarted)
-            {
-                watcherSuspended = true;
-                StopDeviceWatcher();
-            }
-            else
-            {
-                watcherSuspended = false;
-            }
-
-            // Forward suspend event to registered callback function
-            if (appSuspendCallback != null)
-            {
-                appSuspendCallback(sender, args);
-            }
-
-            CloseCurrentlyConnectedDevice();
-        }
-
-        /// <summary>
-        /// When resume into the application, we should reopen a handle to the Usb device again. This will automatically
-        /// happen when we start the device watcher again; the device will be re-enumerated and we will attempt to reopen it
-        /// if IsEnabledAutoReconnect property is enabled.
-        /// 
-        /// See OnAppSuspension for why we are starting the device watcher again
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="arg"></param>
-        private void OnAppResume(Object sender, Object args)
-        {
-            if (watcherSuspended)
-            {
-                watcherSuspended = false;
-                StartDeviceWatcher();
-            }
-        }
-
-        /// <summary>
-        /// Close the device that is opened so that all pending operations are canceled properly.
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="deviceInformationUpdate"></param>
-        private void OnDeviceRemoved(DeviceWatcher sender, DeviceInformationUpdate deviceInformationUpdate)
-        {
-            if (IsDeviceConnected && (deviceInformationUpdate.Id == deviceInformation.Id))
-            {
-                // The main reasons to close the device explicitly is to clean up resources, to properly handle errors,
-                // and stop talking to the disconnected device.
-                CloseCurrentlyConnectedDevice();
-            }
-        }
-
-        /// <summary>
-        /// Open the device that the user wanted to open if it hasn't been opened yet and auto reconnect is enabled.
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="deviceInfo"></param>
-        private void OnDeviceAdded(DeviceWatcher sender, DeviceInformation deviceInfo)
-        {
-            if ((deviceInformation != null) && (deviceInfo.Id == deviceInformation.Id) && !IsDeviceConnected && isEnabledAutoReconnect)
-            {
-            }
-        }
-
-        /// <summary>
-        /// Close the device if the device access was denied by anyone (system or the user) and reopen it if permissions are allowed again
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="eventArgs"></param>
-        private void OnDeviceAccessChanged(DeviceAccessInformation sender, DeviceAccessChangedEventArgs eventArgs)
-        {
-            if ((eventArgs.Status == DeviceAccessStatus.DeniedBySystem)
-                || (eventArgs.Status == DeviceAccessStatus.DeniedByUser))
-            {
-                CloseCurrentlyConnectedDevice();
-            }
-            else if ((eventArgs.Status == DeviceAccessStatus.Allowed) && (deviceInformation != null) && isEnabledAutoReconnect)
-            {
-            }
-        }
-    }
-}
diff --git a/USB Debug Client/Exceptions/CouldntOpenNetMFDeviceException.cs b/USB Debug Client/Exceptions/CouldntOpenNetMFDeviceException.cs
deleted file mode 100644
index 9b68c7e4..00000000
--- a/USB Debug Client/Exceptions/CouldntOpenNetMFDeviceException.cs	
+++ /dev/null
@@ -1,34 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// This file is part of the Microsoft .NET Micro Framework and is unsupported. 
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use these files except in compliance with the License.
-// You may obtain a copy of the License at:
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing
-// permissions and limitations under the License.
-// 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-using System;
-
-namespace Microsoft.NetMicroFramework.Tools.UsbDebug
-{
-    internal class CouldntOpenNetMFDeviceException : Exception
-    {
-        public CouldntOpenNetMFDeviceException()
-        {
-        }
-
-        public CouldntOpenNetMFDeviceException(string message) : base(message)
-        {
-        }
-
-        public CouldntOpenNetMFDeviceException(string message, Exception innerException) : base(message, innerException)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/USB Debug Client/Exceptions/DebugSessionAlreadyOpenException.cs b/USB Debug Client/Exceptions/DebugSessionAlreadyOpenException.cs
deleted file mode 100644
index 7251f0e6..00000000
--- a/USB Debug Client/Exceptions/DebugSessionAlreadyOpenException.cs	
+++ /dev/null
@@ -1,34 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// This file is part of the Microsoft .NET Micro Framework and is unsupported. 
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use these files except in compliance with the License.
-// You may obtain a copy of the License at:
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing
-// permissions and limitations under the License.
-// 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-using System;
-
-namespace Microsoft.NetMicroFramework.Tools.UsbDebug
-{
-    internal class DebugSessionAlreadyOpenException : Exception
-    {
-        public DebugSessionAlreadyOpenException()
-        {
-        }
-
-        public DebugSessionAlreadyOpenException(string message) : base(message)
-        {
-        }
-
-        public DebugSessionAlreadyOpenException(string message, Exception innerException) : base(message, innerException)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/USB Debug Client/MFDevice/UsbDevice.cs b/USB Debug Client/MFDevice/UsbDevice.cs
deleted file mode 100644
index 34a23ef5..00000000
--- a/USB Debug Client/MFDevice/UsbDevice.cs	
+++ /dev/null
@@ -1,71 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// This file is part of the Microsoft .NET Micro Framework and is unsupported. 
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use these files except in compliance with the License.
-// You may obtain a copy of the License at:
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing
-// permissions and limitations under the License.
-// 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-using Microsoft.NetMicroFramework.Tools.UsbDebug;
-using Microsoft.SPOT.Debugger;
-using Microsoft.SPOT.Debugger.WireProtocol;
-using System;
-using System.Threading.Tasks;
-
-namespace Microsoft.NetMicroFramework.Tools
-{
-    public class UsbDevice : MFDeviceBase, IMFDevice
-    {
-        /// <summary>
-        /// .NETMF debug engine
-        /// </summary>
-        //public Engine<MFDevice> DebugEngine { get; protected set; }
-
-        public UsbDeviceInformation DeviceInformation
-        {
-            get
-            {
-                return DeviceObject as UsbDeviceInformation;
-            }
-
-            set
-            {
-                DeviceObject = value;
-            }
-        }
-
-        /// <summary>
-        /// 
-        /// </summary>
-        public UsbDebugClient Parent { get; set; }
-
-        public UsbDevice()
-        {
-            Transport = TransportType.Usb;
-        }
-
-        /// <summary>
-        /// Connect to NETMF device
-        /// </summary>
-        /// <returns>True if operation is successful</returns>
-        public Task<bool> ConnectAsync()
-        {
-            return Parent.ConnectDeviceAsync(this);
-        }
-
-        /// <summary>
-        /// Disconnect NETMF device
-        /// </summary>
-        public void Disconnect()
-        {
-            Parent.DisconnectDevice(this);
-        }
-    }
-}
diff --git a/USB Debug Client/NETMF USB Debug Client.csproj b/USB Debug Client/NETMF USB Debug Client.csproj
deleted file mode 100644
index 6fd09513..00000000
--- a/USB Debug Client/NETMF USB Debug Client.csproj	
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <MinimumVisualStudioVersion>16.0</MinimumVisualStudioVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{76C2C5C6-1F04-4067-938F-F7E9EB67D284}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.NetMicroFramework.Tools.UsbDebug</RootNamespace>
-    <AssemblyName>NETMFUsbDebugClient</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <TargetPlatformIdentifier>Windows</TargetPlatformIdentifier>
-    <TargetPlatformVersion>8.1</TargetPlatformVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_APP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_APP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Exceptions\CouldntOpenNetMFDeviceException.cs" />
-    <Compile Include="Exceptions\DebugSessionAlreadyOpenException.cs" />
-    <Compile Include="MFDevice\UsbDevice.cs" />
-    <Compile Include="USB\UsbDeviceInformation.cs" />
-    <Compile Include="USB\UsbDeviceProperties.cs" />
-    <Compile Include="EventHandlerForUsbDevice.cs" />
-    <Compile Include="SupportedDevices\StDiscovery4.cs" />
-    <Compile Include="UsbDebugClient.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="USB\UsbDeviceRequestType.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/USB Debug Client/Properties/AssemblyInfo.cs b/USB Debug Client/Properties/AssemblyInfo.cs
deleted file mode 100644
index 17ac6f08..00000000
--- a/USB Debug Client/Properties/AssemblyInfo.cs	
+++ /dev/null
@@ -1,33 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("UsbDebugClient")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Microsoft.NetMicroFramework.Tools.UsbDebugClient.Properties")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("51bdd4d7-5037-4355-87ba-bfff0ddb6e1e")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-[assembly: AssemblyVersion("0.15.*")]
-[assembly: AssemblyFileVersion("0.15.0.0")]
diff --git a/USB Debug Client/SupportedDevices/StDiscovery4.cs b/USB Debug Client/SupportedDevices/StDiscovery4.cs
deleted file mode 100644
index 94686260..00000000
--- a/USB Debug Client/SupportedDevices/StDiscovery4.cs	
+++ /dev/null
@@ -1,44 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// This file is part of the Microsoft .NET Micro Framework and is unsupported. 
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use these files except in compliance with the License.
-// You may obtain a copy of the License at:
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing
-// permissions and limitations under the License.
-// 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-using System;
-
-namespace Microsoft.NetMicroFramework.Tools.UsbDebug
-{
-    public class StDiscovery4
-    {
-        public const UInt16 DeviceVid = 0x0483;
-
-        public const UInt16 DevicePid = 0xA08F;
-
-        /// <summary>
-        /// USB device interface class GUID. For NETMF debug capable devices this must be {D32D1D64-963D-463E-874A-8EC8C8082CBF}.
-        /// </summary>
-        public static Guid DeviceInterfaceClass = new Guid("{D32D1D64-963D-463E-874A-8EC8C8082CBF}");
-
-        /// <summary>
-        /// ID string for the device
-        /// </summary>
-        public static String IDString
-        {
-            get { return String.Format("VID_{0:X4}&PID_{1:X4}", DeviceVid, DevicePid); }
-        }
-
-        public static new string ToString()
-        {
-            return "ST Discovery4";
-        }
-    }
-}
diff --git a/USB Debug Client/USB/UsbDeviceInformation.cs b/USB Debug Client/USB/UsbDeviceInformation.cs
deleted file mode 100644
index ca681f21..00000000
--- a/USB Debug Client/USB/UsbDeviceInformation.cs	
+++ /dev/null
@@ -1,68 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// This file is part of the Microsoft .NET Micro Framework and is unsupported. 
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use these files except in compliance with the License.
-// You may obtain a copy of the License at:
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing
-// permissions and limitations under the License.
-// 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-using System;
-using Windows.Devices.Enumeration;
-
-namespace Microsoft.NetMicroFramework.Tools.UsbDebug
-{
-    /// <summary>
-    /// The class will only expose properties from DeviceInformation that are going to be used
-    /// in this sample. Each instance of this class provides information about a single device.
-    ///
-    /// This class is used by the UI to display device specific information so that
-    /// the user can identify which device to use.
-    /// </summary>
-    public class UsbDeviceInformation
-    {
-        private DeviceInformation device;
-        private string deviceSelector;
-
-        public string InstanceId
-        {
-            get
-            {
-                return (string)device.Properties[UsbDeviceProperties.DeviceInstanceId];
-            }
-        }
-
-        public DeviceInformation DeviceInformation
-        {
-            get
-            {
-                return device;
-            }
-        }
-
-        public string DeviceSelector
-        {
-            get
-            {
-                return deviceSelector;
-            }
-        }
-
-        /// <summary>
-        /// The class is mainly used as a DeviceInformation wrapper so that the UI can bind to a list of these.
-        /// </summary>
-        /// <param name="deviceInformation"></param>
-        /// <param name="deviceSelector">The AQS used to find this device</param>
-        public UsbDeviceInformation(Windows.Devices.Enumeration.DeviceInformation deviceInformation, String deviceSelector)
-        {
-            device = deviceInformation;
-            this.deviceSelector = deviceSelector;
-        }
-    }
-}
diff --git a/USB Debug Client/USB/UsbDeviceProperties.cs b/USB Debug Client/USB/UsbDeviceProperties.cs
deleted file mode 100644
index c802a896..00000000
--- a/USB Debug Client/USB/UsbDeviceProperties.cs	
+++ /dev/null
@@ -1,24 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// This file is part of the Microsoft .NET Micro Framework and is unsupported. 
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use these files except in compliance with the License.
-// You may obtain a copy of the License at:
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing
-// permissions and limitations under the License.
-// 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-using System;
-
-namespace Microsoft.NetMicroFramework.Tools.UsbDebug
-{
-    public class UsbDeviceProperties
-    {
-        public const String DeviceInstanceId = "System.Devices.DeviceInstanceId";
-    }
-}
diff --git a/USB Debug Client/USB/UsbDeviceRequestType.cs b/USB Debug Client/USB/UsbDeviceRequestType.cs
deleted file mode 100644
index 28fc3565..00000000
--- a/USB Debug Client/USB/UsbDeviceRequestType.cs	
+++ /dev/null
@@ -1,34 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// This file is part of the Microsoft .NET Micro Framework and is unsupported. 
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use these files except in compliance with the License.
-// You may obtain a copy of the License at:
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing
-// permissions and limitations under the License.
-// 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-namespace Microsoft.NetMicroFramework.Tools.UsbDebug.Usb
-{
-    public enum UsbDeviceRequestType
-    {
-        GetStatus = 0,
-        ClearFeature = 1,
-        _Reserved0 = 2,
-        SetFeature = 3,
-        _Reserved1 = 4,
-        SetAddress = 5,
-        GetDescriptor = 6,
-        SetDescriptor = 7,
-        GetConfiguration = 8,
-        SetConfiguration = 9,
-        GetInterface = 10,
-        SetInterface = 11,
-        SyncFrame = 12
-    }
-}
diff --git a/USB Debug Client/UsbDebugClient.cs b/USB Debug Client/UsbDebugClient.cs
deleted file mode 100644
index 6f5dd7f7..00000000
--- a/USB Debug Client/UsbDebugClient.cs	
+++ /dev/null
@@ -1,634 +0,0 @@
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// This file is part of the Microsoft .NET Micro Framework and is unsupported. 
-// Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use these files except in compliance with the License.
-// You may obtain a copy of the License at:
-// 
-// http://www.apache.org/licenses/LICENSE-2.0
-// 
-// Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing
-// permissions and limitations under the License.
-// 
-//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-using Microsoft.NetMicroFramework.Tools.UsbDebug.Usb;
-using Microsoft.SPOT.Debugger;
-using Microsoft.SPOT.Debugger.WireProtocol;
-using System;
-using System.Linq;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Threading;
-using System.Threading.Tasks;
-using Windows.Devices.Enumeration;
-using Windows.Devices.Usb;
-using Windows.Foundation;
-using Windows.Storage.Streams;
-using Windows.UI.Xaml;
-
-namespace Microsoft.NetMicroFramework.Tools.UsbDebug
-{
-    public class UsbDebugClient : PortBase, IPort
-    {
-        // dictionary with mapping between USB device watcher and the device ID
-        private Dictionary<DeviceWatcher, string> mapDeviceWatchersToDeviceSelector;
-
-        // USB device watchers suspended flag
-        private bool watchersSuspended = false;
-
-        // USB device watchers started flag
-        private bool watchersStarted = false;
-
-        // counter of device watchers completed
-        private int deviceWatchersCompletedCount = 0;
-        private bool isAllDevicesEnumerated = false;
-
-        private object cancelIoLock = new object();
-        private static SemaphoreSlim semaphore;
-
-        /// <summary>
-        /// ObservableCollection of all USB devices that are enumerated.
-        /// </summary>
-        public override ObservableCollection<MFDeviceBase> MFDevices { get; protected set; }
-
-        /// <summary>
-        /// Internal list with the actual MF USB devices
-        /// </summary>
-        List<MFDevice<UsbDevice>> MFUsbDevices;
-
-        /// <summary>
-        /// Creates an USB debug client
-        /// </summary>
-        public UsbDebugClient(Application callerApp)
-        {
-            mapDeviceWatchersToDeviceSelector = new Dictionary<DeviceWatcher, String>();
-            MFDevices = new ObservableCollection<MFDeviceBase>();
-            MFUsbDevices = new List<MFDevice<UsbDevice>>();
-
-            // set caller app property
-            EventHandlerForUsbDevice.CallerApp = callerApp;
-
-            // start USB watchers in a another task
-            Task.Factory.StartNew( () =>
-            {
-                StartUsbDeviceWatchers();
-            });
-
-            semaphore = new SemaphoreSlim(1, 1);
-        }
-
-        #region Device watchers initialization
-
-        /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        Add a device watcher initialization method for each supported device that should be watched.
-        That initialization method must be called from the InitializeDeviceWatchers() method above so the watcher is actually started.
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/
-
-        /// <summary>
-        /// Initialize the device watcher for the ST Discovery4
-        /// </summary>
-        private void InitializeStDiscovery4DeviceWatcher()
-        {
-            // better use  most specific type of DeviceSelector: VID, PID and class GUID
-            var stDiscovery4Selector = Windows.Devices.Usb.UsbDevice.GetDeviceSelector(StDiscovery4.DeviceVid, StDiscovery4.DevicePid, StDiscovery4.DeviceInterfaceClass);
-
-            // Create a device watcher to look for instances of this device
-            var stDiscovery4Watcher = DeviceInformation.CreateWatcher(stDiscovery4Selector);
-
-            // Allow the EventHandlerForDevice to handle device watcher events that relates or effects this device (i.e. device removal, addition, app suspension/resume)
-            AddDeviceWatcher(stDiscovery4Watcher, stDiscovery4Selector);
-        }
-
-        /// <summary>
-        /// Registers for Added, Removed, and Enumerated events on the provided deviceWatcher before adding it to an internal list.
-        /// </summary>
-        /// <param name="deviceWatcher">The device watcher to subscribe the events</param>
-        /// <param name="deviceSelector">The AQS used to create the device watcher</param>
-        private void AddDeviceWatcher(DeviceWatcher deviceWatcher, String deviceSelector)
-        {
-            deviceWatcher.Added += new TypedEventHandler<DeviceWatcher, DeviceInformation>(OnDeviceAdded);
-            deviceWatcher.Removed += new TypedEventHandler<DeviceWatcher, DeviceInformationUpdate>(OnDeviceRemoved);
-            deviceWatcher.EnumerationCompleted += new TypedEventHandler<DeviceWatcher, Object>(OnDeviceEnumerationComplete);
-
-            mapDeviceWatchersToDeviceSelector.Add(deviceWatcher, deviceSelector);
-        }
-
-        #endregion
-
-        #region Device watcher management and host app status handling
-
-        /// <summary>
-        /// Initialize device watchers. Must call here the initialization methods for all devices that we want to set watch.
-        /// </summary>
-        private void InitializeDeviceWatchers()
-        {
-            // ST Discovery 4
-            InitializeStDiscovery4DeviceWatcher();
-        }
-
-        public void StartUsbDeviceWatchers()
-        {
-            // Initialize the USB device watchers to be notified when devices are connected/removed
-            InitializeDeviceWatchers();
-            StartDeviceWatchers();
-        }
-
-        /// <summary>
-        /// Starts all device watchers including ones that have been individually stopped.
-        /// </summary>
-        private void StartDeviceWatchers()
-        {
-            // Start all device watchers
-            watchersStarted = true;
-            deviceWatchersCompletedCount = 0;
-            isAllDevicesEnumerated = false;
-
-            foreach (DeviceWatcher deviceWatcher in mapDeviceWatchersToDeviceSelector.Keys)
-            {
-                if ((deviceWatcher.Status != DeviceWatcherStatus.Started)
-                    && (deviceWatcher.Status != DeviceWatcherStatus.EnumerationCompleted))
-                {
-                    deviceWatcher.Start();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Should be called on host app OnAppSuspension() event to properly handle that status.
-        /// The DeviceWatchers must be stopped because device watchers will continue to raise events even if
-        /// the app is in suspension, which is not desired (drains battery). The device watchers will be resumed once the app resumes too.
-        /// </summary>
-        public void AppSuspending()
-        {
-            if (watchersStarted)
-            {
-                watchersSuspended = true;
-                StopDeviceWatchers();
-            }
-            else
-            {
-                watchersSuspended = false;
-            }
-        }
-
-        /// <summary>
-        /// Should be called on host app OnAppResume() event to properly handle that status.
-        /// See AppSuspending for why we are starting the device watchers again.
-        /// </summary>
-        public void AppResumed()
-        {
-            if (watchersSuspended)
-            {
-                watchersSuspended = false;
-                StartDeviceWatchers();
-            }
-        }
-
-        /// <summary>
-        /// Stops all device watchers.
-        /// </summary>
-        private void StopDeviceWatchers()
-        {
-            // Stop all device watchers
-            foreach (DeviceWatcher deviceWatcher in mapDeviceWatchersToDeviceSelector.Keys)
-            {
-                if ((deviceWatcher.Status == DeviceWatcherStatus.Started)
-                    || (deviceWatcher.Status == DeviceWatcherStatus.EnumerationCompleted))
-                {
-                    deviceWatcher.Stop();
-                }
-            }
-
-            // Clear the list of devices so we don't have potentially disconnected devices around
-            ClearDeviceEntries();
-
-            watchersStarted = false;
-        }
-
-        #endregion
-
-        #region Methods to manage device list add, remove, etc
-
-        /// <summary>
-        /// Creates a DeviceListEntry for a device and adds it to the list of devices
-        /// </summary>
-        /// <param name="deviceInformation">DeviceInformation on the device to be added to the list</param>
-        /// <param name="deviceSelector">The AQS used to find this device</param>
-        private async void AddDeviceToList(DeviceInformation deviceInformation, String deviceSelector)
-        {
-            // search the device list for a device with a matching interface ID
-            var match = FindDevice(deviceInformation.Id);
-
-            // Add the device if it's new
-            if (match == null)
-            {
-                //     Create a new element for this device interface, and queue up the query of its
-                //     device information
-
-                match = new MFDevice<UsbDevice>();
-                match.Transport = TransportType.Usb;
-                match.Device.DeviceInformation = new UsbDeviceInformation(deviceInformation, deviceSelector);
-                match.Device.Parent = this;
-                match.Device.DebugEngine = new Engine(this, match);
-                match.Device.Transport = TransportType.Usb;
-
-                // Add the new element to the end of the list of devices
-                MFDevices.Add(match.Device as MFDeviceBase);
-
-                // now fill in the description
-                // try opening the device to read the descriptor
-                if (await ConnectUsbDeviceAsync(match.Device.DeviceInformation).ConfigureAwait(false))
-                {
-                    // the device description format is kept to maintain backwards compatibility
-                    match.Device.Description = EventHandlerForUsbDevice.Current.DeviceInformation.Name + "_" + await GetDeviceDescriptor(5).ConfigureAwait(false);
-                    match.Description = match.Device.Description;
-
-                    Debug.WriteLine("Add new USB device to list: " + match.Description + " @ " + deviceSelector);
-
-                    // done here, close device
-                    EventHandlerForUsbDevice.Current.CloseDevice();
-                }
-            }
-        }
-
-        private void RemoveDeviceFromList(string deviceId)
-        {
-            // Removes the device entry from the internal list; therefore the UI
-            var deviceEntry = FindDevice(deviceId);
-
-            MFUsbDevices.Remove(deviceEntry);
-        }
-
-        private void ClearDeviceEntries()
-        {
-            MFUsbDevices.Clear();
-        }
-
-        /// <summary>
-        /// Searches through the existing list of devices for the first DeviceListEntry that has
-        /// the specified device Id.
-        /// </summary>
-        /// <param name="deviceId">Id of the device that is being searched for</param>
-        /// <returns>DeviceListEntry that has the provided Id; else a nullptr</returns>
-        private MFDevice<UsbDevice> FindDevice(String deviceId)
-        {
-            if (deviceId != null)
-            {
-                foreach (MFDevice<UsbDevice> entry in MFUsbDevices)
-                {
-                    if (((UsbDeviceInformation)entry.Device.DeviceObject).DeviceInformation.Id == deviceId)
-                    {
-                        return entry;
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Remove the device from the device list 
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="deviceInformationUpdate"></param>
-        private void OnDeviceRemoved(DeviceWatcher sender, DeviceInformationUpdate deviceInformationUpdate)
-        {
-            RemoveDeviceFromList(deviceInformationUpdate.Id);
-        }
-
-        /// <summary>
-        /// This function will add the device to the listOfDevices
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="deviceInformation"></param>
-        private void OnDeviceAdded(DeviceWatcher sender, DeviceInformation deviceInformation)
-        {
-            AddDeviceToList(deviceInformation, mapDeviceWatchersToDeviceSelector[sender]);
-        }
-
-        #endregion
-
-        #region Handlers and events for Device Enumeration Complete 
-
-        private void OnDeviceEnumerationComplete(DeviceWatcher sender, Object args)
-        {
-            // add another device watcher completed
-            deviceWatchersCompletedCount++;
-
-            if (deviceWatchersCompletedCount == mapDeviceWatchersToDeviceSelector.Count)
-            {
-                Debug.WriteLine("USB device enumeration completed. Found {0} devices", MFDevices.Count);
-
-                // all watchers have completed enumeration
-                isAllDevicesEnumerated = true;
-
-                // fire event that USB enumeration is complete 
-                OnDeviceEnumerationCompleted();
-            }
-        }
-
-        private async Task<string> GetDeviceDescriptor(int index)
-        {
-            try
-            {
-                // maximum expected length of descriptor
-                uint readBufferSize = 64;
-
-                // prepare buffer to hold the descriptor data returned from the device
-                var buffer = new Windows.Storage.Streams.Buffer(readBufferSize);
-
-                // setup packet to perform the request
-                UsbSetupPacket setupPacket = new UsbSetupPacket
-                {
-                    RequestType = new UsbControlRequestType
-                    {
-                        Direction = UsbTransferDirection.In,
-                        Recipient = UsbControlRecipient.SpecifiedInterface,
-                        ControlTransferType = UsbControlTransferType.Vendor,
-                    },
-                    // request to get a descriptor
-                    Request = (byte)UsbDeviceRequestType.GetDescriptor,
-
-                    // descriptor number to be read
-                    Value = (uint)index,
-
-                    // max length of response
-                    Length = readBufferSize
-                };
-
-                // send control to device
-                IBuffer responseBuffer = await EventHandlerForUsbDevice.Current.Device.SendControlInTransferAsync(setupPacket, buffer);
-
-                // read from a buffer with a data reader
-                DataReader reader = DataReader.FromBuffer(responseBuffer);
-
-                // USB data is Little Endian 
-                reader.ByteOrder = ByteOrder.LittleEndian;
-
-                // set encoding to UTF16 & Little Endian
-                reader.UnicodeEncoding = Windows.Storage.Streams.UnicodeEncoding.Utf16LE;
-
-                // read 1st byte (descriptor length)
-                int descriptorLenght = reader.ReadByte();
-                // read 2nd byte (descriptor type)
-                int descryptorType = reader.ReadByte();
-
-                // check if this a string (string descriptor type is 0x03)
-                if (descryptorType == 0x03)
-                {
-                    // read a string with remaining bytes available
-                    // the string length is half the available bytes because it's UTF16 encoded (2 bytes for each char)
-                    return reader.ReadString(reader.UnconsumedBufferLength / 2);
-                }
-            }
-            catch (Exception)
-            {
-
-            }
-
-            // if we get here something went wrong above, so we don't have a descriptor
-            return string.Empty;
-        }
-
-        protected virtual void OnDeviceEnumerationCompleted()
-        {
-            EventHandler handler = DeviceEnumerationCompleted;
-            if (handler != null)
-            {
-                handler(this, new EventArgs());
-            }
-        }
-
-        /// <summary>
-        /// Event that is raised when enumeration of all watched devices is complete.
-        /// </summary>
-
-        public event EventHandler DeviceEnumerationCompleted;
-
-        #endregion
-
-        public async Task<bool> ConnectDeviceAsync(MFDeviceBase device)
-        {
-            return await ConnectUsbDeviceAsync(device.DeviceObject as UsbDeviceInformation);
-        }
-
-        private async Task<bool> ConnectUsbDeviceAsync(UsbDeviceInformation usbDeviceInfo)
-        {
-            //cast device object to UsbDeviceEntry
-            //UsbDeviceInformation usbDeviceInfo = (UsbDeviceInformation)device.DeviceObject;
-
-            // Create an EventHandlerForDevice to watch for the device we are connecting to
-            EventHandlerForUsbDevice.CreateNewEventHandlerForDevice();
-
-            // Get notified when the device was successfully connected to or about to be closed
-            EventHandlerForUsbDevice.Current.OnDeviceConnected = this.OnDeviceConnected;
-            EventHandlerForUsbDevice.Current.OnDeviceClose = this.OnDeviceClosing;
-
-            //Debug.WriteLine("Trying to open USB device " + device.Description + " @ " + usbDevice.InstanceId);
-
-            // It is important that the FromIdAsync call is made on the UI thread because the consent prompt can only be displayed
-            // on the UI thread. Since this method is invoked by the UI, we are already in the UI thread.
-            bool openResult = await EventHandlerForUsbDevice.Current.OpenDeviceAsync(usbDeviceInfo.DeviceInformation, usbDeviceInfo.DeviceSelector).ConfigureAwait(false);
-
-            //Debug.WriteLineIf(openResult, "Device open successfully.");
-            Debug.WriteLineIf(!openResult, "Failed to open device.");
-
-            return openResult;
-        }
-
-        public void DisconnectDevice(MFDeviceBase device)
-        {
-            if (FindDevice((device.DeviceObject as UsbDeviceInformation).InstanceId) != null)
-            {
-                //cast device object to UsbDeviceEntry
-                //UsbDeviceListEntry usbDevice = (UsbDeviceListEntry)device.DeviceObject;
-
-                EventHandlerForUsbDevice.Current.CloseDevice();
-            }
-        }
-
-        /// <summary>
-        /// If all the devices have been enumerated, select the device in the list we connected to. Otherwise let the EnumerationComplete event
-        /// from the device watcher handle the device selection
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="deviceInformation"></param>
-        private void OnDeviceConnected(EventHandlerForUsbDevice sender, DeviceInformation deviceInformation)
-        {
-            // Find and select our connected device
-            if (isAllDevicesEnumerated)
-            {
-            }
-
-            //rootPage.NotifyUser("Currently connected to: " + EventHandlerForUSBDevice.Current.DeviceInformation.Id, NotifyType.StatusMessage);
-        }
-
-        /// <summary>
-        /// The device was closed. If we will auto-reconnect to the device, reflect that in the UI
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="deviceInformation"></param>
-        private async void OnDeviceClosing(EventHandlerForUsbDevice sender, DeviceInformation deviceInformation)
-        {
-            //await rootPage.Dispatcher.RunAsync(
-            //    CoreDispatcherPriority.Normal,
-            //    new DispatchedHandler(() =>
-            //    {
-            //        // We were connected to the device that was unplugged, so change the "Disconnect from device" button
-            //        // to "Do not reconnect to device"
-            //        if (ButtonDisconnectFromDevice.IsEnabled && EventHandlerForDevice.Current.IsEnabledAutoReconnect)
-            //        {
-            //            ButtonDisconnectFromDevice.Content = ButtonNameDisableReconnectToDevice;
-            //        }
-            //    }));
-        }
-
-        #region Interface implementations
-
-        public DateTime LastActivity { get; set; }
-
-        public void DisconnectDevice(UsbDevice device)
-        {
-            EventHandlerForUsbDevice.Current.CloseDevice();
-        }
-
-        public async Task<uint> SendBufferAsync(byte[] buffer, CancellationToken cancellationToken)
-        {
-            uint bytesWritten = 0;
-
-            // device must be connected
-            if (EventHandlerForUsbDevice.Current.IsDeviceConnected)
-            {
-                //sanity check for available OUT pipes (must have at least one!)
-                if (EventHandlerForUsbDevice.Current.Device.DefaultInterface.BulkOutPipes.Count < 1)
-                {
-                    // FIXME
-                    // throw exception?
-                }
-
-                // gets the 1st OUT stream for the device
-                var stream = EventHandlerForUsbDevice.Current.Device.DefaultInterface.BulkOutPipes[(int)0].OutputStream;
-
-                // create a data writer to access the device OUT stream
-                var writer = new DataWriter(stream);
-
-                // write buffer
-                writer.WriteBytes(buffer);
-
-                // need to have a timeout to cancel the read task otherwise it may end up waiting forever for this to return
-                var timeoutCancelatioToken = new CancellationTokenSource(2000).Token;
-
-                // because we have an external cancellation token and the above timeout cancellation token, need to combine both
-                var linkedCancelationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCancelatioToken).Token;
-
-                Task<uint> storeAsyncTask;
-
-                try
-                {
-
-                    // Don't start any IO if the task has been canceled
-                    lock (cancelIoLock)
-                    {
-                        // set this makes sure that an exception is thrown when the cancellation token is set
-                        linkedCancelationToken.ThrowIfCancellationRequested();
-
-                        // Now the buffer data is actually flushed out to the device.
-                        // We should implement a cancellation Token here so we are able to stop the task operation explicitly if needed
-                        // The completion function should still be called so that we can properly handle a canceled task
-                        storeAsyncTask = writer.StoreAsync().AsTask(linkedCancelationToken);
-                    }
-
-                    bytesWritten = await storeAsyncTask;
-
-                    if (bytesWritten > 0)
-                    {
-                        LastActivity = DateTime.Now;
-                    }
-                }
-                catch (TaskCanceledException)
-                {
-                    // this is expected to happen, don't do anything with this 
-                }
-            }
-            else
-            {
-                // FIXME 
-                // NotifyDeviceNotConnected
-            }
-
-            return bytesWritten;
-        }
-
-        public async Task<DataReader> ReadBufferAsync(uint bytesToRead, TimeSpan waiTimeout, CancellationToken cancellationToken)
-        {
-            // device must be connected
-            if (EventHandlerForUsbDevice.Current.IsDeviceConnected)
-            {
-                //sanity check for available IN pipes (must have at least one!)
-                if (EventHandlerForUsbDevice.Current.Device.DefaultInterface.BulkInPipes.Count < 1)
-                {
-                    // FIXME
-                    // throw exception?
-                }
-
-                // gets the 1st IN stream for the device
-                var stream = EventHandlerForUsbDevice.Current.Device.DefaultInterface.BulkInPipes[0].InputStream;
-
-                DataReader reader = new DataReader(stream);
-                uint bytesRead = 0;
-
-                // need to have a timeout to cancel the read task otherwise it may end up waiting forever for this to return
-                var timeoutCancelatioToken = new CancellationTokenSource(waiTimeout).Token;
-
-                // because we have an external cancellation token and the above timeout cancellation token, need to combine both
-                var linkedCancelationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCancelatioToken).Token;
-
-                Task<UInt32> loadAsyncTask;
-
-                //Debug.WriteLine("### waiting");
-                await semaphore.WaitAsync();
-                //Debug.WriteLine("### got it");
-
-                try
-                {
-                    // Don't start any IO if the task has been canceled
-                    lock (cancelIoLock)
-                    {
-                        // set this makes sure that an exception is thrown when the cancellation token is set
-                        linkedCancelationToken.ThrowIfCancellationRequested();
-
-                        // We should implement a cancellation Token here so we are able to stop the task operation explicitly if needed
-                        // The completion function should still be called so that we can properly handle a canceled task
-                        loadAsyncTask = reader.LoadAsync(bytesToRead).AsTask(linkedCancelationToken);
-                    }
-
-                    bytesRead = await loadAsyncTask;
-                }
-                catch (TaskCanceledException)
-                {
-                    // this is expected to happen, don't do anything with this 
-                }
-                finally
-                {
-                    semaphore.Release();
-                    //Debug.WriteLine("### released");
-                }
-
-                return reader;
-            }
-            else
-            {
-                // FIXME 
-                // NotifyDeviceNotConnected
-            }
-
-            return null;
-        }
-
-        #endregion
-
-    }
-}
diff --git a/USB Debug Client/project.json b/USB Debug Client/project.json
deleted file mode 100644
index a05250dd..00000000
--- a/USB Debug Client/project.json	
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "supports": {},
-  "dependencies": {},
-  "frameworks": {
-    ".NETCore,Version=v4.5.1": {}
-  }
-}
\ No newline at end of file
diff --git a/USB Test App UWP/App.xaml b/USB Test App UWP/App.xaml
deleted file mode 100644
index 598f329b..00000000
--- a/USB Test App UWP/App.xaml	
+++ /dev/null
@@ -1,8 +0,0 @@
-<Application
-    x:Class="Test_App_UWP.App"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Test_App_UWP"
-    RequestedTheme="Light">
-
-</Application>
diff --git a/USB Test App UWP/App.xaml.cs b/USB Test App UWP/App.xaml.cs
deleted file mode 100644
index 74179457..00000000
--- a/USB Test App UWP/App.xaml.cs	
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-using nanoFramework.Tools.Debugger;
-using System;
-using System.Diagnostics;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
-
-namespace Test_App_UWP
-{
-    /// <summary>
-    /// Provides application-specific behavior to supplement the default Application class.
-    /// </summary>
-    sealed partial class App : Application
-    {
-        internal static PortBase NanoFrameworkUsbDebugClient;
-
-
-        /// <summary>
-        /// Initializes the singleton application object.  This is the first line of authored code
-        /// executed, and as such is the logical equivalent of main() or WinMain().
-        /// </summary>
-        public App()
-        {
-            InitializeComponent();
-            Suspending += OnSuspending;
-        }
-
-        /// <summary>
-        /// Invoked when the application is launched normally by the end user.  Other entry points
-        /// will be used such as when the application is launched to open a specific file.
-        /// </summary>
-        /// <param name="e">Details about the launch request and process.</param>
-        protected override void OnLaunched(LaunchActivatedEventArgs e)
-        {
-
-#if DEBUG
-            if (Debugger.IsAttached)
-            {
-                DebugSettings.EnableFrameRateCounter = true;
-            }
-#endif
-
-            Frame rootFrame = Window.Current.Content as Frame;
-
-            // Do not repeat app initialization when the Window already has content,
-            // just ensure that the window is active
-            if (rootFrame == null)
-            {
-                // Create a Frame to act as the navigation context and navigate to the first page
-                rootFrame = new Frame();
-
-                rootFrame.NavigationFailed += OnNavigationFailed;
-
-                if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
-                {
-                    //TODO: Load state from previously suspended application
-                }
-
-                // Place the frame in the current Window
-                Window.Current.Content = rootFrame;
-            }
-
-            if (rootFrame.Content == null)
-            {
-                // When the navigation stack isn't restored navigate to the first page,
-                // configuring the new page by passing required information as a navigation
-                // parameter
-                rootFrame.Navigate(typeof(MainPage), e.Arguments);
-            }
-            // Ensure the current window is active
-            Window.Current.Activate();
-
-            NanoFrameworkUsbDebugClient = PortBase.CreateInstanceForUsb("", this) as PortBase;
-            NanoFrameworkUsbDebugClient.DeviceEnumerationCompleted += UsbDebugClient_DeviceEnumerationCompleted;
-        }
-
-        private void UsbDebugClient_DeviceEnumerationCompleted(object sender, EventArgs e)
-        {
-            Debug.WriteLine("USB device enumeration complete, Found {0} devices", NanoFrameworkUsbDebugClient.NanoFrameworkDevices.Count);
-        }
-
-        /// <summary>
-        /// Invoked when Navigation to a certain page fails
-        /// </summary>
-        /// <param name="sender">The Frame which failed navigation</param>
-        /// <param name="e">Details about the navigation failure</param>
-        void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
-        {
-            throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
-        }
-
-        /// <summary>
-        /// Invoked when application execution is being suspended.  Application state is saved
-        /// without knowing whether the application will be terminated or resumed with the contents
-        /// of memory still intact.
-        /// </summary>
-        /// <param name="sender">The source of the suspend request.</param>
-        /// <param name="e">Details about the suspend request.</param>
-        private void OnSuspending(object sender, SuspendingEventArgs e)
-        {
-            var deferral = e.SuspendingOperation.GetDeferral();
-            //TODO: Save application state and stop any background activity
-            deferral.Complete();
-        }
-    }
-}
diff --git a/USB Test App UWP/Assets/LockScreenLogo.scale-200.png b/USB Test App UWP/Assets/LockScreenLogo.scale-200.png
deleted file mode 100644
index 735f57ad..00000000
Binary files a/USB Test App UWP/Assets/LockScreenLogo.scale-200.png and /dev/null differ
diff --git a/USB Test App UWP/Assets/SplashScreen.scale-200.png b/USB Test App UWP/Assets/SplashScreen.scale-200.png
deleted file mode 100644
index 023e7f1f..00000000
Binary files a/USB Test App UWP/Assets/SplashScreen.scale-200.png and /dev/null differ
diff --git a/USB Test App UWP/Assets/Square150x150Logo.scale-200.png b/USB Test App UWP/Assets/Square150x150Logo.scale-200.png
deleted file mode 100644
index af49fec1..00000000
Binary files a/USB Test App UWP/Assets/Square150x150Logo.scale-200.png and /dev/null differ
diff --git a/USB Test App UWP/Assets/Square44x44Logo.scale-200.png b/USB Test App UWP/Assets/Square44x44Logo.scale-200.png
deleted file mode 100644
index ce342a2e..00000000
Binary files a/USB Test App UWP/Assets/Square44x44Logo.scale-200.png and /dev/null differ
diff --git a/USB Test App UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/USB Test App UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
deleted file mode 100644
index f6c02ce9..00000000
Binary files a/USB Test App UWP/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and /dev/null differ
diff --git a/USB Test App UWP/Assets/StoreLogo.png b/USB Test App UWP/Assets/StoreLogo.png
deleted file mode 100644
index 7385b56c..00000000
Binary files a/USB Test App UWP/Assets/StoreLogo.png and /dev/null differ
diff --git a/USB Test App UWP/Assets/Wide310x150Logo.scale-200.png b/USB Test App UWP/Assets/Wide310x150Logo.scale-200.png
deleted file mode 100644
index 288995b3..00000000
Binary files a/USB Test App UWP/Assets/Wide310x150Logo.scale-200.png and /dev/null differ
diff --git a/USB Test App UWP/MainPage.xaml b/USB Test App UWP/MainPage.xaml
deleted file mode 100644
index 40bf5c10..00000000
--- a/USB Test App UWP/MainPage.xaml	
+++ /dev/null
@@ -1,19 +0,0 @@
-<Page
-    x:Class="Test_App_UWP.MainPage"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:Test_App_UWP"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    mc:Ignorable="d">
-
-    <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-        <Button x:Name="connectButton" Content="Connect" HorizontalAlignment="Left" Margin="82,82,0,0" VerticalAlignment="Top" Click="connectButton_Click"/>
-        <Button x:Name="pingButton" Content="Ping device" HorizontalAlignment="Left" Margin="82,149,0,0" VerticalAlignment="Top" Click="pingButton_Click"/>
-        <Button x:Name="printMemoryMapButton" Content="Memory Map" HorizontalAlignment="Left" Margin="82,221,0,0" VerticalAlignment="Top" Click="printMemoryMapButton_Click" />
-        <Button x:Name="printFlashSectorMapButton" Content="Flash Sector Map" HorizontalAlignment="Left" Margin="82,292,0,0" VerticalAlignment="Top" Click="printFlashSectorMapButton_Click" />
-        <Button x:Name="deployFileButton" Content="Deploy File" HorizontalAlignment="Left" Margin="82,367,0,0" VerticalAlignment="Top" Click="deployFileButton_Click" />
-        <Button x:Name="disconnectButton" Content="Disconnect" HorizontalAlignment="Left" Margin="248,82,0,0" VerticalAlignment="Top" Click="disconnectButton_Click"/>
-
-    </Grid>
-</Page>
diff --git a/USB Test App UWP/MainPage.xaml.cs b/USB Test App UWP/MainPage.xaml.cs
deleted file mode 100644
index 1101c342..00000000
--- a/USB Test App UWP/MainPage.xaml.cs	
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-using nanoFramework.Tools.Debugger.Extensions;
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Threading;
-using Windows.Storage;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
-
-namespace Test_App_UWP
-{
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class MainPage : Page
-    {
-        public MainPage()
-        {
-            InitializeComponent();
-        }
-
-        private async void connectButton_Click(object sender, RoutedEventArgs e)
-        {
-            // disable button
-            (sender as Button).IsEnabled = false;
-
-            bool connectResult = await App.NanoFrameworkUsbDebugClient.NanoFrameworkDevices[0].DebugEngine.ConnectAsync(3000, true);
-
-            var di = App.NanoFrameworkUsbDebugClient.NanoFrameworkDevices[0].GetDeviceInfo();
-
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-            Debug.WriteLine(di.ToString());
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-
-            // enable button
-            (sender as Button).IsEnabled = true;
-
-            
-        }
-
-        private async System.Threading.Tasks.Task button1_ClickAsync(object sender, RoutedEventArgs e)
-        {
-            var s = await App.NanoFrameworkUsbDebugClient.NanoFrameworkDevices[0].DebugEngine.SendBufferAsync(new byte[] { (byte)'x', (byte)'x' }, TimeSpan.FromMilliseconds(1000), new CancellationToken());
-
-            var r = await App.NanoFrameworkUsbDebugClient.NanoFrameworkDevices[0].DebugEngine.ReadBufferAsync(10, TimeSpan.FromMilliseconds(1000), new CancellationToken());
-        }
-
-        private void pingButton_Click(object sender, RoutedEventArgs e)
-        {
-            // disable button
-            (sender as Button).IsEnabled = false;
-            var p = App.NanoFrameworkUsbDebugClient.NanoFrameworkDevices[0].Ping();
-
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-            Debug.WriteLine("Ping response: " + p.ToString());
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-
-            // enable button
-            (sender as Button).IsEnabled = true;
-        }
-
-        private void printMemoryMapButton_Click(object sender, RoutedEventArgs e)
-        {
-            // disable button
-            (sender as Button).IsEnabled = false;
-
-            var mm = App.NanoFrameworkUsbDebugClient.NanoFrameworkDevices[0].DebugEngine.GetMemoryMap();
-
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-            Debug.WriteLine(mm.ToStringForOutput());
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-
-            // enable button
-            (sender as Button).IsEnabled = true;
-        }
-
-        private void printFlashSectorMapButton_Click(object sender, RoutedEventArgs e)
-        {
-            // disable button
-            (sender as Button).IsEnabled = false;
-
-            var fm = App.NanoFrameworkUsbDebugClient.NanoFrameworkDevices[0].DebugEngine.GetFlashSectorMap();
-            //var fm = await App.NETMFUsbDebugClient.MFDevices[0].DebugEngine.GetAssembliesAsync();
-
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-            Debug.WriteLine(fm.ToStringForOutput());
-            Debug.WriteLine("");
-            Debug.WriteLine("");
-
-            // enable button
-            (sender as Button).IsEnabled = true;
-        }
-
-        private async void deployFileButton_Click(object sender, RoutedEventArgs e)
-        {
-            // disable button
-            (sender as Button).IsEnabled = false;
-
-            //// for this to work first need to copy the files nanoCLR.bin and nanoCLR.hex to Documents folder
-            //string hexFile = Path.Combine(
-            //                            Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
-            //                            "nanoCLR.hex");
-
-            //var reply = await App.NanoFrameworkUsbDebugClient.NanoFrameworkDevices[0].DeploySrecFileAsync(hexFile, CancellationToken.None, null);
-
-            // now the BIN file
-            string binFile = Path.Combine(
-                                        Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments),
-                                        "nanoCLR.bin");
-
-            ////////////////////////////////////////////////////////////////////////////////
-            // MAKE sure to adjust this to the appropriate flash address of the CLR block //
-            uint flashAddress = 0x08004000;
-            ////////////////////////////////////////////////////////////////////////////////
-
-            var reply1 = await App.NanoFrameworkUsbDebugClient.NanoFrameworkDevices[0].DeployBinaryFileAsync(binFile, flashAddress, CancellationToken.None, null);
-
-            // enable button
-            (sender as Button).IsEnabled = true;
-        }
-
-        private void disconnectButton_Click(object sender, RoutedEventArgs e)
-        {
-            // disable button
-            (sender as Button).IsEnabled = false;
-
-            App.NanoFrameworkUsbDebugClient.NanoFrameworkDevices[0].Disconnect();
-
-            // enable button
-            (sender as Button).IsEnabled = true;
-        }
-    }
-}
diff --git a/USB Test App UWP/Package.appxmanifest b/USB Test App UWP/Package.appxmanifest
deleted file mode 100644
index bef92d88..00000000
--- a/USB Test App UWP/Package.appxmanifest	
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="6759b2f1-111c-4917-a2cf-172b4f91d3eb" Publisher="CN=nanoframework" Version="1.0.0.0" />
-  <mp:PhoneIdentity PhoneProductId="6759b2f1-111c-4917-a2cf-172b4f91d3eb" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
-  <Properties>
-    <DisplayName>Test App UWP</DisplayName>
-    <PublisherDisplayName>jassimoes</PublisherDisplayName>
-    <Logo>Assets\StoreLogo.png</Logo>
-  </Properties>
-  <Dependencies>
-    <TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-  </Dependencies>
-  <Resources>
-    <Resource Language="x-generate" />
-  </Resources>
-  <Applications>
-    <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="Test_App_UWP.App">
-      <uap:VisualElements DisplayName="NanoFramework USB Debug Client Test App UWP" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="NanoFramework USB Debug Client Test App UWP" BackgroundColor="transparent">
-        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png">
-        </uap:DefaultTile>
-        <uap:SplashScreen Image="Assets\SplashScreen.png" />
-      </uap:VisualElements>
-    </Application>
-  </Applications>
-  <Capabilities>
-    <Capability Name="internetClient" />
-    <DeviceCapability Name="usb">
-      <Device Id="vidpid:0483 A08f">
-        <Function Type="name:vendorSpecific" />
-      </Device>
-      <Device Id="vidpid:0483 374B">
-        <Function Type="classId:ff * *" />
-      </Device>
-      <Device Id="vidpid:0483 5740">
-        <Function Type="classId:ff * *" />
-      </Device>
-    </DeviceCapability>
-    <DeviceCapability Name="serialcommunication">
-      <Device Id="vidpid:0483 5740">
-        <Function Type="name:serialPort" />
-      </Device>
-    </DeviceCapability>
-  </Capabilities>
-</Package>
\ No newline at end of file
diff --git a/USB Test App UWP/Properties/AssemblyInfo.cs b/USB Test App UWP/Properties/AssemblyInfo.cs
deleted file mode 100644
index ff34ce6b..00000000
--- a/USB Test App UWP/Properties/AssemblyInfo.cs	
+++ /dev/null
@@ -1,28 +0,0 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("UWP Test App for nanoFramework USB debug")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("nanoFramework")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and Contributors")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/USB Test App UWP/Properties/Default.rd.xml b/USB Test App UWP/Properties/Default.rd.xml
deleted file mode 100644
index 80a960ce..00000000
--- a/USB Test App UWP/Properties/Default.rd.xml	
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
-    developers. However, you can modify these parameters to modify the behavior of the .NET Native
-    optimizer.
-
-    Runtime Directives are documented at http://go.microsoft.com/fwlink/?LinkID=391919
-
-    To fully enable reflection for App1.MyClass and all of its public/private members
-    <Type Name="App1.MyClass" Dynamic="Required All"/>
-
-    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
-    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
-
-    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
--->
-
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Application>
-    <!--
-      An Assembly element with Name="*Application*" applies to all assemblies in
-      the application package. The asterisks are not wildcards.
-    -->
-    <Assembly Name="*Application*" Dynamic="Required All" />
-    
-    
-    <!-- Add your application specific runtime directives here. -->
-
-
-  </Application>
-</Directives>
\ No newline at end of file
diff --git a/USB Test App UWP/USB Test App UWP.csproj b/USB Test App UWP/USB Test App UWP.csproj
deleted file mode 100644
index b2392e2b..00000000
--- a/USB Test App UWP/USB Test App UWP.csproj	
+++ /dev/null
@@ -1,152 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}</ProjectGuid>
-    <OutputType>AppContainerExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Test_App_UWP</RootNamespace>
-    <AssemblyName>nanoFramework USB Debug Client Test App UWP</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.17763.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>16</MinimumVisualStudioVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>USB Test App UWP_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>C2BD5489FFE1F1D5E943737C646C7E9A44957765</PackageCertificateThumbprint>
-    <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <None Include="USB Test App UWP_TemporaryKey.pfx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="MainPage.xaml.cs">
-      <DependentUpon>MainPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Properties\Default.rd.xml" />
-    <Content Include="Assets\LockScreenLogo.scale-200.png" />
-    <Content Include="Assets\SplashScreen.scale-200.png" />
-    <Content Include="Assets\Square150x150Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="Assets\StoreLogo.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="MainPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\nanoFramework.Tools.DebugLibrary.UWP\nanoFramework.Tools.DebugLibrary.UWP.csproj">
-      <Project>{21e5a6a5-f4f7-411a-80dc-f49e62d8a7c3}</Project>
-      <Name>nanoFramework.Tools.DebugLibrary.UWP</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.11</Version>
-    </PackageReference>
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/USB Test App WPF/App.config b/USB Test App WPF/App.config
index 2f989554..c23d8b51 100644
--- a/USB Test App WPF/App.config	
+++ b/USB Test App WPF/App.config	
@@ -1,17 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/USB Test App WPF/App.xaml.cs b/USB Test App WPF/App.xaml.cs
index 3a7cd20a..587261d6 100644
--- a/USB Test App WPF/App.xaml.cs	
+++ b/USB Test App WPF/App.xaml.cs	
@@ -8,6 +8,7 @@
 using nanoFramework.Tools.Debugger;
 using Serial_Test_App_WPF.ViewModel;
 using System;
+using System.Collections.Generic;
 
 namespace Serial_Test_App_WPF
 {
@@ -41,13 +42,12 @@ private void App_Activated(object sender, EventArgs e)
 
         private INFSerialDebugClientService CreateSerialDebugClient()
         {
-            //virtualApp = Windows.UI.Xaml.Application.Current;
+            // add here any COM ports to exclude from the search
+            var devicesToExclude = new List<string>() { "COM15" };
 
-            // TODO: check app lifecycle
-            var serialDebugClient = PortBase.CreateInstanceForSerial("", new System.Collections.Generic.List<string>() { "COM16" } );
+            var serialDebugClient = PortBase.CreateInstanceForSerial(devicesToExclude);
 
             return new NFSerialDebugClientService(serialDebugClient);
         }
     }
-
 }
diff --git a/USB Test App WPF/MainWindow.xaml b/USB Test App WPF/MainWindow.xaml
index 1b611c1d..02464982 100644
--- a/USB Test App WPF/MainWindow.xaml	
+++ b/USB Test App WPF/MainWindow.xaml	
@@ -23,7 +23,7 @@
                 <DataGridTextColumn Binding="{Binding Description}"/>
             </DataGrid.Columns>
         </DataGrid>
-        <Button Content="Connect" HorizontalAlignment="Left" Margin="250,77,0,0" VerticalAlignment="Top" Width="98" Click="ConnectDeviceButton_ClickAsync"/>
+        <Button Content="Connect" HorizontalAlignment="Left" Margin="250,77,0,0" VerticalAlignment="Top" Width="98" Click="ConnectDeviceButton_Click"/>
         <Button Content="Disconnect" HorizontalAlignment="Left" Margin="250,102,0,0" VerticalAlignment="Top" Width="98" Click="DisconnectDeviceButton_Click"/>
         <Button Content="Ping" HorizontalAlignment="Left" Margin="250,129,0,0" VerticalAlignment="Top" Width="98" Click="PingButton_Click" />
 
diff --git a/USB Test App WPF/MainWindow.xaml.cs b/USB Test App WPF/MainWindow.xaml.cs
index f114ca23..0ba97f6f 100644
--- a/USB Test App WPF/MainWindow.xaml.cs	
+++ b/USB Test App WPF/MainWindow.xaml.cs	
@@ -104,58 +104,54 @@ public MainWindow()
             InitializeComponent();
         }
 
-        private async void ConnectDeviceButton_ClickAsync(object sender, RoutedEventArgs e)
+        private void ConnectDeviceButton_Click(object sender, RoutedEventArgs e)
         {
             // disable button
             (sender as Button).IsEnabled = false;
 
-            await Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(async () =>
-            {
-                var device = (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex];
+            var device = (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex];
 
-                if(device.DebugEngine == null)
-                {
-                    device.CreateDebugEngine();
-                }
+            if(device.DebugEngine == null)
+            {
+                device.CreateDebugEngine(NanoSerialDevice.SafeDefaultTimeout);
+            }
 
-                bool connectResult = await device.DebugEngine.ConnectAsync(5000, true);
+            bool connectResult = device.DebugEngine.Connect(5000, true);
 
-                if(connectResult)
-                {
-                    device.DebugEngine.OnProcessExit += DebugEngine_OnProcessExit;
-
-                    var di = (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].GetDeviceInfo();
+            if(connectResult)
+            {
+                device.DebugEngine.OnProcessExit += DebugEngine_OnProcessExit;
 
-                    Debug.WriteLine("");
-                    Debug.WriteLine("");
-                    Debug.WriteLine(di.ToString());
-                    Debug.WriteLine("");
-                    Debug.WriteLine("");
+                var di = (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].GetDeviceInfo();
 
-                    Debug.WriteLine("Device capabilities:");
+                Debug.WriteLine("");
+                Debug.WriteLine("");
+                Debug.WriteLine(di.ToString());
+                Debug.WriteLine("");
+                Debug.WriteLine("");
 
-                    Debug.Write("IFU capable: ");
-                    if (device.IsIFUCapable)
-                    {
-                        Debug.WriteLine("YES");
-                    }
-                    else
-                    {
-                        Debug.WriteLine("NO");
-                    }
+                Debug.WriteLine("Device capabilities:");
 
-                    Debug.Write("Has proprietary bootloader: ");
-                    if (device.HasProprietaryBooter)
-                    {
-                        Debug.WriteLine("YES");
-                    }
-                    else
-                    {
-                        Debug.WriteLine("NO");
-                    }
+                Debug.Write("IFU capable: ");
+                if (device.IsIFUCapable)
+                {
+                    Debug.WriteLine("YES");
+                }
+                else
+                {
+                    Debug.WriteLine("NO");
                 }
 
-            }));
+                Debug.Write("Has proprietary bootloader: ");
+                if (device.HasProprietaryBooter)
+                {
+                    Debug.WriteLine("YES");
+                }
+                else
+                {
+                    Debug.WriteLine("NO");
+                }
+            }
 
             // enable button
             (sender as Button).IsEnabled = true;
@@ -734,27 +730,20 @@ private async void StopProcessingButton_Click(object sender, RoutedEventArgs e)
             (sender as Button).IsEnabled = true;
         }
 
-        private async void EraseDeploymentButton_Click(object sender, RoutedEventArgs e)
+        private void EraseDeploymentButton_Click(object sender, RoutedEventArgs e)
         {
             // disable button
             (sender as Button).IsEnabled = false;
 
             try
             {
-                await Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(async () =>
-                {
-                    // enable button
-                    (sender as Button).IsEnabled = true;
-
-                    await (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].EraseAsync(EraseOptions.Deployment, CancellationToken.None);
+                (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].Erase(EraseOptions.Deployment);
 
-                    Debug.WriteLine("");
-                    Debug.WriteLine("");
-                    Debug.WriteLine($"Erased deployment area SUCCESFULL.");
-                    Debug.WriteLine("");
-                    Debug.WriteLine("");
-
-                }));
+                Debug.WriteLine("");
+                Debug.WriteLine("");
+                Debug.WriteLine($"Erased deployment area SUCCESFULL.");
+                Debug.WriteLine("");
+                Debug.WriteLine("");
             }
             catch
             { 
@@ -765,27 +754,20 @@ private async void EraseDeploymentButton_Click(object sender, RoutedEventArgs e)
             (sender as Button).IsEnabled = true;
         }
 
-        private async void IsInitStateButton_Click(object sender, RoutedEventArgs e)
+        private void IsInitStateButton_Click(object sender, RoutedEventArgs e)
         {
             // disable button
             (sender as Button).IsEnabled = false;
 
             try
             {
-                await Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
-                {
-                    // enable button
-                    (sender as Button).IsEnabled = true;
-
-                    var isInitState = (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].DebugEngine.IsDeviceInInitializeState();
+                var isInitState = (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].DebugEngine.IsDeviceInInitializeState();
 
-                    Debug.WriteLine("");
-                    Debug.WriteLine("");
-                    Debug.WriteLine($"device is in init state: {isInitState}");
-                    Debug.WriteLine("");
-                    Debug.WriteLine("");
-
-                }));
+                Debug.WriteLine("");
+                Debug.WriteLine("");
+                Debug.WriteLine($"device is in init state: {isInitState}");
+                Debug.WriteLine("");
+                Debug.WriteLine("");
             }
             catch
             {
@@ -796,65 +778,60 @@ private async void IsInitStateButton_Click(object sender, RoutedEventArgs e)
             (sender as Button).IsEnabled = true;
         }
 
-        private async void GetDeviceConfigButton_Click(object sender, RoutedEventArgs e)
+        private void GetDeviceConfigButton_Click(object sender, RoutedEventArgs e)
         {
             // disable button
             (sender as Button).IsEnabled = false;
 
-            await Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
-             {
-
-                 try
-                 {
-                     // Create cancellation token source
-                     CancellationTokenSource cts = new CancellationTokenSource();
+            try
+            {
+                // Create cancellation token source
+                CancellationTokenSource cts = new CancellationTokenSource();
 
-                     var device = (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex];
+                var device = (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex];
 
-                     // get device info
-                     var deviceConfig = device.DebugEngine.GetDeviceConfiguration(cts.Token);
+                // get device info
+                var deviceConfig = device.DebugEngine.GetDeviceConfiguration(cts.Token);
 
-                     if (deviceConfig.NetworkConfigurations.Count > 0)
-                     {
-                         Debug.WriteLine(deviceConfig.NetworkConfigurations[0].ToStringForOutput());
-                     }
+                if (deviceConfig.NetworkConfigurations.Count > 0)
+                {
+                    Debug.WriteLine(deviceConfig.NetworkConfigurations[0].ToStringForOutput());
+                }
 
-                     if (deviceConfig.Wireless80211Configurations.Count > 0)
-                     {
-                         Debug.WriteLine(deviceConfig.Wireless80211Configurations[0].ToStringForOutput());
-                     }
+                if (deviceConfig.Wireless80211Configurations.Count > 0)
+                {
+                    Debug.WriteLine(deviceConfig.Wireless80211Configurations[0].ToStringForOutput());
+                }
 
-                     if (deviceConfig.WirelessAPConfigurations.Count > 0)
-                     {
-                         Debug.WriteLine(deviceConfig.WirelessAPConfigurations[0].ToStringForOutput());
-                     }
+                if (deviceConfig.WirelessAPConfigurations.Count > 0)
+                {
+                    Debug.WriteLine(deviceConfig.WirelessAPConfigurations[0].ToStringForOutput());
+                }
 
-                     if (deviceConfig.X509Certificates.Count > 0)
-                     {
-                         X509Certificate2 cert = new X509Certificate2(deviceConfig.X509Certificates[0].Certificate);
-                         Debug.WriteLine(cert.ToString());
-                     }
+                if (deviceConfig.X509Certificates.Count > 0)
+                {
+                    X509Certificate2 cert = new X509Certificate2(deviceConfig.X509Certificates[0].Certificate);
+                    Debug.WriteLine(cert.ToString());
+                }
 
-                     if (deviceConfig.X509DeviceCertificates.Count > 0)
-                     {
-                         X509Certificate2 deviceCert = new X509Certificate2(deviceConfig.X509Certificates[0].Certificate);
-                         Debug.WriteLine(deviceCert.ToString());
-                     }
+                if (deviceConfig.X509DeviceCertificates.Count > 0)
+                {
+                    X509Certificate2 deviceCert = new X509Certificate2(deviceConfig.X509Certificates[0].Certificate);
+                    Debug.WriteLine(deviceCert.ToString());
+                }
 
-                     //Debug.WriteLine(string.Empty);
-                     //Debug.WriteLine(string.Empty);
-                     //Debug.WriteLine("--------------------------------");
-                     //Debug.WriteLine("::        Memory Map          ::");
-                     //Debug.WriteLine("--------------------------------");
+                //Debug.WriteLine(string.Empty);
+                //Debug.WriteLine(string.Empty);
+                //Debug.WriteLine("--------------------------------");
+                //Debug.WriteLine("::        Memory Map          ::");
+                //Debug.WriteLine("--------------------------------");
 
 
-                 }
-                 catch(Exception ex)
-                 {
-
-                 }
+            }
+            catch(Exception ex)
+            {
 
-             }));
+            }
 
             // enable button
             (sender as Button).IsEnabled = true;
@@ -868,110 +845,111 @@ private async void GetDeviceConfigButton_Click(object sender, RoutedEventArgs e)
         /// <param name="e"></param>
         /// <remarks>
         /// </remarks>
-        private async void SetDeviceConfigButton_Click(object sender, RoutedEventArgs e)
+        private void SetDeviceConfigButton_Click(object sender, RoutedEventArgs e)
         {
             // disable button
             (sender as Button).IsEnabled = false;
 
-            await Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
-             {
-
-                 try
-                 {
-                     // Create cancellation token source
-                     CancellationTokenSource cts = new CancellationTokenSource();
-
-                     var device = (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex];
+            try
+            {
+                // Create cancellation token source
+                CancellationTokenSource cts = new CancellationTokenSource();
 
-                     // get device info
-                     var deviceConfig = device.DebugEngine.GetDeviceConfiguration(cts.Token);
+                var device = (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex];
 
-                     // update new network configuration
-                     DeviceConfiguration.NetworkConfigurationProperties newDeviceNetworkConfiguration = new DeviceConfiguration.NetworkConfigurationProperties
-                     {
-                         MacAddress = new byte[] { 0, 0x80, 0xe1, 0x01, 0x35, 0x56 },
-                         InterfaceType = NetworkInterfaceType.Ethernet,
-                         StartupAddressMode = AddressMode.DHCP,
+                // get device info
+                var deviceConfig = device.DebugEngine.GetDeviceConfiguration(cts.Token);
 
-                         IPv4DNSAddress1 = IPAddress.Parse("192.168.1.254"),
-                     };
+                // update new network configuration
+                DeviceConfiguration.NetworkConfigurationProperties newDeviceNetworkConfiguration = new DeviceConfiguration.NetworkConfigurationProperties
+                {
+                    MacAddress = new byte[] { 0, 0x80, 0xe1, 0x01, 0x35, 0x56 },
+                    InterfaceType = NetworkInterfaceType.Ethernet,
+                    StartupAddressMode = AddressMode.DHCP,
 
-                     // write device configuration to device
-                     var returnValue = device.DebugEngine.UpdateDeviceConfiguration(newDeviceNetworkConfiguration, 0);
+                    IPv4DNSAddress1 = IPAddress.Parse("192.168.1.254"),
+                };
 
-                     //// add new wireless 802.11 configuration
-                     //DeviceConfiguration.Wireless80211ConfigurationProperties newWireless80211Configuration = new DeviceConfiguration.Wireless80211ConfigurationProperties()
-                     //{
-                     //    Id = 44,
-                     //    Ssid = "Nice_Ssid",
-                     //    Password = "1234",
-                     //};
+                // write device configuration to device
+                var returnValue = device.DebugEngine.UpdateDeviceConfiguration(newDeviceNetworkConfiguration, 0);
 
-                     //// write wireless configuration to device
-                     //returnValue = device.DebugEngine.UpdateDeviceConfiguration(newWireless80211Configuration, 0);
+                //// add new wireless 802.11 configuration
+                //DeviceConfiguration.Wireless80211ConfigurationProperties newWireless80211Configuration = new DeviceConfiguration.Wireless80211ConfigurationProperties()
+                //{
+                //    Id = 44,
+                //    Ssid = "Nice_Ssid",
+                //    Password = "1234",
+                //};
 
-                     // build a CA certificate bundle
-                     DeviceConfiguration.X509CaRootBundleProperties newX509CertificateBundle = new DeviceConfiguration.X509CaRootBundleProperties();
+                //// write wireless configuration to device
+                //returnValue = device.DebugEngine.UpdateDeviceConfiguration(newWireless80211Configuration, 0);
 
-                     // add CA root certificates
+                // build a CA certificate bundle
+                DeviceConfiguration.X509CaRootBundleProperties newX509CertificateBundle = new DeviceConfiguration.X509CaRootBundleProperties();
 
-                     /////////////////////////////////////////////////////////
-                     // BECAUSE WE ARE PARSING FROM A BASE64 encoded format //
-                     // NEED TO ADD A TERMINATOR TO THE STRING              //
-                     /////////////////////////////////////////////////////////
+                // add CA root certificates
 
-                     string caRootBundle = baltimoreCACertificate + letsEncryptCACertificate + "\0";
+                /////////////////////////////////////////////////////////
+                // BECAUSE WE ARE PARSING FROM A BASE64 encoded format //
+                // NEED TO ADD A TERMINATOR TO THE STRING              //
+                /////////////////////////////////////////////////////////
 
-                     byte[] certificateRaw = Encoding.UTF8.GetBytes(caRootBundle);
+                string caRootBundle = baltimoreCACertificate + letsEncryptCACertificate + "\0";
 
-                     newX509CertificateBundle.Certificate = certificateRaw;
+                byte[] certificateRaw = Encoding.UTF8.GetBytes(caRootBundle);
 
-                     // write CA certificate to device
-                     returnValue = device.DebugEngine.UpdateDeviceConfiguration(newX509CertificateBundle, 0);
+                newX509CertificateBundle.Certificate = certificateRaw;
 
-                     Debug.WriteLine("");
-                     Debug.WriteLine("");
-                     Debug.WriteLine($"device config update result: {returnValue}");
-                     Debug.WriteLine("");
-                     Debug.WriteLine("");
+                // write CA certificate to device
+                returnValue = device.DebugEngine.UpdateDeviceConfiguration(newX509CertificateBundle, 0);
 
-                 }
-                 catch (Exception ex)
-                 {
+                Debug.WriteLine("");
+                Debug.WriteLine("");
+                Debug.WriteLine($"device config update result: {returnValue}");
+                Debug.WriteLine("");
+                Debug.WriteLine("");
 
-                 }
+            }
+            catch (Exception ex)
+            {
 
-             }));
+            }
 
             // enable button
             (sender as Button).IsEnabled = true;
         }
 
-        private async void ReScanDevices_Click(object sender, RoutedEventArgs e)
+        private void ReScanDevices_Click(object sender, RoutedEventArgs e)
         {
             // disable button
             (sender as Button).IsEnabled = false;
 
-            await Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() => {
+            Task.Run(delegate
+            {
+                Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
+                {
+                    (DataContext as MainViewModel).SerialDebugService.SerialDebugClient.ReScanDevices();
 
-                (DataContext as MainViewModel).SerialDebugService.SerialDebugClient.ReScanDevices();
+                    // need to wait for devices enumeration to complete
+                    while (!(DataContext as MainViewModel).SerialDebugService.SerialDebugClient.IsDevicesEnumerationComplete)
+                    {
+                        Thread.Sleep(100);
+                    }
 
-            }));
+                    // enable button
+                    (sender as Button).IsEnabled = true;
+                }));
 
-            // enable button
-            (sender as Button).IsEnabled = true;
+            });
         }
 
-        private async void ReadTestButton_Click(object sender, RoutedEventArgs e)
+        private void ReadTestButton_Click(object sender, RoutedEventArgs e)
         {
             // disable button
             (sender as Button).IsEnabled = false;
 
             try
             {
-                // Create cancellation token source
-                CancellationTokenSource cts = new CancellationTokenSource();
-
                 var device = (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex];
 
                 // get memory map
@@ -1022,19 +1000,6 @@ private async void ReadTestButton_Click(object sender, RoutedEventArgs e)
                         // check error code
                     }
                 }
-
-                await Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
-                {
-                    Debug.WriteLine($">>> read flash memory completed <<<<");
-
-
-                    //(DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].DebugEngine.RebootDevice(RebootOptions.ClrOnly);
-
-                    //Task.Delay(1000).Wait();
-
-                    //(DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].GetDeviceInfo(true);
-
-                }));
             }
             catch
             {
@@ -1045,62 +1010,49 @@ private async void ReadTestButton_Click(object sender, RoutedEventArgs e)
             (sender as Button).IsEnabled = true;
         }
 
-        private async void TargetInfoButton_Click(object sender, RoutedEventArgs e)
+        private void TargetInfoButton_Click(object sender, RoutedEventArgs e)
         {
             // disable button
             (sender as Button).IsEnabled = false;
 
+            var device = (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex];
 
-            await Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() => {
 
-                var device = (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex];
-
-
-                var targetInfo = device.DebugEngine.GetMonitorTargetInfo();
-
-                if (targetInfo != null)
-                {
-                    Debug.WriteLine("");
-                    Debug.WriteLine("");
-                    Debug.WriteLine($"{targetInfo.ToString()}");
-                    Debug.WriteLine("");
-                    Debug.WriteLine("");
-                }
-                else
-                {
-                    Debug.WriteLine("");
-                    Debug.WriteLine("no OEM info available");
-                    Debug.WriteLine("");
-                }
+            var targetInfo = device.DebugEngine.GetMonitorTargetInfo();
 
-            }));
+            if (targetInfo != null)
+            {
+                Debug.WriteLine("");
+                Debug.WriteLine("");
+                Debug.WriteLine($"{targetInfo.ToString()}");
+                Debug.WriteLine("");
+                Debug.WriteLine("");
+            }
+            else
+            {
+                Debug.WriteLine("");
+                Debug.WriteLine("no OEM info available");
+                Debug.WriteLine("");
+            }
 
             // enable button
             (sender as Button).IsEnabled = true;
-
         }
 
-        private async void RebootToNanoBooterButton_Click(object sender, RoutedEventArgs e)
+        private void RebootToNanoBooterButton_Click(object sender, RoutedEventArgs e)
         {
             // disable button
             (sender as Button).IsEnabled = false;
 
             try
             {
-                await Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
-                {
-                    // enable button
-                    (sender as Button).IsEnabled = true;
-
-                    (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].DebugEngine.RebootDevice(RebootOptions.EnterNanoBooter);
+                (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].DebugEngine.RebootDevice(RebootOptions.EnterNanoBooter);
 
-                    Debug.WriteLine("");
-                    Debug.WriteLine("");
-                    Debug.WriteLine($"Reboot & launch nanoBooter");
-                    Debug.WriteLine("");
-                    Debug.WriteLine("");
-
-                }));
+                Debug.WriteLine("");
+                Debug.WriteLine("");
+                Debug.WriteLine($"Reboot & launch nanoBooter");
+                Debug.WriteLine("");
+                Debug.WriteLine("");
             }
             catch
             {
@@ -1108,10 +1060,10 @@ private async void RebootToNanoBooterButton_Click(object sender, RoutedEventArgs
             }
 
             // enable button
-
+            (sender as Button).IsEnabled = true;
         }
 
-        private async void DeployFileTestButton_Click(object sender, RoutedEventArgs e)
+        private void DeployFileTestButton_Click(object sender, RoutedEventArgs e)
         {
             // disable button
             (sender as Button).IsEnabled = false;
@@ -1135,7 +1087,7 @@ private async void DeployFileTestButton_Click(object sender, RoutedEventArgs e)
             uint flashAddress = 0x08004000;
             ////////////////////////////////////////////////////////////////////////////////
 
-            var reply1 = await (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].DeployBinaryFileAsync(binFile, flashAddress, CancellationToken.None, null);
+            var reply1 = (DataContext as MainViewModel).AvailableDevices[DeviceGrid.SelectedIndex].DeployBinaryFile(binFile, flashAddress, null);
 
             // enable button
             (sender as Button).IsEnabled = true;
diff --git a/USB Test App WPF/Properties/Resources.Designer.cs b/USB Test App WPF/Properties/Resources.Designer.cs
index 42c7cd2b..88ac5d46 100644
--- a/USB Test App WPF/Properties/Resources.Designer.cs	
+++ b/USB Test App WPF/Properties/Resources.Designer.cs	
@@ -19,7 +19,7 @@ namespace Serial_Test_App_WPF.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
diff --git a/USB Test App WPF/Properties/Settings.Designer.cs b/USB Test App WPF/Properties/Settings.Designer.cs
deleted file mode 100644
index 59b2a388..00000000
--- a/USB Test App WPF/Properties/Settings.Designer.cs	
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace Serial_Test_App_WPF.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}
diff --git a/USB Test App WPF/Properties/Settings.settings b/USB Test App WPF/Properties/Settings.settings
deleted file mode 100644
index 033d7a5e..00000000
--- a/USB Test App WPF/Properties/Settings.settings	
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
\ No newline at end of file
diff --git a/USB Test App WPF/Serial Test App WPF.csproj b/USB Test App WPF/Serial Test App WPF.csproj
index b08d34f9..c4f0fd98 100644
--- a/USB Test App WPF/Serial Test App WPF.csproj	
+++ b/USB Test App WPF/Serial Test App WPF.csproj	
@@ -86,19 +86,10 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config">
@@ -113,16 +104,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="CommonServiceLocator">
-      <Version>2.0.5</Version>
+      <Version>2.0.6</Version>
     </PackageReference>
     <PackageReference Include="Fody">
       <Version>4.2.1</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.SDK.Contracts">
-      <Version>10.0.19041.1</Version>
-    </PackageReference>
     <PackageReference Include="MvvmLight">
       <Version>5.4.1.1</Version>
     </PackageReference>
diff --git a/USB Test App WPF/ViewModel/MainViewModel.cs b/USB Test App WPF/ViewModel/MainViewModel.cs
index 105b423b..5e489f2b 100644
--- a/USB Test App WPF/ViewModel/MainViewModel.cs	
+++ b/USB Test App WPF/ViewModel/MainViewModel.cs	
@@ -14,6 +14,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Windows;
+using System.Windows.Data;
 using System.Windows.Threading;
 
 namespace Serial_Test_App_WPF.ViewModel
@@ -32,8 +33,11 @@ namespace Serial_Test_App_WPF.ViewModel
     /// </summary>
     [AddINotifyPropertyChangedInterface]
     public class MainViewModel : ViewModelBase
-
     {
+        private readonly object _lockObj = new object();
+
+        INFSerialDebugClientService _serialDebugService;
+
         /// <summary>
         /// Initializes a new instance of the MainViewModel class.
         /// </summary>
@@ -49,83 +53,61 @@ public MainViewModel()
             ////}
         }
 
-        public INFSerialDebugClientService SerialDebugService { get; set; }
+        public INFSerialDebugClientService SerialDebugService 
+        { 
+            get
+            {
+                return _serialDebugService;
+            }
 
-        public void OnSerialDebugServiceChanged()
-        {
-            if (SerialDebugService != null)
+            set
             {
-                SerialDebugService.SerialDebugClient.DeviceEnumerationCompleted += SerialDebugClient_DeviceEnumerationCompleted;
+                if (_serialDebugService == value)
+                {
+                    return;
+                }
+
+                _serialDebugService = value;
 
-                SerialDebugService.SerialDebugClient.LogMessageAvailable += SerialDebugClient_LogMessageAvailable;
+                RaisePropertyChanged("SerialDebugService");
+
+                SelectedTransportType = TransportType.Serial;
+
+                AvailableDevices = _serialDebugService.SerialDebugClient.NanoFrameworkDevices;
+
+                // need to do this in order to allow sync from another thread
+                BindingOperations.EnableCollectionSynchronization(AvailableDevices, _lockObj);
+
+                SerialDebugService.SerialDebugClient.NanoFrameworkDevices.CollectionChanged += NanoFrameworkDevices_CollectionChanged;
+
+                SerialDebugService.SerialDebugClient.LogMessageAvailable += SerialDebugClient_LogMessageAvailable1;
             }
         }
 
-        private void SerialDebugClient_LogMessageAvailable(object sender, StringEventArgs e)
+        private void SerialDebugClient_LogMessageAvailable1(object sender, StringEventArgs e)
         {
-            Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() => {
-                Debug.WriteLine(e.EventText);
-            }));
+            try
+            {
+                Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
+                {
+                    Debug.WriteLine(e.EventText);
+                }));
+            }
+            catch
+            {
+                // catch all as the dispatcher is ont always available and that's OK
+            }
         }
 
-        private void SerialDebugClient_DeviceEnumerationCompleted(object sender, EventArgs e)
+        private void SerialDebugClient_LogMessageAvailable(object sender, StringEventArgs e)
         {
-            SerialDebugService.SerialDebugClient.DeviceEnumerationCompleted -= SerialDebugClient_DeviceEnumerationCompleted;
-            //WindowWrapper.Current().Dispatcher.Dispatch(() =>
-            //{
             Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() => {
-                SelectedTransportType = TransportType.Serial;
-                UpdateAvailableDevices();
+                Debug.WriteLine(e.EventText);
             }));
-            //});
         }
 
         public ObservableCollection<NanoDeviceBase> AvailableDevices { get; set; }
 
-        private void UpdateAvailableDevices()
-        {
-            switch (SelectedTransportType)
-            {
-                case TransportType.Serial:
-
-                    Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() => {
-                        //BusySrv.ShowBusy(Res.GetString("HC_Searching"));
-                        AvailableDevices = new ObservableCollection<NanoDeviceBase>(SerialDebugService.SerialDebugClient.NanoFrameworkDevices);
-                                SerialDebugService.SerialDebugClient.NanoFrameworkDevices.CollectionChanged += NanoFrameworkDevices_CollectionChanged;
-                                // if there's just one, select it
-                                SelectedDevice = (AvailableDevices.Count == 1) ? AvailableDevices.First() : null;
-                            //BusySrv.HideBusy();
-                    }));
-                    break;
-
-                case TransportType.Usb:
-
-                    //WindowWrapper.Current().Dispatcher.Dispatch(() =>
-                    //{
-                        //BusySrv.ShowBusy(Res.GetString("HC_Searching"));
-                        //AvailableDevices = new ObservableCollection<NanoDeviceBase>(UsbDebugService.UsbDebugClient.NanoFrameworkDevices);
-                        //UsbDebugService.UsbDebugClient.NanoFrameworkDevices.CollectionChanged += NanoFrameworkDevices_CollectionChanged;
-                        // if there's just one, select it
-                        //SelectedDevice = (AvailableDevices.Count == 1) ? AvailableDevices.First() : null;
-                        //BusySrv.HideBusy();
-                    //});
-
-                    break;
-
-                case TransportType.TcpIp:
-                    // TODO
-                    //BusySrv.ShowBusy("Not implemented yet! Why not give it a try??");
-                    //await Task.Delay(2500);
-                    //await WindowWrapper.Current().Dispatcher.DispatchAsync(() =>
-                    //{
-                    //    AvailableDevices = new ObservableCollection<NanoDeviceBase>();
-                    //    SelectedDevice = null;
-                    //});
-                    //BusySrv.HideBusy();
-                    break;
-            }
-        }
-
         private void NanoFrameworkDevices_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
         {
             Application.Current.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() => {
@@ -137,7 +119,7 @@ private void NanoFrameworkDevices_CollectionChanged(object sender, System.Collec
                     //    break;
 
                     case TransportType.Serial:
-                        AvailableDevices = new ObservableCollection<NanoDeviceBase>(SerialDebugService.SerialDebugClient.NanoFrameworkDevices);
+
                         break;
 
                     default:
@@ -153,16 +135,11 @@ private void NanoFrameworkDevices_CollectionChanged(object sender, System.Collec
 
         public NanoDeviceBase SelectedDevice { get; set; }
 
-
         #region Transport
         public List<TransportType> AvailableTransportTypes { get; set; }
 
         public TransportType SelectedTransportType { get; set; }
 
-        public void OnSelectedTransportTypeChanged()
-        {
-            UpdateAvailableDevices();
-        }
         #endregion
     }
 }
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index af37bd1b..e9c1355e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -187,14 +187,6 @@ steps:
     arguments: 'pack nanoFramework.Tools.DebugLibrary.Net\nanoFramework.Tools.DebugLibrary.Net.nuspec -Version $(MY_NUGET_VERSION) -properties commit="$(Build.SourceVersion)"'
     # arguments: 'pack nanoFramework.Tools.DebugLibrary.Net\nanoFramework.Tools.DebugLibrary.Net.nuspec -Symbols -SymbolPackageFormat snupkg -Version $(MY_NUGET_VERSION) -properties commit="$(Build.SourceVersion)"'
 
-- task: NuGetCommand@2
-  condition: and( succeeded(), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
-  displayName: Pack UWP NuGet package
-  inputs:
-    command: 'custom' 
-    arguments: 'pack nanoFramework.Tools.DebugLibrary.UWP\nanoFramework.Tools.DebugLibrary.UWP.nuspec -Version $(MY_NUGET_VERSION) -properties commit="$(Build.SourceVersion)"'
-    # arguments: 'pack nanoFramework.Tools.DebugLibrary.UWP\nanoFramework.Tools.DebugLibrary.UWP.nuspec -Symbols -SymbolPackageFormat snupkg -Version $(MY_NUGET_VERSION) -properties commit="$(Build.SourceVersion)"'
-
 # we don't have tests (yet)
 # - task: VSTest@2
 #   inputs:
@@ -222,7 +214,7 @@ steps:
     gem install github_changelog_generator --quiet --no-document
     # need to call it passing both cache options with full path otherwise it won't work
     github_changelog_generator --token $(GitHubToken) --cache-log  $env:AGENT_TEMPDIRECTORY\github-changelog-logger.log --cache-file $env:AGENT_TEMPDIRECTORY\github-changelog-http-cache
-  condition: and( succeeded(), ne(variables['Build.Reason'], 'PullRequest'), not( startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ), not( startsWith(variables['Build.SourceBranchName'], 'master') ), not( contains(variables['Build.SourceBranchName'], 'update-dependencies') ), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
+  condition: and( succeeded(), ne(variables['Build.Reason'], 'PullRequest'), not( startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ), not( startsWith(variables['Build.SourceBranchName'], 'main') ), not( contains(variables['Build.SourceBranchName'], 'update-dependencies') ), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
   displayName: Generate change log
 
 # generate change log including future version
@@ -230,7 +222,7 @@ steps:
     gem install github_changelog_generator --quiet --no-document
     # need to call it passing both cache options with full path otherwise it won't work
     github_changelog_generator --token $(GitHubToken) --cache-log  $env:AGENT_TEMPDIRECTORY\github-changelog-logger.log --cache-file $env:AGENT_TEMPDIRECTORY\github-changelog-http-cache --future-release v$env:MY_NUGET_VERSION
-  condition: and( succeeded(), and ( ne(variables['Build.Reason'], 'PullRequest'), not( startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ), startsWith(variables['Build.SourceBranchName'], 'master'), not( contains(variables['Build.SourceBranchName'], 'update-dependencies') ) ), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
+  condition: and( succeeded(), and ( ne(variables['Build.Reason'], 'PullRequest'), not( startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ), startsWith(variables['Build.SourceBranchName'], 'main'), not( contains(variables['Build.SourceBranchName'], 'update-dependencies') ) ), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
   displayName: Generate change log
 
 # copy change log to artifacts directory
@@ -269,8 +261,6 @@ steps:
     Contents: |
       **\nanoFramework.Tools.Debugger.Net.$(MY_NUGET_VERSION).nupkg
       **\nanoFramework.Tools.Debugger.Net.$(MY_NUGET_VERSION).snupkg
-      **\nanoFramework.Tools.Debugger.UWP.$(MY_NUGET_VERSION).nupkg
-      **\nanoFramework.Tools.Debugger.UWP.$(MY_NUGET_VERSION).snupkg
     TargetFolder: '$(Build.ArtifactStagingDirectory)'
     flattenFolders: true
 
@@ -339,7 +329,7 @@ steps:
   env:
     MY_GITHUB_TOKEN: $(GitHubToken)
 
-# create or update GitHub release ON tags from release or master branches
+# create or update GitHub release ON tags from release or main branches
 - task: GitHubReleasePublish@1
   condition: and( succeeded(), ne(variables['Build.Reason'], 'PullRequest'), not( startsWith(variables['Build.SourceBranch'], 'refs/tags/v') ), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
   displayName: Create/Update GitHub PREVIEW release 
@@ -349,7 +339,7 @@ steps:
     githubRepositoryName: 'nf-debugger'
     githubTag: v$(MY_NUGET_VERSION)
     githubReleaseTitle: 'nanoFramework Debugger Library v$(MY_NUGET_VERSION)'
-    githubReleaseNotes: 'Check the [changelog]($(Build.Repository.Uri)/blob/$(Build.SourceBranchName)/CHANGELOG.md).<br><br><h4>Install from NuGet</h4><br>The following NuGet packages are available for download from this release:<br>:package: [.NET](https://www.nuget.org/packages/nanoFramework.Tools.Debugger.Net/$(MY_NUGET_VERSION)) v$(MY_NUGET_VERSION) v$(MY_NUGET_VERSION)<br>:package: [UWP](https://www.nuget.org/packages/nanoFramework.Tools.Debugger.UWP/$(MY_NUGET_VERSION)) v$(MY_NUGET_VERSION)'
+    githubReleaseNotes: 'Check the [changelog]($(Build.Repository.Uri)/blob/$(Build.SourceBranchName)/CHANGELOG.md).<br><br><h4>Install from NuGet</h4><br>The following NuGet packages are available for download from this release:<br>:package: [.NET](https://www.nuget.org/packages/nanoFramework.Tools.Debugger.Net/$(MY_NUGET_VERSION)) v$(MY_NUGET_VERSION) v$(MY_NUGET_VERSION)'
     githubTargetCommitsh: $(Build.SourceVersion)
     githubReleaseDraft: false
     githubReleasePrerelease: true
@@ -359,7 +349,7 @@ steps:
     githubDeleteEmptyTag: true
     githubReleaseAsset: '$(Build.ArtifactStagingDirectory)/*.nupkg'
 
-# create or update GitHub release ON tags from release or master branches
+# create or update GitHub release ON tags from release or main branches
 - task: GitHubReleasePublish@1
   condition: and( succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/v'), not(contains(variables['Build.SourceBranch'], 'preview') ), ne( variables['StartReleaseCandidate'], true ), ne(variables['UPDATE_DEPENDENTS'], 'true') )
   displayName: Create/Update GitHub release
@@ -369,7 +359,7 @@ steps:
     githubRepositoryName: 'nf-debugger'
     githubTag: v$(MY_NUGET_VERSION)
     githubReleaseTitle: 'nanoFramework Debugger Library v$(MY_NUGET_VERSION)'
-    githubReleaseNotes: 'Check the [changelog]($(Build.Repository.Uri)/blob/$(Build.SourceBranchName)/CHANGELOG.md).<br><br><h4>Install from NuGet</h4><br>The following NuGet packages are available for download from this release:<br>:package: [.NET](https://www.nuget.org/packages/nanoFramework.Tools.Debugger.Net/$(MY_NUGET_VERSION)) v$(MY_NUGET_VERSION) v$(MY_NUGET_VERSION)<br>:package: [UWP](https://www.nuget.org/packages/nanoFramework.Tools.Debugger.UWP/$(MY_NUGET_VERSION)) v$(MY_NUGET_VERSION)'
+    githubReleaseNotes: 'Check the [changelog]($(Build.Repository.Uri)/blob/$(Build.SourceBranchName)/CHANGELOG.md).<br><br><h4>Install from NuGet</h4><br>The following NuGet packages are available for download from this release:<br>:package: [.NET](https://www.nuget.org/packages/nanoFramework.Tools.Debugger.Net/$(MY_NUGET_VERSION)) v$(MY_NUGET_VERSION) v$(MY_NUGET_VERSION)'
     githubTargetCommitsh: $(Build.SourceVersion)
     githubReleaseDraft: false
     githubReleasePrerelease: false
diff --git a/nanoFramework.Tools.DebugLibrary.Net/PortDefinitions/PortBase.cs b/nanoFramework.Tools.DebugLibrary.Net/PortDefinitions/PortBase.cs
index 0e26fa2d..f986e3bc 100644
--- a/nanoFramework.Tools.DebugLibrary.Net/PortDefinitions/PortBase.cs
+++ b/nanoFramework.Tools.DebugLibrary.Net/PortDefinitions/PortBase.cs
@@ -9,25 +9,25 @@
 namespace nanoFramework.Tools.Debugger
 {
     public abstract partial class PortBase : PortMessageBase
-    {       
-        public static PortBase CreateInstanceForSerial(string displayName, List<string> portBlackList = null)
+    {
+        public static PortBase CreateInstanceForSerial()
         {
-            return new SerialPortManager(null, true, portBlackList);
+            return new PortSerialManager(true, null);
         }
 
-        public static PortBase CreateInstanceForSerial(string displayName, bool startDeviceWatchers = true, List<string> portBlackList = null)
+        public static PortBase CreateInstanceForSerial(List<string> portExclusionList)
         {
-            return new SerialPortManager(null, startDeviceWatchers, portBlackList);
+            return new PortSerialManager(true, portExclusionList);
         }
 
-        public static PortBase CreateInstanceForSerial(string displayName, object callerApp = null, bool startDeviceWatchers = true, int bootTime = 1000)
+        public static PortBase CreateInstanceForSerial(bool startDeviceWatchers, int bootTime = 1000)
         {
-            return new SerialPortManager(callerApp, startDeviceWatchers, null, bootTime);
+            return new PortSerialManager(startDeviceWatchers, null, bootTime);
         }
 
-        public static PortBase CreateInstanceForSerial(string displayName, object callerApp = null, bool startDeviceWatchers = true, List<string> portBlackList = null, int bootTime = 1000)
+        public static PortBase CreateInstanceForSerial(bool startDeviceWatchers, List<string> portExclusionList = null, int bootTime = 1000)
         {
-            return new SerialPortManager(callerApp, startDeviceWatchers, portBlackList, bootTime);
+            return new PortSerialManager(startDeviceWatchers, portExclusionList, bootTime);
         }
     }
 }
diff --git a/nanoFramework.Tools.DebugLibrary.Net/PortSerial/SerialPort.cs b/nanoFramework.Tools.DebugLibrary.Net/PortSerial/SerialPort.cs
index 8b2992dd..9c9f4c57 100644
--- a/nanoFramework.Tools.DebugLibrary.Net/PortSerial/SerialPort.cs
+++ b/nanoFramework.Tools.DebugLibrary.Net/PortSerial/SerialPort.cs
@@ -5,7 +5,7 @@
 
 namespace nanoFramework.Tools.Debugger.PortSerial
 {
-    public partial class SerialPort
+    public partial class PortSerial
     {
     }
 }
diff --git a/nanoFramework.Tools.DebugLibrary.Net/PortUsb/EventHandlerForUsbDevice.cs b/nanoFramework.Tools.DebugLibrary.Net/PortUsb/EventHandlerForUsbDevice.cs
deleted file mode 100644
index 0c57b735..00000000
--- a/nanoFramework.Tools.DebugLibrary.Net/PortUsb/EventHandlerForUsbDevice.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-
-using System;
-using System.Diagnostics;
-using System.Threading.Tasks;
-using Windows.Devices.Enumeration;
-using Windows.Foundation;
-
-namespace nanoFramework.Tools.Debugger.Usb
-{
-    /// <summary>
-    /// This class handles the required changes and operation of an UsbDevice when a specific app event
-    /// is raised (app suspension and resume) or when the device is disconnected. The device watcher events are also handled here.
-    /// </summary>
-    public partial class EventHandlerForUsbDevice
-    {
-        /// <summary>
-        /// Listen for any changed in device access permission. The user can block access to the device while the device is in use.
-        /// If the user blocks access to the device while the device is opened, the device's handle will be closed automatically by
-        /// the system; it is still a good idea to close the device explicitly so that resources are cleaned up.
-        /// 
-        /// Note that by the time the AccessChanged event is raised, the device handle may already be closed by the system.
-        /// </summary>
-        private void RegisterForDeviceAccessStatusChange()
-        {
-            //deviceAccessInformation = DeviceAccessInformation.CreateFromId(deviceInformation.Id);
-
-            //deviceAccessEventHandler = new TypedEventHandler<DeviceAccessInformation, DeviceAccessChangedEventArgs>(OnDeviceAccessChanged);
-            //deviceAccessInformation.AccessChanged += deviceAccessEventHandler;
-        }
-
-        /// <summary>
-        /// This method opens the device using the WinRT Usb API. After the device is opened, save the device
-        /// so that it can be used across scenarios.
-        ///
-        /// It is important that the FromIdAsync call is made on the UI thread because the consent prompt can only be displayed
-        /// on the UI thread.
-        /// 
-        /// This method is used to reopen the device after the device reconnects to the computer and when the app resumes.
-        /// </summary>
-        /// <param name="deviceInfo">Device information of the device to be opened</param>
-        /// <param name="deviceSelector">The AQS used to find this device</param>
-        /// <returns>True if the device was successfully opened, false if the device could not be opened for well known reasons.
-        /// An exception may be thrown if the device could not be opened for extraordinary reasons.</returns>
-        public async Task<bool> OpenDeviceAsync(DeviceInformation deviceInfo, String deviceSelector)
-        {
-#pragma warning disable ConfigureAwaitChecker // CAC001
-            device = await Windows.Devices.Usb.UsbDevice.FromIdAsync(deviceInfo.Id);
-#pragma warning restore ConfigureAwaitChecker // CAC001
-
-            bool successfullyOpenedDevice = false;
-
-            try
-            {
-                // Device could have been blocked by user or the device has already been opened by another app.
-                if (device != null)
-                {
-                    successfullyOpenedDevice = true;
-
-                    deviceInformation = deviceInfo;
-                    this.deviceSelector = deviceSelector;
-
-                    Debug.WriteLine($"Device {deviceInformation.Id} opened");
-
-                    // Notify registered callback handle that the device has been opened
-                    deviceConnectedCallback?.Invoke(this, deviceInformation);
-
-                    // Background tasks are not part of the app, so app events will not have an affect on the device
-                    if (!isBackgroundTask && (appSuspendEventHandler == null || appResumeEventHandler == null))
-                    {
-                        RegisterForAppEvents();
-                    }
-
-                    // User can block the device after it has been opened in the Settings charm. We can detect this by registering for the 
-                    // DeviceAccessInformation.AccessChanged event
-                    if (deviceAccessEventHandler == null)
-                    {
-                        RegisterForDeviceAccessStatusChange();
-                    }
-
-                    // Create and register device watcher events for the device to be opened unless we're reopening the device
-                    if (deviceWatcher == null)
-                    {
-                        deviceWatcher = DeviceInformation.CreateWatcher(deviceSelector);
-
-                        RegisterForDeviceWatcherEvents();
-                    }
-
-                    if (!watcherStarted)
-                    {
-                        // Start the device watcher after we made sure that the device is opened.
-                        StartDeviceWatcher();
-                    }
-                }
-                else
-                {
-                    successfullyOpenedDevice = false;
-
-                    // Most likely the device is opened by another app, but cannot be sure
-                    Debug.WriteLine($"Unknown error, possibly opened by another app : {deviceInfo.Id}");
-                }
-            }
-            // catch all because the device open might fail for a number of reasons
-            catch { }
-
-            return successfullyOpenedDevice;
-        }
-
-        /// <summary>
-        /// Close the device if the device access was denied by anyone (system or the user) and reopen it if permissions are allowed again
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="eventArgs"></param>
-        private void OnDeviceAccessChanged(DeviceAccessInformation sender, DeviceAccessChangedEventArgs eventArgs)
-        {
-            if ((eventArgs.Status == DeviceAccessStatus.DeniedBySystem)
-                || (eventArgs.Status == DeviceAccessStatus.DeniedByUser))
-            {
-                CloseCurrentlyConnectedDevice();
-            }
-            else if ((eventArgs.Status == DeviceAccessStatus.Allowed) && (deviceInformation != null) && isEnabledAutoReconnect)
-            {
-            }
-        }
-    }
-}
diff --git a/nanoFramework.Tools.DebugLibrary.Net/nanoFramework.Tools.DebugLibrary.Net.csproj b/nanoFramework.Tools.DebugLibrary.Net/nanoFramework.Tools.DebugLibrary.Net.csproj
index a4054a78..b23e22ba 100644
--- a/nanoFramework.Tools.DebugLibrary.Net/nanoFramework.Tools.DebugLibrary.Net.csproj
+++ b/nanoFramework.Tools.DebugLibrary.Net/nanoFramework.Tools.DebugLibrary.Net.csproj
@@ -46,6 +46,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>default</LangVersion>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup>
@@ -66,7 +67,6 @@
     <Compile Include="BinaryFormatter.cs" />
     <Compile Include="PortDefinitions\PortBase.cs" />
     <Compile Include="PortSerial\SerialPort.cs" />
-    <Compile Include="PortUsb\EventHandlerForUsbDevice.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -85,16 +85,13 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Windows.SDK.Contracts">
-      <Version>10.0.19041.1</Version>
-    </PackageReference>
     <PackageReference Include="Nerdbank.GitVersioning">
-      <Version>3.3.37</Version>
+      <Version>3.4.194</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Polly">
-      <Version>7.2.1</Version>
+      <Version>7.2.2</Version>
     </PackageReference>
     <PackageReference Include="Polly.Contrib.WaitAndRetry">
       <Version>1.1.1</Version>
@@ -102,6 +99,9 @@
     <PackageReference Include="PropertyChanged.Fody">
       <Version>2.6.1</Version>
     </PackageReference>
+    <PackageReference Include="System.IO.Ports">
+      <Version>5.0.1</Version>
+    </PackageReference>
     <PackageReference Include="System.Threading.Tasks.Extensions">
       <Version>4.5.4</Version>
     </PackageReference>
@@ -109,6 +109,9 @@
       <Version>4.5.0</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
   <Import Project="..\nanoFramework.Tools.DebugLibrary.Shared\nanoFramework.Tools.DebugLibrary.Net.projitems" Label="Shared" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/nanoFramework.Tools.DebugLibrary.Net/nanoFramework.Tools.DebugLibrary.Net.nuspec b/nanoFramework.Tools.DebugLibrary.Net/nanoFramework.Tools.DebugLibrary.Net.nuspec
index f416b058..feea9493 100644
--- a/nanoFramework.Tools.DebugLibrary.Net/nanoFramework.Tools.DebugLibrary.Net.nuspec
+++ b/nanoFramework.Tools.DebugLibrary.Net/nanoFramework.Tools.DebugLibrary.Net.nuspec
@@ -14,7 +14,7 @@
     <repository type="git" url="https://github.com/nanoframework/nf-debugger" commit="$commit$" />
     <copyright>Copyright (c) .NET Foundation and Contributors</copyright>
     <description>This .NET library provides a debug client for nanoFramework devices using USB or Serial connection to a board.</description>
-    <releaseNotes>This package provides the .NET version of the debug library.&#10;For UWP look for the respective Nuget package.
+    <releaseNotes>This package provides the .NET version of the debug library.
     </releaseNotes>
     <tags>nanoFramework C# csharp netmf netnf</tags>
     <dependencies>
diff --git a/nanoFramework.Tools.DebugLibrary.Net/packages.lock.json b/nanoFramework.Tools.DebugLibrary.Net/packages.lock.json
index 47ba6767..7f223c32 100644
--- a/nanoFramework.Tools.DebugLibrary.Net/packages.lock.json
+++ b/nanoFramework.Tools.DebugLibrary.Net/packages.lock.json
@@ -18,27 +18,17 @@
           "Microsoft.SourceLink.Common": "1.1.0-beta-20204-02"
         }
       },
-      "Microsoft.Windows.SDK.Contracts": {
-        "type": "Direct",
-        "requested": "[10.0.19041.1, )",
-        "resolved": "10.0.19041.1",
-        "contentHash": "sgDwuoyubbLFNJR/BINbvfSNRiglF91D+Q0uEAkU4ZTO5Hgbnu8+gA4TCc65S56e1kK7gvR1+H4kphkDTr+9bw==",
-        "dependencies": {
-          "System.Runtime.WindowsRuntime": "4.6.0",
-          "System.Runtime.WindowsRuntime.UI.Xaml": "4.6.0"
-        }
-      },
       "Nerdbank.GitVersioning": {
         "type": "Direct",
-        "requested": "[3.3.37, )",
-        "resolved": "3.3.37",
-        "contentHash": "YlDKV/gSHQGDThWSGqVyPfKeNP/kx1fj/NPFFgGc/cxzgIbXv4jtYOcbFOz3ZIeAKtpCcSAmVNDOikBs3OxI/A=="
+        "requested": "[3.4.194, )",
+        "resolved": "3.4.194",
+        "contentHash": "f4V2lLy9G0BnddqGhfaVa+dKsbu8iCiLiUARHKBo0l899MgJdRjVU2C7e29gHrZWxc2HZkq3aq28OHHK7q0/iQ=="
       },
       "Polly": {
         "type": "Direct",
-        "requested": "[7.2.1, )",
-        "resolved": "7.2.1",
-        "contentHash": "Od8SnPlpQr+PuAS0YzY3jgtzaDNknlIuAaldN2VEIyTvm/wCg22C5nUkUV1BEG8rIsub5RFMoV/NEQ0tM/+7Uw=="
+        "requested": "[7.2.2, )",
+        "resolved": "7.2.2",
+        "contentHash": "E6CeKyS513j7taKAq4q2MESDBvzuzWnR1rQ2Y2zqJvpiVtKMm699Aubb20MUPBDmb0Ov8PmcLHTCVFdCjoy2kA=="
       },
       "Polly.Contrib.WaitAndRetry": {
         "type": "Direct",
@@ -55,6 +45,12 @@
           "Fody": "4.2.1"
         }
       },
+      "System.IO.Ports": {
+        "type": "Direct",
+        "requested": "[5.0.1, )",
+        "resolved": "5.0.1",
+        "contentHash": "cOfs0q0+lmq8oXgIeYDzzT2IxQ0gIij2/awNDXn3OjykDii26EgzzY09BhabUlxt3rwGNpAOxYkdac5udWWJgQ=="
+      },
       "System.Threading.Tasks.Extensions": {
         "type": "Direct",
         "requested": "[4.5.4, )",
@@ -84,19 +80,30 @@
         "type": "Transitive",
         "resolved": "4.5.3",
         "contentHash": "3TIsJhD1EiiT0w2CcDMN/iSSwnNnsrnbzeVHSKkaEgV85txMprmuO+Yq2AdSbeVGcg28pdNDTPK87tJhX7VFHw=="
-      },
-      "System.Runtime.WindowsRuntime": {
-        "type": "Transitive",
-        "resolved": "4.6.0",
-        "contentHash": "IWrs1TmbxP65ZZjIglNyvDkFNoV5q2Pofg5WO7I8RKQOpLdFprQSh3xesOoClBqR4JHr4nEB1Xk1MqLPW1jPuQ=="
-      },
-      "System.Runtime.WindowsRuntime.UI.Xaml": {
-        "type": "Transitive",
-        "resolved": "4.6.0",
-        "contentHash": "r4tNw5v5kqRJ9HikWpcyNf3suGw7DjX93svj9iBjtdeLqL8jt9Z+7f+s4wrKZJr84u8IMsrIjt8K6jYvkRqMSg==",
-        "dependencies": {
-          "System.Runtime.WindowsRuntime": "4.6.0"
-        }
+      }
+    },
+    ".NETFramework,Version=v4.7.2/win": {
+      "System.IO.Ports": {
+        "type": "Direct",
+        "requested": "[5.0.1, )",
+        "resolved": "5.0.1",
+        "contentHash": "cOfs0q0+lmq8oXgIeYDzzT2IxQ0gIij2/awNDXn3OjykDii26EgzzY09BhabUlxt3rwGNpAOxYkdac5udWWJgQ=="
+      }
+    },
+    ".NETFramework,Version=v4.7.2/win-x64": {
+      "System.IO.Ports": {
+        "type": "Direct",
+        "requested": "[5.0.1, )",
+        "resolved": "5.0.1",
+        "contentHash": "cOfs0q0+lmq8oXgIeYDzzT2IxQ0gIij2/awNDXn3OjykDii26EgzzY09BhabUlxt3rwGNpAOxYkdac5udWWJgQ=="
+      }
+    },
+    ".NETFramework,Version=v4.7.2/win-x86": {
+      "System.IO.Ports": {
+        "type": "Direct",
+        "requested": "[5.0.1, )",
+        "resolved": "5.0.1",
+        "contentHash": "cOfs0q0+lmq8oXgIeYDzzT2IxQ0gIij2/awNDXn3OjykDii26EgzzY09BhabUlxt3rwGNpAOxYkdac5udWWJgQ=="
       }
     }
   }
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/DebuggerEventSource.cs b/nanoFramework.Tools.DebugLibrary.Shared/DebuggerEventSource.cs
index ef2bba58..72d659bf 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/DebuggerEventSource.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/DebuggerEventSource.cs
@@ -56,6 +56,7 @@ private enum PacketFlags
             [Commands.c_Monitor_DeploymentMap] = "DeploymentMap",
             [Commands.c_Monitor_FlashSectorMap] = "FlashSectorMap",
             [Commands.c_Monitor_OemInfo] = "OemInfo",
+            [Commands.c_Monitor_TargetInfo] = "TargetInfo",
             [Commands.c_Debugging_Execution_BasePtr] = "Execution_BasePtr",
             [Commands.c_Debugging_Execution_ChangeConditions] = "Execution_ChangeConditions",
             [Commands.c_Debugging_Execution_SecurityKey] = "Execution_SecurityKey",
@@ -135,23 +136,43 @@ public void WireProtocolTxHeader(uint crcHeader, uint crcData, uint cmd, uint fl
             Debug.WriteLine($"TX: " +
                 $"{GetCommandName(cmd)} " +
                 $"flags=[{(PacketFlags)flags}] " +
-                $"hCRC: 0x{crcHeader.ToString("X08")} " +
-                $"pCRC: 0x{crcData.ToString("X08")} " +
-                $"seq: 0x{seq.ToString("X04")} " +
-                $"replySeq: 0x{seqReply.ToString("X04")} " +
-                $"len={length}");
+                //$"hCRC: 0x{crcHeader:X08} " +
+                //$"pCRC: 0x{crcData:X08} " +
+                $"seq: 0x{seq:X04} " +
+                $"replySeq: 0x{seqReply:X04} " +
+                $"len={length} " +
+                $"{DateTime.Now:HH:mm:ss.fff}");
+        }
+
+        [Event(1, Opcode = EventOpcode.Info)]
+        public void WireProtocolTimeout(uint cmd, ushort seq, ushort seqReply, DateTime timestamp)
+        {
+            Debug.WriteLine($"TX: " +
+                $"{GetCommandName(cmd)} *** ABORTED *** " +
+                $"seq: 0x{seq:X04} " +
+                $"replySeq: 0x{seqReply:X04} " +
+                $"timeout: {DateTime.Now - timestamp:ss\\.ffff}");
         }
 
         [Event(2, Opcode = EventOpcode.Receive)]
-        public void WireProtocolRxHeader(uint crcHeader, uint crcData, uint cmd, uint flags, ushort seq, ushort seqReply, uint length)
+        public void WireProtocolRxHeader(uint crcHeader, uint crcData, uint cmd, uint flags, ushort seq, ushort seqReply, uint length, DateTime timestamp)
         {
+            TimeSpan roundTrip = TimeSpan.FromSeconds(0);
+
+            if (timestamp != DateTime.MinValue)
+            {
+                roundTrip = DateTime.Now - timestamp;
+            }
+
             Debug.WriteLine($"RX: {GetCommandName(cmd)} " +
                 $"flags=[{(PacketFlags)flags}] " +
-                $"hCRC: 0x{crcHeader.ToString("X08")} " +
-                $"pCRC: 0x{crcData.ToString("X08")} " +
-                $"seq: 0x{seq.ToString("X04")} " +
-                $"replySeq: 0x{seqReply.ToString("X04")} " +
-                $"len={length.ToString()}");
+                //$"hCRC: 0x{crcHeader:X08} " +
+                //$"pCRC: 0x{crcData:X08} " +
+                $"seq: 0x{seq:X04} " +
+                $"replySeq: 0x{seqReply:X04} " +
+                $"len={length} " +
+                $"{DateTime.Now:HH:mm:ss.fff} " +
+                $"round-trip: {roundTrip:ss\\.ffff}");
         }
 
         [Event(3)]
@@ -160,6 +181,12 @@ public void WireProtocolReceiveState(MessageReassembler.ReceiveState state)
             Debug.WriteLine($"State machine: {state.ToString()}");
         }
 
+        [Event(3)]
+        public void WireProtocolReceiveState(MessageReassembler.ReceiveState state, TimeSpan idleTime)
+        {
+            Debug.WriteLine($"State machine: {state} for {idleTime:s\\.ffff}s");
+        }
+
         [Event(4)]
         public void EngineEraseMemory(uint address, uint length)
         {
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/Extensions/ConditionsStateExtensions.cs b/nanoFramework.Tools.DebugLibrary.Shared/Extensions/ConditionsStateExtensions.cs
new file mode 100644
index 00000000..ee0f7d14
--- /dev/null
+++ b/nanoFramework.Tools.DebugLibrary.Shared/Extensions/ConditionsStateExtensions.cs
@@ -0,0 +1,119 @@
+//
+// Copyright (c) .NET Foundation and Contributors
+// See LICENSE file in the project root for full license information.
+//
+
+using nanoFramework.Tools.Debugger.WireProtocol;
+using Polly;
+using System;
+using System.Diagnostics;
+
+namespace nanoFramework.Tools.Debugger.Extensions
+{
+    public static class ConditionsStateExtensions
+    {
+        /// <summary>
+        /// Check if device state is Initialized state (see remarks).
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns><see langword="true"/> if the device is in initialized state. <see langword="false"/> otherwise.</returns>
+        /// <remarks>
+        /// A device is in initialized state if it's not running a program or if the program execution is stopped (after having running one).
+        /// </remarks>
+        public static bool IsDeviceInInitializeState(this Commands.DebuggingExecutionChangeConditions.State state)
+        {
+            // check for unknown state
+            if(state == Commands.DebuggingExecutionChangeConditions.State.Unknown)
+            {
+                return false;
+            }
+
+            // engine is in initialized state if it's not running a program or if the program execution is stopped (after having running one)
+            var filteredResult = state & (Commands.DebuggingExecutionChangeConditions.State.ProgramExited | Commands.DebuggingExecutionChangeConditions.State.ProgramRunning);
+
+            Debug.WriteLine($"Device state is: {filteredResult.OutputDeviceExecutionState()}.");
+
+            return (filteredResult == Commands.DebuggingExecutionChangeConditions.State.Initialize);
+        }
+
+        /// <summary>
+        /// Check if device execution state is: program exited.
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        public static bool IsDeviceInExitedState(this Commands.DebuggingExecutionChangeConditions.State state)
+        {
+            // check for unknown state
+            if (state == Commands.DebuggingExecutionChangeConditions.State.Unknown)
+            {
+                return false;
+            }
+
+            var filteredResult = state & WireProtocol.Commands.DebuggingExecutionChangeConditions.State.ProgramExited;
+
+            Debug.WriteLine($"Device state is: {filteredResult.OutputDeviceExecutionState()}.");
+
+            return (filteredResult == WireProtocol.Commands.DebuggingExecutionChangeConditions.State.ProgramExited);
+        }
+
+        /// <summary>
+        /// Check if device execution state is: program running.
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        public static bool IsDeviceInProgramRunningState(this Commands.DebuggingExecutionChangeConditions.State state)
+        {
+            // check for unknown state
+            if (state == Commands.DebuggingExecutionChangeConditions.State.Unknown)
+            {
+                return false;
+            }
+            
+            var filteredResult = state & WireProtocol.Commands.DebuggingExecutionChangeConditions.State.ProgramRunning;
+
+            Debug.WriteLine($"Device state is: {filteredResult.OutputDeviceExecutionState()}.");
+
+            return (filteredResult == WireProtocol.Commands.DebuggingExecutionChangeConditions.State.ProgramRunning);
+        }
+
+        /// <summary>
+        /// Check if device execution state is: stopped on type resolution failed.
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        public static bool IsDeviceStoppedOnTypeResolutionFailed(this Commands.DebuggingExecutionChangeConditions.State state)
+        {
+            // check for unknown state
+            if (state == Commands.DebuggingExecutionChangeConditions.State.Unknown)
+            {
+                return false;
+            }
+            
+            var filteredResult = state & WireProtocol.Commands.DebuggingExecutionChangeConditions.State.ResolutionFailed;
+
+            Debug.WriteLine($"Device state is: {filteredResult.OutputDeviceExecutionState()}.");
+
+            return (filteredResult == WireProtocol.Commands.DebuggingExecutionChangeConditions.State.ResolutionFailed);
+        }
+
+        /// <summary>
+        /// Check if device execution state is: stopped.
+        /// </summary>
+        /// <param name="state"></param>
+        /// <returns></returns>
+        public static bool IsDeviceInStoppedState(this Commands.DebuggingExecutionChangeConditions.State state)
+        {
+            // check for unknown state
+            if (state == Commands.DebuggingExecutionChangeConditions.State.Unknown)
+            {
+                return false;
+            }
+
+            var filteredResult = state & WireProtocol.Commands.DebuggingExecutionChangeConditions.State.Stopped;
+
+            Debug.WriteLine($"Device state is: {filteredResult.OutputDeviceExecutionState()}.");
+
+            return (filteredResult == WireProtocol.Commands.DebuggingExecutionChangeConditions.State.Stopped);
+        }
+    }
+}
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/Extensions/DeviceInformationExtensions.cs b/nanoFramework.Tools.DebugLibrary.Shared/Extensions/DeviceInformationExtensions.cs
index 87001230..05899383 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/Extensions/DeviceInformationExtensions.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/Extensions/DeviceInformationExtensions.cs
@@ -2,30 +2,31 @@
 // Copyright (c) .NET Foundation and Contributors
 // See LICENSE file in the project root for full license information.
 //
-using Windows.Devices.Enumeration;
+
 
 namespace nanoFramework.Tools.Debugger.Extensions
 {
     public static class DeviceInformationExtensions
     {
-        public static string GetSerialNumber(this DeviceInformation value)
-        {
-            // typical ID string is \\?\USB#VID_0483&PID_5740#NANO_3267335D#{86e0d1e0-8089-11d0-9ce4-08003e301f73}
+        // TODO
+        //public static string GetSerialNumber(this DeviceInformation value)
+        //{
+        //    // typical ID string is \\?\USB#VID_0483&PID_5740#NANO_3267335D#{86e0d1e0-8089-11d0-9ce4-08003e301f73}
 
-            int startIndex = value.Id.IndexOf("USB");
+        //    int startIndex = value.Id.IndexOf("USB");
 
-            int endIndex = value.Id.LastIndexOf("#");
+        //    int endIndex = value.Id.LastIndexOf("#");
 
-            // sanity check
-            if(startIndex < 0 || endIndex < 0)
-            {
-                return null;
-            }
+        //    // sanity check
+        //    if(startIndex < 0 || endIndex < 0)
+        //    {
+        //        return null;
+        //    }
 
-            // get device ID portion
-            var deviceIDCollection = value.Id.Substring(startIndex, endIndex - startIndex).Split('#');
+        //    // get device ID portion
+        //    var deviceIDCollection = value.Id.Substring(startIndex, endIndex - startIndex).Split('#');
 
-            return deviceIDCollection?.GetValue(2) as string;
-        }
+        //    return deviceIDCollection?.GetValue(2) as string;
+        //}
     }
 }
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/CachedDeviceInfo.cs b/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/CachedDeviceInfo.cs
index 9fc38171..608f001d 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/CachedDeviceInfo.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/CachedDeviceInfo.cs
@@ -9,12 +9,12 @@ internal class CachedDeviceInfo
     {
         public string TargetName;
         public string PlatformName;
-        public uint BaudRate;
+        public int BaudRate;
 
         public CachedDeviceInfo(
             string targetName,
             string platformName,
-            uint baudRate = 0)
+            int baudRate = 0)
         {
             TargetName = targetName;
             PlatformName = platformName;
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/INanoDevice.cs b/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/INanoDevice.cs
index 56dcedb2..dd238e04 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/INanoDevice.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/INanoDevice.cs
@@ -3,14 +3,12 @@
 // See LICENSE file in the project root for full license information.
 //
 
-using System.Threading.Tasks;
-
 namespace nanoFramework.Tools.Debugger
 {
     public interface INanoDevice
     {
-        Task<bool> ConnectAsync();
+        bool Connect();
 
-        void Disconnect();
+        void Disconnect(bool force = false);
     }
 }
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/NanoDevice.cs b/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/NanoDevice.cs
index 73ba0ced..3544f11e 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/NanoDevice.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/NanoDevice.cs
@@ -5,24 +5,23 @@
 //
 
 using nanoFramework.Tools.Debugger.WireProtocol;
+using PropertyChanged;
 using System;
-using System.Threading.Tasks;
 
 namespace nanoFramework.Tools.Debugger
 {
+    [AddINotifyPropertyChangedInterface]
     public class NanoDevice<T> : NanoDeviceBase, IDisposable, INanoDevice where T : new()
     {
         public T Device { get; set; }
 
+        public string DeviceId { get; set; }
+
         public NanoDevice()
         {
             Device = new T();
 
-            if (Device is NanoUsbDevice)
-            {
-                Transport = TransportType.Usb;
-            }
-            else if (Device is NanoSerialDevice)
+            if (Device is NanoSerialDevice)
             {
                 Transport = TransportType.Serial;
             }
@@ -47,16 +46,14 @@ private void Dispose(bool disposing)
                     {
                         // release managed components
                         Disconnect();
-
-                        DebugEngine?.Dispose();
                     }
                     catch
                     {
                         // required to catch exceptions from Engine dispose calls
                     }
-                }
 
-                disposed = true;
+                    disposed = true;
+                }
             }
         }
 
@@ -66,8 +63,6 @@ private void Dispose(bool disposing)
         public void Dispose()
         {
             Dispose(true);
-
-            GC.SuppressFinalize(this);
         }
 
         #endregion
@@ -76,15 +71,11 @@ public void Dispose()
         /// Connect to nanoFramework device
         /// </summary>
         /// <returns>True if operation is successful</returns>
-        public async Task<bool> ConnectAsync()
+        public bool Connect()
         {
-            if (Device is NanoUsbDevice)
+            if (Device is NanoSerialDevice)
             {
-                return await ConnectionPort.ConnectDeviceAsync();
-            }
-            else if (Device is NanoSerialDevice)
-            {
-                return await ConnectionPort.ConnectDeviceAsync();
+                return ConnectionPort.ConnectDevice();
             }
 
             return false;
@@ -93,11 +84,9 @@ public async Task<bool> ConnectAsync()
         /// <summary>
         /// Disconnect nanoFramework device
         /// </summary>
-        public override void Disconnect()
+        public override void Disconnect(bool force = false)
         {
-            ConnectionPort.DisconnectDevice();
-
-            DeviceBase = null;
+            ConnectionPort.DisconnectDevice(force);
         }
     }
 }
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/NanoDeviceBase.cs b/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/NanoDeviceBase.cs
index bae823fe..50bb9e6e 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/NanoDeviceBase.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/NanoDeviceBase.cs
@@ -6,20 +6,18 @@
 
 using nanoFramework.Tools.Debugger.WireProtocol;
 using Polly;
+using PropertyChanged;
 using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
-using Windows.Security.Cryptography;
-using Windows.Security.Cryptography.Core;
-using Windows.Storage;
-using Windows.Storage.Streams;
+using nanoFramework.Tools.Debugger.Extensions;
 
 namespace nanoFramework.Tools.Debugger
 {
+    [AddINotifyPropertyChangedInterface]
     public abstract class NanoDeviceBase
     {
         /// <summary>
@@ -31,9 +29,11 @@ public abstract class NanoDeviceBase
         /// <summary>
         /// Create a new debug engine for this nanoDevice.
         /// </summary>
-        public void CreateDebugEngine()
+        /// <param name="timeoutMilliseconds"></param>
+        public void CreateDebugEngine(int timeoutMilliseconds = 5000)
         {
             DebugEngine = new Engine(this);
+            DebugEngine.DefaultTimeout = timeoutMilliseconds;
         }
 
         /// <summary>
@@ -74,7 +74,7 @@ public void CreateDebugEngine()
         /// <summary>
         /// Unique ID of the NanoDevice.
         /// </summary>
-        public Guid DeviceId { get; internal set; }
+        public Guid DeviceUniqueId { get; internal set; }
 
         /// <summary>
         /// Version of nanoBooter.
@@ -97,13 +97,13 @@ public Version BooterVersion
         /// <summary>
         /// Version of nanoCLR.
         /// </summary>
-        public Version ClrVersion
+        public Version CLRVersion
         {
             get
             {
                 try
                 {
-                    return DebugEngine.TargetInfo.ClrVersion;
+                    return DebugEngine.TargetInfo.CLRVersion;
                 }
                 catch
                 {
@@ -162,10 +162,10 @@ protected NanoDeviceBase()
         {
             DeviceInfo = new NanoFrameworkDeviceInfo(this);
 
-            DeviceId = Guid.NewGuid();
+            DeviceUniqueId = Guid.NewGuid();
         }
 
-        private bool IsClrDebuggerEnabled
+        private bool IsCLRDebuggerEnabled
         {
             get
             {
@@ -187,7 +187,7 @@ private bool IsClrDebuggerEnabled
 
         public object DeviceBase { get; internal set; }
 
-        public abstract void Disconnect();
+        public abstract void Disconnect(bool force = false);
 
         /// <summary>
         /// Get <see cref="INanoFrameworkDeviceInfo"/> from device.
@@ -201,10 +201,10 @@ public INanoFrameworkDeviceInfo GetDeviceInfo(bool force = true)
             if (!DeviceInfo.Valid || force)
             {
                 // seems to be invalid so get it from device
-                NanoFrameworkDeviceInfo mfDeviceInfo = new NanoFrameworkDeviceInfo(this);
-                mfDeviceInfo.GetDeviceInfo();
+                NanoFrameworkDeviceInfo nfDeviceInfo = new NanoFrameworkDeviceInfo(this);
+                nfDeviceInfo.GetDeviceInfo();
 
-                DeviceInfo = mfDeviceInfo;
+                DeviceInfo = nfDeviceInfo;
             }
 
             return DeviceInfo;
@@ -214,34 +214,14 @@ public INanoFrameworkDeviceInfo GetDeviceInfo(bool force = true)
         /// Attempts to communicate with the connected nanoFramework device
         /// </summary>
         /// <returns></returns>
-        public PingConnectionType Ping()
+        public ConnectionSource Ping()
         {
             if(DebugEngine == null)
             {
-                return PingConnectionType.NoConnection;
+                return ConnectionSource.Unknown;
             }
 
-            var pingPolicy = Policy.Handle<Exception>().OrResult<Commands.Monitor_Ping.Reply>(r => r == null)
-                           .WaitAndRetry(3, retryAttempt => TimeSpan.FromMilliseconds((retryAttempt + 1) * 250));
-
-            var reply = pingPolicy.Execute(() => DebugEngine.GetConnectionSource());
-
-            if (reply != null)
-            {
-                // there is a reply, so the device _has_ to be connected
-                DebugEngine.IsConnected = true;
-
-                switch (reply.Source)
-                {
-                    case Commands.Monitor_Ping.c_Ping_Source_NanoCLR:
-                        return PingConnectionType.nanoCLR;
-
-                    case Commands.Monitor_Ping.c_Ping_Source_NanoBooter:
-                        return PingConnectionType.nanoBooter;
-                }
-            }
-
-            return PingConnectionType.NoConnection;
+            return DebugEngine.GetConnectionSource();
         }
 
         /// <summary>
@@ -265,7 +245,7 @@ public int GetDeploymentStartAddress()
         /// Start address of the CLR block.
         /// Returns (-1) as invalid value if the address can't be retrieved from the device properties.
         /// </summary>
-        public int GetClrStartAddress()
+        public int GetCLRStartAddress()
         {
             if (DebugEngine != null)
             {
@@ -282,11 +262,11 @@ public int GetClrStartAddress()
         /// Attempt to establish a connection with nanoBooter (with reboot if necessary)
         /// </summary>
         /// <returns>true connection was made, false otherwise</returns>
-        public async Task<bool> ConnectToNanoBooterAsync(CancellationToken cancellationToken)
+        public bool ConnectToNanoBooter()
         {
             bool ret = false;
 
-            if (!await DebugEngine.ConnectAsync(1000, true))
+            if (!DebugEngine.Connect(1000, true))
             {
                 return false;
             }
@@ -330,23 +310,16 @@ public async Task<bool> ConnectToNanoBooterAsync(CancellationToken cancellationT
 
                     for (int i = 0; i < 40; i++)
                     {
-                        // check if cancellation was requested 
-                        if (cancellationToken.IsCancellationRequested) return false;
-
                         if (DebugEngine == null)
                         {
                             CreateDebugEngine();
                         }
 
-                        if (fConnected = await DebugEngine.ConnectAsync(
+                        if (fConnected = DebugEngine.Connect(
                             1000,
-                            true,
-                            3,
-                            ConnectionSource.Unknown))
+                            true))
                         {
-                            Commands.Monitor_Ping.Reply reply = DebugEngine.GetConnectionSource();
-
-                            ret = (reply.Source == Commands.Monitor_Ping.c_Ping_Source_NanoBooter);
+                            ret = (DebugEngine.GetConnectionSource() == ConnectionSource.nanoBooter);
 
                             break;
                         }
@@ -375,9 +348,8 @@ public async Task<bool> ConnectToNanoBooterAsync(CancellationToken cancellationT
         /// <returns>Returns false if the erase fails, true otherwise
         /// Possible exceptions: MFUserExitException, MFDeviceNoResponseException
         /// </returns>
-        public async Task<bool> EraseAsync(
+        public bool Erase(
             EraseOptions options,
-            CancellationToken cancellationToken,
             IProgress<MessageWithProgress> progress = null,
             IProgress<string> log = null)
         {
@@ -389,29 +361,29 @@ public async Task<bool> EraseAsync(
                 return false;
             }
 
-            log?.Report("Check device presence...");
-
             // check if the device is responsive
-            if (Ping() == PingConnectionType.NoConnection)
+            if (Ping() == ConnectionSource.Unknown)
             {
-                log?.Report("Attempting to reconnect...");
+                log?.Report("Device not responding, attempting to reconnect...");
 
                 // it's not, try reconnect
-                if (!await DebugEngine.ConnectAsync(5000, true))
+                if (!DebugEngine.Connect())
                 {
+                    log?.Report("*** ERROR: failed to reconnect to device ***");
+
                     return false;
                 }
             }
 
-            if (!IsClrDebuggerEnabled || 0 != (options & EraseOptions.Firmware))
+            if (!IsCLRDebuggerEnabled || 0 != (options & EraseOptions.Firmware))
             {
                 log?.Report("Connecting to nanoBooter...");
 
                 fReset = DebugEngine.IsConnectedTonanoCLR;
 
-                if (!await ConnectToNanoBooterAsync(cancellationToken))
+                if (!ConnectToNanoBooter())
                 {
-                    log?.Report("Request to connect to nanoBooter failed!");
+                    log?.Report("*** ERROR: request to connect to nanoBooter failed ***");
 
                     return false;
                 }
@@ -420,9 +392,9 @@ public async Task<bool> EraseAsync(
                 requestBooter = true;
             }
 
-            if (DebugEngine.FlashSectorMap == null)
+            if (DebugEngine.FlashSectorMap.Count == 0)
             {
-                log?.Report("No flash map for device available. Aborting...");
+                log?.Report("*** ERROR: device flash map not available, aborting ***");
 
                 return false;
             }
@@ -438,20 +410,32 @@ public async Task<bool> EraseAsync(
 
             if (DebugEngine.IsConnectedTonanoCLR)
             {
-                log?.Report("Connected to CLR. Pausing execution...");
+                var deviceState = DebugEngine.GetExecutionMode();
 
-                DebugEngine.PauseExecution();
+                if (deviceState == Commands.DebuggingExecutionChangeConditions.State.Unknown)
+                {
+                    log?.Report("*** ERROR: failed to retrieve device execution state ***");
+
+                    return false;
+                }
+                
+                if(!deviceState.IsDeviceInStoppedState())
+                {
+                    log?.Report("Connected to CLR. Pausing execution...");
+
+                    if (!DebugEngine.PauseExecution())
+                    {
+                        log?.Report("*** ERROR: failed to stop execution ***");
+
+                        return false;
+                    }
+                }
             }
 
             List<Commands.Monitor_FlashSectorMap.FlashSectorData> eraseSectors = new List<Commands.Monitor_FlashSectorMap.FlashSectorData>();
 
             foreach (Commands.Monitor_FlashSectorMap.FlashSectorData flashSectorData in DebugEngine.FlashSectorMap)
             {
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    return false;
-                }
-
                 switch (flashSectorData.Flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_MASK)
                 {
                     case Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_DEPLOYMENT:
@@ -569,18 +553,18 @@ public async Task<bool> EraseAsync(
             return true;
         }
 
-        public async Task<bool> DeployUpdateAsync(StorageFile comprFilePath, CancellationToken cancellationToken, IProgress<string> progress = null)
-        {
-            if (DebugEngine.IsConnectedTonanoCLR)
-            {
-                if (await DeployMFUpdateAsync(comprFilePath, cancellationToken, progress))
-                {
-                    return true;
-                }
-            }
+        //public bool DeployUpdateAsync(StorageFile comprFilePath, CancellationToken cancellationToken, IProgress<string> progress = null)
+        //{
+        //    if (DebugEngine.IsConnectedTonanoCLR)
+        //    {
+        //        if (await DeployMFUpdateAsync(comprFilePath, cancellationToken, progress))
+        //        {
+        //            return true;
+        //        }
+        //    }
 
-            return false;
-        }
+        //    return false;
+        //}
 
         /// <summary>
         /// Attempts to deploy a binary (.bin) file to the connected nanoFramework device. 
@@ -595,10 +579,9 @@ public async Task<bool> DeployUpdateAsync(StorageFile comprFilePath, Cancellatio
         /// - nanoBooter if this is meant to update nanoCLR
         /// Failing to meet this condition will abort the operation.
         /// </remarks>
-        public async Task<bool> DeployBinaryFileAsync(
+        public bool DeployBinaryFile(
             string binFile,
             uint address,
-            CancellationToken cancellationToken, 
             IProgress<string> progress = null)
         {
             // validate if file exists
@@ -614,9 +597,8 @@ public async Task<bool> DeployBinaryFileAsync(
             
             var data = File.ReadAllBytes(binFile);
 
-            if (!await PrepareForDeployAsync(
+            if (!PrepareForDeploy(
                 address,
-                cancellationToken,
                 progress))
             {
                 return false;
@@ -652,7 +634,7 @@ public async Task<bool> DeployBinaryFileAsync(
         /// Also returns the entry point address for the given SREC file.
         /// </returns>
         // TODO this is not working most likely because of the format or parsing.
-        private async Task<bool> DeploySrecFileAsync(
+        private bool DeploySrecFile(
             string srecFile,
             CancellationToken cancellationToken,
             IProgress<string> progress = null)
@@ -680,7 +662,7 @@ private async Task<bool> DeploySrecFileAsync(
                     total += blocks[i].data.Length;
                 }
 
-                if(!await PrepareForDeployAsync(blocks, cancellationToken, progress))
+                if(!PrepareForDeploy(blocks, progress))
                 {
                     return false;
                 }
@@ -724,8 +706,7 @@ private bool DeployFile(
             (AccessMemoryErrorCodes ErrorCode, bool Success) = DebugEngine.WriteMemory(
                 address,
                 buffer,
-                programAligment,
-                progress);
+                programAligment);
 
             if (!Success)
             {
@@ -757,24 +738,17 @@ private bool VerifyMemory(
         /// This method is generally used after the Deploy method to jump into the code that was deployed.
         /// </summary>
         /// <param name="entrypoint">Entry point address for execution to begin</param>
-        /// <param name="cancellationToken">Cancellation token for caller to cancel task execution</param>
         /// <returns>Returns false if execution fails, true otherwise
         /// </returns>
-        public async Task<bool> ExecuteAync(uint entryPoint, CancellationToken cancellationToken)
+        public bool Execute(uint entryPoint)
         {
             if (DebugEngine == null)
             {
                 return false;
             }
 
-            if (await CheckForMicroBooterAsync(cancellationToken))
+            if (CheckForMicroBooter())
             {
-                // check if cancellation was requested 
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    return false;
-                }
-
                 if (m_execSrecHash.ContainsKey(entryPoint))
                 {
                     string execRec = m_execSrecHash[entryPoint];
@@ -782,33 +756,15 @@ public async Task<bool> ExecuteAync(uint entryPoint, CancellationToken cancellat
 
                     for (int retry = 0; retry < 10; retry++)
                     {
-                        // check if cancellation was requested 
-                        if (cancellationToken.IsCancellationRequested)
-                        {
-                            return false;
-                        }
-
                         try
                         {
-                            await DebugEngine.SendBufferAsync(Encoding.UTF8.GetBytes(execRec), TimeSpan.FromMilliseconds(1000), cancellationToken).ConfigureAwait(true);
+                            DebugEngine.SendBuffer(Encoding.UTF8.GetBytes(execRec));
 
-                            // check if cancellation was requested 
-                            if (cancellationToken.IsCancellationRequested)
-                            {
-                                return false;
-                            }
-
-                            await DebugEngine.SendBufferAsync(Encoding.UTF8.GetBytes("\n"), TimeSpan.FromMilliseconds(1000), cancellationToken).ConfigureAwait(true);
+                            DebugEngine.SendBuffer(Encoding.UTF8.GetBytes("\n"));
                         }
                         catch
                         {
-                            // catch all, doesn't matter the return
-                            return false;
-                        }
-
-                        // check if cancellation was requested 
-                        if (cancellationToken.IsCancellationRequested)
-                        {
+                            // catch all, doesn't care about the return
                             return false;
                         }
 
@@ -825,27 +781,28 @@ public async Task<bool> ExecuteAync(uint entryPoint, CancellationToken cancellat
                 return false;
             }
 
-            Commands.Monitor_Ping.Reply reply = DebugEngine.GetConnectionSource();
+            var connectionSource = DebugEngine.GetConnectionSource();
 
-            if (reply == null)
+            if (connectionSource == ConnectionSource.Unknown)
             {
                 return false;
             }
 
-            // only execute if we are talking to the nanoBooter, otherwise reboot
-            if (reply.Source == Commands.Monitor_Ping.c_Ping_Source_NanoBooter)
+            // only execute if connected to nanoBooter, otherwise reboot
+            if (connectionSource == ConnectionSource.nanoBooter)
             {
                 return DebugEngine.ExecuteMemory(entryPoint);
             }
-            else // if we are talking to the CLR then we simply did a deployment update, so reboot
+            else
             {
+                // if connected to CLR then this was just a deployment update, reboot
                 DebugEngine.RebootDevice(RebootOptions.ClrOnly);
             }
 
             return true;
         }
 
-        internal async Task<bool> CheckForMicroBooterAsync(CancellationToken cancellationToken)
+        internal bool CheckForMicroBooter()
         {
             if (DebugEngine == null) return false;
 
@@ -857,9 +814,7 @@ internal async Task<bool> CheckForMicroBooterAsync(CancellationToken cancellatio
                 // try to see if we are connected to MicroBooter
                 for (int retry = 0; retry < 5; retry++)
                 {
-                    if (cancellationToken.IsCancellationRequested) return false;
-
-                    await DebugEngine.SendBufferAsync(Encoding.UTF8.GetBytes("xx\n"), TimeSpan.FromMilliseconds(5000), cancellationToken).ConfigureAwait(true);
+                    DebugEngine.SendBuffer(Encoding.UTF8.GetBytes("xx\n"));
 
                     if (m_evtMicroBooterError.WaitOne(100))
                     {
@@ -875,526 +830,521 @@ internal async Task<bool> CheckForMicroBooterAsync(CancellationToken cancellatio
             return false;
         }
 
-        private async Task<bool> DeployMFUpdateAsync(StorageFile zipFile, CancellationToken cancellationToken, IProgress<string> progress = null)
-        {
-            if (zipFile.IsAvailable)
-            {
-                byte[] packet = new byte[DebugEngine.WireProtocolPacketSize];
-                try
-                {
-                    int handle = -1;
-                    int idx = 0;
-
-                    Windows.Storage.FileProperties.BasicProperties fileInfo = await zipFile.GetBasicPropertiesAsync();
-                    uint numPkts = (uint)(fileInfo.Size + DebugEngine.WireProtocolPacketSize - 1) / DebugEngine.WireProtocolPacketSize;
-
-                    byte[] hashData = Encoding.UTF8.GetBytes(zipFile.Name + fileInfo.DateModified.ToString());
-
-                    uint updateId = CRC.ComputeCRC(hashData, 0, hashData.Length, 0);
-                    uint imageCRC = 0;
-
-                    byte[] sig = null;
-
-                    //Debug.WriteLine(updateId);
-
-                    handle = DebugEngine.StartUpdate("NetMF", 4, 4, updateId, 0, 0, (uint)fileInfo.Size, DebugEngine.WireProtocolPacketSize, 0);
-                    if (handle > -1)
-                    {
-                        uint authType;
-                        IAsyncResult iar = null;
-
-                        // perform request
-                        (byte[] Response, bool Success) resp = DebugEngine.UpdateAuthCommand(handle, 1, null);
-
-                        // check result
-                        if (!resp.Success || resp.Response.Length < 4) return false;
-
-
-                        using (MemoryStream ms = new MemoryStream(resp.Item1))
-                        using (BinaryReader br = new BinaryReader(ms))
-                        {
-                            authType = br.ReadUInt32();
-                        }
-
-
-                        byte[] pubKey = null;
-
-                        // FIXME
-                        //if (m_serverCert != null)
-                        //{
-
-                        //    RSACryptoServiceProvider rsa = m_serverCert.PrivateKey as RSACryptoServiceProvider;
-
-                        //    if (rsa != null)
-                        //    {
-                        //        pubKey = rsa.ExportCspBlob(false);
-                        //    }
-                        //}
-
-                        if (!DebugEngine.UpdateAuthenticate(handle, pubKey))
-                        {
-                            return false;
-                        }
-
-                        // FIXME
-                        //if (authType == 1 && m_serverCert != null)
-                        //{
-                        //    iar = await DebugEngine.UpgradeConnectionToSsl_Begin(m_serverCert, m_requireClientCert);
-
-                        //    if (0 == WaitHandle.WaitAny(new WaitHandle[] { iar.AsyncWaitHandle, EventCancel }, 10000))
-                        //    {
-                        //        try
-                        //        {
-                        //            if (!m_eng.UpgradeConnectionToSSL_End(iar))
-                        //            {
-                        //                m_eng.Dispose();
-                        //                m_eng = null;
-                        //                return false;
-                        //            }
-                        //        }
-                        //        catch
-                        //        {
-                        //            m_eng.Dispose();
-                        //            m_eng = null;
-                        //            return false;
-                        //        }
-                        //    }
-                        //    else
-                        //    {
-                        //        return false;
-                        //    }
-                        //}
-
-                        // FIXME
-                        //RSAPKCS1SignatureFormatter alg = null;
-                        object alg = null;
-                        HashAlgorithmProvider hash = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha1);
-                        byte[] hashValue = null;
-
-                        try
-                        {
-                            if (m_serverCert != null)
-                            {
-                                //alg = new RSAPKCS1SignatureFormatter(m_serverCert.PrivateKey);
-                                //alg.SetHashAlgorithm("SHA1");
-                                hash = HashAlgorithmProvider.OpenAlgorithm("SHA1");
-                                hashValue = new byte[hash.HashLength / 8];
-                            }
-                        }
-                        catch
-                        {
-                        }
-
-                        IBuffer buffer = await FileIO.ReadBufferAsync(zipFile);
-                        using (DataReader dataReader = DataReader.FromBuffer(buffer))
-                        {
-                            dataReader.ReadBytes(packet);
-
-                            uint crc = CRC.ComputeCRC(packet, 0, packet.Length, 0);
-
-                            if (!DebugEngine.AddPacket(handle, (uint)idx++, packet, CRC.ComputeCRC(packet, 0, packet.Length, 0))) return false;
-
-                            imageCRC = CRC.ComputeCRC(packet, 0, packet.Length, imageCRC);
-
-                            progress?.Report($"Deploying {idx}...");
-                        }
-
-                        if (hash != null)
-                        {
-                            buffer = await FileIO.ReadBufferAsync(zipFile);
-                                             // hash it
-                            IBuffer hashed = hash.HashData(buffer);
-                            CryptographicBuffer.CopyToByteArray(hashed, out sig);
-                        }
-
-                        if (alg != null)
-                        {
-                            //sig = alg.CreateSignature(hash);
-                            //CryptographicBuffer.CopyToByteArray(sig)
-                        }
-                        else
-                        {
-                            sig = new byte[4];
-                            using (MemoryStream ms = new MemoryStream(sig))
-                            using (BinaryWriter br = new BinaryWriter(ms))
-                            {
-                                br.Write(imageCRC);
-                            }
-                        }
-
-                        if (DebugEngine.InstallUpdate(handle, sig))
-                        {
-                            return true;
-                        }
-                    }
-                }
-                catch
-                {
-                }
-            }
-
-            return false;
-        }
-
-        private async Task<Tuple<uint, bool>> DeploySRECAsync(StorageFile srecFile, CancellationToken cancellationToken)
-        {
-            m_srecHash.Clear();
-            m_execSrecHash.Clear();
-
-            // create .EXT file for SREC file
-            StorageFolder folder = await srecFile.GetParentAsync();
-
-            int m_totalSrecs = 0;
-            uint m_minSrecAddr = uint.MaxValue;
-            uint m_maxSrecAddr = 0;
-
-            if (srecFile.IsAvailable)
-            {
-                // check is EXT file exists, if yes delete it
-                StorageFile srecExtFile = await folder.TryGetItemAsync(Path.GetFileNameWithoutExtension(srecFile.Name) + ".ext") as StorageFile;
-                if (srecExtFile != null)
-                {
-                    await srecExtFile.DeleteAsync();
-                }
-
-                if (await PreProcesSrecAsync(srecFile))
-                {
-                    srecExtFile = await folder.TryGetItemAsync(srecFile.Name.Replace(srecFile.FileType, "") + ".ext") as StorageFile;
-                }
-
-                // check if cancellation was requested 
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    new Tuple<uint, bool>(0, false);
-                }
-
-                SrecParseResult parsedFile = await ParseSrecFileAsync(srecExtFile);
-
-                try
-                {
-                    int sleepTime = 5000;
-                    UInt32 imageAddr = 0xFFFFFFFF;
-
-                    m_totalSrecs = parsedFile.Records.Count;
-
-                    //m_evtMicroBooterStart.Set();
-                    //m_evtMicroBooter.Reset();
-                    //m_evtMicroBooterError.Reset();
-
-                    while (parsedFile.Records.Count > 0)
-                    {
-                        // check if cancellation was requested 
-                        if (cancellationToken.IsCancellationRequested)
-                        {
-                            new Tuple<uint, bool>(0, false);
-                        }
-
-                        List<uint> remove = new List<uint>();
-
-                        const int c_MaxPipeline = 4;
-                        int pipe = c_MaxPipeline;
-
-                        uint[] keys = new uint[parsedFile.Records.Count];
-
-                        parsedFile.Records.Keys.CopyTo(keys, 0);
-
-                        Array.Sort(keys);
-
-                        if (keys[0] < imageAddr) imageAddr = keys[0];
-
-                        foreach (uint key in keys)
-                        {
-                            // check if cancellation was requested 
-                            if (cancellationToken.IsCancellationRequested)
-                            {
-                                new Tuple<uint, bool>(0, false);
-                            }
-
-                            if (key < m_minSrecAddr) m_minSrecAddr = key;
-                            if (key > m_maxSrecAddr) m_maxSrecAddr = key;
-                            if (m_srecHash.ContainsKey(key))
-                            {
-                                remove.Add(key);
-                                continue;
-                            }
-
-                            await DebugEngine.SendBufferAsync(Encoding.UTF8.GetBytes("\n"), TimeSpan.FromMilliseconds(1000), cancellationToken).ConfigureAwait(true);
-
-                            await DebugEngine.SendBufferAsync(Encoding.UTF8.GetBytes(parsedFile.Records[key]), TimeSpan.FromMilliseconds(20000), cancellationToken).ConfigureAwait(true);
-
-                            await DebugEngine.SendBufferAsync(Encoding.UTF8.GetBytes("\n"), TimeSpan.FromMilliseconds(1000), cancellationToken).ConfigureAwait(true);
-
-                            if (pipe-- <= 0)
-                            {
-                                //m_evtMicroBooter.WaitOne(sleepTime);
-                                pipe = c_MaxPipeline;
-                            }
-                        }
-
-                        int cnt = remove.Count;
-
-                        if (cnt > 0)
-                        {
-                            for (int i = 0; i < cnt; i++)
-                            {
-                                parsedFile.Records.Remove(remove[i]);
-                            }
-                        }
-                    }
-
-                    if (imageAddr != 0)
-                    {
-                        string basefile = Path.GetFileNameWithoutExtension(srecFile.Name);
-
-                        // srecfile might be .bin.ext (for srec updates)
-                        if (!string.IsNullOrEmpty(Path.GetExtension(basefile)))
-                        {
-                            basefile = Path.GetFileNameWithoutExtension(basefile);
-                        }
-
-                        string path = folder.Path;
-                        string binFilePath = "";
-                        string symdefFilePath = "";
-
-                        if (folder.Path.ToLower().EndsWith("\\nanoCLR.hex"))
-                        {
-                            binFilePath = Path.GetDirectoryName(path) + "\\nanoCLR.bin\\" + basefile;
-                            symdefFilePath = Path.GetDirectoryName(path) + "\\nanoCLR.symdefs";
-                        }
-                        else
-                        {
-                            binFilePath = Path.GetDirectoryName(srecFile.Path) + "\\" + basefile + ".bin";
-                            symdefFilePath = Path.GetDirectoryName(srecFile.Path) + "\\" + basefile + ".symdefs";
-                        }
-
-                        StorageFile binFile = await folder.TryGetItemAsync(binFilePath) as StorageFile;
-
-                        StorageFile symdefFile = await folder.TryGetItemAsync(symdefFilePath) as StorageFile;
-
-                        // check if cancellation was requested 
-                        if (cancellationToken.IsCancellationRequested)
-                        {
-                            new Tuple<uint, bool>(0, false);
-                        }
-
-                        // send image crc
-                        if (binFile != null && symdefFile != null)
-                        {
-                            Windows.Storage.FileProperties.BasicProperties fileInfo = await binFile.GetBasicPropertiesAsync();
-
-                            UInt32 imageCRC = 0;
-
-                            // read lines from SREC file
-                            IList<string> textLines = await FileIO.ReadLinesAsync(symdefFile);
-
-                            foreach (string line in textLines)
-                            {
-                                // check if cancellation was requested 
-                                if (cancellationToken.IsCancellationRequested)
-                                {
-                                    new Tuple<uint, bool>(0, false);
-                                }
-
-                                if (line.Contains("LOAD_IMAGE_CRC"))
-                                {
-                                    int idxEnd = line.IndexOf(' ', 2);
-                                    imageCRC = UInt32.Parse(line.Substring(2, idxEnd - 2), System.Globalization.NumberStyles.HexNumber);
-                                }
-                            }
-
-                            m_execSrecHash[parsedFile.EntryPoint] = string.Format("<CRC>{0:X08},{1:X08},{2:X08},{3:X08}</CRC>\n", imageAddr, fileInfo.Size, imageCRC, parsedFile.EntryPoint);
-                        }
-                    }
-
-                    return new Tuple<uint, bool>(parsedFile.EntryPoint, true);
-                }
-                finally
-                {
-                    //m_evtMicroBooterStart.Reset();
-                }
-            }
-
-            return new Tuple<uint, bool>(0, false);
-        }
-
-        private async Task<SrecParseResult> ParseSrecFileAsync(StorageFile srecFile)
-        {
-            SrecParseResult reply = new SrecParseResult();
-
-            Dictionary<uint, string> recs = new Dictionary<uint, string>();
-
-            try
-            {
-                int total = 0;
-
-                IList<string> textLines = await FileIO.ReadLinesAsync(srecFile);
-
-                foreach (string line in textLines)
-                {
-                    string addr = line.Substring(4, 8);
-
-                    // we only support s7, s3 records
-                    if (line.ToLower().StartsWith("s7"))
-                    {
-                        reply.EntryPoint = uint.Parse(addr, System.Globalization.NumberStyles.HexNumber);
-                    }
-                    else if (line.ToLower().StartsWith("s3"))
-                    {
-                        total += line.Length - 14;
-                        reply.Records[uint.Parse(addr, System.Globalization.NumberStyles.HexNumber)] = line;
-                    }
-                }
-
-                reply.ImageSize = (uint)total;
-            }
-            catch
-            {
-                return null;
-            }
-
-            return reply;
-        }
-
-        private async Task<bool> PreProcesSrecAsync(StorageFile srecFile)
-        {
-            if (!srecFile.IsAvailable) return false;
+        //private bool DeployMFUpdateAsync(StorageFile zipFile, CancellationToken cancellationToken, IProgress<string> progress = null)
+        //{
+        //    if (zipFile.IsAvailable)
+        //    {
+        //        byte[] packet = new byte[DebugEngine.WireProtocolPacketSize];
+        //        try
+        //        {
+        //            int handle = -1;
+        //            int idx = 0;
+
+        //            Windows.Storage.FileProperties.BasicProperties fileInfo = await zipFile.GetBasicPropertiesAsync();
+        //            uint numPkts = (uint)(fileInfo.Size + DebugEngine.WireProtocolPacketSize - 1) / DebugEngine.WireProtocolPacketSize;
+
+        //            byte[] hashData = Encoding.UTF8.GetBytes(zipFile.Name + fileInfo.DateModified.ToString());
+
+        //            uint updateId = CRC.ComputeCRC(hashData, 0, hashData.Length, 0);
+        //            uint imageCRC = 0;
+
+        //            byte[] sig = null;
+
+        //            //Debug.WriteLine(updateId);
+
+        //            handle = DebugEngine.StartUpdate("NetMF", 4, 4, updateId, 0, 0, (uint)fileInfo.Size, DebugEngine.WireProtocolPacketSize, 0);
+        //            if (handle > -1)
+        //            {
+        //                uint authType;
+        //                IAsyncResult iar = null;
+
+        //                // perform request
+        //                (byte[] Response, bool Success) resp = DebugEngine.UpdateAuthCommand(handle, 1, null);
+
+        //                // check result
+        //                if (!resp.Success || resp.Response.Length < 4) return false;
+
+
+        //                using (MemoryStream ms = new MemoryStream(resp.Item1))
+        //                using (BinaryReader br = new BinaryReader(ms))
+        //                {
+        //                    authType = br.ReadUInt32();
+        //                }
+
+
+        //                byte[] pubKey = null;
+
+        //                // FIXME
+        //                //if (m_serverCert != null)
+        //                //{
+
+        //                //    RSACryptoServiceProvider rsa = m_serverCert.PrivateKey as RSACryptoServiceProvider;
+
+        //                //    if (rsa != null)
+        //                //    {
+        //                //        pubKey = rsa.ExportCspBlob(false);
+        //                //    }
+        //                //}
+
+        //                if (!DebugEngine.UpdateAuthenticate(handle, pubKey))
+        //                {
+        //                    return false;
+        //                }
+
+        //                // FIXME
+        //                //if (authType == 1 && m_serverCert != null)
+        //                //{
+        //                //    iar = await DebugEngine.UpgradeConnectionToSsl_Begin(m_serverCert, m_requireClientCert);
+
+        //                //    if (0 == WaitHandle.WaitAny(new WaitHandle[] { iar.AsyncWaitHandle, EventCancel }, 10000))
+        //                //    {
+        //                //        try
+        //                //        {
+        //                //            if (!m_eng.UpgradeConnectionToSSL_End(iar))
+        //                //            {
+        //                //                m_eng.Dispose();
+        //                //                m_eng = null;
+        //                //                return false;
+        //                //            }
+        //                //        }
+        //                //        catch
+        //                //        {
+        //                //            m_eng.Dispose();
+        //                //            m_eng = null;
+        //                //            return false;
+        //                //        }
+        //                //    }
+        //                //    else
+        //                //    {
+        //                //        return false;
+        //                //    }
+        //                //}
+
+        //                // FIXME
+        //                //RSAPKCS1SignatureFormatter alg = null;
+        //                object alg = null;
+        //                HashAlgorithmProvider hash = HashAlgorithmProvider.OpenAlgorithm(HashAlgorithmNames.Sha1);
+        //                byte[] hashValue = null;
+
+        //                try
+        //                {
+        //                    if (m_serverCert != null)
+        //                    {
+        //                        //alg = new RSAPKCS1SignatureFormatter(m_serverCert.PrivateKey);
+        //                        //alg.SetHashAlgorithm("SHA1");
+        //                        hash = HashAlgorithmProvider.OpenAlgorithm("SHA1");
+        //                        hashValue = new byte[hash.HashLength / 8];
+        //                    }
+        //                }
+        //                catch
+        //                {
+        //                }
+
+        //                IBuffer buffer = await FileIO.ReadBufferAsync(zipFile);
+        //                using (DataReader dataReader = DataReader.FromBuffer(buffer))
+        //                {
+        //                    dataReader.ReadBytes(packet);
+
+        //                    uint crc = CRC.ComputeCRC(packet, 0, packet.Length, 0);
+
+        //                    if (!DebugEngine.AddPacket(handle, (uint)idx++, packet, CRC.ComputeCRC(packet, 0, packet.Length, 0))) return false;
+
+        //                    imageCRC = CRC.ComputeCRC(packet, 0, packet.Length, imageCRC);
+
+        //                    progress?.Report($"Deploying {idx}...");
+        //                }
+
+        //                if (hash != null)
+        //                {
+        //                    buffer = await FileIO.ReadBufferAsync(zipFile);
+        //                                     // hash it
+        //                    IBuffer hashed = hash.HashData(buffer);
+        //                    CryptographicBuffer.CopyToByteArray(hashed, out sig);
+        //                }
+
+        //                if (alg != null)
+        //                {
+        //                    //sig = alg.CreateSignature(hash);
+        //                    //CryptographicBuffer.CopyToByteArray(sig)
+        //                }
+        //                else
+        //                {
+        //                    sig = new byte[4];
+        //                    using (MemoryStream ms = new MemoryStream(sig))
+        //                    using (BinaryWriter br = new BinaryWriter(ms))
+        //                    {
+        //                        br.Write(imageCRC);
+        //                    }
+        //                }
+
+        //                if (DebugEngine.InstallUpdate(handle, sig))
+        //                {
+        //                    return true;
+        //                }
+        //            }
+        //        }
+        //        catch
+        //        {
+        //        }
+        //    }
+
+        //    return false;
+        //}
+
+        //private async Task<Tuple<uint, bool>> DeploySRECAsync(StorageFile srecFile, CancellationToken cancellationToken)
+        //{
+        //    m_srecHash.Clear();
+        //    m_execSrecHash.Clear();
+
+        //    // create .EXT file for SREC file
+        //    StorageFolder folder = await srecFile.GetParentAsync();
+
+        //    int m_totalSrecs = 0;
+        //    uint m_minSrecAddr = uint.MaxValue;
+        //    uint m_maxSrecAddr = 0;
+
+        //    if (srecFile.IsAvailable)
+        //    {
+        //        // check is EXT file exists, if yes delete it
+        //        StorageFile srecExtFile = await folder.TryGetItemAsync(Path.GetFileNameWithoutExtension(srecFile.Name) + ".ext") as StorageFile;
+        //        if (srecExtFile != null)
+        //        {
+        //            await srecExtFile.DeleteAsync();
+        //        }
+
+        //        if (await PreProcesSrecAsync(srecFile))
+        //        {
+        //            srecExtFile = await folder.TryGetItemAsync(srecFile.Name.Replace(srecFile.FileType, "") + ".ext") as StorageFile;
+        //        }
+
+        //        // check if cancellation was requested 
+        //        if (cancellationToken.IsCancellationRequested)
+        //        {
+        //            new Tuple<uint, bool>(0, false);
+        //        }
+
+        //        SrecParseResult parsedFile = await ParseSrecFileAsync(srecExtFile);
+
+        //        try
+        //        {
+        //            int sleepTime = 5000;
+        //            UInt32 imageAddr = 0xFFFFFFFF;
+
+        //            m_totalSrecs = parsedFile.Records.Count;
+
+        //            //m_evtMicroBooterStart.Set();
+        //            //m_evtMicroBooter.Reset();
+        //            //m_evtMicroBooterError.Reset();
+
+        //            while (parsedFile.Records.Count > 0)
+        //            {
+        //                // check if cancellation was requested 
+        //                if (cancellationToken.IsCancellationRequested)
+        //                {
+        //                    new Tuple<uint, bool>(0, false);
+        //                }
+
+        //                List<uint> remove = new List<uint>();
+
+        //                const int c_MaxPipeline = 4;
+        //                int pipe = c_MaxPipeline;
+
+        //                uint[] keys = new uint[parsedFile.Records.Count];
+
+        //                parsedFile.Records.Keys.CopyTo(keys, 0);
+
+        //                Array.Sort(keys);
+
+        //                if (keys[0] < imageAddr) imageAddr = keys[0];
+
+        //                foreach (uint key in keys)
+        //                {
+        //                    // check if cancellation was requested 
+        //                    if (cancellationToken.IsCancellationRequested)
+        //                    {
+        //                        new Tuple<uint, bool>(0, false);
+        //                    }
+
+        //                    if (key < m_minSrecAddr) m_minSrecAddr = key;
+        //                    if (key > m_maxSrecAddr) m_maxSrecAddr = key;
+        //                    if (m_srecHash.ContainsKey(key))
+        //                    {
+        //                        remove.Add(key);
+        //                        continue;
+        //                    }
+
+        //                    await DebugEngine.SendBufferAsync(Encoding.UTF8.GetBytes("\n"), TimeSpan.FromMilliseconds(1000), cancellationToken).ConfigureAwait(true);
+
+        //                    await DebugEngine.SendBufferAsync(Encoding.UTF8.GetBytes(parsedFile.Records[key]), TimeSpan.FromMilliseconds(20000), cancellationToken).ConfigureAwait(true);
+
+        //                    await DebugEngine.SendBufferAsync(Encoding.UTF8.GetBytes("\n"), TimeSpan.FromMilliseconds(1000), cancellationToken).ConfigureAwait(true);
+
+        //                    if (pipe-- <= 0)
+        //                    {
+        //                        //m_evtMicroBooter.WaitOne(sleepTime);
+        //                        pipe = c_MaxPipeline;
+        //                    }
+        //                }
+
+        //                int cnt = remove.Count;
+
+        //                if (cnt > 0)
+        //                {
+        //                    for (int i = 0; i < cnt; i++)
+        //                    {
+        //                        parsedFile.Records.Remove(remove[i]);
+        //                    }
+        //                }
+        //            }
+
+        //            if (imageAddr != 0)
+        //            {
+        //                string basefile = Path.GetFileNameWithoutExtension(srecFile.Name);
+
+        //                // srecfile might be .bin.ext (for srec updates)
+        //                if (!string.IsNullOrEmpty(Path.GetExtension(basefile)))
+        //                {
+        //                    basefile = Path.GetFileNameWithoutExtension(basefile);
+        //                }
+
+        //                string path = folder.Path;
+        //                string binFilePath = "";
+        //                string symdefFilePath = "";
+
+        //                if (folder.Path.ToLower().EndsWith("\\nanoCLR.hex"))
+        //                {
+        //                    binFilePath = Path.GetDirectoryName(path) + "\\nanoCLR.bin\\" + basefile;
+        //                    symdefFilePath = Path.GetDirectoryName(path) + "\\nanoCLR.symdefs";
+        //                }
+        //                else
+        //                {
+        //                    binFilePath = Path.GetDirectoryName(srecFile.Path) + "\\" + basefile + ".bin";
+        //                    symdefFilePath = Path.GetDirectoryName(srecFile.Path) + "\\" + basefile + ".symdefs";
+        //                }
+
+        //                StorageFile binFile = await folder.TryGetItemAsync(binFilePath) as StorageFile;
+
+        //                StorageFile symdefFile = await folder.TryGetItemAsync(symdefFilePath) as StorageFile;
+
+        //                // check if cancellation was requested 
+        //                if (cancellationToken.IsCancellationRequested)
+        //                {
+        //                    new Tuple<uint, bool>(0, false);
+        //                }
+
+        //                // send image crc
+        //                if (binFile != null && symdefFile != null)
+        //                {
+        //                    Windows.Storage.FileProperties.BasicProperties fileInfo = await binFile.GetBasicPropertiesAsync();
+
+        //                    UInt32 imageCRC = 0;
+
+        //                    // read lines from SREC file
+        //                    IList<string> textLines = await FileIO.ReadLinesAsync(symdefFile);
+
+        //                    foreach (string line in textLines)
+        //                    {
+        //                        // check if cancellation was requested 
+        //                        if (cancellationToken.IsCancellationRequested)
+        //                        {
+        //                            new Tuple<uint, bool>(0, false);
+        //                        }
+
+        //                        if (line.Contains("LOAD_IMAGE_CRC"))
+        //                        {
+        //                            int idxEnd = line.IndexOf(' ', 2);
+        //                            imageCRC = UInt32.Parse(line.Substring(2, idxEnd - 2), System.Globalization.NumberStyles.HexNumber);
+        //                        }
+        //                    }
+
+        //                    m_execSrecHash[parsedFile.EntryPoint] = string.Format("<CRC>{0:X08},{1:X08},{2:X08},{3:X08}</CRC>\n", imageAddr, fileInfo.Size, imageCRC, parsedFile.EntryPoint);
+        //                }
+        //            }
+
+        //            return new Tuple<uint, bool>(parsedFile.EntryPoint, true);
+        //        }
+        //        finally
+        //        {
+        //            //m_evtMicroBooterStart.Reset();
+        //        }
+        //    }
+
+        //    return new Tuple<uint, bool>(0, false);
+        //}
+
+        //private async Task<SrecParseResult> ParseSrecFileAsync(StorageFile srecFile)
+        //{
+        //    SrecParseResult reply = new SrecParseResult();
+
+        //    Dictionary<uint, string> recs = new Dictionary<uint, string>();
+
+        //    try
+        //    {
+        //        int total = 0;
+
+        //        IList<string> textLines = await FileIO.ReadLinesAsync(srecFile);
+
+        //        foreach (string line in textLines)
+        //        {
+        //            string addr = line.Substring(4, 8);
+
+        //            // we only support s7, s3 records
+        //            if (line.ToLower().StartsWith("s7"))
+        //            {
+        //                reply.EntryPoint = uint.Parse(addr, System.Globalization.NumberStyles.HexNumber);
+        //            }
+        //            else if (line.ToLower().StartsWith("s3"))
+        //            {
+        //                total += line.Length - 14;
+        //                reply.Records[uint.Parse(addr, System.Globalization.NumberStyles.HexNumber)] = line;
+        //            }
+        //        }
+
+        //        reply.ImageSize = (uint)total;
+        //    }
+        //    catch
+        //    {
+        //        return null;
+        //    }
+
+        //    return reply;
+        //}
+
+        //private bool PreProcesSrecAsync(StorageFile srecFile)
+        //{
+        //    if (!srecFile.IsAvailable) return false;
+
+        //    // create .EXT file for SREC file
+        //    StorageFolder folder = await srecFile.GetParentAsync();
+
+        //    try
+        //    {
+        //        // read lines from SREC file
+        //        IList<string> textLines = await FileIO.ReadLinesAsync(srecFile);
+
+        //        StorageFile srecExtFile = await folder.CreateFileAsync(Path.GetFileNameWithoutExtension(srecFile.Name) + ".ext", CreationCollisionOption.ReplaceExisting);
+
+        //        const int c_MaxRecords = 8;
+        //        int iRecord = 0;
+        //        int currentCRC = 0;
+        //        int iDataLength = 0;
+        //        string s7rec = "";
+        //        StringBuilder sb = new StringBuilder();
+
+        //        foreach (string line in textLines)
+        //        {
+        //            // we only support s7, s3 records
+        //            if (line.ToLower().StartsWith("s7"))
+        //            {
+        //                s7rec = line;
+        //                continue;
+        //            }
+
+        //            if (!line.ToLower().StartsWith("s3")) continue;
+
+        //            string crcData;
+
+        //            if (iRecord == 0)
+        //            {
+        //                crcData = line.Substring(4, line.Length - 6);
+        //            }
+        //            else
+        //            {
+        //                crcData = line.Substring(12, line.Length - 14);
+        //            }
+
+        //            iDataLength += crcData.Length / 2; // 2 chars per byte
+
+        //            if (iRecord == 0)
+        //            {
+        //                sb.Append(line.Substring(0, 2));
+        //            }
+        //            sb.Append(crcData);
+
+        //            iRecord++;
+
+        //            for (int i = 0; i < crcData.Length - 1; i += 2)
+        //            {
+        //                currentCRC += Byte.Parse(crcData.Substring(i, 2), System.Globalization.NumberStyles.HexNumber);
+        //            }
+
+        //            if (iRecord == c_MaxRecords)
+        //            {
+        //                iDataLength += 1; // crc
+
+        //                sb = sb.Insert(2, string.Format("{0:X02}", iDataLength));
+
+        //                currentCRC += (iDataLength & 0xFF) + ((iDataLength >> 8) & 0xFF);
+
+        //                // write crc
+        //                sb.Append(string.Format("{0:X02}", (0xFF - (0xFF & currentCRC))));
+
+        //                await FileIO.WriteTextAsync(srecExtFile, sb.ToString());
+
+        //                currentCRC = 0;
+        //                iRecord = 0;
+        //                iDataLength = 0;
+        //                sb.Length = 0;
+        //            }
+        //        }
+
+        //        if (iRecord != 0)
+        //        {
+        //            iDataLength += 1; // crc
+
+        //            sb = sb.Insert(2, string.Format("{0:X02}", iDataLength));
+
+        //            currentCRC += (iDataLength & 0xFF) + ((iDataLength >> 8) & 0xFF);
+
+        //            // write crc
+        //            sb.Append(string.Format("{0:X02}", (0xFF - (0xFF & currentCRC))));
 
-            // create .EXT file for SREC file
-            StorageFolder folder = await srecFile.GetParentAsync();
+        //            await FileIO.WriteTextAsync(srecExtFile, sb.ToString());
+        //        }
 
-            try
-            {
-                // read lines from SREC file
-                IList<string> textLines = await FileIO.ReadLinesAsync(srecFile);
+        //        if (s7rec != "")
+        //        {
+        //            await FileIO.WriteTextAsync(srecExtFile, s7rec);
+        //        }
+        //    }
+        //    catch
+        //    {
+        //        StorageFile thisFile = await folder.TryGetItemAsync(Path.GetFileNameWithoutExtension(srecFile.Name) + ".ext") as StorageFile;
 
-                StorageFile srecExtFile = await folder.CreateFileAsync(Path.GetFileNameWithoutExtension(srecFile.Name) + ".ext", CreationCollisionOption.ReplaceExisting);
+        //        if (thisFile != null)
+        //        {
+        //            await thisFile.DeleteAsync();
+        //        }
 
-                const int c_MaxRecords = 8;
-                int iRecord = 0;
-                int currentCRC = 0;
-                int iDataLength = 0;
-                string s7rec = "";
-                StringBuilder sb = new StringBuilder();
+        //        return false;
+        //    }
 
-                foreach (string line in textLines)
-                {
-                    // we only support s7, s3 records
-                    if (line.ToLower().StartsWith("s7"))
-                    {
-                        s7rec = line;
-                        continue;
-                    }
-
-                    if (!line.ToLower().StartsWith("s3")) continue;
-
-                    string crcData;
-
-                    if (iRecord == 0)
-                    {
-                        crcData = line.Substring(4, line.Length - 6);
-                    }
-                    else
-                    {
-                        crcData = line.Substring(12, line.Length - 14);
-                    }
-
-                    iDataLength += crcData.Length / 2; // 2 chars per byte
-
-                    if (iRecord == 0)
-                    {
-                        sb.Append(line.Substring(0, 2));
-                    }
-                    sb.Append(crcData);
-
-                    iRecord++;
-
-                    for (int i = 0; i < crcData.Length - 1; i += 2)
-                    {
-                        currentCRC += Byte.Parse(crcData.Substring(i, 2), System.Globalization.NumberStyles.HexNumber);
-                    }
+        //    return true;
+        //}
 
-                    if (iRecord == c_MaxRecords)
-                    {
-                        iDataLength += 1; // crc
-
-                        sb = sb.Insert(2, string.Format("{0:X02}", iDataLength));
-
-                        currentCRC += (iDataLength & 0xFF) + ((iDataLength >> 8) & 0xFF);
-
-                        // write crc
-                        sb.Append(string.Format("{0:X02}", (0xFF - (0xFF & currentCRC))));
-
-                        await FileIO.WriteTextAsync(srecExtFile, sb.ToString());
-
-                        currentCRC = 0;
-                        iRecord = 0;
-                        iDataLength = 0;
-                        sb.Length = 0;
-                    }
-                }
-
-                if (iRecord != 0)
-                {
-                    iDataLength += 1; // crc
-
-                    sb = sb.Insert(2, string.Format("{0:X02}", iDataLength));
-
-                    currentCRC += (iDataLength & 0xFF) + ((iDataLength >> 8) & 0xFF);
-
-                    // write crc
-                    sb.Append(string.Format("{0:X02}", (0xFF - (0xFF & currentCRC))));
-
-                    await FileIO.WriteTextAsync(srecExtFile, sb.ToString());
-                }
-
-                if (s7rec != "")
-                {
-                    await FileIO.WriteTextAsync(srecExtFile, s7rec);
-                }
-            }
-            catch
-            {
-                StorageFile thisFile = await folder.TryGetItemAsync(Path.GetFileNameWithoutExtension(srecFile.Name) + ".ext") as StorageFile;
-
-                if (thisFile != null)
-                {
-                    await thisFile.DeleteAsync();
-                }
-
-                return false;
-            }
-
-            return true;
-        }
-
-        private async Task<bool> PrepareForDeployAsync(
+        private bool PrepareForDeploy(
             uint address,
-            CancellationToken cancellationToken,
             IProgress<string> progress = null)
         {
-            return await PrepareForDeployAsync(
+            return PrepareForDeploy(
                 address,
                 null,
-                cancellationToken,
                 progress);
         }
 
-        private async Task<bool> PrepareForDeployAsync(
+        private bool PrepareForDeploy(
             List<SRecordFile.Block> blocks,
-            CancellationToken cancellationToken,
             IProgress<string> progress = null)
         {
-            return await PrepareForDeployAsync(
+            return PrepareForDeploy(
                 0,
                 blocks,
-                cancellationToken,
                 progress);
         }
 
-        private async Task<bool> PrepareForDeployAsync(
+        private bool PrepareForDeploy(
             uint address,
             List<SRecordFile.Block> blocks, 
-            CancellationToken cancellationToken, 
             IProgress<string> progress = null)
         {
             // get flash sector map, only if needed
@@ -1469,9 +1419,8 @@ private async Task<bool> PrepareForDeployAsync(
             // erase whatever blocks are required
             if (updatesClr)
             {
-                if (!await EraseAsync(
+                if (!Erase(
                     EraseOptions.Firmware,
-                    cancellationToken,
                     null,
                     progress))
                 {
@@ -1481,9 +1430,8 @@ private async Task<bool> PrepareForDeployAsync(
 
             if (updatesDeployment)
             {
-                if (!await EraseAsync(
+                if (!Erase(
                     EraseOptions.Deployment, 
-                    cancellationToken,
                     null,
                     progress))
                 {
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/NanoSerialDevice.cs b/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/NanoSerialDevice.cs
index 32068db4..0bdea54c 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/NanoSerialDevice.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/NanoSerialDevice.cs
@@ -3,12 +3,13 @@
 // See LICENSE file in the project root for full license information.
 //
 
-using nanoFramework.Tools.Debugger.Serial;
-
 namespace nanoFramework.Tools.Debugger
 {
     public class NanoSerialDevice
     {
-        public SerialDeviceInformation DeviceInformation { get; set; }
+        /// <summary>
+        /// Default timeout for serial device (in milliseconds).
+        /// </summary>
+        public const int SafeDefaultTimeout = 1000;
     }
 }
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/NanoUsbDevice.cs b/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/NanoUsbDevice.cs
deleted file mode 100644
index 82692ac6..00000000
--- a/nanoFramework.Tools.DebugLibrary.Shared/NFDevice/NanoUsbDevice.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-
-using nanoFramework.Tools.Debugger.Usb;
-
-namespace nanoFramework.Tools.Debugger
-{
-    public class NanoUsbDevice 
-    {
-        public UsbDeviceInformation DeviceInformation { get; set; }
-    }
-}
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/NanoDevicesEventSource.cs b/nanoFramework.Tools.DebugLibrary.Shared/NanoDevicesEventSource.cs
index f91a216a..60e2145e 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/NanoDevicesEventSource.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/NanoDevicesEventSource.cs
@@ -19,9 +19,9 @@ internal class NanoDevicesEventSource : EventSource
         private static readonly Lazy<NanoDevicesEventSource> Log_ = new Lazy<NanoDevicesEventSource>(() => new NanoDevicesEventSource());
 
         [Event(1, Level = EventLevel.Informational, Opcode = EventOpcode.Info)]
-        public string DroppingBlackListedDevice(string deviceSelector)
+        public string DroppingDeviceToExclude(string deviceSelector)
         {
-            string logMessage = $"NanoDevices: dropping black listed device {deviceSelector}";
+            string logMessage = $"NanoDevices: dropping device in exclusion list {deviceSelector}";
 
             WriteEvent(1, logMessage);
 
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/PortDefinitions/IPort.cs b/nanoFramework.Tools.DebugLibrary.Shared/PortDefinitions/IPort.cs
index d6d3d427..b762a9d7 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/PortDefinitions/IPort.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/PortDefinitions/IPort.cs
@@ -4,19 +4,19 @@
 //
 
 using System;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace nanoFramework.Tools.Debugger
 {
     public interface IPort
     {
-        Task<uint> SendBufferAsync(byte[] buffer, TimeSpan waiTimeout, CancellationToken cancellationToken);
+        int AvailableBytes { get; }
 
-        Task<byte[]> ReadBufferAsync(uint bytesToRead, TimeSpan waiTimeout, CancellationToken cancellationToken);
+        int SendBuffer(byte[] buffer);
 
-        Task<bool> ConnectDeviceAsync();
+        byte[] ReadBuffer(int bytesToRead);
 
-        void DisconnectDevice();
+        bool ConnectDevice();
+
+        void DisconnectDevice(bool force = false);
     }
 }
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/PortDefinitions/PortBase.cs b/nanoFramework.Tools.DebugLibrary.Shared/PortDefinitions/PortBase.cs
index d981a83c..8ab279b3 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/PortDefinitions/PortBase.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/PortDefinitions/PortBase.cs
@@ -11,7 +11,7 @@ namespace nanoFramework.Tools.Debugger
 {
     public abstract partial class PortBase
     {
-        public List<string> PortBlackList { get; set; } = new List<string>();
+        public List<string> PortExclusionList { get; set; } = new List<string>();
 
         public override bool Equals(object obj)
         {
@@ -72,5 +72,11 @@ public string PersistName
         /// This operation resets the list of available devices and attempts to validate if a connected device it's a nanoDevice.
         /// </summary>
         public abstract void ReScanDevices();
+
+        /// <summary>
+        /// Disposes a device.
+        /// </summary>
+        /// <param name="instanceId">Id of the device to dispose.</param>
+        public abstract void DisposeDevice(string instanceId);
     }
 }
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/DeviceWatcher.cs b/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/DeviceWatcher.cs
new file mode 100644
index 00000000..a0854f69
--- /dev/null
+++ b/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/DeviceWatcher.cs
@@ -0,0 +1,174 @@
+using Microsoft.Win32;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO.Ports;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace nanoFramework.Tools.Debugger.PortSerial
+{
+    public class DeviceWatcher
+    {
+        private bool _started = false;
+        private List<string> _ports;
+
+        public delegate void EventDeviceAdded(object sender, string port);
+
+        public event EventDeviceAdded Added;
+
+        public delegate void EventDeviceRemoved(object sender, string port);
+
+        public event EventDeviceRemoved Removed;
+
+        public DeviceWatcherStatus Status { get; internal set; }
+
+        public void Start()
+        {
+            if (!_started)
+            {
+                var threadWatch = new Thread(() =>
+                {
+                    _ports = new List<string>();
+
+                    _started = true;
+
+                    Status = DeviceWatcherStatus.Started;
+                    
+                    while (_started)
+                    {
+                        var ports = GetPortNames();
+
+                        // process ports that have arrived
+                        foreach (var port in ports)
+                        {
+                            if (!_ports.Contains(port))
+                            {
+                                _ports.Add(port);
+                                Added?.Invoke(this, port);
+                            }
+                        }
+
+                        // check for ports that departed 
+                        List<string> portsToRemove = new();
+
+                        foreach (var port in _ports)
+                        {
+                            if (!ports.Contains(port))
+                            {
+                                portsToRemove.Add(port);
+                            }
+                        }
+
+                        // process ports that have departed 
+                        foreach (var port in portsToRemove)
+                        {
+                            if (_ports.Contains(port))
+                            {
+                                _ports.Remove(port);
+                                Removed?.Invoke(this, port);
+                            }
+                        }
+
+                        Thread.Sleep(200);
+                    }
+
+                    Status = DeviceWatcherStatus.Stopped;
+                })
+                {
+                    Priority = ThreadPriority.Lowest
+                };
+                threadWatch.Start();
+            }
+        }
+
+        private List<string> GetPortNames()
+        {
+            const string FindFullPathPattern = @"\\\\\?\\([\w]*)#([\w&]*)#([\w&]*)";
+            const string RegExPattern = @"\\Device\\([a-zA-Z]*)(\d)";
+            List<string> portNames = new List<string>();
+            try
+            {
+                // Gets the list of supposed open ports
+                RegistryKey allPorts = Registry.LocalMachine.OpenSubKey(@"HARDWARE\DEVICEMAP\SERIALCOMM");
+                RegistryKey deviceFullPaths = Registry.LocalMachine.OpenSubKey(@"SYSTEM\CurrentControlSet\Control\COM Name Arbiter\Devices");
+                if (allPorts != null)
+                {
+                    // Then gets all the names, they are like \Device\BthModem0 \Device\Silabser0 etc,
+                    foreach (var port in allPorts.GetValueNames())
+                    {
+                        var portNameDetails = Regex.Match(port, RegExPattern);
+                        if (portNameDetails.Success)
+                        {
+                            RegistryKey activePorts = Registry.LocalMachine.OpenSubKey($"SYSTEM\\CurrentControlSet\\Services\\{portNameDetails.Groups[1]}\\Enum");
+                            if (activePorts != null)
+                            {
+                                // If the device is still plugged, it should appear as valid here, if not present, it means, the device has been disconnected
+                                string portDescription = (string)activePorts.GetValue($"{portNameDetails.Groups[2]}");
+                                if (portDescription != null)
+                                {
+                                    RegistryKey portKeyInfo = Registry.LocalMachine.OpenSubKey($"SYSTEM\\CurrentControlSet\\Enum\\{portDescription}\\Device Parameters");
+                                    if (portKeyInfo != null)
+                                    {
+                                        string portName = (string)allPorts.GetValue(port);
+                                        if (portName != null)
+                                        {
+                                            portNames.Add(portName);
+                                        }
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                string portName = (string)allPorts.GetValue(port);
+                                if (portName != null)
+                                {
+                                    // Get the full qualified name of the device
+                                    string deviceFullPath = (string)deviceFullPaths.GetValue(portName);
+                                    if (deviceFullPath != null)
+                                    {
+                                        var devicePathDetail = Regex.Match(deviceFullPath.Replace("+", "&"), FindFullPathPattern);
+                                        if ((devicePathDetail.Success) && (devicePathDetail.Groups.Count == 4))
+                                        {
+                                            string devicePath = deviceFullPath.Split('#')[1];
+
+                                            RegistryKey device = Registry.LocalMachine.OpenSubKey($"SYSTEM\\CurrentControlSet\\Enum\\{devicePathDetail.Groups[1]}\\{devicePath}\\{devicePathDetail.Groups[3]}");
+                                            if (device != null)
+                                            {
+                                                string service = (string)device.GetValue("Service");
+                                                if (service != null)
+                                                {
+                                                    activePorts = Registry.LocalMachine.OpenSubKey($"SYSTEM\\CurrentControlSet\\Services\\{service}\\Enum");
+                                                    if (activePorts != null)
+                                                    {
+                                                        // If the device is still plugged, it should appear as valid here, if not present, it means, the device has been disconnected                                                        
+                                                        portNames.Add(portName);
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            catch
+            {
+                // Errors in enumeration can happen                
+            }
+
+            return portNames;
+        }
+
+        public void Stop()
+        {
+            _started = false;
+            Status = DeviceWatcherStatus.Stopping;
+        }
+    }
+}
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/DeviceWatcherStatus.cs b/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/DeviceWatcherStatus.cs
new file mode 100644
index 00000000..11a95040
--- /dev/null
+++ b/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/DeviceWatcherStatus.cs
@@ -0,0 +1,36 @@
+namespace nanoFramework.Tools.Debugger.PortSerial
+{
+    public enum DeviceWatcherStatus
+    {
+        /// <summary>
+        /// The watcher has aborted operation. No subsequent events will be raised.
+        /// </summary>
+        Aborted = 5,
+
+        /// <summary>
+        /// This is the initial state of a Watcher object. During this state clients can register event handlers.
+        /// </summary>
+        Created = 0,
+
+        /// <summary>
+        /// The watcher has completed enumerating the initial collection. Items can still be added, updated or removed from the collection.
+        /// </summary>
+        EnumerationCompleted = 2,
+
+        /// <summary>
+        /// The watcher transitions to the Started state once Start is called. The watcher is enumerating the initial collection. Note that during this enumeration phase it is possible to receive Updated and Removed notifications but only to items that have already been Added.
+        /// </summary>
+        Started = 1,
+
+        /// <summary>
+        /// The client has called Stop and the watcher has completed all outstanding events. No further events will be raised.
+        /// </summary>
+        Stopped = 4,
+
+        /// <summary>
+        /// The client has called Stop and the watcher is still in the process of stopping. Events may still be raised.
+        /// </summary>
+        Stopping = 3
+
+    }
+}
\ No newline at end of file
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/PortSerial.cs b/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/PortSerial.cs
new file mode 100644
index 00000000..2a7aca56
--- /dev/null
+++ b/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/PortSerial.cs
@@ -0,0 +1,283 @@
+//
+// Copyright (c) .NET Foundation and Contributors
+// See LICENSE file in the project root for full license information.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.IO.Ports;
+using System.Threading;
+
+namespace nanoFramework.Tools.Debugger.PortSerial
+{
+    public partial class PortSerial : PortMessageBase, IPort
+    {
+        private readonly PortSerialManager _portManager;
+
+        public SerialPort Device => (SerialPort)NanoDevice.DeviceBase;
+
+        // valid baud rates
+        public static readonly List<int> ValidBaudRates = new List<int>() { 921600, 460800, 115200 };
+
+        public int BaudRate { get; internal set; }
+
+        public NanoDevice<NanoSerialDevice> NanoDevice { get; }
+
+        /// <summary>
+        /// This DeviceInformation represents which device is connected or which device will be reconnected when
+        /// the device is plugged in again (if IsEnabledAutoReconnect is true);.
+        /// </summary>
+        public string InstanceId
+        {
+            get
+            {
+                return NanoDevice.DeviceId;
+            }
+        }
+
+        /// <summary>
+        /// Creates an Serial debug client
+        /// </summary>
+        /// <param name="deviceInfo">Device information of the device to be opened</param>
+        /// <param name="deviceSelector">The AQS used to find this device</param>
+        public PortSerial(PortSerialManager portManager, NanoDevice<NanoSerialDevice> serialDevice)
+        {
+            _portManager = portManager ?? throw new ArgumentNullException(nameof(portManager));
+            NanoDevice = serialDevice ?? throw new ArgumentNullException(nameof(serialDevice));
+
+            // init default baud rate with 1st value
+            BaudRate = ValidBaudRates[0];
+        }
+
+        #region SerialDevice methods
+
+        /// <summary>
+        /// This method opens the device using the WinRT Serial API. After the device is opened, save the device
+        /// so that it can be used across scenarios.
+        ///
+        /// It is important that the FromIdAsync call is made on the UI thread because the consent prompt can only be displayed
+        /// on the UI thread.
+        /// 
+        /// This method is used to reopen the device after the device reconnects to the computer and when the app resumes.
+        /// </summary>
+        /// <returns>True if the device was successfully opened, false if the device could not be opened for well known reasons.
+        /// An exception may be thrown if the device could not be opened for extraordinary reasons.</returns>
+        public bool OpenDevice()
+        {
+            bool successfullyOpenedDevice = false;
+            bool retry = false;
+
+            try
+            {
+                /////////////////////////////////////////////////////////////
+                // need to FORCE the parity setting to _NONE_ because        
+                // the default on the current ST Link is different causing 
+                // the communication to fail
+                /////////////////////////////////////////////////////////////
+
+                NanoDevice.DeviceBase = new SerialPort(InstanceId, BaudRate, Parity.None, 8);
+
+                // Device could have been blocked by user or the device has already been opened by another app.
+                if (Device != null)
+                {
+                    try
+                    {
+                        Device.Open();
+                    }
+                    catch (IOException)
+                    {
+                        retry = true;
+                    }
+
+                    if (retry)
+                    {
+                        Thread.Sleep(100);
+                        Device.Open();
+                    }
+
+                    successfullyOpenedDevice = true;
+
+                    // set conservative timeouts
+                    Device.WriteTimeout = 500;
+                    Device.ReadTimeout = 500;
+                    Device.ErrorReceived += Device_ErrorReceived;
+
+                    // better make sure the RX FIFO it's cleared
+                    Device.DiscardInBuffer();
+                }
+                else
+                {
+                    successfullyOpenedDevice = false;
+                }
+            }
+#if DEBUG
+            catch (Exception ex)
+#else
+            catch
+#endif
+            {
+                // catch all because the device open might fail for a number of reasons
+            }
+
+            return successfullyOpenedDevice;
+        }
+
+
+        public bool IsDeviceConnected
+        {
+            get
+            {
+                return (Device != null);
+            }
+        }
+
+        /// <summary>
+        /// Closes the device, stops the device watcher, stops listening for app events, and resets object state to before a device
+        /// was ever connected.
+        /// </summary>
+        public void CloseDevice()
+        {
+            if (NanoDevice.DeviceBase != null)
+            {
+                ((SerialPort)NanoDevice.DeviceBase).Close();
+                ((SerialPort)NanoDevice.DeviceBase).Dispose();
+            }
+        }
+
+        private void Device_ErrorReceived(object sender, SerialErrorReceivedEventArgs e)
+        {
+            Debug.WriteLine($">>>> Serial ERROR from {InstanceId}: {e.EventType}");
+        }
+
+        #endregion
+
+        public bool ConnectDevice()
+        {
+            // try to determine if we already have this device opened.
+            if (Device != null &&
+                Device.IsOpen)
+            {
+                return true;
+            }
+
+            bool openDeviceResult = OpenDevice();
+
+            if (openDeviceResult)
+            {
+                OnLogMessageAvailable(NanoDevicesEventSource.Log.OpenDevice(InstanceId));
+            }
+            else
+            {
+                // Most likely the device is opened by another app, but cannot be sure
+                OnLogMessageAvailable(NanoDevicesEventSource.Log.CriticalError($"Unknown error opening {InstanceId}, possibly opened by another app"));
+            }
+
+            return openDeviceResult;
+        }
+
+        public void DisconnectDevice(bool force = false)
+        {
+            // disconnecting the current device
+
+            OnLogMessageAvailable(NanoDevicesEventSource.Log.CloseDevice(InstanceId));
+
+            // close device
+            CloseDevice();
+
+            if (force)
+            {
+                _portManager.DisposeDevice(InstanceId);
+            }
+        }
+
+        #region Interface implementations
+
+        public DateTime LastActivity { get; set; }
+
+        public int AvailableBytes
+        {
+            get
+            {
+                if (Device.IsOpen)
+                {
+                    return Device.BytesToRead;
+                }
+                else
+                {
+                    // return -1 to signal that the port is not open
+                    return -1;
+                }
+            }
+        }
+
+        public int SendBuffer(byte[] buffer)
+        {
+            // device must be connected
+            if (IsDeviceConnected &&
+                Device.IsOpen)
+            {
+                try
+                {
+                    // write buffer to device
+                    Device.Write(buffer, 0, buffer.Length);
+
+                    return buffer.Length;
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine($"SendRawBufferAsync-Serial-Exception occurred: {ex.Message}\r\n {ex.StackTrace}");
+
+                    throw;
+                }
+            }
+            else
+            {
+                throw new DeviceNotConnectedException();
+            }
+        }
+
+        public byte[] ReadBuffer(int bytesToRead)
+        {
+            // device must be connected
+            if (IsDeviceConnected &&
+                Device.IsOpen)
+            {
+                byte[] buffer = new byte[bytesToRead];
+
+                try
+                {
+                    int readBytes = Device.Read(buffer, 0, bytesToRead);
+
+                    if (readBytes != bytesToRead)
+                    {
+                        Array.Resize(ref buffer, readBytes);
+                    }
+
+                    return buffer;
+                }
+                catch (TimeoutException)
+                {
+                    // this is expected to happen when the timeout occurs, no need to do anything with it
+                }
+                catch (Exception ex)
+                {
+                    Debug.WriteLine($"ReadBufferAsync-Serial-Exception occurred: {ex.Message}\r\n {ex.StackTrace}");
+
+                    throw;
+                }
+            }
+            else
+            {
+                throw new DeviceNotConnectedException();
+            }
+
+            // return empty byte array
+            return new byte[0];
+        }
+
+        #endregion
+
+    }
+}
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/PortSerialManager.cs b/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/PortSerialManager.cs
new file mode 100644
index 00000000..0fb3063b
--- /dev/null
+++ b/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/PortSerialManager.cs
@@ -0,0 +1,676 @@
+//
+// Copyright (c) .NET Foundation and Contributors
+// See LICENSE file in the project root for full license information.
+//
+
+using Microsoft.Win32;
+using nanoFramework.Tools.Debugger.Extensions;
+using nanoFramework.Tools.Debugger.Serial;
+using nanoFramework.Tools.Debugger.WireProtocol;
+using Polly;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.IO.Ports;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace nanoFramework.Tools.Debugger.PortSerial
+{
+    public partial class PortSerialManager : PortBase
+    {
+        private readonly DeviceWatcher _deviceWatcher = new();
+
+        // Serial device watchers started flag
+        private bool _watchersStarted = false;
+
+        // counter of device watchers completed
+        private int _deviceWatchersCompletedCount = 0;
+
+        // counter of device watchers completed
+        private int _newDevicesCount = 0;
+
+        private readonly Random _delay = new Random(DateTime.Now.Millisecond);
+
+        /// <summary>
+        /// Internal list with the actual nF Serial devices
+        /// </summary>
+        private readonly List<SerialDeviceInformation> _serialDevices;
+
+        private readonly ConcurrentDictionary<string, CachedDeviceInfo> _devicesCache = new ConcurrentDictionary<string, CachedDeviceInfo>();
+
+        public int BootTime { get; set; }
+
+        /// <summary>
+        /// Creates an Serial debug client
+        /// </summary>
+        public PortSerialManager(bool startDeviceWatchers = true, List<string> portExclusionList = null, int bootTime = 3000)
+        {
+            NanoFrameworkDevices = new ObservableCollection<NanoDeviceBase>();
+            _serialDevices = new List<SerialDeviceInformation>();
+
+            BootTime = bootTime;
+
+            if (portExclusionList != null)
+            {
+                PortExclusionList = portExclusionList;
+            }
+
+            Task.Factory.StartNew(() =>
+            {
+
+                InitializeDeviceWatchers();
+
+                if (startDeviceWatchers)
+                {
+                    StartSerialDeviceWatchers();
+                }
+            });
+        }
+
+        public override void ReScanDevices()
+        {
+            _newDevicesCount = 0;
+
+            // need to reset this here to have intimidate effect
+            IsDevicesEnumerationComplete = false;
+
+            Task.Run(delegate
+            {
+                StopDeviceWatchersInternal();
+
+                StartDeviceWatchersInternal();
+            });
+        }
+
+        public override void StartDeviceWatchers()
+        {
+            if (!_watchersStarted)
+            {
+                StartDeviceWatchersInternal();
+            }
+        }
+
+        public override void StopDeviceWatchers()
+        {
+            StopDeviceWatchersInternal();
+        }
+
+        #region Device watcher management and host app status handling
+
+        /// <summary>
+        /// Initialize device watchers. Must call here the initialization methods for all devices that we want to set watch.
+        /// </summary>
+        private void InitializeDeviceWatchers()
+        {
+            _deviceWatcher.Added += OnDeviceAdded;
+            _deviceWatcher.Removed += OnDeviceRemoved;
+        }
+
+        public void StartSerialDeviceWatchers()
+        {
+            // Initialize the Serial device watchers to be notified when devices are connected/removed
+            StartDeviceWatchersInternal();
+        }
+
+        /// <summary>
+        /// Starts all device watchers including ones that have been individually stopped.
+        /// </summary>
+        private void StartDeviceWatchersInternal()
+        {
+            // Start all device watchers
+
+            _deviceWatcher.Start();
+
+            _watchersStarted = true;
+
+            _deviceWatchersCompletedCount = 0;
+            IsDevicesEnumerationComplete = false;
+        }
+
+        /// <summary>
+        /// Stops all device watchers.
+        /// </summary>
+        private void StopDeviceWatchersInternal()
+        {
+            if (_deviceWatcher.Status == DeviceWatcherStatus.Started)
+            {
+                _deviceWatcher.Stop();
+
+                while (_deviceWatcher.Status != DeviceWatcherStatus.Stopped)
+                {
+                    Thread.Sleep(100);
+                }
+            }
+
+            // Clear the list of devices so we don't have potentially disconnected devices around
+            ClearDeviceEntries();
+
+            // also clear nanoFramework devices list
+            var devicesToRemove = NanoFrameworkDevices.Select(nanoDevice => ((NanoDevice<NanoSerialDevice>)nanoDevice).DeviceId).ToList();
+
+            foreach (var deviceId in devicesToRemove)
+            {
+                // get device...
+                var device = FindNanoFrameworkDevice(deviceId);
+
+                // ... and remove it from collection
+                NanoFrameworkDevices.Remove(device);
+
+                device?.DebugEngine?.StopProcessing();
+                device?.DebugEngine?.Dispose();
+
+                device?.Disconnect();
+
+                // This closes the handle to the device
+                ((NanoDevice<NanoSerialDevice>)device)?.Dispose();
+            }
+
+            _watchersStarted = false;
+        }
+
+        #endregion
+
+
+        #region Methods to manage device list add, remove, etc
+
+        /// <summary>
+        /// Creates a DeviceListEntry for a device and adds it to the list of devices
+        /// </summary>
+        /// <param name="deviceInformation">DeviceInformation on the device to be added to the list</param>
+        /// <param name="deviceId">The AQS used to find this device</param>
+        private void AddDeviceToListAsync(String deviceId)
+        {
+            // search the device list for a device with a matching interface ID
+            var serialMatch = FindDevice(deviceId);
+
+            // Add the device if it's new
+            if (serialMatch == null)
+            {
+                var serialDevice = new SerialDeviceInformation(deviceId);
+
+                OnLogMessageAvailable(NanoDevicesEventSource.Log.CandidateDevice(deviceId));
+
+                // search the nanoFramework device list for a device with a matching interface ID
+                var nanoFrameworkDeviceMatch = FindNanoFrameworkDevice(deviceId);
+
+                if (nanoFrameworkDeviceMatch == null)
+                {
+                    // Create a new element for this device and...
+                    var newNanoFrameworkDevice = new NanoDevice<NanoSerialDevice>();
+                    newNanoFrameworkDevice.DeviceId = deviceId;
+                    newNanoFrameworkDevice.ConnectionPort = new PortSerial(this, newNanoFrameworkDevice);
+                    newNanoFrameworkDevice.Transport = TransportType.Serial;
+
+                    if (newNanoFrameworkDevice.ConnectionPort.ConnectDevice())
+                    {
+                        if (CheckValidNanoFrameworkSerialDevice(newNanoFrameworkDevice))
+                        {
+                            //add device to the collection
+                            NanoFrameworkDevices.Add(newNanoFrameworkDevice);
+
+                            _serialDevices.Add(serialDevice);
+
+                            OnLogMessageAvailable(NanoDevicesEventSource.Log.ValidDevice($"{newNanoFrameworkDevice.Description} {newNanoFrameworkDevice.DeviceId}"));
+                        }
+                        else
+                        {
+                            // disconnect
+                            newNanoFrameworkDevice.Disconnect();
+
+                            // devices powered by the USB cable and that feature a serial converter (like an FTDI chip) 
+                            // are still booting when the USB enumeration event raises
+                            // so need to give them enough time for the boot sequence to complete before trying to communicate with them
+
+                            // Failing to connect to debugger engine on first attempt occurs frequently on dual USB devices like ESP32 WROVER KIT.
+                            // Seems to be something related with both devices using the same USB endpoint
+                            // Another reason is that an ESP32 takes around 3 seconds to complete the boot sequence and launch the CLR.
+                            // Until then the device will look non responsive or invalid to the detection mechanism that we're using.
+                            // A nice workaround for this seems to be adding an extra random wait so the comms are not simultaneous.
+
+                            int delay;
+                            lock (_delay)
+                            {
+                                delay = _delay.Next(200, 600);
+                            }
+
+                            Thread.Sleep(BootTime + delay);
+
+                            OnLogMessageAvailable(NanoDevicesEventSource.Log.CheckingValidDevice($" {newNanoFrameworkDevice.DeviceId} *** 2nd attempt ***"));
+
+                            if (newNanoFrameworkDevice.ConnectionPort.ConnectDevice())
+                            {
+                                if (CheckValidNanoFrameworkSerialDevice(newNanoFrameworkDevice))
+                                {
+                                    //add device to the collection
+                                    NanoFrameworkDevices.Add(newNanoFrameworkDevice);
+
+                                    _serialDevices.Add(serialDevice);
+
+                                    OnLogMessageAvailable(NanoDevicesEventSource.Log.ValidDevice($"{newNanoFrameworkDevice.Description} {newNanoFrameworkDevice.DeviceId}"));
+                                }
+                                else
+                                {
+                                    OnLogMessageAvailable(NanoDevicesEventSource.Log.QuitDevice(deviceId));
+                                }
+                            }
+                            else
+                            {
+                                OnLogMessageAvailable(NanoDevicesEventSource.Log.QuitDevice(deviceId));
+                            }
+                        }
+                    }
+                    else
+                    {
+                        OnLogMessageAvailable(NanoDevicesEventSource.Log.QuitDevice(deviceId));
+                    }
+
+                    // subtract devices count
+                    _newDevicesCount--;
+
+                    // check if we are done processing arriving devices
+                    if (_newDevicesCount == 0)
+                    {
+                        ProcessDeviceEnumerationComplete();
+                    }
+                }
+            }
+        }
+
+        public override void DisposeDevice(string instanceId)
+        {
+            var deviceToDispose = NanoFrameworkDevices.FirstOrDefault(nanoDevice => ((NanoDevice<NanoSerialDevice>)nanoDevice).DeviceId == instanceId);
+
+            if (deviceToDispose != null)
+            {
+                Task.Run(() =>
+                {
+                    ((NanoDevice<NanoSerialDevice>)deviceToDispose).Dispose();
+                });
+            }
+        }
+
+        private void RemoveDeviceFromList(string deviceId)
+        {
+            // Removes the device entry from the internal list; therefore the UI
+            var deviceEntry = FindDevice(deviceId);
+
+            OnLogMessageAvailable(NanoDevicesEventSource.Log.DeviceDeparture(deviceId));
+
+            _serialDevices.Remove(deviceEntry);
+
+            // get device...
+            var device = FindNanoFrameworkDevice(deviceId);
+
+            // ... and remove it from collection
+            NanoFrameworkDevices.Remove(device);
+
+            device?.DebugEngine?.StopProcessing();
+            device?.DebugEngine?.Dispose();
+        }
+
+        private void ClearDeviceEntries()
+        {
+            _serialDevices.Clear();
+        }
+
+        /// <summary>
+        /// Searches through the existing list of devices for the first DeviceListEntry that has
+        /// the specified device Id.
+        /// </summary>
+        /// <param name="deviceId">Id of the device that is being searched for</param>
+        /// <returns>DeviceListEntry that has the provided Id; else a nullptr</returns>
+        internal SerialDeviceInformation FindDevice(String deviceId)
+        {
+            if (deviceId != null)
+            {
+                foreach (SerialDeviceInformation entry in _serialDevices)
+                {
+                    if (entry.InstanceId == deviceId)
+                    {
+                        return entry;
+                    }
+                }
+            }
+
+            return null;
+        }
+
+        private NanoDeviceBase FindNanoFrameworkDevice(string deviceId)
+        {
+            if (deviceId != null)
+            {
+                // SerialMatch.Device.DeviceInformation
+                return NanoFrameworkDevices.FirstOrDefault(d => ((d as NanoDevice<NanoSerialDevice>).DeviceId) == deviceId);
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Remove the device from the device list 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="deviceInformationUpdate"></param>
+        private void OnDeviceRemoved(object sender, string serialPort)
+        {
+            RemoveDeviceFromList(serialPort);
+        }
+
+        // TODO
+        /// <summary>
+        /// This function will add the device to the listOfDevices
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="deviceInformation"></param>
+        private void OnDeviceAdded(object sender, string serialPort)
+        {
+            // check against exclusion list
+            if (PortExclusionList.Contains(serialPort))
+            {
+                OnLogMessageAvailable(NanoDevicesEventSource.Log.DroppingDeviceToExclude(serialPort));
+                return;
+            }
+
+            // discard known system and other rogue devices
+            RegistryKey portKeyInfo = Registry.LocalMachine.OpenSubKey(@"SYSTEM\CurrentControlSet\Control\COM Name Arbiter\Devices");
+            if (portKeyInfo != null)
+            {
+                var portInfo = (string)portKeyInfo.GetValue(serialPort);
+
+                if (portInfo != null)
+                {
+                    Debug.WriteLine($"{nameof(OnDeviceAdded)}: port {serialPort}, portinfo: {portInfo}");
+
+                    // make  it upper case for comparison
+                    portInfo = portInfo.ToUpperInvariant();
+
+                    if (
+                       portInfo.StartsWith(@"\\?\ACPI") ||
+
+                       // reported in https://github.com/nanoframework/Home/issues/332
+                       // COM ports from Broadcom 20702 Bluetooth adapter
+                       portInfo.Contains(@"VID_0A5C+PID_21E1") ||
+
+                       // reported in https://nanoframework.slack.com/archives/C4MGGBH1P/p1531660736000055?thread_ts=1531659631.000021&cid=C4MGGBH1P
+                       // COM ports from Broadcom 20702 Bluetooth adapter
+                       portInfo.Contains(@"VID&00010057_PID&0023") ||
+
+                       // reported in Discord channel
+                       portInfo.Contains(@"VID&0001009E_PID&400A") ||
+
+                       // this seems to cover virtual COM ports from Bluetooth devices
+                       portInfo.Contains("BTHENUM") ||
+
+                       // this seems to cover virtual COM ports by ELTIMA 
+                       portInfo.Contains("EVSERIAL")
+                       )
+                    {
+                        OnLogMessageAvailable(NanoDevicesEventSource.Log.DroppingDeviceToExclude(serialPort));
+
+                        // don't even bother with this one
+                        return;
+                    }
+                }
+            }
+
+            OnLogMessageAvailable(NanoDevicesEventSource.Log.DeviceArrival(serialPort));
+
+            _newDevicesCount++;
+
+            Task.Run(() =>
+            {
+                AddDeviceToListAsync(serialPort);
+            });
+        }
+
+        #endregion
+
+
+        #region Handlers and events for Device Enumeration Complete 
+
+        private void ProcessDeviceEnumerationComplete()
+        {
+            OnLogMessageAvailable(NanoDevicesEventSource.Log.SerialDeviceEnumerationCompleted(NanoFrameworkDevices.Count));
+
+            // all watchers have completed enumeration
+            IsDevicesEnumerationComplete = true;
+
+            // fire event that Serial enumeration is complete 
+            OnDeviceEnumerationCompleted();
+        }
+
+        private bool CheckValidNanoFrameworkSerialDevice(NanoDevice<NanoSerialDevice> device)
+        {
+            bool validDevice = false;
+            bool isKnownDevice = false;
+
+            // store device ID
+            string deviceId = device.DeviceId;
+
+            try
+            {
+                // sanity check for invalid or null device base
+                if ((SerialPort)device.DeviceBase != null)
+                {
+                    // check if this device is on cache
+                    isKnownDevice = _devicesCache.TryGetValue(deviceId, out var cachedDevice);
+
+                    // need to go through all the valid baud rates: 921600, 460800 and 115200.
+                    foreach (int baudRate in PortSerial.ValidBaudRates)
+                    {
+                        if (device.DebugEngine == null)
+                        {
+                            device.CreateDebugEngine(NanoSerialDevice.SafeDefaultTimeout);
+                        }
+
+                        if (isKnownDevice)
+                        {
+                            // OK to go with stored cache
+                            ((SerialPort)device.DeviceBase).BaudRate = cachedDevice.BaudRate;
+                        }
+                        else
+                        {
+                            ((SerialPort)device.DeviceBase).BaudRate = baudRate;
+                        }
+
+                        if (!((SerialPort)device.DeviceBase).IsOpen)
+                        {
+                            ((SerialPort)device.DeviceBase).Open();
+                        }
+
+                        // better flush the UART FIFOs
+                        ((SerialPort)device.DeviceBase).DiscardInBuffer();
+                        ((SerialPort)device.DeviceBase).DiscardOutBuffer();
+
+                        OnLogMessageAvailable(NanoDevicesEventSource.Log.CheckingValidDevice($" {deviceId} @ { baudRate }"));
+
+                        // try to "just" connect to the device meaning...
+                        // ... don't request capabilities or force anything except the absolute minimum required, plus...
+                        // ... it's OK to use a very short timeout as we'll be exchanging really short packets with the device
+                        if (device.DebugEngine.Connect(500))
+                        {
+                            if (isKnownDevice)
+                            {
+                                // skip getting properties from device
+                                device.TargetName = cachedDevice.TargetName;
+                                device.Platform = cachedDevice.PlatformName;
+
+                                validDevice = true;
+                                break;
+                            }
+
+                            // set retry policies
+                            var targetInfoPropertiesPolicy = Policy.Handle<NullReferenceException>().OrResult<CLRCapabilities.TargetInfoProperties>(r => r.TargetName == null)
+                                                        .WaitAndRetry(2, retryAttempt => TimeSpan.FromMilliseconds((retryAttempt + 1) * 200));
+                            var targetInfoPolicy = Policy.Handle<NullReferenceException>().OrResult<TargetInfo>(r => r.TargetName == null)
+                                                            .WaitAndRetry(2, retryAttempt => TimeSpan.FromMilliseconds((retryAttempt + 1) * 200));
+                            var targetReleaseInfoPolicy = Policy.Handle<NullReferenceException>().OrResult<ReleaseInfo>(r => r == null)
+                                                            .WaitAndRetry(2, retryAttempt => TimeSpan.FromMilliseconds((retryAttempt + 1) * 200));
+
+                            if (device.DebugEngine.IsConnectedTonanoBooter)
+                            {
+                                // try first with new command
+                                var targetInfo = targetInfoPolicy.Execute(() => device.DebugEngine.GetMonitorTargetInfo());
+
+                                if (targetInfo != null)
+                                {
+                                    device.TargetName = targetInfo.TargetName;
+                                    device.Platform = targetInfo.PlatformName;
+                                }
+                                else
+                                {
+                                    // try again with deprecated command
+                                    var deviceInfo = targetReleaseInfoPolicy.Execute(() => device.DebugEngine.GetMonitorOemInfo());
+
+                                    if (deviceInfo != null)
+                                    {
+                                        device.TargetName = deviceInfo.TargetName;
+                                        device.Platform = deviceInfo.PlatformName;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                var deviceInfo = targetInfoPropertiesPolicy.Execute(() =>
+                                {
+                                    if (device.DebugEngine != null)
+                                    {
+                                        return device.DebugEngine.GetTargetInfo();
+                                    }
+                                    else
+                                    {
+                                        return new CLRCapabilities.TargetInfoProperties();
+                                    }
+                                });
+
+                                if (!string.IsNullOrEmpty(deviceInfo.TargetName))
+                                {
+                                    device.TargetName = deviceInfo.TargetName;
+                                    device.Platform = deviceInfo.Platform;
+                                }
+                            }
+
+                            if (string.IsNullOrEmpty(device.TargetName)
+                                || string.IsNullOrEmpty(device.Platform))
+                            {
+                                OnLogMessageAvailable(NanoDevicesEventSource.Log.CriticalError($"ERROR: {device.DeviceId} failed to get target information"));
+
+                                validDevice = false;
+                                break;
+                            }
+                            else
+                            {
+                                validDevice = true;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                if (validDevice)
+                {
+                    // there should be a valid nanoFramework device at the other end
+
+                    device.SerialNumber = GetSerialNumber(deviceId);
+
+                    // store valid baud rate from device detection
+                    ((PortSerial)device.ConnectionPort).BaudRate = ((SerialPort)device.DeviceBase).BaudRate;
+
+                    // store connection ID
+                    device.ConnectionId = deviceId;
+
+                    // store device in cache
+                    var cachedDevice = new CachedDeviceInfo(
+                        device.TargetName,
+                        device.Platform,
+                        ((SerialPort)device.DeviceBase).BaudRate);
+
+                    _devicesCache.TryAdd(
+                        deviceId,
+                        cachedDevice);
+                }
+                else
+                {
+                    // remove from cache
+                    _devicesCache.TryRemove(deviceId, out var dummy);
+
+                    device.DebugEngine?.Stop();
+                    device.DebugEngine?.Dispose();
+                    device.DebugEngine = null;
+
+                    if (device.DeviceBase != null)
+                    {
+                        ((SerialPort)device.DeviceBase).Close();
+                        ((SerialPort)device.DeviceBase).Dispose();
+
+                        device.DeviceBase = null;
+                    }
+                }
+            }
+            catch
+            {
+                // "catch all" required because the device open & check calls might fail for a number of reasons
+                // if there is a deviceID, remove it from cache, just in case
+                if (deviceId != null)
+                {
+                    _devicesCache.TryRemove(deviceId, out var dummy);
+                }
+
+                try
+                {
+                    device.DebugEngine?.Stop();
+                    device.DebugEngine?.Dispose();
+                    device.DebugEngine = null;
+
+                    if (device.DeviceBase != null)
+                    {
+                        ((SerialPort)device.DeviceBase).Close();
+                        ((SerialPort)device.DeviceBase).Dispose();
+
+                        device.DeviceBase = null;
+                    }
+                }
+                catch
+                {
+                    // catch all trying to get rid of the device
+                }
+            }
+
+            return validDevice;
+        }
+
+        protected virtual void OnDeviceEnumerationCompleted()
+        {
+            DeviceEnumerationCompleted?.Invoke(this, new EventArgs());
+        }
+
+        /// <summary>
+        /// Event that is raised when enumeration of all watched devices is complete.
+        /// </summary>
+        public override event EventHandler DeviceEnumerationCompleted;
+
+        #endregion
+
+        public static string GetSerialNumber(string value)
+        {
+            int startIndex = value.IndexOf("USB");
+
+            int endIndex = value.LastIndexOf("#");
+
+            // sanity check
+            if (startIndex < 0 || endIndex < 0)
+            {
+                return null;
+            }
+
+            // get device ID portion
+            var deviceIDCollection = value.Substring(startIndex, endIndex - startIndex).Split('#');
+
+            return deviceIDCollection?.GetValue(2) as string;
+        }
+    }
+}
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/SerialDeviceInformation.cs b/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/SerialDeviceInformation.cs
index 3f808494..97bb41cd 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/SerialDeviceInformation.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/SerialDeviceInformation.cs
@@ -4,36 +4,19 @@
 //
 
 using System;
-using Windows.Devices.Enumeration;
+
 
 namespace nanoFramework.Tools.Debugger.Serial
 {
     public class SerialDeviceInformation
     {
-        private readonly DeviceInformation device;
-        private readonly string deviceSelector;
+        private readonly string _deviceSelector;
 
         public string InstanceId
         {
             get
             {
-                return (string)device.Properties[SerialDeviceProperties.DeviceInstanceId];
-            }
-        }
-
-        public DeviceInformation DeviceInformation
-        {
-            get
-            {
-                return device;
-            }
-        }
-
-        public string DeviceSelector
-        {
-            get
-            {
-                return deviceSelector;
+                return _deviceSelector;
             }
         }
 
@@ -42,10 +25,9 @@ public string DeviceSelector
         /// </summary>
         /// <param name="deviceInformation"></param>
         /// <param name="deviceSelector">The AQS used to find this device</param>
-        public SerialDeviceInformation(DeviceInformation deviceInformation, String deviceSelector)
+        public SerialDeviceInformation(String deviceSelector)
         {
-            device = deviceInformation;
-            this.deviceSelector = deviceSelector;
+            _deviceSelector = deviceSelector;
         }
     }
 }
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/SerialPort.cs b/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/SerialPort.cs
deleted file mode 100644
index 3b65e233..00000000
--- a/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/SerialPort.cs
+++ /dev/null
@@ -1,472 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-
-using nanoFramework.Tools.Debugger.Extensions;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading;
-using System.Threading.Tasks;
-using Windows.Devices.Enumeration;
-using Windows.Devices.SerialCommunication;
-using Windows.Storage.Streams;
-
-namespace nanoFramework.Tools.Debugger.PortSerial
-{
-    public partial class SerialPort : PortMessageBase, IPort
-    {
-        // R/W operation cancellation tokens objects
-        private CancellationTokenSource _readCancellationTokenSource;
-        private CancellationTokenSource _sendCancellationTokenSource;
-        private readonly object _readCancelLock = new object();
-        private readonly object _sendCancelLock = new object();
-        private readonly SerialPortManager _portManager;
-
-        public SerialDevice Device { get; internal set; }
-
-        // valid baud rates
-        public static readonly List<uint> ValidBaudRates = new List<uint>() { 921600, 460800, 115200 };
-
-        public uint BaudRate { get; internal set; }
-
-        public NanoDevice<NanoSerialDevice> NanoDevice { get; }
-
-        /// <summary>
-        /// This DeviceInformation represents which device is connected or which device will be reconnected when
-        /// the device is plugged in again (if IsEnabledAutoReconnect is true);.
-        /// </summary>
-        public DeviceInformation DeviceInformation
-        {
-            get
-            {
-                return NanoDevice.Device.DeviceInformation.DeviceInformation;
-            }
-        }
-
-        /// <summary>
-        /// Returns DeviceAccessInformation for the device that is currently connected using this EventHandlerForSerialEclo
-        /// object.
-        /// </summary>
-        public DeviceAccessInformation DeviceAccessInformation { get; }
-
-        /// <summary>
-        /// Creates an Serial debug client
-        /// </summary>
-        /// <param name="deviceInfo">Device information of the device to be opened</param>
-        /// <param name="deviceSelector">The AQS used to find this device</param>
-        public SerialPort(SerialPortManager portManager, NanoDevice<NanoSerialDevice> serialDevice)
-        {
-            _portManager = portManager ?? throw new ArgumentNullException(nameof(portManager));
-            NanoDevice = serialDevice ?? throw new ArgumentNullException(nameof(serialDevice));
-
-            // init default baud rate with 1st value
-            BaudRate =  ValidBaudRates[0];
-
-            ResetReadCancellationTokenSource();
-            ResetSendCancellationTokenSource();
-        }
-
-        #region SerialDevice methods
-
-        /// <summary>
-        /// This method opens the device using the WinRT Serial API. After the device is opened, save the device
-        /// so that it can be used across scenarios.
-        ///
-        /// It is important that the FromIdAsync call is made on the UI thread because the consent prompt can only be displayed
-        /// on the UI thread.
-        /// 
-        /// This method is used to reopen the device after the device reconnects to the computer and when the app resumes.
-        /// </summary>
-        /// <returns>True if the device was successfully opened, false if the device could not be opened for well known reasons.
-        /// An exception may be thrown if the device could not be opened for extraordinary reasons.</returns>
-        public async Task<bool> OpenDeviceAsync()
-        {
-            bool successfullyOpenedDevice = false;
-
-            try
-            {
-                // need to wrap the call to FromIdAsync on a task with a timed cancellation token to force a constrained execution time 
-                // as this API call can block execution when an exception occurs inside it (the real reason is undetermined, seems to be with the driver) 
-                // has reportedly been seen with Bluetooth virtual serial ports and some ESP32 serial interfaces
-
-                var cts = new CancellationTokenSource();
-                cts.CancelAfter(1000);
-
-                Device = await SerialDevice.FromIdAsync(DeviceInformation.Id).AsTask(cts.Token).CancelAfterAsync(1000, cts);
-
-                // Device could have been blocked by user or the device has already been opened by another app.
-                if (Device != null)
-                {
-                    successfullyOpenedDevice = true;
-
-                    // adjust settings for serial port
-                    // baud rate is coming from the property
-                    Device.BaudRate = BaudRate;
-                    Device.DataBits = 8;
-
-                    /////////////////////////////////////////////////////////////
-                    // need to FORCE the parity setting to _NONE_ because        
-                    // the default on the current ST Link is different causing 
-                    // the communication to fail
-                    /////////////////////////////////////////////////////////////
-                    Device.Parity = SerialParity.None;
-
-                    Device.WriteTimeout = TimeSpan.FromMilliseconds(500);
-                    Device.ReadTimeout = TimeSpan.FromMilliseconds(1000);
-                    Device.ErrorReceived += Device_ErrorReceived;
-
-                    //// Background tasks are not part of the app, so app events will not have an affect on the device
-                    //if (!_isBackgroundTask && (_appSuspendEventHandler == null || _appResumeEventHandler == null))
-                    //{
-                    //    RegisterForAppEvents();
-                    //}
-
-                    //// User can block the device after it has been opened in the Settings charm. We can detect this by registering for the 
-                    //// DeviceAccessInformation.AccessChanged event
-                    //if (_deviceAccessEventHandler == null)
-                    //{
-                    //    RegisterForDeviceAccessStatusChange();
-                    //}
-
-                    //// Create and register device watcher events for the device to be opened unless we're reopening the device
-                    //if (_deviceWatcher == null)
-                    //{
-                    //    _deviceWatcher = DeviceInformation.CreateWatcher(deviceSelector);
-
-                    //    RegisterForDeviceWatcherEvents();
-                    //}
-
-                    //if (!_watcherStarted)
-                    //{
-                    //    // Start the device watcher after we made sure that the device is opened.
-                    //    StartDeviceWatcher();
-                    //}
-                }
-                else
-                {
-                    successfullyOpenedDevice = false;
-                }
-            }
-            catch
-            {
-                // catch all because the device open might fail for a number of reasons
-            }
-
-            return successfullyOpenedDevice;
-        }
-
-
-        public bool IsDeviceConnected
-        {
-            get
-            {
-                return (Device != null);
-            }
-        }
-
-        /// <summary>
-        /// Closes the device, stops the device watcher, stops listening for app events, and resets object state to before a device
-        /// was ever connected.
-        /// </summary>
-        public void CloseDevice()
-        {
-            if (IsDeviceConnected)
-            {
-                CloseCurrentlyConnectedDevice();
-            }
-        }
-
-        /// <summary>
-        /// Closes the device, stops the device watcher, stops listening for app events, and resets object state to before a device
-        /// was ever connected.
-        /// 
-        /// When the SerialDevice is closing, it will cancel all IO operations that are still pending (not complete).
-        /// The close will not wait for any IO completion callbacks to be called, so the close call may complete before any of
-        /// the IO completion callbacks are called.
-        /// The pending IO operations will still call their respective completion callbacks with either a task 
-        /// cancelled error or the operation completed.
-        /// </summary>
-        private void CloseCurrentlyConnectedDevice()
-        {
-            if (Device != null)
-            {
-                // dispose on a Task to give it a timeout to perform the Dispose()
-                // this is required to be able to actually close devices that get stuck with pending tasks on the in/output streams
-                var closeTask = Task.Factory.StartNew(() =>
-                {
-                    try
-                    {
-                        // This closes the handle to the device
-                        Device?.Dispose();
-                        Device = null;
-                    }
-                    catch
-                    {
-                        // catch all required to deal with possible InteropServices.SEHException
-                    }
-                });
-
-                //need to wrap this in try-catch to catch possible AggregateExceptions
-                try
-                {
-                    Task.WaitAll(new Task[] { closeTask }, TimeSpan.FromMilliseconds(1000));
-                }
-                catch
-                {
-                    // catch all required to deal with possible AggregateExceptions
-                }
-            }
-        }
-
-        private void Device_ErrorReceived(SerialDevice sender, ErrorReceivedEventArgs args)
-        {
-            //throw new NotImplementedException();
-        }
-
-        #endregion
-
-        public async Task<bool> ConnectDeviceAsync()
-        {
-            bool connectFlag = await ConnectSerialDeviceAsync();
-
-            if(connectFlag && NanoDevice.DeviceBase == null)
-            {
-                NanoDevice.DeviceBase = Device;
-            }
-
-            return connectFlag;
-        }
-
-        private async Task<bool> ConnectSerialDeviceAsync()
-        {
-            // try to determine if we already have this device opened.
-            if (Device != null)
-            {
-                return true;
-            }
-
-            bool openDeviceResult = await OpenDeviceAsync();
-
-            if (openDeviceResult)
-            {
-                OnLogMessageAvailable(NanoDevicesEventSource.Log.OpenDevice(DeviceInformation.Id));
-            }
-            else
-            {
-                // Most likely the device is opened by another app, but cannot be sure
-                OnLogMessageAvailable(NanoDevicesEventSource.Log.CriticalError($"Unknown error opening {DeviceInformation.Id}, possibly opened by another app"));
-            }
-
-            return openDeviceResult;
-        }
-
-        public void DisconnectDevice()
-        {
-            // disconnecting the current device
-
-            try
-            {
-                // cancel all IO operations
-                CancelAllIoTasks();
-
-                OnLogMessageAvailable(NanoDevicesEventSource.Log.CloseDevice(DeviceInformation.Id));
-
-                // close device
-                CloseDevice();
-
-                // stop and dispose DebugEgine if instantiated
-                NanoDevice.DebugEngine?.Stop();
-                NanoDevice.DebugEngine?.Dispose();
-                NanoDevice.DebugEngine = null;
-            }
-            catch
-            {
-                // catch all required to deal with possible Exceptions when disconnecting the device
-            }
-        }
-
-        private void CancelReadTask()
-        {
-            lock (_readCancelLock)
-            {
-                if (_readCancellationTokenSource != null)
-                {
-                    if (!_readCancellationTokenSource.IsCancellationRequested)
-                    {
-                        _readCancellationTokenSource.Cancel();
-
-                        // Existing IO already has a local copy of the old cancellation token so this reset won't affect it
-                        ResetReadCancellationTokenSource();
-                    }
-                }
-            }
-        }
-
-        private void CancelWriteTask()
-        {
-            lock (_sendCancelLock)
-            {
-                if (_sendCancellationTokenSource != null)
-                {
-                    if (!_sendCancellationTokenSource.IsCancellationRequested)
-                    {
-                        _sendCancellationTokenSource.Cancel();
-
-                        // Existing IO already has a local copy of the old cancellation token so this reset won't affect it
-                        ResetSendCancellationTokenSource();
-                    }
-                }
-            }
-        }
-
-        private void CancelAllIoTasks()
-        {
-            CancelReadTask();
-            CancelWriteTask();
-        }
-
-        private void ResetReadCancellationTokenSource()
-        {
-            // Create a new cancellation token source so that can cancel all the tokens again
-            _readCancellationTokenSource = new CancellationTokenSource();
-
-            // Hook the cancellation callback (called whenever Task.cancel is called)
-            // TODO this probably could be used to notify the debug engine and others of the cancellation
-            //ReadCancellationTokenSource.Token.Register(() => NotifyReadCancelingTask());
-        }
-
-        private void ResetSendCancellationTokenSource()
-        {
-            // Create a new cancellation token source so that can cancel all the tokens again
-            _sendCancellationTokenSource = new CancellationTokenSource();
-
-            // Hook the cancellation callback (called whenever Task.cancel is called)
-            // TODO this probably could be used to notify the debug engine and others of the cancellation
-            //SendCancellationTokenSource.Token.Register(() => NotifySendCancelingTask());
-        }
-
-        #region Interface implementations
-
-        public DateTime LastActivity { get; set; }
-
-        public async Task<uint> SendBufferAsync(byte[] buffer, TimeSpan waiTimeout, CancellationToken cancellationToken)
-        {
-            // device must be connected
-            if (IsDeviceConnected && !cancellationToken.IsCancellationRequested)
-            {
-                DataWriter outputStreamWriter = new DataWriter(Device.OutputStream);
-                Task<UInt32> storeAsyncTask;
-
-
-                using (CancellationTokenSource linkedCts =
-                        CancellationTokenSource.CreateLinkedTokenSource(_sendCancellationTokenSource.Token, cancellationToken))
-                {
-                    try
-                    {
-                        // write buffer to device
-                        outputStreamWriter.WriteBytes(buffer);
-
-                        // Don't start any IO if the task was canceled
-                        lock (_sendCancelLock)
-                        {
-                            cancellationToken.ThrowIfCancellationRequested();
-                            linkedCts.Token.ThrowIfCancellationRequested();
-
-                            storeAsyncTask = outputStreamWriter.StoreAsync().AsTask(linkedCts.Token.AddTimeout(waiTimeout));
-                        }
-
-                        return await storeAsyncTask.ConfigureAwait(true);
-                    }
-                    catch (TaskCanceledException)
-                    {
-                        // this is expected to happen when the timeout occurs, no need to do anything with it
-                    }
-                    catch (Exception ex)
-                    {
-                        Debug.WriteLine($"SendRawBufferAsync-Serial-Exception occurred: {ex.Message}\r\n {ex.StackTrace}");
-
-                        throw new DeviceNotConnectedException();
-                    }
-                    finally
-                    {
-                        // detach stream
-                        outputStreamWriter?.DetachStream();
-                    }
-                }
-            }
-            else
-            {
-                throw new DeviceNotConnectedException();
-            }
-
-            return 0;
-        }
-
-        public async Task<byte[]> ReadBufferAsync(uint bytesToRead, TimeSpan waiTimeout, CancellationToken cancellationToken)
-        {
-            // device must be connected
-            if (IsDeviceConnected && !cancellationToken.IsCancellationRequested)
-            {
-                DataReader inputStreamReader = new DataReader(Device.InputStream);
-                Task<UInt32> loadAsyncTask;
-
-                using (CancellationTokenSource linkedCts =
-                        CancellationTokenSource.CreateLinkedTokenSource(_readCancellationTokenSource.Token, cancellationToken))
-                {
-
-                    try
-                    {
-                        // Don't start any IO if the task was canceled
-                        lock (_readCancelLock)
-                        {
-                            cancellationToken.ThrowIfCancellationRequested();
-                            linkedCts.Token.ThrowIfCancellationRequested();
-
-                            loadAsyncTask = inputStreamReader.LoadAsync(bytesToRead).AsTask(linkedCts.Token.AddTimeout(waiTimeout));
-                        }
-
-                        UInt32 bytesRead = await loadAsyncTask.ConfigureAwait(true);
-
-                        if (bytesRead > 0)
-                        {
-                            byte[] readBuffer = new byte[bytesRead];
-                            inputStreamReader?.ReadBytes(readBuffer);
-
-                            return readBuffer;
-                        }
-                    }
-                    catch (TaskCanceledException)
-                    {
-                        // this is expected to happen when the timeout occurs, no need to do anything with it
-                    }
-                    catch (NullReferenceException)
-                    {
-                        // this is expected to happen when there isn't anything to read, don't bother with it
-                    }
-                    catch (Exception ex)
-                    {
-                        Debug.WriteLine($"ReadBufferAsync-Serial-Exception occurred: {ex.Message}\r\n {ex.StackTrace}");
-
-                        throw new DeviceNotConnectedException();
-                    }
-                    finally
-                    {
-                        // detach stream
-                        inputStreamReader?.DetachStream();
-                    }
-                }
-            }
-            else
-            {
-                throw new DeviceNotConnectedException();
-            }
-
-            // return empty byte array
-            return new byte[0];
-        }
-
-        #endregion
-    }
-}
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/SerialPortManager.cs b/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/SerialPortManager.cs
deleted file mode 100644
index 2a890016..00000000
--- a/nanoFramework.Tools.DebugLibrary.Shared/PortSerial/SerialPortManager.cs
+++ /dev/null
@@ -1,739 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-
-using nanoFramework.Tools.Debugger.Extensions;
-using nanoFramework.Tools.Debugger.Serial;
-using nanoFramework.Tools.Debugger.WireProtocol;
-using Polly;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Windows.Devices.Enumeration;
-using Windows.Devices.SerialCommunication;
-using Windows.Foundation;
-
-namespace nanoFramework.Tools.Debugger.PortSerial
-{
-    public partial class SerialPortManager : PortBase
-    {
-        // dictionary with mapping between Serial device watcher and the device ID
-        private readonly Dictionary<DeviceWatcher, string> _mapDeviceWatchersToDeviceSelector;
-
-        // Serial device watchers suspended flag
-        private bool _watchersSuspended = false;
-
-        // Serial device watchers started flag
-        private bool _watchersStarted = false;
-
-        // counter of device watchers completed
-        private int _deviceWatchersCompletedCount = 0;
-
-        // counter of device watchers completed
-        private int _newDevicesCount = 0;
-
-        private readonly Random _delay = new Random(DateTime.Now.Millisecond);
-
-        /// <summary>
-        /// Internal list with the actual nF Serial devices
-        /// </summary>
-        private readonly List<SerialDeviceInformation> _serialDevices;
-
-        private readonly ConcurrentDictionary<string, CachedDeviceInfo> _devicesCache = new ConcurrentDictionary<string, CachedDeviceInfo>();
-
-        // A pointer back to the calling app.  This is needed to reach methods and events there 
-#if WINDOWS_UWP
-       public static Windows.UI.Xaml.Application CallerApp { get; set; }
-#else
-        public static System.Windows.Application CallerApp { get; set; }
-#endif
-
-        public int BootTime { get; set; }
-
-        /// <summary>
-        /// Creates an Serial debug client
-        /// </summary>
-        public SerialPortManager(object callerApp, bool startDeviceWatchers = true, List<string> portBlackList = null, int bootTime = 3000)
-        {
-            _mapDeviceWatchersToDeviceSelector = new Dictionary<DeviceWatcher, string>();
-            NanoFrameworkDevices = new ObservableCollection<NanoDeviceBase>();
-            _serialDevices = new List<SerialDeviceInformation>();
-
-            // set caller app property, if any
-            if (callerApp != null)
-            {
-
-#if WINDOWS_UWP
-                CallerApp = callerApp as Windows.UI.Xaml.Application;
-#else
-                CallerApp = callerApp as System.Windows.Application;
-#endif
-            };
-
-            BootTime = bootTime;
-
-            if (portBlackList != null)
-            {
-                PortBlackList = portBlackList;
-            }
-
-            Task.Factory.StartNew(() => {
-
-                InitializeDeviceWatchers();
-
-                if (startDeviceWatchers)
-                {
-                    StartSerialDeviceWatchers();
-                }
-            });
-        }
-
-
-        #region Device watchers initialization
-
-        /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        Add a device watcher initialization method for each supported device that should be watched.
-        That initialization method must be called from the InitializeDeviceWatchers() method above so the watcher is actually started.
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/
-
-        /// <summary>
-        /// Registers for Added, Removed, and Enumerated events on the provided deviceWatcher before adding it to an internal list.
-        /// </summary>
-        /// <param name="deviceWatcher">The device watcher to subscribe the events</param>
-        /// <param name="deviceSelector">The AQS used to create the device watcher</param>
-        private void AddDeviceWatcher(DeviceWatcher deviceWatcher, String deviceSelector)
-        {
-            deviceWatcher.Added += new TypedEventHandler<DeviceWatcher, DeviceInformation>(OnDeviceAdded);
-            deviceWatcher.Removed += new TypedEventHandler<DeviceWatcher, DeviceInformationUpdate>(OnDeviceRemoved);
-            deviceWatcher.EnumerationCompleted += new TypedEventHandler<DeviceWatcher, object>(OnDeviceEnumerationComplete);
-
-            _mapDeviceWatchersToDeviceSelector.Add(deviceWatcher, deviceSelector);
-        }
-
-        #endregion
-
-        public override void ReScanDevices()
-        {
-            _newDevicesCount = 0;
-
-            Task.Run(delegate
-            {
-                StopDeviceWatchersInternal();
-
-                StartDeviceWatchersInternal();
-            }).FireAndForget();
-        }
-
-        public override void StartDeviceWatchers()
-        {
-            if(!_watchersStarted)
-            {
-                StartDeviceWatchersInternal();
-            }
-        }
-
-        public override void StopDeviceWatchers()
-        {
-            StopDeviceWatchersInternal();
-        }
-
-        #region Device watcher management and host app status handling
-
-        /// <summary>
-        /// Initialize device watchers. Must call here the initialization methods for all devices that we want to set watch.
-        /// </summary>
-        private void InitializeDeviceWatchers()
-        {
-            // Target all Serial Devices present on the system
-            var deviceSelector = SerialDevice.GetDeviceSelector();
-
-            // Other variations of GetDeviceSelector() usage are commented for reference
-            //
-            // Target a specific Serial Device using its VID and PID 
-            // var deviceSelector = SerialDevice.GetDeviceSelectorFromUsbVidPid(0x2341, 0x0043);
-            //
-            // Target a specific Serial Device by its COM PORT Name - "COM3"
-            // var deviceSelector = SerialDevice.GetDeviceSelector("COM3");
-            //
-            // Target a specific UART based Serial Device by its COM PORT Name (usually defined in ACPI) - "UART1"
-            // var deviceSelector = SerialDevice.GetDeviceSelector("UART1");
-            //
-
-            // Create a device watcher to look for instances of the Serial Device that match the device selector
-            // used earlier.
-
-            var deviceWatcher = DeviceInformation.CreateWatcher(deviceSelector);
-
-            // Allow the EventHandlerForDevice to handle device watcher events that relates or effects our device (i.e. device removal, addition, app suspension/resume)
-            AddDeviceWatcher(deviceWatcher, deviceSelector);
-        }
-
-        public void StartSerialDeviceWatchers()
-        {
-            // Initialize the Serial device watchers to be notified when devices are connected/removed
-            StartDeviceWatchersInternal();
-        }
-
-        /// <summary>
-        /// Starts all device watchers including ones that have been individually stopped.
-        /// </summary>
-        private void StartDeviceWatchersInternal()
-        {
-            // Start all device watchers
-            _watchersStarted = true;
-            _deviceWatchersCompletedCount = 0;
-            IsDevicesEnumerationComplete = false;
-
-            foreach (DeviceWatcher deviceWatcher in _mapDeviceWatchersToDeviceSelector.Keys)
-            {
-                if ((deviceWatcher.Status != DeviceWatcherStatus.Started)
-                    && (deviceWatcher.Status != DeviceWatcherStatus.EnumerationCompleted))
-                {
-                    deviceWatcher.Start();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Should be called on host app OnAppSuspension() event to properly handle that status.
-        /// The DeviceWatchers must be stopped because device watchers will continue to raise events even if
-        /// the app is in suspension, which is not desired (drains battery). The device watchers will be resumed once the app resumes too.
-        /// </summary>
-        public void AppSuspending()
-        {
-            if (_watchersStarted)
-            {
-                _watchersSuspended = true;
-                StopDeviceWatchers();
-            }
-            else
-            {
-                _watchersSuspended = false;
-            }
-        }
-
-        /// <summary>
-        /// Should be called on host app OnAppResume() event to properly handle that status.
-        /// See AppSuspending for why we are starting the device watchers again.
-        /// </summary>
-        public void AppResumed()
-        {
-            if (_watchersSuspended)
-            {
-                _watchersSuspended = false;
-                StartDeviceWatchersInternal();
-            }
-        }
-
-        /// <summary>
-        /// Stops all device watchers.
-        /// </summary>
-        private void StopDeviceWatchersInternal()
-        {
-            // Stop all device watchers
-            foreach (DeviceWatcher deviceWatcher in _mapDeviceWatchersToDeviceSelector.Keys)
-            {
-                if ((deviceWatcher.Status == DeviceWatcherStatus.Started)
-                    || (deviceWatcher.Status == DeviceWatcherStatus.EnumerationCompleted))
-                {
-                    deviceWatcher.Stop();
-
-                    // need to wait for the watcher to be stopped before proceeding to the next 
-                    // 3 attempts
-                    for(int i = 0; i < 3; i++)
-                    {
-                        if( deviceWatcher.Status == DeviceWatcherStatus.Stopped || deviceWatcher.Status == DeviceWatcherStatus.Aborted)
-                        {
-                            // this is OK now
-                            break;
-                        }
-
-                        Thread.Sleep(300 * i);
-                    }
-                }
-            }
-
-            // Clear the list of devices so we don't have potentially disconnected devices around
-            ClearDeviceEntries();
-
-            // also clear nanoFramework devices list
-            var devicesToRemove = NanoFrameworkDevices.Select(nanoDevice => ((NanoDevice<NanoSerialDevice>)nanoDevice).Device.DeviceInformation.DeviceInformation.Id).ToList();
-
-            foreach (var deviceId in devicesToRemove)
-            {
-                // get device...
-                var device = FindNanoFrameworkDevice(deviceId);
-
-                // ... and remove it from collection
-                NanoFrameworkDevices.Remove(device);
-
-                device?.DebugEngine?.StopProcessing();
-                device?.DebugEngine?.Dispose();
-
-                device?.Disconnect();
-                // This closes the handle to the device
-                ((NanoDevice<NanoSerialDevice>)device)?.Dispose();
-            }
-
-            _watchersStarted = false;
-        }
-
-        #endregion
-
-
-        #region Methods to manage device list add, remove, etc
-
-        /// <summary>
-        /// Creates a DeviceListEntry for a device and adds it to the list of devices
-        /// </summary>
-        /// <param name="deviceInformation">DeviceInformation on the device to be added to the list</param>
-        /// <param name="deviceSelector">The AQS used to find this device</param>
-        private async Task AddDeviceToListAsync(DeviceInformation deviceInformation, String deviceSelector)
-        {
-            // search the device list for a device with a matching interface ID
-            var serialMatch = FindDevice(deviceInformation.Id);
-
-            // Add the device if it's new
-            if (serialMatch == null)
-            {
-                var serialDevice = new SerialDeviceInformation(deviceInformation, deviceSelector);
-
-                OnLogMessageAvailable(NanoDevicesEventSource.Log.CandidateDevice(deviceInformation.Id));
-
-                // search the nanoFramework device list for a device with a matching interface ID
-                var nanoFrameworkDeviceMatch = FindNanoFrameworkDevice(deviceInformation.Id);
-
-                if (nanoFrameworkDeviceMatch == null)
-                {
-                    // Create a new element for this device and...
-                    var newNanoFrameworkDevice = new NanoDevice<NanoSerialDevice>();
-                    newNanoFrameworkDevice.Device.DeviceInformation = new SerialDeviceInformation(deviceInformation, deviceSelector);
-                    newNanoFrameworkDevice.ConnectionPort = new SerialPort(this, newNanoFrameworkDevice);
-                    newNanoFrameworkDevice.Transport = TransportType.Serial;
-
-                    await Task.Delay(100).ConfigureAwait(true);
-
-                    if (await newNanoFrameworkDevice.ConnectionPort.ConnectDeviceAsync().ConfigureAwait(true))
-                    {
-                        if (await CheckValidNanoFrameworkSerialDeviceAsync(newNanoFrameworkDevice).ConfigureAwait(true))
-                        {
-                            //add device to the collection
-                            NanoFrameworkDevices.Add(newNanoFrameworkDevice);
-
-                            _serialDevices.Add(serialDevice);
-
-                            OnLogMessageAvailable(NanoDevicesEventSource.Log.ValidDevice($"{newNanoFrameworkDevice.Description} {newNanoFrameworkDevice.Device.DeviceInformation.DeviceInformation.Id}"));
-                        }
-                        else
-                        {
-                            // devices powered by the USB cable and that feature a serial converter (like an FTDI chip) 
-                            // are still booting when the USB enumeration event raises
-                            // so need to give them enough time for the boot sequence to complete before trying to communicate with them
-
-                            // Failing to connect to debugger engine on first attempt occurs frequently on dual USB devices like ESP32 WROVER KIT.
-                            // Seems to be something related with both devices using the same USB endpoint
-                            // Another reason is that an ESP32 takes around 3 seconds to complete the boot sequence and launch the CLR.
-                            // Until then the device will look non responsive or invalid to the detection mechanism that we're using.
-                            // A nice workaround for this seems to be adding an extra random wait so the comms are not simultaneous.
-
-                            int delay;
-                            lock (_delay)
-                            {
-                                delay = _delay.Next(200, 600);
-                            }
-                            await Task.Delay(BootTime + delay).ConfigureAwait(true);
-
-                            OnLogMessageAvailable(NanoDevicesEventSource.Log.CheckingValidDevice($" {newNanoFrameworkDevice.Device.DeviceInformation.DeviceInformation.Id} *** 2nd attempt ***"));
-
-                            if (await newNanoFrameworkDevice.ConnectionPort.ConnectDeviceAsync().ConfigureAwait(true))
-                            {
-                                if (await CheckValidNanoFrameworkSerialDeviceAsync(newNanoFrameworkDevice).ConfigureAwait(true))
-                                {
-                                    //add device to the collection
-                                    NanoFrameworkDevices.Add(newNanoFrameworkDevice);
-
-                                    _serialDevices.Add(serialDevice);
-
-                                    OnLogMessageAvailable(NanoDevicesEventSource.Log.ValidDevice($"{newNanoFrameworkDevice.Description} {newNanoFrameworkDevice.Device.DeviceInformation.DeviceInformation.Id}"));
-                                }
-                                else
-                                {
-                                    OnLogMessageAvailable(NanoDevicesEventSource.Log.QuitDevice(deviceInformation.Id));
-                                }
-                            }
-                            else
-                            {
-                                OnLogMessageAvailable(NanoDevicesEventSource.Log.QuitDevice(deviceInformation.Id));
-                            }
-                        }
-                    }
-                    else
-                    {
-                        OnLogMessageAvailable(NanoDevicesEventSource.Log.QuitDevice(deviceInformation.Id));
-                    }
-
-                    // subtract devices count
-                    _newDevicesCount--;
-
-                    // check if we are done processing arriving devices
-                    if (_newDevicesCount == 0)
-                    {
-                        ProcessDeviceEnumerationComplete();
-                    }
-                }
-            }
-        }
-
-        private void RemoveDeviceFromList(string deviceId)
-        {
-            // Removes the device entry from the internal list; therefore the UI
-            var deviceEntry = FindDevice(deviceId);
-
-            OnLogMessageAvailable(NanoDevicesEventSource.Log.DeviceDeparture(deviceId));
-
-            _serialDevices.Remove(deviceEntry);
-
-            // get device...
-            var device = FindNanoFrameworkDevice(deviceId);
-
-            // ... and remove it from collection
-            NanoFrameworkDevices.Remove(device);
-
-            device?.DebugEngine?.StopProcessing();
-            device?.DebugEngine?.Dispose();
-        }
-
-        private void ClearDeviceEntries()
-        {
-            _serialDevices.Clear();
-        }
-
-        /// <summary>
-        /// Searches through the existing list of devices for the first DeviceListEntry that has
-        /// the specified device Id.
-        /// </summary>
-        /// <param name="deviceId">Id of the device that is being searched for</param>
-        /// <returns>DeviceListEntry that has the provided Id; else a nullptr</returns>
-        internal SerialDeviceInformation FindDevice(String deviceId)
-        {
-            if (deviceId != null)
-            {
-                foreach (SerialDeviceInformation entry in _serialDevices)
-                {
-                    if (entry.DeviceInformation.Id == deviceId)
-                    {
-                        return entry;
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        private NanoDeviceBase FindNanoFrameworkDevice(string deviceId)
-        {
-            if (deviceId != null)
-            {
-                // SerialMatch.Device.DeviceInformation
-                return NanoFrameworkDevices.FirstOrDefault(d => ((d as NanoDevice<NanoSerialDevice>).Device.DeviceInformation ).DeviceInformation.Id == deviceId);
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Remove the device from the device list 
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="deviceInformationUpdate"></param>
-        private void OnDeviceRemoved(DeviceWatcher sender, DeviceInformationUpdate deviceInformationUpdate)
-        {
-            RemoveDeviceFromList(deviceInformationUpdate.Id);
-        }
-
-        /// <summary>
-        /// This function will add the device to the listOfDevices
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="deviceInformation"></param>
-        private void OnDeviceAdded(DeviceWatcher sender, DeviceInformation deviceInformation)
-        {
-            // device black listed
-            // discard known system and unusable devices
-            // 
-            if (
-               deviceInformation.Id.StartsWith(@"\\?\ACPI") ||
-
-               // reported in https://github.com/nanoframework/Home/issues/332
-               // COM ports from Broadcom 20702 Bluetooth adapter
-               deviceInformation.Id.Contains(@"VID_0A5C+PID_21E1") ||
-
-               // reported in https://nanoframework.slack.com/archives/C4MGGBH1P/p1531660736000055?thread_ts=1531659631.000021&cid=C4MGGBH1P
-               // COM ports from Broadcom 20702 Bluetooth adapter
-               deviceInformation.Id.Contains(@"VID&00010057_PID&0023") ||
-
-               // reported in Discord channel
-               deviceInformation.Id.Contains(@"VID&0001009e_PID&400a") ||
-
-               // this seems to cover virtual COM ports from Bluetooth devices
-               deviceInformation.Id.Contains("BTHENUM") ||
-               
-               // this seems to cover virtual COM ports by ELTIMA 
-               deviceInformation.Id.Contains("EVSERIAL")
-               )
-            {
-                OnLogMessageAvailable(NanoDevicesEventSource.Log.DroppingBlackListedDevice(deviceInformation.Id));
-
-                // don't even bother with this one
-                return;
-            }
-
-            OnLogMessageAvailable(NanoDevicesEventSource.Log.DeviceArrival(deviceInformation.Id));
-
-            _newDevicesCount++;
-
-            Task.Run(async delegate
-            {
-                await AddDeviceToListAsync(deviceInformation, _mapDeviceWatchersToDeviceSelector[sender]);
-            }).FireAndForget();
-        }
-
-        #endregion
-
-
-        #region Handlers and events for Device Enumeration Complete 
-
-        private void OnDeviceEnumerationComplete(DeviceWatcher sender, object args)
-        {
-            // add another device watcher completed
-            _deviceWatchersCompletedCount++;
-        }
-
-        private void ProcessDeviceEnumerationComplete()
-        {
-            OnLogMessageAvailable(NanoDevicesEventSource.Log.SerialDeviceEnumerationCompleted(NanoFrameworkDevices.Count));
-
-            // all watchers have completed enumeration
-            IsDevicesEnumerationComplete = true;
-
-            // fire event that Serial enumeration is complete 
-            OnDeviceEnumerationCompleted();
-        }
-
-        private async Task<bool> CheckValidNanoFrameworkSerialDeviceAsync(NanoDevice<NanoSerialDevice> device)
-        {
-            bool validDevice = false;
-            bool isKnownDevice = false;
-
-            // store device ID
-            string deviceId = device.Device.DeviceInformation.DeviceInformation.Id;
-
-            try
-            {
-                if (device.DebugEngine == null)
-                {
-                    device.CreateDebugEngine();
-                }
-
-                // get access to Windows.Devices.SerialDevice object
-                // so we can set it's BaudRate property
-                var serialDevice = (SerialDevice)device.DeviceBase;
-
-                // sanity check for invalid or null device base
-                if (serialDevice != null)
-                {
-                    // check against black list
-                    if (PortBlackList.Contains(serialDevice.PortName))
-                    {
-                        OnLogMessageAvailable(NanoDevicesEventSource.Log.DroppingBlackListedDevice(deviceId));
-                    }
-                    else
-                    {
-                        // check if this device is on cache
-                        isKnownDevice = _devicesCache.TryGetValue(deviceId, out var cachedDevice);
-
-                        // need to go through all the valid baud rates: 921600, 460800 and 115200.
-                        foreach (uint baudRate in SerialPort.ValidBaudRates)
-                        {
-                            if (isKnownDevice)
-                            {
-                                // OK to go with stored cache
-                                serialDevice.BaudRate = cachedDevice.BaudRate;
-                            }
-                            else
-                            {
-                                serialDevice.BaudRate = baudRate;
-                            }
-
-                            OnLogMessageAvailable(NanoDevicesEventSource.Log.CheckingValidDevice($" {deviceId} @ { serialDevice.BaudRate }"));
-
-                            // try to "just" connect to the device meaning...
-                            // ... don't request capabilities or force anything except the absolute minimum required, plus...
-                            // ... it's OK to use a very short timeout as we'll be exchanging really short packets with the device
-                            if (await device.DebugEngine.ConnectAsync(
-                                200,
-                                false,
-                                1,
-                                ConnectionSource.Unknown,
-                                false).ConfigureAwait(true))
-                            {
-                                if (isKnownDevice)
-                                {
-                                    // skip getting properties from device
-                                    device.TargetName = cachedDevice.TargetName;
-                                    device.Platform = cachedDevice.PlatformName;
-
-                                    validDevice = true;
-                                    break;
-                                }
-
-                                // set retry policies
-                                var targetInfoPropertiesPolicy = Policy.Handle<NullReferenceException>().OrResult<CLRCapabilities.TargetInfoProperties>(r => r.TargetName == null)
-                                                            .WaitAndRetry(2, retryAttempt => TimeSpan.FromMilliseconds((retryAttempt + 1) * 200));
-                                var targetInfoPolicy = Policy.Handle<NullReferenceException>().OrResult<TargetInfo>(r => r.TargetName == null)
-                                                             .WaitAndRetry(2, retryAttempt => TimeSpan.FromMilliseconds((retryAttempt + 1) * 200));
-                                var targetReleaseInfoPolicy = Policy.Handle<NullReferenceException>().OrResult<ReleaseInfo>(r => r == null)
-                                                             .WaitAndRetry(2, retryAttempt => TimeSpan.FromMilliseconds((retryAttempt + 1) * 200));
-
-                                if (device.DebugEngine.IsConnectedTonanoBooter)
-                                {
-                                    // try first with new command
-                                    var targetInfo = targetInfoPolicy.Execute(() => device.DebugEngine.GetMonitorTargetInfo());
-
-                                    if (targetInfo != null)
-                                    {
-                                        device.TargetName = targetInfo.TargetName;
-                                        device.Platform = targetInfo.PlatformName;
-                                    }
-                                    else
-                                    {
-                                        // try again with deprecated command
-                                        var deviceInfo = targetReleaseInfoPolicy.Execute(() => device.DebugEngine.GetMonitorOemInfo());
-                                        
-                                        if (deviceInfo != null)
-                                        {
-                                            device.TargetName = deviceInfo.TargetName;
-                                            device.Platform = deviceInfo.PlatformName;
-                                        }
-                                    }
-                                }
-                                else
-                                {
-                                    var deviceInfo = targetInfoPropertiesPolicy.Execute(() => { if (device.DebugEngine != null) { return device.DebugEngine.GetTargetInfo(); } else { return new CLRCapabilities.TargetInfoProperties(); } });
-
-                                    if (!string.IsNullOrEmpty(deviceInfo.TargetName))
-                                    {
-                                        device.TargetName = deviceInfo.TargetName;
-                                        device.Platform = deviceInfo.Platform;
-                                    }
-                                }
-
-                                if (string.IsNullOrEmpty(device.TargetName)
-                                    || string.IsNullOrEmpty(device.Platform))
-                                {
-                                    OnLogMessageAvailable(NanoDevicesEventSource.Log.CriticalError($"ERROR: {device.Device.DeviceInformation.DeviceInformation.Id} failed to get target information"));
-
-                                    validDevice = false;
-                                    break;
-                                }
-                                else
-                                {
-                                    validDevice = true;
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                if (validDevice)
-                {
-                    // there should be a valid nanoFramework device at the other end
-
-                    device.SerialNumber = GetSerialNumber(deviceId);
-
-                    // set valid baud rate from device detection
-                    ((SerialPort)device.ConnectionPort).BaudRate = serialDevice.BaudRate;
-
-                    // store connection ID
-                    device.ConnectionId = serialDevice.PortName;
-
-                    // store device in cache
-                    var cachedDevice = new CachedDeviceInfo(
-                        device.TargetName,
-                        device.Platform,
-                        serialDevice.BaudRate);
-
-                    _devicesCache.TryAdd(
-                        deviceId,
-                        cachedDevice);
-                }
-                else
-                {
-                    // remove from cache
-                    _devicesCache.TryRemove(deviceId, out var dummy);
-                }
- 
-                Task.Factory.StartNew(() =>
-                {
-                    // perform the Dispose() call on a Task
-                    // this is required to be able to actually close devices that get stuck with pending tasks on the in/output streams
-
-                    device.Disconnect();
-                    // This closes the handle to the device
-                    device?.Dispose();
-                    device = null;
-
-                }).FireAndForget();
-            }
-            catch
-            {
-                // "catch all" required because the device open & check calls might fail for a number of reasons
-                // if there is a deviceID, remove it from cache, just in case
-                if (deviceId != null)
-                {
-                    _devicesCache.TryRemove(deviceId, out var dummy);
-                }
-            }
-
-            return validDevice;
-        }
-
-        protected virtual void OnDeviceEnumerationCompleted()
-        {
-            DeviceEnumerationCompleted?.Invoke(this, new EventArgs());
-        }
-
-        /// <summary>
-        /// Event that is raised when enumeration of all watched devices is complete.
-        /// </summary>
-        public override event EventHandler DeviceEnumerationCompleted;
-
-        #endregion
-
-        public static string GetSerialNumber(string value)
-        {
-            // typical ID string is \\?\USB#VID_0483&PID_5740#NANO_3267335D#{86e0d1e0-8089-11d0-9ce4-08003e301f73}
-
-            int startIndex = value.IndexOf("USB");
-
-            int endIndex = value.LastIndexOf("#");
-
-            // sanity check
-            if (startIndex < 0 || endIndex < 0)
-            {
-                return null;
-            }
-
-            // get device ID portion
-            var deviceIDCollection = value.Substring(startIndex, endIndex - startIndex).Split('#');
-
-            return deviceIDCollection?.GetValue(2) as string;
-        }
-    }
-}
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/PortUSB/EventHandlerForUsbDevice.cs b/nanoFramework.Tools.DebugLibrary.Shared/PortUSB/EventHandlerForUsbDevice.cs
deleted file mode 100644
index 4bf38a3d..00000000
--- a/nanoFramework.Tools.DebugLibrary.Shared/PortUSB/EventHandlerForUsbDevice.cs
+++ /dev/null
@@ -1,444 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-
-using System;
-using Windows.Devices.Enumeration;
-using Windows.Foundation;
-using Windows.UI.Xaml;
-
-namespace nanoFramework.Tools.Debugger.Usb
-{
-    /// <summary>
-    /// This class handles the required changes and operation of an UsbDevice when a specific app event
-    /// is raised (app suspension and resume) or when the device is disconnected. The device watcher events are also handled here.
-    /// </summary>
-    public partial class EventHandlerForUsbDevice
-    {
-        /// <summary>
-        /// Allows for singleton EventHandlerForUSBDevice
-        /// </summary>
-        private static volatile EventHandlerForUsbDevice eventHandlerForNanoFrameworkDevice;
-
-        /// <summary>
-        /// Used to synchronize threads to avoid multiple instantiations of eventHandlerForUSBDevice.
-        /// </summary>
-        private static object singletonCreationLock = new object();
-
-        private string deviceSelector;
-        private DeviceWatcher deviceWatcher;
-
-        private DeviceInformation deviceInformation;
-        private DeviceAccessInformation deviceAccessInformation;
-        private Windows.Devices.Usb.UsbDevice device;
-
-        private SuspendingEventHandler appSuspendCallback;
-
-        private SuspendingEventHandler appSuspendEventHandler;
-        private EventHandler<object> appResumeEventHandler;
-
-        private TypedEventHandler<EventHandlerForUsbDevice, DeviceInformation> deviceCloseCallback;
-        private TypedEventHandler<EventHandlerForUsbDevice, DeviceInformation> deviceConnectedCallback;
-
-        private TypedEventHandler<DeviceWatcher, DeviceInformation> deviceAddedEventHandler;
-        private TypedEventHandler<DeviceWatcher, DeviceInformationUpdate> deviceRemovedEventHandler;
-        private TypedEventHandler<DeviceAccessInformation, DeviceAccessChangedEventArgs> deviceAccessEventHandler;
-
-        private bool watcherSuspended;
-        private bool watcherStarted;
-
-        private bool isBackgroundTask;
-        private bool isEnabledAutoReconnect;
-
-        // A pointer back to the calling app.  This is needed to reach methods and events there 
-        public static Application CallerApp { get; set; }
-
-        /// <summary>
-        /// Enforces the singleton pattern so that there is only one object handling app events
-        /// as it relates to the UsbDevice because this app only supports communicating with one device at a time. 
-        ///
-        /// An instance of EventHandlerForUSBDevice is globally available because the device needs to persist across scenario pages.
-        ///
-        /// If there is no instance of EventHandlerForUSBDevice created before this property is called,
-        /// an EventHandlerForUSBDevice will be created; the EventHandlerForUSBDevice created this way
-        /// is not meant for BackgroundTasks.
-        /// </summary>
-        public static EventHandlerForUsbDevice Current
-        {
-            get
-            {
-                lock (singletonCreationLock)
-                {
-                    if (eventHandlerForNanoFrameworkDevice == null)
-                    {
-                        CreateNewEventHandlerForDevice();
-                    }
-                }
-
-                return eventHandlerForNanoFrameworkDevice;
-            }
-        }
-
-        /// <summary>
-        /// Creates a new instance of EventHandlerForUSBDevice, enables auto reconnect, and uses it as the Current instance.
-        /// </summary>
-        public static void CreateNewEventHandlerForDevice()
-        {
-            eventHandlerForNanoFrameworkDevice = new EventHandlerForUsbDevice(false);
-        }
-
-        /// <summary>
-        /// Creates a new instance of EventHandlerForUSBDevice, disables auto reconnect, and uses it as the Current instance.
-        /// Background tasks do not need to worry about app events, so we will not be registering for app events
-        /// </summary>
-        public static void CreateNewEventHandlerForDeviceForBackgroundTasks()
-        {
-            eventHandlerForNanoFrameworkDevice = new EventHandlerForUsbDevice(true);
-        }
-
-        public SuspendingEventHandler OnAppSuspendCallback
-        {
-            get
-            {
-                return appSuspendCallback;
-            }
-
-            set
-            {
-                appSuspendCallback = value;
-            }
-        }
-
-        public TypedEventHandler<EventHandlerForUsbDevice, DeviceInformation> OnDeviceClose
-        {
-            get
-            {
-                return deviceCloseCallback;
-            }
-
-            set
-            {
-                deviceCloseCallback = value;
-            }
-        }
-
-        public TypedEventHandler<EventHandlerForUsbDevice, DeviceInformation> OnDeviceConnected
-        {
-            get
-            {
-                return deviceConnectedCallback;
-            }
-
-            set
-            {
-                deviceConnectedCallback = value;
-            }
-        }
-
-        public bool IsDeviceConnected
-        {
-            get
-            {
-                return (device != null);
-            }
-        }
-
-        public Windows.Devices.Usb.UsbDevice Device
-        {
-            get
-            {
-                return device;
-            }
-        }
-
-        /// <summary>
-        /// This DeviceInformation represents which device is connected or which device will be reconnected when
-        /// the device is plugged in again (if IsEnabledAutoReconnect is true);.
-        /// </summary>
-        public DeviceInformation DeviceInformation
-        {
-            get
-            {
-                return deviceInformation;
-            }
-        }
-
-        /// <summary>
-        /// Returns DeviceAccessInformation for the device that is currently connected using this EventHandlerForUSBDevice
-        /// object.
-        /// </summary>
-        public DeviceAccessInformation DeviceAccessInformation
-        {
-            get
-            {
-                return deviceAccessInformation;
-            }
-        }
-
-        /// <summary>
-        /// DeviceSelector AQS used to find this device
-        /// </summary>
-        public String DeviceSelector
-        {
-            get
-            {
-                return deviceSelector;
-            }
-        }
-
-        /// <summary>
-        /// True if EventHandlerForUSBDevice will attempt to reconnect to the device once it is plugged into the computer again
-        /// </summary>
-        public bool IsEnabledAutoReconnect
-        {
-            get
-            {
-                return isEnabledAutoReconnect;
-            }
-            set
-            {
-                isEnabledAutoReconnect = value;
-            }
-        }
-
-        /// <summary>
-        /// Closes the device, stops the device watcher, stops listening for app events, and resets object state to before a device
-        /// was ever connected.
-        /// </summary>
-        public void CloseDevice()
-        {
-            if (IsDeviceConnected)
-            {
-                CloseCurrentlyConnectedDevice();
-            }
-
-            if (deviceWatcher != null)
-            {
-                if (watcherStarted)
-                {
-                    StopDeviceWatcher();
-
-                    UnregisterFromDeviceWatcherEvents();
-                }
-
-                deviceWatcher = null;
-            }
-
-            if (deviceAccessInformation != null)
-            {
-                UnregisterFromDeviceAccessStatusChange();
-
-                deviceAccessInformation = null;
-            }
-
-            if (appSuspendEventHandler != null || appResumeEventHandler != null)
-            {
-                UnregisterFromAppEvents();
-            }
-
-            deviceInformation = null;
-            deviceSelector = null;
-
-            deviceConnectedCallback = null;
-            deviceCloseCallback = null;
-            appSuspendCallback = null;
-
-            isEnabledAutoReconnect = true;
-        }
-
-        /// <summary>
-        /// If this event handler will be running in a background task, app events will not be registered for because they are of
-        /// no use to the background task.
-        /// </summary>
-        /// <param name="isBackgroundTask">Whether or not the event handler will be running as a background task</param>
-        private EventHandlerForUsbDevice(bool isBackgroundTask)
-        {
-            watcherStarted = false;
-            watcherSuspended = false;
-            isEnabledAutoReconnect = true;
-            this.isBackgroundTask = isBackgroundTask;
-        }
-
-        /// <summary>
-        /// Closes the device, stops the device watcher, stops listening for app events, and resets object state to before a device
-        /// was ever connected.
-        /// 
-        /// When the UsbDevice is closing, it will cancel all IO operations that are still pending (not complete).
-        /// The close will not wait for any IO completion callbacks to be called, so the close call may complete before any of
-        /// the IO completion callbacks are called.
-        /// The pending IO operations will still call their respective completion callbacks with either a task 
-        /// canceled error or the operation completed.
-        /// </summary>
-        private void CloseCurrentlyConnectedDevice()
-        {
-            if (device != null)
-            {
-                // Notify callback that we're about to close the device
-                deviceCloseCallback?.Invoke(this, deviceInformation);
-
-                NanoDevicesEventSource.Log.CloseDevice(deviceInformation.Id);
-            }
-        }
-
-        /// <summary>
-        /// Register for app suspension/resume events. See the comments
-        /// for the event handlers for more information on what is being done to the device.
-        ///
-        /// We will also register for when the app exists so that we may close the device handle.
-        /// </summary>
-        private void RegisterForAppEvents()
-        {
-            appSuspendEventHandler = new SuspendingEventHandler(Current.OnAppSuspension);
-            appResumeEventHandler = new EventHandler<object>(Current.OnAppResume);
-
-            // This event is raised when the app is exited and when the app is suspended
-            CallerApp.Suspending += appSuspendEventHandler;
-
-            CallerApp.Resuming += appResumeEventHandler;
-        }
-
-        private void UnregisterFromAppEvents()
-        {
-            // This event is raised when the app is exited and when the app is suspended
-            CallerApp.Suspending -= appSuspendEventHandler;
-            appSuspendEventHandler = null;
-
-            CallerApp.Resuming -= appResumeEventHandler;
-            appResumeEventHandler = null;
-        }
-
-        /// <summary>
-        /// Register for Added and Removed events.
-        /// Note that, when disconnecting the device, the device may be closed by the system before the OnDeviceRemoved callback is invoked.
-        /// </summary>
-        private void RegisterForDeviceWatcherEvents()
-        {
-            deviceAddedEventHandler = new TypedEventHandler<DeviceWatcher, DeviceInformation>(OnDeviceAdded);
-
-            deviceRemovedEventHandler = new TypedEventHandler<DeviceWatcher, DeviceInformationUpdate>(OnDeviceRemoved);
-
-            deviceWatcher.Added += deviceAddedEventHandler;
-
-            deviceWatcher.Removed += deviceRemovedEventHandler;
-        }
-
-        private void UnregisterFromDeviceWatcherEvents()
-        {
-            deviceWatcher.Added -= deviceAddedEventHandler;
-            deviceAddedEventHandler = null;
-
-            deviceWatcher.Removed -= deviceRemovedEventHandler;
-            deviceRemovedEventHandler = null;
-        }
-
-        private void UnregisterFromDeviceAccessStatusChange()
-        {
-            deviceAccessInformation.AccessChanged -= deviceAccessEventHandler;
-
-            deviceAccessEventHandler = null;
-        }
-
-        private void StartDeviceWatcher()
-        {
-            watcherStarted = true;
-
-            if ((deviceWatcher.Status != DeviceWatcherStatus.Started)
-                && (deviceWatcher.Status != DeviceWatcherStatus.EnumerationCompleted))
-            {
-                deviceWatcher.Start();
-            }
-        }
-
-        private void StopDeviceWatcher()
-        {
-            if ((deviceWatcher.Status == DeviceWatcherStatus.Started)
-                || (deviceWatcher.Status == DeviceWatcherStatus.EnumerationCompleted))
-            {
-                deviceWatcher.Stop();
-            }
-
-            watcherStarted = false;
-        }
-
-        /// <summary>
-        /// If a UsbDevice object has been instantiated (a handle to the device is opened), we must close it before the app 
-        /// goes into suspension because the API automatically closes it for us if we don't. When resuming, the API will
-        /// not reopen the device automatically, so we need to explicitly open the device in that situation.
-        ///
-        /// Since we have to reopen the device ourselves when the app resumes, it is good practice to explicitly call the close
-        /// in the app as well (For every open there is a close).
-        /// 
-        /// We must stop the DeviceWatcher because it will continue to raise events even if
-        /// the app is in suspension, which is not desired (drains battery). We resume the device watcher once the app resumes again.
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="eventArgs"></param>
-        private void OnAppSuspension(object sender, Windows.ApplicationModel.SuspendingEventArgs args)
-        {
-            if (watcherStarted)
-            {
-                watcherSuspended = true;
-                StopDeviceWatcher();
-            }
-            else
-            {
-                watcherSuspended = false;
-            }
-
-            // Forward suspend event to registered callback function
-            if (appSuspendCallback != null)
-            {
-                appSuspendCallback(sender, args);
-            }
-
-            CloseCurrentlyConnectedDevice();
-        }
-
-        /// <summary>
-        /// When resume into the application, we should reopen a handle to the Usb device again. This will automatically
-        /// happen when we start the device watcher again; the device will be re-enumerated and we will attempt to reopen it
-        /// if IsEnabledAutoReconnect property is enabled.
-        /// 
-        /// See OnAppSuspension for why we are starting the device watcher again
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="arg"></param>
-        private void OnAppResume(object sender, object args)
-        {
-            if (watcherSuspended)
-            {
-                watcherSuspended = false;
-                StartDeviceWatcher();
-            }
-        }
-
-        /// <summary>
-        /// Close the device that is opened so that all pending operations are canceled properly.
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="deviceInformationUpdate"></param>
-        private void OnDeviceRemoved(DeviceWatcher sender, DeviceInformationUpdate deviceInformationUpdate)
-        {
-            if (IsDeviceConnected && (deviceInformationUpdate.Id == deviceInformation.Id))
-            {
-                // The main reasons to close the device explicitly is to clean up resources, to properly handle errors,
-                // and stop talking to the disconnected device.
-                CloseCurrentlyConnectedDevice();
-            }
-        }
-
-        /// <summary>
-        /// Open the device that the user wanted to open if it hasn't been opened yet and auto reconnect is enabled.
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="deviceInfo"></param>
-        private void OnDeviceAdded(DeviceWatcher sender, DeviceInformation deviceInfo)
-        {
-            if ((deviceInformation != null) && (deviceInfo.Id == deviceInformation.Id) && !IsDeviceConnected && isEnabledAutoReconnect)
-            {
-            }
-        }
-
-    }
-}
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/PortUSB/UsbDeviceInformation.cs b/nanoFramework.Tools.DebugLibrary.Shared/PortUSB/UsbDeviceInformation.cs
deleted file mode 100644
index 9a5870ab..00000000
--- a/nanoFramework.Tools.DebugLibrary.Shared/PortUSB/UsbDeviceInformation.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-
-using System;
-using Windows.Devices.Enumeration;
-
-namespace nanoFramework.Tools.Debugger.Usb
-{
-    /// <summary>
-    /// The class will only expose properties from DeviceInformation that are going to be used
-    /// in this sample. Each instance of this class provides information about a single device.
-    ///
-    /// This class is used by the UI to display device specific information so that
-    /// the user can identify which device to use.
-    /// </summary>
-    public class UsbDeviceInformation
-    {
-        private readonly DeviceInformation device;
-        private readonly string deviceSelector;
-
-        public string InstanceId
-        {
-            get
-            {
-                return (string)device.Properties[UsbDeviceProperties.DeviceInstanceId];
-            }
-        }
-
-        public DeviceInformation DeviceInformation
-        {
-            get
-            {
-                return device;
-            }
-        }
-
-        public string DeviceSelector
-        {
-            get
-            {
-                return deviceSelector;
-            }
-        }
-
-        /// <summary>
-        /// The class is mainly used as a DeviceInformation wrapper so that the UI can bind to a list of these.
-        /// </summary>
-        /// <param name="deviceInformation"></param>
-        /// <param name="deviceSelector">The AQS used to find this device</param>
-        public UsbDeviceInformation(DeviceInformation deviceInformation, String deviceSelector)
-        {
-            device = deviceInformation;
-            this.deviceSelector = deviceSelector;
-        }
-    }
-}
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/PortUSB/UsbDeviceProperties.cs b/nanoFramework.Tools.DebugLibrary.Shared/PortUSB/UsbDeviceProperties.cs
deleted file mode 100644
index 538edf8e..00000000
--- a/nanoFramework.Tools.DebugLibrary.Shared/PortUSB/UsbDeviceProperties.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-
-using System;
-
-namespace nanoFramework.Tools.Debugger.Usb
-{
-    public class UsbDeviceProperties
-    {
-        public const String DeviceInstanceId = "System.Devices.DeviceInstanceId";
-    }
-}
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/PortUSB/UsbDeviceRequestType.cs b/nanoFramework.Tools.DebugLibrary.Shared/PortUSB/UsbDeviceRequestType.cs
deleted file mode 100644
index 53a49d09..00000000
--- a/nanoFramework.Tools.DebugLibrary.Shared/PortUSB/UsbDeviceRequestType.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// Portions Copyright (c) Microsoft Corporation.  All rights reserved.
-// See LICENSE file in the project root for full license information.
-//
-
-namespace nanoFramework.Tools.Debugger.Usb
-{
-    public enum UsbDeviceRequestType
-    {
-        GetStatus = 0,
-        ClearFeature = 1,
-        _Reserved0 = 2,
-        SetFeature = 3,
-        _Reserved1 = 4,
-        SetAddress = 5,
-        GetDescriptor = 6,
-        SetDescriptor = 7,
-        GetConfiguration = 8,
-        SetConfiguration = 9,
-        GetInterface = 10,
-        SetInterface = 11,
-        SyncFrame = 12
-    }
-}
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/PortUSB/UsbPort.cs b/nanoFramework.Tools.DebugLibrary.Shared/PortUSB/UsbPort.cs
deleted file mode 100644
index 4e2fc941..00000000
--- a/nanoFramework.Tools.DebugLibrary.Shared/PortUSB/UsbPort.cs
+++ /dev/null
@@ -1,663 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// Portions Copyright (c) Microsoft Corporation.  All rights reserved.
-// See LICENSE file in the project root for full license information.
-//
-
-using nanoFramework.Tools.Debugger.WireProtocol;
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using Windows.Devices.Enumeration;
-using Windows.Devices.Usb;
-using Windows.Foundation;
-using Windows.Storage.Streams;
-using Windows.UI.Xaml;
-
-namespace nanoFramework.Tools.Debugger.Usb
-{
-    public class UsbPort : PortBase, IPort
-    {
-        // dictionary with mapping between USB device watcher and the device ID
-        private readonly Dictionary<DeviceWatcher, string> mapDeviceWatchersToDeviceSelector;
-
-        // USB device watchers suspended flag
-        private bool watchersSuspended = false;
-
-        // USB device watchers started flag
-        private bool watchersStarted = false;
-
-        // counter of device watchers completed
-        private int deviceWatchersCompletedCount = 0;
-
-        private readonly object cancelIoLock = new object();
-        private static SemaphoreSlim semaphore;
-
-        /// <summary>
-        /// Internal list with the actual nF USB devices
-        /// </summary>
-        readonly List<UsbDeviceInformation> UsbDevices;
-
-        /// <summary>
-        /// Creates an USB debug client
-        /// </summary>
-        public UsbPort(Application callerApp, bool startDeviceWatchers = true)
-        {
-            mapDeviceWatchersToDeviceSelector = new Dictionary<DeviceWatcher, String>();
-            NanoFrameworkDevices = new ObservableCollection<NanoDeviceBase>();
-            UsbDevices = new List<UsbDeviceInformation>();
-
-            // set caller app property
-            EventHandlerForUsbDevice.CallerApp = callerApp;
-
-            // init semaphore
-            semaphore = new SemaphoreSlim(1, 1);
-
-            Task.Factory.StartNew(() =>
-            {
-                if (startDeviceWatchers)
-                {
-                    StartUsbDeviceWatchers();
-                }
-            });
-        }
-
-        #region Device watchers initialization
-
-        /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-        Add a device watcher initialization method for each supported device that should be watched.
-        That initialization method must be called from the InitializeDeviceWatchers() method above so the watcher is actually started.
-        ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/
-
-        /// <summary>
-        /// Initialize the device watcher for the ST Discovery4
-        /// </summary>
-        private void InitializeStDiscovery4DeviceWatcher()
-        {
-            // better use  most specific type of DeviceSelector: VID, PID and class GUID
-            var stDiscovery4Selector = UsbDevice.GetDeviceSelector(STM_Discovery4.DeviceVid, STM_Discovery4.DevicePid, STM_Discovery4.DeviceInterfaceClass);
-
-            // Create a device watcher to look for instances of this device
-            var stDiscovery4Watcher = DeviceInformation.CreateWatcher(stDiscovery4Selector);
-
-            // Allow the EventHandlerForDevice to handle device watcher events that relates or effects this device (i.e. device removal, addition, app suspension/resume)
-            AddDeviceWatcher(stDiscovery4Watcher, stDiscovery4Selector);
-        }
-
-        /// <summary>
-        /// Registers for Added, Removed, and Enumerated events on the provided deviceWatcher before adding it to an internal list.
-        /// </summary>
-        /// <param name="deviceWatcher">The device watcher to subscribe the events</param>
-        /// <param name="deviceSelector">The AQS used to create the device watcher</param>
-        private void AddDeviceWatcher(DeviceWatcher deviceWatcher, String deviceSelector)
-        {
-            deviceWatcher.Added += new TypedEventHandler<DeviceWatcher, DeviceInformation>(OnDeviceAdded);
-            deviceWatcher.Removed += new TypedEventHandler<DeviceWatcher, DeviceInformationUpdate>(OnDeviceRemoved);
-            deviceWatcher.EnumerationCompleted += new TypedEventHandler<DeviceWatcher, object>(OnDeviceEnumerationComplete);
-
-            mapDeviceWatchersToDeviceSelector.Add(deviceWatcher, deviceSelector);
-        }
-
-        #endregion
-
-        #region Device watcher management and host app status handling
-
-        /// <summary>
-        /// Initialize device watchers. Must call here the initialization methods for all devices that we want to set watch.
-        /// </summary>
-        private void InitializeDeviceWatchers()
-        {
-            // ST Discovery 4
-            InitializeStDiscovery4DeviceWatcher();
-        }
-
-        public void StartUsbDeviceWatchers()
-        {
-            // Initialize the USB device watchers to be notified when devices are connected/removed
-            StartDeviceWatchersInternal();
-        }
-
-        /// <summary>
-        /// Starts all device watchers including ones that have been individually stopped.
-        /// </summary>
-        private void StartDeviceWatchersInternal()
-        {
-            // Start all device watchers
-            watchersStarted = true;
-            deviceWatchersCompletedCount = 0;
-            IsDevicesEnumerationComplete = false;
-
-            foreach (DeviceWatcher deviceWatcher in mapDeviceWatchersToDeviceSelector.Keys)
-            {
-                if ((deviceWatcher.Status != DeviceWatcherStatus.Started)
-                    && (deviceWatcher.Status != DeviceWatcherStatus.EnumerationCompleted))
-                {
-                    deviceWatcher.Start();
-                }
-            }
-        }
-
-        /// <summary>
-        /// Should be called on host app OnAppSuspension() event to properly handle that status.
-        /// The DeviceWatchers must be stopped because device watchers will continue to raise events even if
-        /// the app is in suspension, which is not desired (drains battery). The device watchers will be resumed once the app resumes too.
-        /// </summary>
-        public void AppSuspending()
-        {
-            if (watchersStarted)
-            {
-                watchersSuspended = true;
-                StopDeviceWatchersInternal();
-            }
-            else
-            {
-                watchersSuspended = false;
-            }
-        }
-
-        /// <summary>
-        /// Should be called on host app OnAppResume() event to properly handle that status.
-        /// See AppSuspending for why we are starting the device watchers again.
-        /// </summary>
-        public void AppResumed()
-        {
-            if (watchersSuspended)
-            {
-                watchersSuspended = false;
-                StartDeviceWatchers();
-            }
-        }
-
-        /// <summary>
-        /// Stops all device watchers.
-        /// </summary>
-        private void StopDeviceWatchersInternal()
-        {
-            // Stop all device watchers
-            foreach (DeviceWatcher deviceWatcher in mapDeviceWatchersToDeviceSelector.Keys)
-            {
-                if ((deviceWatcher.Status == DeviceWatcherStatus.Started)
-                    || (deviceWatcher.Status == DeviceWatcherStatus.EnumerationCompleted))
-                {
-                    deviceWatcher.Stop();
-                }
-            }
-
-            // Clear the list of devices so we don't have potentially disconnected devices around
-            ClearDeviceEntries();
-
-            watchersStarted = false;
-        }
-
-        #endregion
-
-        #region Methods to manage device list add, remove, etc
-
-        /// <summary>
-        /// Creates a DeviceListEntry for a device and adds it to the list of devices
-        /// </summary>
-        /// <param name="deviceInformation">DeviceInformation on the device to be added to the list</param>
-        /// <param name="deviceSelector">The AQS used to find this device</param>
-        private async void AddDeviceToList(DeviceInformation deviceInformation, String deviceSelector)
-        {
-            // search the device list for a device with a matching interface ID
-            var usbMatch = FindDevice(deviceInformation.Id);
-
-            OnLogMessageAvailable(NanoDevicesEventSource.Log.CandidateDevice(deviceInformation.Id));
-
-            // Add the device if it's new
-            if (usbMatch == null)
-            {
-                UsbDevices.Add(new UsbDeviceInformation(deviceInformation, deviceSelector));
-
-                // search the NanoFramework device list for a device with a matching interface ID
-                var nanoFrameworkDeviceMatch = FindNanoFrameworkDevice(deviceInformation.Id);
-
-                if (nanoFrameworkDeviceMatch == null)
-                {
-                    //     Create a new element for this device interface, and queue up the query of its
-                    //     device information
-
-                    var newNanoFrameworkDevice = new NanoDevice<NanoUsbDevice>();
-                    //newMFDevice.DeviceInformation = new UsbDeviceInformation(deviceInformation, deviceSelector);
-                    newNanoFrameworkDevice.Device.DeviceInformation = new UsbDeviceInformation(deviceInformation, deviceSelector);
-                    newNanoFrameworkDevice.ConnectionPort = this;
-                    newNanoFrameworkDevice.Transport = TransportType.Usb;
-                    newNanoFrameworkDevice.ConnectionId = newNanoFrameworkDevice.Device.DeviceInformation.InstanceId;
-
-                    // Add the new element to the end of the list of devices
-                    NanoFrameworkDevices.Add(newNanoFrameworkDevice as NanoDeviceBase);
-
-                    // now fill in the description
-                    // try opening the device to read the descriptor
-                    if (await ConnectUsbDeviceAsync(newNanoFrameworkDevice.Device.DeviceInformation))
-                    {
-                        // the device description format is kept to maintain backwards compatibility
-                        // TODO
-                        // newNanoFrameworkDevice.Description = EventHandlerForUsbDevice.Current.DeviceInformation.Name + "_" + await GetDeviceDescriptor(5);
-
-                        NanoDevicesEventSource.Log.ValidDevice(newNanoFrameworkDevice.Description + " @ " + newNanoFrameworkDevice.Device.DeviceInformation.DeviceSelector);
-
-                        // done here, close device
-                        EventHandlerForUsbDevice.Current.CloseDevice();
-
-                    }
-                    else
-                    {
-                        // couldn't open device, better remove it from the lists
-                        NanoFrameworkDevices.Remove(newNanoFrameworkDevice as NanoDeviceBase);
-                        UsbDevices.Remove(newNanoFrameworkDevice.Device.DeviceInformation);
-
-                        NanoDevicesEventSource.Log.QuitDevice(deviceInformation.Id);
-
-                        // can't do anything with this one, better dispose it
-                        newNanoFrameworkDevice.Dispose();
-                    }
-                }
-                else
-                {
-                    // this NanoFramework device is already on the list
-                }
-            }
-        }
-
-        private void RemoveDeviceFromList(string deviceId)
-        {
-            // Removes the device entry from the internal list; therefore the UI
-            var deviceEntry = FindDevice(deviceId);
-
-            NanoDevicesEventSource.Log.DeviceDeparture(deviceId);
-
-            UsbDevices.Remove(deviceEntry);
-            // get device
-            var device = FindNanoFrameworkDevice(deviceId);
-            // yes, remove it from collection
-            NanoFrameworkDevices.Remove(device);
-        }
-
-        private void ClearDeviceEntries()
-        {
-            UsbDevices.Clear();
-        }
-
-        /// <summary>
-        /// Searches through the existing list of devices for the first DeviceListEntry that has
-        /// the specified device Id.
-        /// </summary>
-        /// <param name="deviceId">Id of the device that is being searched for</param>
-        /// <returns>DeviceListEntry that has the provided Id; else a nullptr</returns>
-        private UsbDeviceInformation FindDevice(String deviceId)
-        {
-            if (deviceId != null)
-            {
-                foreach (UsbDeviceInformation entry in UsbDevices)
-                {
-                    if (entry.DeviceInformation.Id == deviceId)
-                    {
-                        return entry;
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        private NanoDeviceBase FindNanoFrameworkDevice(string deviceId)
-        {
-            if (deviceId != null)
-            {
-
-                // usbMatch.Device.DeviceInformation
-                return NanoFrameworkDevices.FirstOrDefault(d => ((d as NanoDevice<NanoUsbDevice>).Device.DeviceInformation).DeviceInformation.Id == deviceId);
-            }
-
-            return null;
-        }
-
-
-        /// <summary>
-        /// Remove the device from the device list 
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="deviceInformationUpdate"></param>
-        private void OnDeviceRemoved(DeviceWatcher sender, DeviceInformationUpdate deviceInformationUpdate)
-        {
-            RemoveDeviceFromList(deviceInformationUpdate.Id);
-        }
-
-        /// <summary>
-        /// This function will add the device to the listOfDevices
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="deviceInformation"></param>
-        private void OnDeviceAdded(DeviceWatcher sender, DeviceInformation deviceInformation)
-        {
-            AddDeviceToList(deviceInformation, mapDeviceWatchersToDeviceSelector[sender]);
-        }
-
-        #endregion
-
-        #region Handlers and events for Device Enumeration Complete 
-
-        private void OnDeviceEnumerationComplete(DeviceWatcher sender, object args)
-        {
-            // add another device watcher completed
-            deviceWatchersCompletedCount++;
-
-            if (deviceWatchersCompletedCount == mapDeviceWatchersToDeviceSelector.Count)
-            {
-                NanoDevicesEventSource.Log.UsbDeviceEnumerationCompleted(UsbDevices.Count);
-
-                // all watchers have completed enumeration
-                IsDevicesEnumerationComplete = true;
-
-                // fire event that USB enumeration is complete 
-                OnDeviceEnumerationCompleted();
-            }
-        }
-
-        private async Task<string> GetDeviceDescriptor(int index)
-        {
-            try
-            {
-                // maximum expected length of descriptor
-                uint readBufferSize = 64;
-
-                // prepare buffer to hold the descriptor data returned from the device
-                var buffer = new Windows.Storage.Streams.Buffer(readBufferSize);
-
-                // setup packet to perform the request
-                UsbSetupPacket setupPacket = new UsbSetupPacket
-                {
-                    RequestType = new UsbControlRequestType
-                    {
-                        Direction = UsbTransferDirection.In,
-                        Recipient = UsbControlRecipient.SpecifiedInterface,
-                        ControlTransferType = UsbControlTransferType.Vendor,
-                    },
-                    // request to get a descriptor
-                    Request = (byte)UsbDeviceRequestType.GetDescriptor,
-
-                    // descriptor number to be read
-                    Value = (uint)index,
-
-                    // max length of response
-                    Length = readBufferSize
-                };
-
-                // send control to device
-                IBuffer responseBuffer = await EventHandlerForUsbDevice.Current.Device.SendControlInTransferAsync(setupPacket, buffer);
-
-                // read from a buffer with a data reader
-                DataReader reader = DataReader.FromBuffer(responseBuffer);
-
-                // USB data is Little Endian 
-                reader.ByteOrder = ByteOrder.LittleEndian;
-
-                // set encoding to UTF16 & Little Endian
-                reader.UnicodeEncoding = UnicodeEncoding.Utf16LE;
-
-                // read 1st byte (descriptor length)
-                // not use, but still need to read it to consume the buffer
-                int descriptorLenght = reader.ReadByte();
-                // read 2nd byte (descriptor type)
-                int descryptorType = reader.ReadByte();
-
-                // check if this a string (string descriptor type is 0x03)
-                if (descryptorType == 0x03)
-                {
-                    // read a string with remaining bytes available
-                    // the string length is half the available bytes because it's UTF16 encoded (2 bytes for each char)
-                    return reader.ReadString(reader.UnconsumedBufferLength / 2);
-                }
-            }
-            catch (Exception)
-            {
-                // catch everything else, doesn't matter
-            }
-
-            // if we get here something went wrong above, so we don't have a descriptor
-            return string.Empty;
-        }
-
-        protected virtual void OnDeviceEnumerationCompleted()
-        {
-            DeviceEnumerationCompleted?.Invoke(this, new EventArgs());
-        }
-
-        /// <summary>
-        /// Event that is raised when enumeration of all watched devices is complete.
-        /// </summary>
-
-        public override event EventHandler DeviceEnumerationCompleted;
-
-        #endregion
-
-        public Task<bool> ConnectDeviceAsync()
-        {
-            return ConnectUsbDeviceAsync(null);
-        }
-
-        private Task<bool> ConnectUsbDeviceAsync(UsbDeviceInformation usbDeviceInfo)
-        {
-            // try to determine if we already have this device opened.
-            if (EventHandlerForUsbDevice.Current != null)
-            {
-                // device matches
-                if (EventHandlerForUsbDevice.Current.DeviceInformation == usbDeviceInfo.DeviceInformation)
-                {
-                    return Task.FromResult(true);
-                }
-            }
-
-            // Create an EventHandlerForDevice to watch for the device we are connecting to
-            EventHandlerForUsbDevice.CreateNewEventHandlerForDevice();
-
-            return EventHandlerForUsbDevice.Current.OpenDeviceAsync(usbDeviceInfo.DeviceInformation, usbDeviceInfo.DeviceSelector);
-        }
-
-        public void DisconnectDevice(NanoDeviceBase device)
-        {
-            if (FindDevice(((device as NanoDevice<NanoUsbDevice>).Device.DeviceInformation).DeviceInformation.Id) != null)
-            {
-                EventHandlerForUsbDevice.Current.CloseDevice();
-            }
-        }
-
-        #region Interface implementations
-
-        public DateTime LastActivity { get; set; }
-
-        public void DisconnectDevice()
-        {
-            EventHandlerForUsbDevice.Current.CloseDevice();
-        }
-
-        public async Task<uint> SendBufferAsync(byte[] buffer, TimeSpan waiTimeout, CancellationToken cancellationToken)
-        {
-            uint bytesWritten = 0;
-
-            // device must be connected
-            if (EventHandlerForUsbDevice.Current.IsDeviceConnected)
-            {
-                //sanity check for available OUT pipes (must have at least one!)
-                if (EventHandlerForUsbDevice.Current.Device.DefaultInterface.BulkOutPipes.Count < 1)
-                {
-                    // FIXME
-                    // throw exception?
-                }
-
-                // gets the 1st OUT stream for the device
-                var stream = EventHandlerForUsbDevice.Current.Device.DefaultInterface.BulkOutPipes[0].OutputStream;
-
-                // create a data writer to access the device OUT stream
-                var writer = new DataWriter(stream);
-
-                // write buffer
-                writer.WriteBytes(buffer);
-
-                // need to have a timeout to cancel the read task otherwise it may end up waiting forever for this to return
-                var timeoutCancelatioToken = new CancellationTokenSource(waiTimeout).Token;
-
-                // because we have an external cancellation token and the above timeout cancellation token, need to combine both
-                var linkedCancelationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCancelatioToken).Token;
-
-                Task<uint> storeAsyncTask;
-
-                try
-                {
-
-                    // Don't start any IO if the task has been cancelled
-                    lock (cancelIoLock)
-                    {
-                        // set this makes sure that an exception is thrown when the cancellation token is set
-                        linkedCancelationToken.ThrowIfCancellationRequested();
-
-                        // Now the buffer data is actually flushed out to the device.
-                        // We should implement a cancellation Token here so we are able to stop the task operation explicitly if needed
-                        // The completion function should still be called so that we can properly handle a cancelled task
-                        storeAsyncTask = writer.StoreAsync().AsTask(linkedCancelationToken);
-                    }
-
-                    bytesWritten = await storeAsyncTask.ConfigureAwait(true);
-
-                    if (bytesWritten > 0)
-                    {
-                        LastActivity = DateTime.Now;
-                    }
-                }
-                catch (TaskCanceledException)
-                {
-                    // this is expected to happen, don't do anything with this 
-                }
-                catch (Exception ex)
-                {
-                    Debug.WriteLine($"SendRawBufferAsync-USB-Exception occurred: {ex.Message}\r\n {ex.StackTrace}");
-                    return 0;
-                }
-            }
-            else
-            {
-                throw new DeviceNotConnectedException();
-            }
-
-            return bytesWritten;
-        }
-
-        public async Task<byte[]> ReadBufferAsync(uint bytesToRead, TimeSpan waiTimeout, CancellationToken cancellationToken)
-        {
-            // device must be connected
-            if (EventHandlerForUsbDevice.Current.IsDeviceConnected)
-            {
-                //sanity check for available IN pipes (must have at least one!)
-                if (EventHandlerForUsbDevice.Current.Device.DefaultInterface.BulkInPipes.Count < 1)
-                {
-                    // FIXME
-                    // throw exception?
-                }
-
-                // gets the 1st IN stream for the device
-                var stream = EventHandlerForUsbDevice.Current.Device.DefaultInterface.BulkInPipes[0].InputStream;
-
-                DataReader reader = new DataReader(stream);
-                uint bytesRead = 0;
-
-                // need to have a timeout to cancel the read task otherwise it may end up waiting forever for this to return
-                var timeoutCancelatioToken = new CancellationTokenSource(waiTimeout).Token;
-
-                // because we have an external cancellation token and the above timeout cancellation token, need to combine both
-                var linkedCancelationToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken, timeoutCancelatioToken).Token;
-
-                //Task<UInt32> loadAsyncTask;
-
-                await semaphore.WaitAsync();
-
-                try
-                {
-                    //// Don't start any IO if the task has been canceled
-                    //lock (cancelIoLock)
-                    //{
-                    //    // set this makes sure that an exception is thrown when the cancellation token is set
-                    //    linkedCancelationToken.ThrowIfCancellationRequested();
-
-                    //    // We should implement a cancellation Token here so we are able to stop the task operation explicitly if needed
-                    //    // The completion function should still be called so that we can properly handle a cancelled task
-                    //    loadAsyncTask = reader.LoadAsync(bytesToRead).AsTask(linkedCancelationToken);
-                    //}
-
-                    //bytesRead = await loadAsyncTask;
-
-                    List<byte> buffer = new List<byte>();
-                    int offset = 0;
-
-                    while (waiTimeout.TotalMilliseconds > 0)
-                    {
-                        uint readCount = reader.UnconsumedBufferLength;
-
-                        // any byte to read or are we expecting any more bytes?
-                        if (readCount > 0 &&
-                            bytesToRead > 0)
-                        {
-                            await reader.LoadAsync(readCount).AsTask(linkedCancelationToken).ConfigureAwait(true);
-
-                            byte[] readBuffer = new byte[bytesToRead];
-                            reader.ReadBytes(readBuffer);
-
-                            buffer.AddRange(readBuffer);
-
-                            offset += readBuffer.Length;
-                            bytesToRead -= (uint)readBuffer.Length;
-                        }
-
-                        // 
-                        waiTimeout.Subtract(new TimeSpan(0, 0, 0, 0, 100));
-                    }
-
-                    return buffer.ToArray();
-                }
-                catch (TaskCanceledException)
-                {
-                    // this is expected to happen, don't do anything with this 
-                }
-                catch (Exception ex)
-                {
-                    Debug.WriteLine($"ReadBufferAsync-USB-Exception occurred: {ex.Message}\r\n {ex.StackTrace}");
-                    return new byte[0];
-                }
-                finally
-                {
-                    semaphore.Release();
-                }
-
-            }
-            else
-            {
-                throw new DeviceNotConnectedException();
-            }
-
-            // return empty byte array
-            return new byte[0];
-        }
-
-        public override void StartDeviceWatchers()
-        {
-            throw new NotImplementedException();
-        }
-
-        public override void StopDeviceWatchers()
-        {
-            throw new NotImplementedException();
-        }
-
-        public override void ReScanDevices()
-        {
-            throw new NotImplementedException();
-        }
-
-        #endregion
-    }
-}
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Commands.cs b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Commands.cs
index 3fe7fc82..62f0f3ab 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Commands.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Commands.cs
@@ -139,7 +139,7 @@ public class Monitor_Ping
             public const uint c_Ping_WPFlag_SupportsCRC32 =             0x00000010;
 
             // Wire Protocol packet size (3rd position)
-            public const uint Monitor_Ping_c_PacketSize_Position =      0x00000F00;
+            public const uint Monitor_Ping_c_PacketSize_Position =      0x00000700;
             // default packet size is 1024
             public const uint Monitor_Ping_c_PacketSize_1024 =          0x00000100;
             public const uint Monitor_Ping_c_PacketSize_0512 =          0x00000200;
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Controller.cs b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Controller.cs
index 00ebc7ef..d5c89076 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Controller.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Controller.cs
@@ -5,7 +5,7 @@
 //
 
 using System;
-using System.Threading;
+using System.IO;
 using System.Threading.Tasks;
 
 namespace nanoFramework.Tools.Debugger.WireProtocol
@@ -13,8 +13,6 @@ namespace nanoFramework.Tools.Debugger.WireProtocol
     public class Controller : IControllerLocal
     {
         private ushort lastOutboundMessage;
-        private readonly Semaphore _sendSemaphore = new Semaphore(1, 1);
-        private readonly Semaphore _receiveSemaphore = new Semaphore(1, 1);
         private readonly int nextEndpointId;
         private readonly object incrementLock = new object();
 
@@ -26,7 +24,7 @@ public Controller(IControllerHostLocal app)
         {
             App = app;
 
-            Random random = new Random();
+            Random random = new();
 
             lastOutboundMessage = ushort.MaxValue;
             nextEndpointId = random.Next(int.MaxValue);
@@ -45,59 +43,30 @@ private void ProcessExit()
             App.ProcessExited();
         }
 
-        public async Task<bool> SendAsync(MessageRaw raw, CancellationToken cancellationToken)
+        public bool Send(MessageRaw raw)
         {
-            if(!_sendSemaphore.WaitOne())
-            {
-                return false;
-            }
-
-            // check for cancellation request
-            if (cancellationToken.IsCancellationRequested)
-            {
-                // cancellation requested
-                return false;
-            }
-
             try
             {
                 // TX header
-                var sendHeaderCount = await SendRawBufferAsync(raw.Header, TimeSpan.FromMilliseconds(1000), cancellationToken);
-
-                // check for cancellation request
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    // cancellation requested
-                    return false;
-                }
+                var sendHeaderCount = SendRawBuffer(raw.Header);
 
-                if (raw.Payload != null)
+                if (sendHeaderCount == raw.Header.Length)
                 {
-                    // we have a payload to TX
-                    if (sendHeaderCount == raw.Header.Length)
+                    if (raw.Payload != null &&
+                        raw.Payload.Length > 0)
                     {
-                        var sendPayloadCount = await SendRawBufferAsync(raw.Payload, TimeSpan.FromMilliseconds(1000), cancellationToken);
+                        // we have a payload to TX
 
-                        if (sendPayloadCount == raw.Payload.Length)
-                        {
-                            // payload TX OK
-                            return true;
-                        }
-                        else
+                        var sendPayloadCount = SendRawBuffer(raw.Payload);
+
+                        if (sendPayloadCount != raw.Payload.Length)
                         {
                             // failed TX the payload
                             return false;
                         }
                     }
-                    else
-                    {
-                        // already failed to TX header so don't bother with the payload
-                        return false;
-                    }
-                }
-                else
-                {
-                    // no payload, header TX OK, we are good
+
+                    // all good
                     return true;
                 }
             }
@@ -109,19 +78,23 @@ public async Task<bool> SendAsync(MessageRaw raw, CancellationToken cancellation
             {
                 throw;
             }
+            catch (IOException)
+            {
+                App.ProcessExited();
+            }
             catch (AggregateException)
             {
                 App.ProcessExited();
             }
+            catch (InvalidOperationException)
+            {
+                App.ProcessExited();
+            }
             catch
             {
                 // catch everything else here, doesn't matter
                 return false;
             }
-            finally
-            {
-                _sendSemaphore.Release();
-            }
 
             return false;
         }
@@ -150,59 +123,47 @@ public uint GetUniqueEndpointId()
             throw new NotImplementedException();
         }
 
-        private Task<uint> SendRawBufferAsync(byte[] buffer, TimeSpan waiTimeout, CancellationToken cancellationToken)
+        private int SendRawBuffer(byte[] buffer)
         {
-            return App.SendBufferAsync(buffer, waiTimeout, cancellationToken);
+            return App.SendBuffer(buffer);
         }
 
-        internal async Task<int> ReadBufferAsync(byte[] buffer, int offset, int bytesToRead, TimeSpan waitTimeout, CancellationToken cancellationToken)
+        internal int ReadBuffer(byte[] buffer, int offset, int bytesToRead)
         {
-            if (!_receiveSemaphore.WaitOne())
+            // check if there is anything to read
+            var availableBytes = App.AvailableBytes;
+            if (availableBytes <= 0)
             {
-                return 0;
-            }
+                if (availableBytes == -1)
+                {
+                    throw new DeviceNotConnectedException();
+                }
 
-            // check for cancellation request
-            if (cancellationToken.IsCancellationRequested)
-            {
-                // cancellation requested
                 return 0;
             }
 
-            int bytesToReadRequested = bytesToRead;
-
             try
             {
-                // sanity check for anything to read
-                if (bytesToRead == 0)
-                {
-                    return 0;
-                }
+                // read data 
+                var readResult = App.ReadBuffer(bytesToRead);
 
-                while (bytesToRead > 0 && !cancellationToken.IsCancellationRequested)
-                {
-                    // read next chunk of data async
-                    var readResult = await App.ReadBufferAsync((uint)bytesToRead, waitTimeout, cancellationToken).ConfigureAwait(true);
+                Array.Copy(readResult, 0, buffer, offset, readResult.Length);
 
-                    // any byte read?
-                    if (readResult.Length > 0)
-                    {
-                        Array.Copy(readResult, 0, buffer, offset, readResult.Length);
-
-                        offset += readResult.Length;
-                        bytesToRead -= readResult.Length;
-                    }
-                }
+                return readResult.Length;
             }
             catch (DeviceNotConnectedException)
             {
                 throw;
             }
-            catch (TaskCanceledException)
+            catch (TimeoutException)
             {
                 // don't do anything here, as this is expected
             }
-            catch (AggregateException)
+            catch (IOException)
+            {
+                App.ProcessExited();
+            }
+            catch (InvalidOperationException)
             {
                 App.ProcessExited();
             }
@@ -211,12 +172,8 @@ internal async Task<int> ReadBufferAsync(byte[] buffer, int offset, int bytesToR
                 // catch everything else, doesn't matter
                 return 0;
             }
-            finally
-            {
-                _receiveSemaphore.Release();
-            }
 
-            return bytesToReadRequested - bytesToRead;
+            return 0;
         }
     }
 }
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Engine.cs b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Engine.cs
index 0a5042dc..2ab673a2 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Engine.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/Engine.cs
@@ -27,10 +27,14 @@ namespace nanoFramework.Tools.Debugger
     public partial class Engine : IDisposable, IControllerHostLocal
     {
         private const int TIMEOUT_DEFAULT = 5000;
+        
+        /// <summary>
+        /// This constant is to be used to pause between requests, when doing batched requests to a target.
+        /// </summary>
+        private const int _InterRequestSleep = 2;
 
         internal IPort _portDefinition;
         internal Controller _controlller { get; set; }
-        bool m_silent;
 
         DateTime m_lastNoise = DateTime.Now;
 
@@ -52,26 +56,19 @@ public partial class Engine : IDisposable, IControllerHostLocal
 
         readonly CancellationTokenSource _noiseHandlingCancellation = new CancellationTokenSource();
 
-        readonly CancellationTokenSource _backgroundProcessorCancellation = new CancellationTokenSource();
-
         AutoResetEvent _rpcEvent;
         //ArrayList m_rpcQueue;
         ArrayList _rpcEndPoints;
 
-        ManualResetEvent m_evtShutdown;
-        ManualResetEvent _pingEvent;
+        static ManualResetEvent _pingEvent;
         TypeSysLookup m_typeSysLookup;
         EngineState _state;
 
-        private Task _backgroundProcessor;
+        private Thread _backgroundProcessor;
 
         protected readonly WireProtocolRequestsStore _requestsStore = new WireProtocolRequestsStore();
         protected readonly Timer _pendingRequestsTimer;
 
-
-        private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
-        public CancellationToken CancellationToken => _cancellationTokenSource.Token;
-
         internal INanoDevice Device;
 
         internal Engine(NanoDeviceBase device)
@@ -81,14 +78,13 @@ internal Engine(NanoDeviceBase device)
             // default to false
             IsCRC32EnabledForWireProtocol = false;
 
-            _pendingRequestsTimer = new Timer(ClearPendingRequests, null, 1000, 1000);
+            _pendingRequestsTimer = new Timer(ClearPendingRequests, null, 0, 100);
         }
 
         private void Initialize()
         {
             m_notifyEvent = new AutoResetEvent(false);
             _rpcEvent = new AutoResetEvent(false);
-            m_evtShutdown = new ManualResetEvent(false);
             _pingEvent = new ManualResetEvent(false);
 
             //m_rpcQueue = ArrayList.Synchronized(new ArrayList());
@@ -102,8 +98,9 @@ private void Initialize()
             //default capabilities, used until clr can be queried.
             Capabilities = new CLRCapabilities();
 
-            // clear memory map
+            // clear maps
             FlashSectorMap = new List<Commands.Monitor_FlashSectorMap.FlashSectorData>();
+            MemoryMap = new List<Commands.Monitor_MemoryMap.Range>();
         }
 
         private void InitializeLocal(NanoDeviceBase device)
@@ -118,7 +115,15 @@ private void InitializeLocal(NanoDeviceBase device)
 
         public CLRCapabilities Capabilities { get; internal set; }
         public TargetInfo TargetInfo { get; private set; }
+        
         public List<Commands.Monitor_FlashSectorMap.FlashSectorData> FlashSectorMap { get; private set; }
+        
+        public List<Commands.Monitor_MemoryMap.Range> MemoryMap { get; private set; }
+
+        /// <summary>
+        /// Default timeout value for operations (in milliseconds).
+        /// </summary>
+        public int DefaultTimeout { get; set; } = TIMEOUT_DEFAULT;
 
         public BinaryFormatter CreateBinaryFormatter()
         {
@@ -149,7 +154,6 @@ public BinaryFormatter CreateBinaryFormatter()
 
         private ConnectionSource _connectionSource = ConnectionSource.Unknown;
 
-        [Obsolete("Please use IsConnectedTonanoCLR or IsConnectedTonanoBooter instead. This will be removed in a future version.")]
 #pragma warning disable S2292 // Need to keep this here to allow transition period before remove it for good.
         public ConnectionSource ConnectionSource { get => _connectionSource; set => _connectionSource = value; }
 #pragma warning restore S2292 // Trivial properties should be auto-implemented
@@ -172,199 +176,245 @@ public BinaryFormatter CreateBinaryFormatter()
 
         public bool StopDebuggerOnConnect { get; set; }
 
-        public async Task<bool> ConnectAsync(
-            int timeout, 
+        /// <summary>
+        /// Setting for debugger output to be silent.
+        /// </summary>
+        public bool Silent { get; set; }
+
+        public bool Connect()
+        {
+            return Connect(
+                TIMEOUT_DEFAULT,
+                false,
+                false);
+        }
+
+        public bool Connect(
+            bool force,
+            bool requestCapabilities = false)
+        {
+            return Connect(
+                TIMEOUT_DEFAULT,
+                force,
+                requestCapabilities);
+        }
+
+        public bool Connect(
+            int millisecondsTimeout, 
             bool force = false,
-            int attempts = 1,
-            ConnectionSource requestedConnectionSource = ConnectionSource.Unknown, 
-            bool requestCapabilities = true)
+            bool requestCapabilities = false)
         {
-            // setup linear back-off based on the parameters
-            var delay = Backoff.LinearBackoff(TimeSpan.FromMilliseconds(timeout), retryCount: attempts, fastFirst: true);
+            var timeout = millisecondsTimeout != TIMEOUT_DEFAULT ? millisecondsTimeout : DefaultTimeout;
 
-            // setup policy
-            var operatioRetryPolicy = Policy.HandleResult<bool>(r => !r)
-                .WaitAndRetryAsync(delay);
+            bool capabilitesRetrieved = false;
 
-            // perform connect operation with policy
-            return await operatioRetryPolicy.ExecuteAsync(async () =>
+            if (force || !IsConnected)
             {
-                if (force || !IsConnected)
+                // connect to device 
+                if (Device.Connect())
                 {
-                    // connect to device 
-                    if (await Device.ConnectAsync())
+                    if (!IsRunning)
                     {
-                        if (!IsRunning)
+                        if (_state.GetValue() == EngineState.Value.NotStarted )
                         {
-                            if (_state.GetValue() == EngineState.Value.NotStarted)
-                            {
-                                // background processor was never started
-                                _state.SetValue(EngineState.Value.Starting, true);
+                            // background processor was never started
+                            _state.SetValue(EngineState.Value.Starting, true);
 
-                                // start task to process background messages
-                                _backgroundProcessor = Task.Factory.StartNew(() => IncomingMessagesListener(), _backgroundProcessorCancellation.Token, TaskCreationOptions.LongRunning, TaskScheduler.Current);
+                            // start task to process background messages
+                            _backgroundProcessor = CreateThreadHelper(new ThreadStart(this.IncomingMessagesListener));
 
-                                _state.SetValue(EngineState.Value.Started, false);
-                            }
-                            else
-                            {
-                                // background processor is not running, start it
-                                ResumeProcessing();
-                            }
+                            _state.SetValue(EngineState.Value.Started, false);
                         }
-
-                        Commands.Monitor_Ping cmd = new Commands.Monitor_Ping
+                        else
                         {
-                            Source = Commands.Monitor_Ping.c_Ping_Source_Host,
-                            Flags = (StopDebuggerOnConnect ? Commands.Monitor_Ping.c_Ping_DbgFlag_Stop : 0)
-                        };
-
-                        IncomingMessage msg = PerformSyncRequest(Commands.c_Monitor_Ping, Flags.c_NoCaching, cmd, timeout);
+                            // background processor is not running, start it
+                            ResumeProcessing();
+                        }
+                    }
 
-                        if (msg == null || msg?.Payload == null)
-                        {
-                            // update flag
-                            IsConnected = false;
+                    Commands.Monitor_Ping cmd = new Commands.Monitor_Ping
+                    {
+                        Source = Commands.Monitor_Ping.c_Ping_Source_Host,
+                        Flags = (StopDebuggerOnConnect ? Commands.Monitor_Ping.c_Ping_DbgFlag_Stop : 0)
+                    };
 
-                            // done here
-                            return false;
-                        }
+                    IncomingMessage msg = PerformSyncRequest(Commands.c_Monitor_Ping, Flags.c_NoCaching, cmd, timeout);
 
+                    if (msg == null || msg?.Payload == null)
+                    {
+                        goto connect_failed;
+                    }
 
-                        if (msg.Payload is Commands.Monitor_Ping.Reply reply)
-                        {
-                            IsTargetBigEndian = (reply.Flags & Commands.Monitor_Ping.c_Ping_DbgFlag_BigEndian).Equals(Commands.Monitor_Ping.c_Ping_DbgFlag_BigEndian);
+                    if (msg.Payload is Commands.Monitor_Ping.Reply reply)
+                    {
+                        IsTargetBigEndian = (reply.Flags & Commands.Monitor_Ping.c_Ping_DbgFlag_BigEndian).Equals(Commands.Monitor_Ping.c_Ping_DbgFlag_BigEndian);
 
-                            IsCRC32EnabledForWireProtocol = (reply.Flags & Commands.Monitor_Ping.c_Ping_WPFlag_SupportsCRC32).Equals(Commands.Monitor_Ping.c_Ping_WPFlag_SupportsCRC32);
+                        IsCRC32EnabledForWireProtocol = (reply.Flags & Commands.Monitor_Ping.c_Ping_WPFlag_SupportsCRC32).Equals(Commands.Monitor_Ping.c_Ping_WPFlag_SupportsCRC32);
 
-                            // get Wire Protocol packet size
-                            switch (reply.Flags & Commands.Monitor_Ping.Monitor_Ping_c_PacketSize_Position)
-                            {
-                                case Commands.Monitor_Ping.Monitor_Ping_c_PacketSize_0128:
-                                    WireProtocolPacketSize = 128;
-                                    break;
-                                case Commands.Monitor_Ping.Monitor_Ping_c_PacketSize_0256:
-                                    WireProtocolPacketSize = 256;
-                                    break;
-                                case Commands.Monitor_Ping.Monitor_Ping_c_PacketSize_0512:
-                                    WireProtocolPacketSize = 512;
-                                    break;
-                                case Commands.Monitor_Ping.Monitor_Ping_c_PacketSize_1024:
-                                    WireProtocolPacketSize = 1024;
-                                    break;
-
-                                default:
-                                    // unsupported packet size
-                                    throw new NotSupportedException("Wire Protocol packet size reported by target device is not supported.");
-                            }
+                        // get Wire Protocol packet size
+                        switch (reply.Flags & Commands.Monitor_Ping.Monitor_Ping_c_PacketSize_Position)
+                        {
+                            case Commands.Monitor_Ping.Monitor_Ping_c_PacketSize_0128:
+                                WireProtocolPacketSize = 128;
+                                break;
+                            case Commands.Monitor_Ping.Monitor_Ping_c_PacketSize_0256:
+                                WireProtocolPacketSize = 256;
+                                break;
+                            case Commands.Monitor_Ping.Monitor_Ping_c_PacketSize_0512:
+                                WireProtocolPacketSize = 512;
+                                break;
+                            case Commands.Monitor_Ping.Monitor_Ping_c_PacketSize_1024:
+                                WireProtocolPacketSize = 1024;
+                                break;
+
+                            default:
+                                // unsupported packet size
+                                throw new NotSupportedException("Wire Protocol packet size reported by target device is not supported.");
+                        }
 
-                            // get other device capabilities
-                            ConfigBlockRequiresErase = (reply.Flags & Commands.Monitor_Ping.Monitor_Ping_c_ConfigBlockRequiresErase).Equals(Commands.Monitor_Ping.Monitor_Ping_c_ConfigBlockRequiresErase);
+                        // get other device capabilities
+                        ConfigBlockRequiresErase = (reply.Flags & Commands.Monitor_Ping.Monitor_Ping_c_ConfigBlockRequiresErase).Equals(Commands.Monitor_Ping.Monitor_Ping_c_ConfigBlockRequiresErase);
 
-                            HasProprietaryBooter = (reply.Flags & Commands.Monitor_Ping.Monitor_Ping_c_HasProprietaryBooter).Equals(Commands.Monitor_Ping.Monitor_Ping_c_HasProprietaryBooter);
+                        HasProprietaryBooter = (reply.Flags & Commands.Monitor_Ping.Monitor_Ping_c_HasProprietaryBooter).Equals(Commands.Monitor_Ping.Monitor_Ping_c_HasProprietaryBooter);
 
-                            HasNanoBooter = (reply.Flags & Commands.Monitor_Ping.Monitor_Ping_c_HasNanoBooter).Equals(Commands.Monitor_Ping.Monitor_Ping_c_HasNanoBooter);
+                        HasNanoBooter = (reply.Flags & Commands.Monitor_Ping.Monitor_Ping_c_HasNanoBooter).Equals(Commands.Monitor_Ping.Monitor_Ping_c_HasNanoBooter);
 
-                            IsIFUCapable = (reply.Flags & Commands.Monitor_Ping.Monitor_Ping_c_IFUCapable).Equals(Commands.Monitor_Ping.Monitor_Ping_c_IFUCapable);
+                        IsIFUCapable = (reply.Flags & Commands.Monitor_Ping.Monitor_Ping_c_IFUCapable).Equals(Commands.Monitor_Ping.Monitor_Ping_c_IFUCapable);
 
 
-                            // update flag
-                            IsConnected = true;
+                        // update flag
+                        IsConnected = true;
 
-                            // update field
-                            switch (reply.Source)
-                            {
-                                case Commands.Monitor_Ping.c_Ping_Source_NanoCLR:
-                                    _connectionSource = ConnectionSource.nanoCLR;
-                                    break;
+                        // update field
+                        switch (reply.Source)
+                        {
+                            case Commands.Monitor_Ping.c_Ping_Source_NanoCLR:
+                                _connectionSource = ConnectionSource.nanoCLR;
+                                break;
 
-                                case Commands.Monitor_Ping.c_Ping_Source_NanoBooter:
-                                    _connectionSource = ConnectionSource.nanoBooter;
-                                    break;
+                            case Commands.Monitor_Ping.c_Ping_Source_NanoBooter:
+                                _connectionSource = ConnectionSource.nanoBooter;
+                                break;
 
-                                default:
-                                    _connectionSource = ConnectionSource.Unknown;
-                                    break;
-                            }
+                            default:
+                                _connectionSource = ConnectionSource.Unknown;
+                                break;
+                        }
 
-                            if (m_silent)
-                            {
-                                SetExecutionMode(Commands.DebuggingExecutionChangeConditions.State.DebuggerQuiet, 0);
-                            }
+                        if (Silent)
+                        {
+                            SetExecutionMode(Commands.DebuggingExecutionChangeConditions.State.DebuggerQuiet, 0);
                         }
                     }
                 }
+            }
 
-                var flashMapPolicy = Policy.Handle<Exception>().OrResult<List<Commands.Monitor_FlashSectorMap.FlashSectorData>>(r => r == null)
-                                           .WaitAndRetry(2, retryAttempt => TimeSpan.FromMilliseconds((retryAttempt + 1) * timeout));
-                var targetInfoPolicy = Policy.Handle<Exception>().OrResult<TargetInfo>(r => r == null)
-                                             .WaitAndRetry(2, retryAttempt => TimeSpan.FromMilliseconds((retryAttempt + 1) * timeout));
+            var flashMapPolicy = Policy.Handle<Exception>().OrResult<List<Commands.Monitor_FlashSectorMap.FlashSectorData>>(r => r == null)
+                                        .WaitAndRetry(2, retryAttempt => TimeSpan.FromMilliseconds((retryAttempt + 1) * 250));
+            var memoryMapPolicy = Policy.Handle<Exception>().OrResult<List<Commands.Monitor_MemoryMap.Range>>(r => r == null)
+                                        .WaitAndRetry(2, retryAttempt => TimeSpan.FromMilliseconds((retryAttempt + 1) * 250));
+            var targetInfoPolicy = Policy.Handle<Exception>().OrResult<TargetInfo>(r => r == null)
+                                            .WaitAndRetry(2, retryAttempt => TimeSpan.FromMilliseconds((retryAttempt + 1) * 250));
 
-                if (IsConnectedTonanoCLR &&
-                    requestCapabilities &&
-                    (force || Capabilities.IsUnknown))
-                {
-                    CancellationTokenSource cancellationTSource = new CancellationTokenSource();
-
-                    //default capabilities
-                    Capabilities = new CLRCapabilities();
+            if (IsConnectedTonanoCLR &&
+                requestCapabilities)
+            {
+                CancellationTokenSource cancellationTSource = new CancellationTokenSource();
+                CLRCapabilities tempCapabilities = new();
 
-                    // fill flash sector map
+                // fill flash sector map
+                if (FlashSectorMap.Count == 0)
+                {
                     FlashSectorMap = flashMapPolicy.Execute(() => GetFlashSectorMap());
+                }
 
-                    // get target info
-                    TargetInfo = targetInfoPolicy.Execute(() => GetMonitorTargetInfo());
-
-                    var tempCapabilities = DiscoverCLRCapabilities(cancellationTSource.Token);
-
-                    if (tempCapabilities != null && !tempCapabilities.IsUnknown)
+                if (FlashSectorMap.Count != 0)
+                {
+                    if(MemoryMap.Count == 0)
                     {
-                        Capabilities = tempCapabilities;
-                        _controlller.Capabilities = Capabilities;
+                        MemoryMap = memoryMapPolicy.Execute(() => GetMemoryMap());
                     }
-                    else
+
+                    if (MemoryMap.Count != 0)
                     {
-                        // update flag
-                        IsConnected = false;
+                        // get target info
+                        if (TargetInfo == null)
+                        {
+                            TargetInfo = targetInfoPolicy.Execute(() => GetMonitorTargetInfo());
+                        }
 
-                        // done here
-                        return false;
+                        if (TargetInfo != null)
+                        {
+                            if (Capabilities.IsUnknown)
+                            {
+                                tempCapabilities = DiscoverCLRCapabilities(cancellationTSource.Token);
+
+                                if (tempCapabilities != null
+                                    && !tempCapabilities.IsUnknown)
+                                {
+                                    Capabilities = tempCapabilities;
+                                    _controlller.Capabilities = Capabilities;
+                                }
+                            }
+
+                            if (!Capabilities.IsUnknown)
+                            {
+                                // we have everything that we need
+                                capabilitesRetrieved = true;
+                            }
+
+                        }
                     }
                 }
 
-                if (IsConnectedTonanoBooter &&
-                    requestCapabilities &&
-                    (force || TargetInfo == null))
+                if (requestCapabilities
+                    && !capabilitesRetrieved)
                 {
-                    // fill flash sector map
-                    FlashSectorMap = flashMapPolicy.Execute(() => GetFlashSectorMap());
-
-                    // get target info
-                    TargetInfo = targetInfoPolicy.Execute(() => GetMonitorTargetInfo());
+                    goto connect_failed;
                 }
+            }
 
-                if (requestedConnectionSource != ConnectionSource.Unknown && requestedConnectionSource != _connectionSource)
+            if (IsConnectedTonanoBooter &&
+                requestCapabilities)
+            {
+                // fill flash sector map
+                if (FlashSectorMap.Count == 0)
                 {
-                    // update flag
-                    IsConnected = false;
-
-                    // done here
-                    return false;
+                    FlashSectorMap = flashMapPolicy.Execute(() => GetFlashSectorMap());
                 }
 
-                if (requestCapabilities &&
-                    (FlashSectorMap == null
-                    || TargetInfo == null))
+                if (FlashSectorMap.Count > 0)
                 {
-                    // update flag
-                    IsConnected = false;
+                    // flash map available
+                    // get target info
+                    if (TargetInfo == null)
+                    {
+                        TargetInfo = targetInfoPolicy.Execute(() => GetMonitorTargetInfo());
+                    }
 
-                    // done here
-                    return false;
+                    if(TargetInfo != null)
+                    {
+                        // we have everything that we need
+                        capabilitesRetrieved = true;
+                    }
                 }
+            }
+
+            if (requestCapabilities &&
+                !capabilitesRetrieved)
+            {
+                goto connect_failed;
+            }
 
-                return IsConnected;
-            });
+            return IsConnected;
+
+        connect_failed:
+
+            // update flag
+            IsConnected = false;
+
+            // done here
+            return false;
         }
 
         public bool UpdateDebugFlags()
@@ -388,11 +438,16 @@ public bool UpdateDebugFlags()
                     return false;
                 }
 
-                if (m_silent)
+                // get state flags to set
+                var stateFlagsToSet = Commands.DebuggingExecutionChangeConditions.State.SourceLevelDebugging;
+
+                if (Silent)
                 {
-                    SetExecutionMode(Commands.DebuggingExecutionChangeConditions.State.DebuggerQuiet, 0);
+                    stateFlagsToSet |= Commands.DebuggingExecutionChangeConditions.State.DebuggerQuiet;
                 }
 
+                SetExecutionMode(stateFlagsToSet, 0);
+
                 // done here
                 return true;
             }
@@ -412,6 +467,8 @@ private void ClearPendingRequests(object state)
                     ? wireProtocolRequest.TaskCompletionSource.TrySetCanceled(wireProtocolRequest.CancellationToken)
                     : wireProtocolRequest.TaskCompletionSource.TrySetCanceled();
 
+                wireProtocolRequest.RequestAborted();
+
                 // remove the request from the store
                 if (_requestsStore.Remove(wireProtocolRequest.OutgoingMessage.Header) && requestCanceled)
                 {
@@ -423,47 +480,39 @@ private void ClearPendingRequests(object state)
 
         public void IncomingMessagesListener()
         {
+            Debug.WriteLine(">>>> START IncomingMessagesListener <<<<");
+            
             var reassembler = new MessageReassembler(_controlller);
 
-            while (!_backgroundProcessorCancellation.IsCancellationRequested && _state.IsRunning)
+            while (_state.IsRunning)
             {
                 try
                 {
-                    reassembler.ProcessAsync(_backgroundProcessorCancellation.Token).Wait();
+                    reassembler.Process();
                 }
-                catch (AggregateException)
+                catch(DeviceNotConnectedException)
                 {
-                    ProcessExited();
+                    Stop(true);
                     break;
                 }
-                catch (DeviceNotConnectedException)
+                catch(ThreadAbortException)
                 {
-                    ProcessExited();
                     break;
                 }
+#if DEBUG
                 catch (Exception ex)
                 {
-                    // look for exceptions that are an indication that this is doomed
-                    // 0x800703E3
-                    // 0x80070006
-                    // 0x80070079
-                    // 0x8007001F
-                    // 0x800701B1
-                    if (ex.HResult == -2147023901
-                        || ex.HResult == -2147024890
-                        || ex.HResult == -2147024775
-                        || ex.HResult == -2147024865
-                        || ex.HResult == -2147024463)
-                    {
-                        ProcessExited();
-                        break;
-                    }
+                    Debug.WriteLine($"IncomingMessagesListener >>>>>>> {ex.Message}");
+#else
+                catch (Exception)
+                {
+#endif
+                    Stop();
+                    break;
                 }
             }
 
-            _state.SetValue(EngineState.Value.Stopping, false);
-
-            Debug.WriteLine("**** EXIT IncomingMessagesListenerAsync ****");
+            Debug.WriteLine("<<<< EXIT IncomingMessagesListener >>>>");
         }
 
         public DateTime LastActivity
@@ -480,7 +529,7 @@ public DateTime LastActivity
 
         public bool ThrowOnCommunicationFailure { get; set; } = false;
 
-        #region Events 
+#region Events 
 
         public event NoiseEventHandler OnNoise
         {
@@ -534,9 +583,9 @@ public event EventHandler OnProcessExit
             }
         }
 
-        #endregion
+#endregion
 
-        #region IDisposable Support
+#region IDisposable Support
 
         private bool disposedValue = false; // To detect redundant calls
 
@@ -544,27 +593,26 @@ protected virtual void Dispose(bool disposing)
         {
             if (!disposedValue)
             {
-                if (disposing)
+                try
                 {
-                    // TODO: dispose managed state (managed objects).
+                    Stop();
 
-                    //noiseHandlingCancellation.Cancel();
+                    if (_state.SetValue(EngineState.Value.Disposing))
+                    {
+                        IDisposable disposable = _controlller as IDisposable;
 
-                    //backgroundProcessorCancellation.Cancel();
+                        if (disposable != null)
+                        {
+                            disposable.Dispose();
+                        }
 
-                    try
-                    {
-                        _cancellationTokenSource.Cancel();
-                        _cancellationTokenSource.Dispose();
-                    }
-                    catch
-                    {
-                        // catch everything else, doesn't matter
+                        _state.SetValue(EngineState.Value.Disposed);
                     }
                 }
-
-                // TODO: free unmanaged resources (unmanaged objects) and override a finalizer below.
-                // TODO: set large fields to null.
+                catch
+                {
+                    // intended use to let dispose happen even if exceptions occur
+                }
 
                 disposedValue = true;
             }
@@ -572,81 +620,103 @@ protected virtual void Dispose(bool disposing)
 
         ~Engine()
         {
-            // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
             Dispose(false);
         }
 
-        // This code added to correctly implement the disposable pattern.
         public void Dispose()
         {
-            // Do not change this code. Put cleanup code in Dispose(bool disposing) above.
             Dispose(true);
-            // TODO: uncomment the following line if the finalizer is overridden above.
-            // GC.SuppressFinalize(this);
         }
 
         #endregion
 
-        private IncomingMessage PerformSyncRequest(uint command, uint flags, object payload, int millisecondsTimeout = 5000)
+        /// <summary>
+        /// Global lock object for synchronizing message request. This ensures there is only one
+        /// outstanding request at any point of time. 
+        /// </summary>
+        internal object _syncReqLock = new object();
+
+        private IncomingMessage PerformSyncRequest(uint command, uint flags, object payload, int millisecondsTimeout = TIMEOUT_DEFAULT)
         {
-            OutgoingMessage message = new OutgoingMessage(_controlller.GetNextSequenceId(), CreateConverter(), command, flags, payload);
+            lock (_syncReqLock)
+            {
+                OutgoingMessage message = new OutgoingMessage(_controlller.GetNextSequenceId(), CreateConverter(), command, flags, payload);
 
-            var request = PerformRequestAsync(message, _cancellationTokenSource.Token, millisecondsTimeout);
+                var timeout = millisecondsTimeout != TIMEOUT_DEFAULT ? millisecondsTimeout : DefaultTimeout;
 
-            try
-            {
-                if (request != null)
+                var request = PerformRequestAsync(message, timeout);
+
+                try
                 {
-                    Task.WaitAll(request);
+                    if (request != null)
+                    {
+                        Task.WaitAll(request);
+                    }
+                    else
+                    {
+                        return null;
+                    }
                 }
-                else
+                catch (AggregateException)
                 {
                     return null;
                 }
-            }
-            catch(AggregateException)
-            {
-                return null;
-            }
 
-            return request.Result;
+                return request.Result;
+            }
         }
 
-        private IncomingMessage PerformSyncRequest(OutgoingMessage message, int millisecondsTimeout = 5000)
+        private IncomingMessage PerformSyncRequest(OutgoingMessage message, int millisecondsTimeout = TIMEOUT_DEFAULT)
         {
-            var request = PerformRequestAsync(message, _cancellationTokenSource.Token, millisecondsTimeout);
-
-            try
+            lock (_syncReqLock)
             {
-                if (request != null)
+                var timeout = millisecondsTimeout != TIMEOUT_DEFAULT ? millisecondsTimeout : DefaultTimeout;
+
+                var request = PerformRequestAsync(message, timeout);
+
+                try
                 {
-                    Task.WaitAll(request);
+                    if (request != null)
+                    {
+                        Task.WaitAll(request);
+                    }
+                    else
+                    {
+                        return null;
+                    }
                 }
-                else
+                catch
                 {
+                    // catch everything, doesn't matter
                     return null;
                 }
-            }
-            catch
-            {
-                // catch everything, doesn't matter
-                return null;
-            }
 
-            return request.Result;
+                return request.Result;
+            }
         }
 
-        public Task<IncomingMessage> PerformRequestAsync(OutgoingMessage message, CancellationToken cancellationToken, int millisecondsTimeout = 5000)
+        internal Task<IncomingMessage> PerformRequestAsync(OutgoingMessage message, int millisecondsTimeout = TIMEOUT_DEFAULT)
         {
-            WireProtocolRequest request = new WireProtocolRequest(message, cancellationToken, millisecondsTimeout);
-            _requestsStore.Add(request);
+            var timeout = millisecondsTimeout != TIMEOUT_DEFAULT ? millisecondsTimeout : DefaultTimeout;
+
+            WireProtocolRequest request = new WireProtocolRequest(message, timeout);
+
+            // only add this to store if a reply is expected/required
+            if (request.NeedsReply)
+            {
+                _requestsStore.Add(request);
+            }
 
             try
             {
                 // Start a background task that will complete tcs1.Task
                 Task.Factory.StartNew(() =>
                 {
-                    request.PerformRequestAsync(_controlller).Wait(millisecondsTimeout, cancellationToken);
+                    if (!request.PerformRequest(_controlller))
+                    {
+                        // send failed...
+                        request.TaskCompletionSource.SetException(new InvalidOperationException());
+                    }
                 });
             }
             catch (Exception ex)
@@ -654,6 +724,9 @@ public Task<IncomingMessage> PerformRequestAsync(OutgoingMessage message, Cancel
                 // perform request failed, remove it from store
                 _requestsStore.Remove(request.OutgoingMessage.Header);
 
+                // report failure
+                request.RequestAborted();
+
                 request.TaskCompletionSource.SetException(ex);
 
                 return Task.FromResult<IncomingMessage>(null);
@@ -674,34 +747,39 @@ private List<IncomingMessage> PerformRequestBatch(List<OutgoingMessage> messages
             return replies;
         }
 
-        public Commands.Monitor_Ping.Reply GetConnectionSource()
+        public ConnectionSource GetConnectionSource()
         {
-            IncomingMessage reply = PerformSyncRequest(Commands.c_Monitor_Ping, 0, null);
+
+            if (!IsConnected)
+            {
+                if (Connect(TIMEOUT_DEFAULT, true))
+                {
+                    return ConnectionSource;
+                }
+                else
+                {
+                    return ConnectionSource.Unknown;
+                }
+            }
+
+            IncomingMessage reply = PerformSyncRequest(Commands.c_Monitor_Ping, Flags.c_NoCaching, new byte[0]);
 
             if (reply != null)
             {
                 var connectionSource = reply.Payload as Commands.Monitor_Ping.Reply;
 
                 // update field
-                switch (connectionSource.Source)
+                _connectionSource = connectionSource.Source switch
                 {
-                    case Commands.Monitor_Ping.c_Ping_Source_NanoCLR:
-                        _connectionSource = ConnectionSource.nanoCLR;
-                        break;
-
-                    case Commands.Monitor_Ping.c_Ping_Source_NanoBooter:
-                        _connectionSource = ConnectionSource.nanoBooter;
-                        break;
-
-                    default:
-                        _connectionSource = ConnectionSource.Unknown;
-                        break;
-                }
+                    Commands.Monitor_Ping.c_Ping_Source_NanoCLR => ConnectionSource.nanoCLR,
+                    Commands.Monitor_Ping.c_Ping_Source_NanoBooter => ConnectionSource.nanoBooter,
+                    _ => ConnectionSource.Unknown,
+                };
 
-                return connectionSource;
+                return _connectionSource;
             }
 
-            return null;
+            return ConnectionSource.Unknown;
         }
 
         internal Converter CreateConverter()
@@ -709,12 +787,14 @@ internal Converter CreateConverter()
             return new Converter(Capabilities);
         }
 
-        public Task<uint> SendBufferAsync(byte[] buffer, TimeSpan waitTimeout, CancellationToken cancellationToken)
+        public int SendBuffer(byte[] buffer)
         {
-            return Task.Run(() =>
-            {
-                return _portDefinition.SendBufferAsync(buffer, waitTimeout, cancellationToken);
-            }, cancellationToken);
+            return _portDefinition.SendBuffer(buffer);
+        }
+
+        internal WireProtocolRequest FindRequest(Packet packet)
+        {
+            return _requestsStore.GetByReplyHeader(packet);
         }
 
         public bool ProcessMessage(IncomingMessage message, bool isReply)
@@ -754,7 +834,14 @@ public bool ProcessMessage(IncomingMessage message, bool isReply)
                                 Flags = (StopDebuggerOnConnect ? Commands.Monitor_Ping.c_Ping_DbgFlag_Stop : 0)
                             };
 
-                            PerformRequestAsync(new OutgoingMessage(_controlller.GetNextSequenceId(), message, _controlller.CreateConverter(), Flags.c_NonCritical, cmdReply), _backgroundProcessorCancellation.Token);
+                            PerformRequestAsync(
+                                new OutgoingMessage(
+                                    _controlller.GetNextSequenceId(),
+                                    message,
+                                    _controlller.CreateConverter(),
+                                    Flags.c_NonCritical,
+                                    cmdReply)
+                                );
 
                             // signal that a monitor ping was received
                             _pingEvent.Set();
@@ -778,24 +865,24 @@ public bool ProcessMessage(IncomingMessage message, bool isReply)
 
                     case Commands.c_Debugging_Messaging_Query:
                         Debug.Assert(message.Payload != null);
-                        Task.Factory.StartNew(() => RpcReceiveQuery(message, (Commands.Debugging_Messaging_Query)message.Payload), _backgroundProcessorCancellation.Token);
+                        Task.Factory.StartNew(() => RpcReceiveQuery(message, (Commands.Debugging_Messaging_Query)message.Payload));
                         break;
 
                     case Commands.c_Debugging_Messaging_Reply:
                         Debug.Assert(message.Payload != null);
-                        Task.Factory.StartNew(() => RpcReceiveReplyAsync(message, (Commands.Debugging_Messaging_Reply)message.Payload), _backgroundProcessorCancellation.Token);
+                        Task.Factory.StartNew(() => RpcReceiveReplyAsync(message, (Commands.Debugging_Messaging_Reply)message.Payload));
                         break;
 
                     case Commands.c_Debugging_Messaging_Send:
                         Debug.Assert(message.Payload != null);
-                        Task.Factory.StartNew(() => RpcReceiveSendAsync(message, (Commands.Debugging_Messaging_Send)message.Payload), _backgroundProcessorCancellation.Token);
+                        Task.Factory.StartNew(() => RpcReceiveSendAsync(message, (Commands.Debugging_Messaging_Send)message.Payload));
                         break;
                 }
             }
 
             if (_eventCommand != null)
             {
-                Task.Factory.StartNew(() => _eventCommand.Invoke(message, isReply), _backgroundProcessorCancellation.Token);
+                Task.Factory.StartNew(() => _eventCommand.Invoke(message, isReply));
 
                 return true;
             }
@@ -817,14 +904,13 @@ public void ProcessExited()
             _eventProcessExit?.Invoke(this, EventArgs.Empty);
         }
 
-        public Task<byte[]> ReadBufferAsync(uint bytesToRead, TimeSpan waitTimeout, CancellationToken cancellationToken)
+        public byte[] ReadBuffer(int bytesToRead)
         {
-            return Task.Run(() =>
-            {
-               return _portDefinition.ReadBufferAsync(bytesToRead, waitTimeout, cancellationToken);
-            }, cancellationToken);
+            return _portDefinition.ReadBuffer(bytesToRead);
         }
 
+        public int AvailableBytes => _portDefinition.AvailableBytes;
+
         private OutgoingMessage CreateMessage(uint cmd, uint flags, object payload)
         {
             return new OutgoingMessage(_controlller.GetNextSequenceId(), CreateConverter(), cmd, flags, payload);
@@ -834,40 +920,42 @@ public void StopProcessing()
         {
             _state.SetValue(EngineState.Value.Stopping, false);
 
-            m_evtShutdown.Set();
-
             if (_backgroundProcessor != null)
             {
-                _backgroundProcessorCancellation.Cancel();
-                _cancellationTokenSource.Cancel();
+                try
+                {
+                    _backgroundProcessor.Join(TimeSpan.FromSeconds(1));
+                    _backgroundProcessor.Abort();
+                }
+                catch
+                {
+                    // there are random issues with the cancellation tokens
+                }
+                finally
+                {
+                    Thread.Sleep(500);
+                    _backgroundProcessor = null;
+                }
             }
         }
 
         public void ResumeProcessing()
         {
-            m_evtShutdown.Reset();
-
             _state.SetValue(EngineState.Value.Resume, false);
 
-            if ((_backgroundProcessor != null && _backgroundProcessor.IsCompleted) ||
-                (_backgroundProcessor == null))
+            if (_backgroundProcessor == null)
             {
-                    _backgroundProcessor = Task.Factory.StartNew(() => IncomingMessagesListener(), _backgroundProcessorCancellation.Token, TaskCreationOptions.LongRunning, TaskScheduler.Current);
+                _backgroundProcessor = CreateThreadHelper(new ThreadStart( this.IncomingMessagesListener ));
             }
         }
 
-        public void Stop()
+        public void Stop(bool force = false)
         {
-            if (m_evtShutdown != null)
-            {
-                m_evtShutdown.Set();
-            }
-
             if (_state.SetValue(EngineState.Value.Stopping, false))
             {
                 StopProcessing();
 
-                //((IController)this).ClosePort();
+                Device.Disconnect(force);
 
                 _state.SetValue(EngineState.Value.Stopped, false);
             }
@@ -875,7 +963,7 @@ public void Stop()
 
         public bool IsRunning => _state.IsRunning;
 
-        #region RPC Support
+#region RPC Support
 
         // comment from original code REVIEW: Can this be refactored out of here to a separate class dedicated to RPC?
         internal class EndPointRegistration
@@ -1040,7 +1128,7 @@ private EndPointRegistration RpcFind(uint type, uint id, bool fOnlyServer)
             return null;
         }
 
-        private async Task RpcReceiveQuery(IncomingMessage message, Commands.Debugging_Messaging_Query query)
+        private void RpcReceiveQuery(IncomingMessage message, Commands.Debugging_Messaging_Query query)
         {
             Commands.Debugging_Messaging_Address addr = query.m_addr;
             EndPointRegistration eep = RpcFind(addr.m_to_Type, addr.m_to_Id, true);
@@ -1051,7 +1139,7 @@ private async Task RpcReceiveQuery(IncomingMessage message, Commands.Debugging_M
                 m_addr = addr
             };
 
-            await PerformRequestAsync(new OutgoingMessage(_controlller.GetNextSequenceId(), message, CreateConverter(), Flags.c_NonCritical, reply), _cancellationTokenSource.Token);
+            PerformRequestAsync(new OutgoingMessage(_controlller.GetNextSequenceId(), message, CreateConverter(), Flags.c_NonCritical, reply));
         }
 
         internal bool RpcCheck(Commands.Debugging_Messaging_Address addr)
@@ -1159,7 +1247,7 @@ private async Task RpcReceiveSendAsync(IncomingMessage msg, Commands.Debugging_M
                 m_addr = addr
             };
 
-            await PerformRequestAsync(new OutgoingMessage(_controlller.GetNextSequenceId(), msg, CreateConverter(), Flags.c_NonCritical, res), _cancellationTokenSource.Token);
+            await PerformRequestAsync(new OutgoingMessage(_controlller.GetNextSequenceId(), msg, CreateConverter(), Flags.c_NonCritical, res));
 
             if (eep != null)
             {
@@ -1217,7 +1305,7 @@ private async Task RpcReceiveReplyAsync(IncomingMessage message, Commands.Debugg
                 m_addr = addr
             };
 
-            await PerformRequestAsync(new OutgoingMessage(_controlller.GetNextSequenceId(), message, CreateConverter(), Flags.c_NonCritical, res), _cancellationTokenSource.Token);
+            await PerformRequestAsync(new OutgoingMessage(_controlller.GetNextSequenceId(), message, CreateConverter(), Flags.c_NonCritical, res));
 
             if (eep != null)
             {
@@ -1241,68 +1329,66 @@ internal uint RpcGetUniqueEndpointId()
             return _controlller.GetUniqueEndpointId();
         }
 
-        #endregion
+#endregion
 
 
-        internal async Task<WireProtocolRequest> RequestAsync(OutgoingMessage message, int timeout)
+        internal WireProtocolRequest AsyncRequest(OutgoingMessage message, int timeout)
         {
-            using (CancellationTokenSource cts = new CancellationTokenSource())
-            {
-                WireProtocolRequest request = new WireProtocolRequest(message, cts.Token);
+            WireProtocolRequest request = new WireProtocolRequest(message);
 
-                //Checking whether IsRunning and adding the request to m_requests
-                //needs to be atomic to avoid adding a request after the Engine
-                //has been stopped.
+            //Checking whether IsRunning and adding the request to m_requests
+            //needs to be atomic to avoid adding a request after the Engine
+            //has been stopped.
 
-                if (!IsRunning)
-                {
-                    return request;
-                }
-
-                _requestsStore.Add(request);
+            if (!IsRunning)
+            {
+                request.TaskCompletionSource.SetException(new InvalidOperationException());
+                return request;
+            }
 
-                try
+            try
+            {
+                if (request.PerformRequest(_controlller))
                 {
-                    await request.PerformRequestAsync(_controlller);
+                    _requestsStore.Add(request);
                 }
-                catch
-                {
-                    _requestsStore.Remove(message.Header);
+                else
+                { 
+                    // send failed...
+                    request.TaskCompletionSource.SetException(new InvalidOperationException());
                 }
-
-                return request;
             }
-        }
+            catch
+            {
+                throw;
+            }
 
-        /// <summary>
-        /// Global lock object for synchronizing message request. This ensures there is only one
-        /// outstanding request at any point of time. 
-        /// </summary>
-        internal object m_ReqSyncLock = new object();
+            return request;
+        }
 
-        private async Task<WireProtocolRequest> AsyncMessage(uint command, uint flags, object payload, int timeout)
-        {
-            OutgoingMessage msg = CreateMessage(command, flags, payload);
+        //private WireProtocolRequest AsyncMessage(uint command, uint flags, object payload, int timeout)
+        //{
+        //    OutgoingMessage msg = CreateMessage(command, flags, payload);
 
-            return await RequestAsync(msg, timeout);
-        }
+        //    return AsyncRequest(msg, timeout);
+        //}
 
-        private async Task<IncomingMessage> MessageAsync(uint command, uint flags, object payload, int timeout)
-        {
-            _ = await AsyncMessage(command, flags, payload, timeout);
+        //private IncomingMessage MessageAsync(uint command, uint flags, object payload, int timeout)
+        //{
+        //    _ = await AsyncMessage(command, flags, payload, timeout);
 
-            return null;
-        }
+        //    return null;
+        //}
 
-        private async Task<IncomingMessage> SyncMessageAsync(uint command, uint flags, object payload)
-        {
-            return await MessageAsync(command, flags, payload, TIMEOUT_DEFAULT);
-        }
+        //private async Task<IncomingMessage> SyncMessageAsync(uint command, uint flags, object payload)
+        //{
+        //    return await MessageAsync(command, flags, payload, DefaultTimeout);
+        //}
 
 
-        #region Commands implementation
+#region Commands implementation
 
-        public List<Commands.Monitor_MemoryMap.Range> GetMemoryMap()
+        private List<Commands.Monitor_MemoryMap.Range> GetMemoryMap()
         {
             Commands.Monitor_MemoryMap cmd = new Commands.Monitor_MemoryMap();
 
@@ -1375,11 +1461,8 @@ public TargetInfo GetMonitorTargetInfo()
             return null;
         }
 
-        public List<Commands.Monitor_FlashSectorMap.FlashSectorData> GetFlashSectorMap()
+        private List<Commands.Monitor_FlashSectorMap.FlashSectorData> GetFlashSectorMap()
         {
-            // TODO replace with token argument
-            CancellationTokenSource cancelTSource = new CancellationTokenSource();
-
             IncomingMessage reply = PerformSyncRequest(Commands.c_Monitor_FlashSectorMap, 0, null);
 
             if (reply != null)
@@ -1395,7 +1478,7 @@ public TargetInfo GetMonitorTargetInfo()
                 }
             }
 
-            return null;
+            return new List<Commands.Monitor_FlashSectorMap.FlashSectorData>();
         }
 
         private (byte[] Buffer, uint ErrorCode, bool Success) ReadMemory(uint address, uint length, uint offset)
@@ -1449,13 +1532,14 @@ public TargetInfo GetMonitorTargetInfo()
             int offset,
             int length,
             int programAligment = 0,
-            IProgress<string> progress = null)
+            int startLenght = 0,
+            int totalLenght = 0,
+            IProgress<MessageWithProgress> progress = null,
+            IProgress<string> log = null)
         {
             int count = length;
             int position = offset;
 
-            progress?.Report($"Deploying {length} bytes to device...");
-
             while (count > 0)
             {
                 Commands.Monitor_WriteMemory cmd = new Commands.Monitor_WriteMemory();
@@ -1481,7 +1565,8 @@ public TargetInfo GetMonitorTargetInfo()
                     if (!reply.IsPositiveAcknowledge() ||
                         (AccessMemoryErrorCodes)cmdReply.ErrorCode != AccessMemoryErrorCodes.NoError)
                     {
-                        progress?.Report($"Error writing to device @ 0x{address:X8} ({packetLength} bytes). Error code: {cmdReply.ErrorCode}.");
+                        progress?.Report(new MessageWithProgress(""));
+                        log?.Report($"Error writing to device @ 0x{address:X8} ({packetLength} bytes). Error code: {cmdReply.ErrorCode}.");
 
                         return ((AccessMemoryErrorCodes)cmdReply.ErrorCode, false);
                     }
@@ -1492,10 +1577,14 @@ public TargetInfo GetMonitorTargetInfo()
                 }
                 else
                 {
-                    progress?.Report($"Error writing to device @ 0x{address:X8} ({packetLength} bytes). Unknown error.");
+                    progress?.Report(new MessageWithProgress(""));
+                    log?.Report($"Error writing to device @ 0x{address:X8} ({packetLength} bytes). Unknown error.");
 
                     return (AccessMemoryErrorCodes.Unknown, false);
                 }
+
+                progress?.Report(new MessageWithProgress($"Deployed { startLenght + position }/{totalLenght} bytes...", (uint)(startLenght + position), (uint)totalLenght));
+                log?.Report($"Deployed { startLenght + position }/{ totalLenght } bytes.");
             }
 
             return (AccessMemoryErrorCodes.NoError, true);
@@ -1505,7 +1594,10 @@ public TargetInfo GetMonitorTargetInfo()
             uint address, 
             byte[] buf,
             int programAligment = 0,
-            IProgress<string> progress = null)
+            int startLenght = 0,
+            int totalLenght = 0,
+            IProgress<MessageWithProgress> progress = null,
+            IProgress<string> log = null)
         {
             return WriteMemory(
                 address,
@@ -1513,6 +1605,8 @@ public TargetInfo GetMonitorTargetInfo()
                 0,
                 buf.Length,
                 programAligment,
+                startLenght,
+                totalLenght,
                 progress);
         }
 
@@ -1544,7 +1638,9 @@ public bool CheckMemory(uint address, byte[] buf)
             return CheckMemory(address, buf, 0, buf.Length);
         }
 
-        public (AccessMemoryErrorCodes ErrorCode, bool Success) EraseMemory(uint address, uint length)
+        public (AccessMemoryErrorCodes ErrorCode, bool Success) EraseMemory(
+            uint address, 
+            uint length)
         {
             DebuggerEventSource.Log.EngineEraseMemory(address, length);
 
@@ -1660,12 +1756,13 @@ public void RebootDevice(
 
             try
             {
-                _pingEvent.Reset();
-
                 log?.Report($"Rebooting ({(RebootOptions)cmd.flags})");
+                
+                // reset event
+                _pingEvent.Reset();
 
-                // don't keep hopes too high on a reply from reboot request, so make it with a very short timeout
-                var reqResult = PerformSyncRequest(Commands.c_Monitor_Reboot, Flags.c_NoCaching, cmd, 500);
+                // don't keep hopes too high on a reply from reboot request
+                var reqResult = PerformSyncRequest(Commands.c_Monitor_Reboot, Flags.c_NoCaching, cmd);
 
                 if(reqResult != null)
                 {
@@ -1674,40 +1771,48 @@ public void RebootDevice(
                     log?.Report($"Reboot command executed {result}");
                 }
 
-                // if reboot options ends on a hard reboot, force connection state to disconnected
+                // if reboot options ends up on a hard reboot, force connection state to disconnected
+                // a Connect request has to happen after this
                 if (((RebootOptions)cmd.flags == RebootOptions.EnterNanoBooter) ||
                     ((RebootOptions)cmd.flags == RebootOptions.NormalReboot))
                 {
                     IsConnected = false;
                 }
+
+                var rebootTimeout = 3 * DefaultTimeout;
+
+                // wait for ping after reboot
+                log?.Report($"Waiting {rebootTimeout}ms for reboot...");
+
+                // make it 3x the default timeout
+                if(_pingEvent.WaitOne(rebootTimeout))
+                {
+                    log?.Report($"!! Device reboot confirmed !!");
+                }
                 else
                 {
-                    // wait for ping after reboot
-                    log?.Report($"Waiting for ping event...");
-
-                    if(_pingEvent.WaitOne(10000))
-                    {
-                        log?.Report($"Ping arrived!");
-                    }
-                    else
-                    {
-                        log?.Report($"No presence from device");
-                    }
+                    log?.Report($"ERROR: No activity detected from device after reboot...");
                 }
             }
+#if DEBUG
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"*** ERROR when waiting for reboot operation to complete {ex.Message}");
+            }
+#endif
             finally
             {
                 ThrowOnCommunicationFailure = fThrowOnCommunicationFailureSav;
             }
         }
 
-        public async Task<bool> ReconnectAsync(bool fSoftReboot, int timeout = 5000)
+        public bool Reconnect(bool fSoftReboot, int millisecondsTimeout = TIMEOUT_DEFAULT)
         {
-            if (!await ConnectAsync(
+            var timeout = millisecondsTimeout != TIMEOUT_DEFAULT ? millisecondsTimeout : DefaultTimeout;
+
+            if (!Connect(
                 timeout,
-                true,
-                3,
-                ConnectionSource.Unknown))
+                true))
             {
                 if (ThrowOnCommunicationFailure)
                 {
@@ -1745,7 +1850,9 @@ public Commands.DebuggingExecutionChangeConditions.State GetExecutionMode()
                 FlagsToReset = 0
             };
 
-            IncomingMessage reply = PerformSyncRequest(Commands.c_Debugging_Execution_ChangeConditions, Flags.c_NoCaching, cmd);
+            // need to use a reasonably larger timeout because the device could be sending boot PINGs after a reboot
+            // and a timeout too short will miss the reply
+            IncomingMessage reply = PerformSyncRequest(Commands.c_Debugging_Execution_ChangeConditions, Flags.c_NoCaching, cmd, 6000);
             if (reply != null)
             {
                 // need this to get DebuggingExecutionChangeConditions.State enum from raw value
@@ -1889,7 +1996,7 @@ public bool UnlockDevice(byte[] blob)
         //    return iar;
         //}
 
-        //public async Task<bool> UpgradeConnectionToSSL_End(IAsyncResult iar)
+        //public bool UpgradeConnectionToSSL_End(IAsyncResult iar)
         //{
         //    AsyncNetworkStream ans = ((IControllerLocal)m_ctrl).OpenPort() as AsyncNetworkStream;
 
@@ -2913,18 +3020,15 @@ private bool DeploymentExecuteIncremental(
             IProgress<MessageWithProgress> progress = null,
             IProgress<string> log = null)
         {
-            // get flash sector map from device
-            var flashSectorMap = GetFlashSectorMap();
-
             // check if we do have the map
-            if (flashSectorMap != null)
+            if (FlashSectorMap.Count != 0)
             {
                 // total size of assemblies to deploy 
                 int deployLength = assemblies.Sum(a => a.Length);
 
                 // build the deployment blob from the flash sector map
                 // apply a filter so that we take only the blocks flag for deployment 
-                var deploymentBlob = flashSectorMap.Where(s => (s.Flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_MASK) == Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_DEPLOYMENT)
+                var deploymentBlob = FlashSectorMap.Where(s => (s.Flags & Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_MASK) == Commands.Monitor_FlashSectorMap.c_MEMORY_USAGE_DEPLOYMENT)
                     .Select(s => s.ToDeploymentSector())
                     .ToList();
 
@@ -2999,6 +3103,7 @@ private bool DeploymentExecuteIncremental(
 
                 // get the block list to deploy (not empty)
                 var blocksToDeploy = deploymentBlob.ToDeploymentBlockList().FindAll(b => b.DeploymentData.Length > 0);
+                var deploymentSize = blocksToDeploy.Sum(b => b.DeploymentData.Length);
                 var deployedBytes = 0;
 
                 foreach (DeploymentBlock block in blocksToDeploy)
@@ -3006,10 +3111,14 @@ private bool DeploymentExecuteIncremental(
                     // check if skip erase step was requested
                     if(!skipErase)
                     {
+                        progress?.Report(new MessageWithProgress($"Erasing block @ 0x{block.StartAddress:X8}...", (uint)deployedBytes, (uint)deploymentSize));
                         log?.Report($"Erasing block @ 0x{block.StartAddress:X8}...");
 
                         // erase memory sector
-                        (AccessMemoryErrorCodes ErrorCode, bool Success) eraseMemoryResult = EraseMemory((uint)block.StartAddress, (uint)block.Size);
+                        (AccessMemoryErrorCodes ErrorCode, bool Success) eraseMemoryResult = EraseMemory(
+                            (uint)block.StartAddress,
+                            (uint)block.Size);
+
                         if (!eraseMemoryResult.Success)
                         {
                             log?.Report($"Error erasing device memory @ 0x{block.StartAddress:X8}.");
@@ -3026,7 +3135,15 @@ private bool DeploymentExecuteIncremental(
                     }
 
                     // block erased, write buffer
-                    (AccessMemoryErrorCodes ErrorCode, bool Success) writeMemoryResult = WriteMemory((uint)block.StartAddress, block.DeploymentData, block.ProgramAligment);
+                    (AccessMemoryErrorCodes ErrorCode, bool Success) writeMemoryResult = WriteMemory(
+                        (uint)block.StartAddress,
+                        block.DeploymentData,
+                        block.ProgramAligment,
+                        deployedBytes,
+                        deploymentSize,
+                        progress,
+                        log);
+
                     if (!writeMemoryResult.Success)
                     {
                         log?.Report($"Error writing to device memory @ 0x{block.StartAddress:X8} ({block.DeploymentData.Length} bytes).");
@@ -3044,25 +3161,17 @@ private bool DeploymentExecuteIncremental(
 #if DEBUG
                     if (System.Diagnostics.Debugger.IsAttached)
                     {
-                        // read back
-                        var memCopy = ReadMemory((uint)block.StartAddress, (uint)block.DeploymentData.Length, 0);
-                        Debug.Assert(memCopy.Success, "Failed reading data from device.");
-                        Debug.Assert(memCopy.Buffer.Length == block.DeploymentData.Length, "Comparison of data flashed to device and read back failed.");
-                        var comparer = new ArrayEqualityComparer<byte>();
-                        Debug.Assert(comparer.Equals(memCopy.Buffer, block.DeploymentData), "Comparison of data flashed to device and read back failed.");
+                        // check memory
+                        var memCheck = CheckMemory((uint)block.StartAddress, block.DeploymentData);
+                        Debug.Assert(memCheck, "Memory check Failed.");
                     }
 #endif
 
                     deployedBytes += block.DeploymentData.Length;
-
-                    // report progress
-                    progress?.Report(new MessageWithProgress($"Deployed { deployedBytes }/{ blocksToDeploy.Sum(b => b.DeploymentData.Length) } bytes...", (uint)deployedBytes, (uint)blocksToDeploy.Sum(b => b.DeploymentData.Length)));
-                    log?.Report($"Deployed { deployedBytes }/{ blocksToDeploy.Sum(b => b.DeploymentData.Length) } bytes.");
                 }
 
                 // report progress
                 progress?.Report(new MessageWithProgress(""));
-                log?.Report($"Deployed assemblies with a total size of {blocksToDeploy.Sum(b => b.DeploymentData.Length)} bytes.");
 
                 // deployment successful
                 return true;
@@ -3070,7 +3179,7 @@ private bool DeploymentExecuteIncremental(
 
             // invalid flash map
             progress?.Report(new MessageWithProgress(""));
-            log?.Report("Error retrieving device flash map.");
+            log?.Report("*** ERROR retrieving device flash map ***");
 
             return false;
         }
@@ -3157,11 +3266,23 @@ public bool DeploymentExecute(
         {
             bool deployedOK;
 
-            if (!PauseExecution())
+            var executionState = GetExecutionMode();
+
+            if(executionState == Commands.DebuggingExecutionChangeConditions.State.Unknown)
             {
+                log?.Report("*** ERROR: failed to get device execution state, aborting deployment ***");
                 return false;
             }
 
+            if (!executionState.IsDeviceInStoppedState())
+            {
+                if (!PauseExecution())
+                {
+                    log?.Report("*** ERROR: failed to pause execution in device, aborting deployment ***");
+                    return false;
+                }
+            }
+
             if (Capabilities.IncrementalDeployment)
             {
                 log?.Report("Incrementally deploying assemblies to the device");
@@ -3182,11 +3303,11 @@ public bool DeploymentExecute(
 
             if (!deployedOK)
             {
-                log?.Report("Error deploying assemblies to the device.");
+                log?.Report("*** ERROR deploying assemblies to the device ***");
             }
             else
             {
-                log?.Report("Assemblies successfully deployed to the device.");
+                log?.Report("Assemblies successfully deployed to the device");
 
                 if (rebootAfterDeploy)
                 {
@@ -3237,7 +3358,7 @@ private IncomingMessage DiscoverCLRCapability(uint capabilities)
                 m_caps = capabilities
             };
 
-            return PerformSyncRequest(Commands.c_Debugging_Execution_QueryCLRCapabilities, 0, cmd);
+            return PerformSyncRequest(Commands.c_Debugging_Execution_QueryCLRCapabilities, Flags.c_NoCaching, cmd);
         }
 
         private uint DiscoverCLRCapabilityAsUint(uint capabilities)
@@ -3266,6 +3387,7 @@ private uint DiscoverCLRCapabilityAsUint(uint capabilities)
 
         private CLRCapabilities.Capability DiscoverCLRCapabilityFlags()
         {
+            Debug.WriteLine("==============================");
             Debug.WriteLine("DiscoverCLRCapability");
 
             return (CLRCapabilities.Capability)DiscoverCLRCapabilityAsUint(Commands.Debugging_Execution_QueryCLRCapabilities.c_CapabilityFlags);
@@ -3273,6 +3395,7 @@ private CLRCapabilities.Capability DiscoverCLRCapabilityFlags()
 
         private CLRCapabilities.SoftwareVersionProperties DiscoverSoftwareVersionProperties()
         {
+            Debug.WriteLine("==============================");
             Debug.WriteLine("DiscoverSoftwareVersionProperties");
 
             IncomingMessage reply = DiscoverCLRCapability(Commands.Debugging_Execution_QueryCLRCapabilities.c_CapabilitySoftwareVersion);
@@ -3297,6 +3420,7 @@ private CLRCapabilities.SoftwareVersionProperties DiscoverSoftwareVersionPropert
 
         private CLRCapabilities.HalSystemInfoProperties DiscoverHalSystemInfoProperties()
         {
+            Debug.WriteLine("==============================");
             Debug.WriteLine("DiscoverHalSystemInfoProperties");
 
             IncomingMessage reply = DiscoverCLRCapability(Commands.Debugging_Execution_QueryCLRCapabilities.c_CapabilityHalSystemInfo);
@@ -3325,6 +3449,7 @@ private CLRCapabilities.HalSystemInfoProperties DiscoverHalSystemInfoProperties(
 
         private CLRCapabilities.ClrInfoProperties DiscoverClrInfoProperties()
         {
+            Debug.WriteLine("==============================");
             Debug.WriteLine("DiscoverClrInfoProperties");
 
             IncomingMessage reply = DiscoverCLRCapability(Commands.Debugging_Execution_QueryCLRCapabilities.c_CapabilityClrInfo);
@@ -3383,6 +3508,8 @@ private CLRCapabilities.TargetInfoProperties DiscoverTargetInfoProperties()
         /// <returns>A list of the native assemblies available in the target device</returns>
         private List<CLRCapabilities.NativeAssemblyProperties> DiscoveryInteropNativeAssemblies()
         {
+            const int maxRetryCount = 2;
+
             Commands.Debugging_Execution_QueryCLRCapabilities.NativeAssemblies nativeInteropAssemblies = new Commands.Debugging_Execution_QueryCLRCapabilities.NativeAssemblies();
             List<CLRCapabilities.NativeAssemblyProperties> nativeAssemblies = new List<CLRCapabilities.NativeAssemblyProperties>();
 
@@ -3396,6 +3523,8 @@ private CLRCapabilities.TargetInfoProperties DiscoverTargetInfoProperties()
                 if (reply.IsPositiveAcknowledge())
                 {
                     uint assemblyCount = 0;
+                    int retryCount = 0;
+                    bool batchSizeAdjusted = false;
 
                     if (reply.Payload is Commands.Debugging_Execution_QueryCLRCapabilities.Reply cmdReply && cmdReply.m_data != null)
                     {
@@ -3411,13 +3540,16 @@ private CLRCapabilities.TargetInfoProperties DiscoverTargetInfoProperties()
                             assemblyCount = reader.ReadUInt32();
 
                             // compute the assembly batch size that fits on target WP packet size
-                            var batchSize = WireProtocolPacketSize / Commands.Debugging_Execution_QueryCLRCapabilities.NativeAssemblyDetails.Size;
+                            uint batchSize = WireProtocolPacketSize / Commands.Debugging_Execution_QueryCLRCapabilities.NativeAssemblyDetails.Size;
                             uint index = 0;
 
                             while (index < assemblyCount)
                             {
                                 // get next batch
 
+                                // need to pause between requests
+                                Thread.Sleep(_InterRequestSleep);
+
                                 // encode batch request
                                 uint encodedRequest = batchSize << 24;
                                 encodedRequest += index << 16;
@@ -3449,20 +3581,66 @@ private CLRCapabilities.TargetInfoProperties DiscoverTargetInfoProperties()
                                                    );
 
                                             index += batchSize;
+
+                                            // reset retry counter
+                                            retryCount = 0;
                                         }
                                         else
                                         {
+                                            if (retryCount < maxRetryCount)
+                                            {
+                                                retryCount++;
+                                                // done here, try again
+                                                continue;
+                                            }
+
                                             return null;
                                         }
                                     }
                                     else
                                     {
+                                        if (retryCount < maxRetryCount)
+                                        {
+                                            retryCount++;
+
+                                            // done here, try again
+                                            continue;
+                                        }
+
                                         return null;
                                     }
                                 }
                                 else
                                 {
-                                    return null;
+                                    // check retry
+                                    if (retryCount < maxRetryCount)
+                                    {
+                                        retryCount++;
+                                    }
+                                    else
+                                    {
+                                        // check if batch size has been adjusted
+                                        if (!batchSizeAdjusted)
+                                        {
+                                            // adjust, if possible
+                                            if (batchSize > 1)
+                                            {
+                                                // set to half the current size
+                                                batchSize = (uint)Math.Floor(batchSize / 2.0);
+
+                                                batchSizeAdjusted = true;
+
+                                                // reset retry count
+                                                retryCount = 0;
+
+                                                // done here, try again
+                                                continue;
+                                            }
+                                        }
+
+                                        // nothing else to try, just quit
+                                        return null;
+                                    }
                                 }
                             }
 
@@ -3514,6 +3692,12 @@ private CLRCapabilities DiscoverCLRCapabilities(CancellationToken cancellationTo
                 return null;
             }
 
+            if(clrFlags == 0)
+            {
+                return null;
+            }
+            Thread.Sleep(_InterRequestSleep);
+
             var softwareVersion = DiscoverSoftwareVersionProperties();
             // check for cancellation request
             if (cancellationToken.IsCancellationRequested)
@@ -3523,6 +3707,12 @@ private CLRCapabilities DiscoverCLRCapabilities(CancellationToken cancellationTo
                 return null;
             }
 
+            if (softwareVersion.BuildDate == "")
+            {
+                return null;
+            }
+            Thread.Sleep(_InterRequestSleep);
+
             var halSysInfo = DiscoverHalSystemInfoProperties();
             // check for cancellation request
             if (cancellationToken.IsCancellationRequested)
@@ -3532,6 +3722,12 @@ private CLRCapabilities DiscoverCLRCapabilities(CancellationToken cancellationTo
                 return null;
             }
 
+            if (halSysInfo.halVendorInfo == "")
+            {
+                return null;
+            }
+            Thread.Sleep(_InterRequestSleep);
+
             var clrInfo = DiscoverClrInfoProperties();
             // check for cancellation request
             if (cancellationToken.IsCancellationRequested)
@@ -3541,6 +3737,12 @@ private CLRCapabilities DiscoverCLRCapabilities(CancellationToken cancellationTo
                 return null;
             }
 
+            if (clrInfo.clrVendorInfo == "")
+            {
+                return null;
+            }
+            Thread.Sleep(_InterRequestSleep);
+
             var solutionInfo = DiscoverTargetInfoProperties();
             // check for cancellation request
             if (cancellationToken.IsCancellationRequested)
@@ -3550,6 +3752,14 @@ private CLRCapabilities DiscoverCLRCapabilities(CancellationToken cancellationTo
                 return null;
             }
 
+            if (solutionInfo.TargetName == "")
+            {
+                return null;
+            }
+
+            Thread.Sleep(_InterRequestSleep);
+
+
             var nativeAssembliesInfo = DiscoveryInteropNativeAssemblies();
             // check for cancellation request
             if (cancellationToken.IsCancellationRequested)
@@ -3559,6 +3769,8 @@ private CLRCapabilities DiscoverCLRCapabilities(CancellationToken cancellationTo
                 return null;
             }
 
+            Thread.Sleep(_InterRequestSleep);
+
             // sanity check for NULL native assemblies
             if (nativeAssembliesInfo == null)
             {
@@ -3574,10 +3786,10 @@ public CLRCapabilities.TargetInfoProperties GetTargetInfo()
             return DiscoverTargetInfoProperties();
         }
 
-        #endregion
+#endregion
 
 
-        #region Device configuration methods
+#region Device configuration methods
 
         public DeviceConfiguration GetDeviceConfiguration(CancellationToken cancellationToken)
         {
@@ -4343,7 +4555,15 @@ private DeviceConfiguration.DeviceConfigurationOption GetDeviceConfigurationOpti
             }
         }
 
-    #endregion
+#endregion
 
+        private Thread CreateThreadHelper(ThreadStart ts)
+        {
+            Thread th = new Thread(ts);
+            th.IsBackground = true;
+            th.Start();
+
+            return th;
+        }
     }
 }
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/EngineState.cs b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/EngineState.cs
index 43f013c1..2c697cfd 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/EngineState.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/EngineState.cs
@@ -45,7 +45,8 @@ public bool SetValue(Value value, bool fThrow)
         {
             lock (SyncObject)
             {
-                if (_value == Value.Stopping && value == Value.Resume)
+                if ((_value == Value.Stopping || _value == Value.Stopped )
+                    && value == Value.Resume)
                 {
                     _value = Value.Started;
                     return true;
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/IController.cs b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/IController.cs
index 3368dfbd..df6de287 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/IController.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/IController.cs
@@ -23,6 +23,6 @@ public interface IController
 
         Converter CreateConverter();
 
-        Task<bool> SendAsync(MessageRaw raw, CancellationToken cancellationToken);
+        bool Send(MessageRaw raw);
     }
 }
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/IControllerHostLocal.cs b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/IControllerHostLocal.cs
index 4062349c..a102fac0 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/IControllerHostLocal.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/IControllerHostLocal.cs
@@ -5,8 +5,6 @@
 //
 
 using System;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace nanoFramework.Tools.Debugger.WireProtocol
 {
@@ -14,9 +12,11 @@ public interface IControllerHostLocal : IControllerHost
     {
         bool ProcessMessage(IncomingMessage msg, bool fReply);
 
-        Task<uint> SendBufferAsync(byte[] buffer, TimeSpan waitTimeout, CancellationToken cancellationToken);
+        int SendBuffer(byte[] buffer);
 
-        Task<byte[]> ReadBufferAsync(uint bytesToRead, TimeSpan waitTimeout, CancellationToken cancellationToken);
+        byte[] ReadBuffer(int bytesToRead);
+
+        int AvailableBytes { get; }
     }
 }
 
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/MessageReassembler.cs b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/MessageReassembler.cs
index 06609e0d..bda0e166 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/MessageReassembler.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/MessageReassembler.cs
@@ -16,29 +16,58 @@ public class MessageReassembler
     {
         public enum ReceiveState
         {
-            Idle = 0,
-            Initialize = 1,
-            WaitingForHeader = 2,
-            ReadingHeader = 3,
-            CompleteHeader = 4,
-            ReadingPayload = 5,
-            CompletePayload = 6,
+            Idle,
+            ExitingIdle,
+            Initialize,
+            WaitingForHeader,
+            ReadingHeader,
+            CompleteHeader,
+            ReadingPayload,
+            CompletePayload,
         }
 
+        // constants to use in the inactivity back-off calculation
+        private const int MaxBackoffTime = 500;
+        private const int BackoffTimeStep1 = (int)(MaxBackoffTime * 0.80);
+        private const int BackoffTimeStep2 = (int)(MaxBackoffTime * 0.40);
+        private const int BackoffTimeStep3 = (int)(MaxBackoffTime * 0.10);
+        private const int BackoffTimeStep4 = (int)(MaxBackoffTime * 0.05);
+
+        // constants to use the inactivity calculation
+        private const int MaxInactivityTime = 5000;
+        private const int MaxInactivityTimeStep1 = (int)(MaxInactivityTime * 0.75);
+        private const int MaxInactivityTimeStep2 = (int)(MaxInactivityTime * 0.25);
+        private const int MaxInactivityTimeStep3 = (int)(MaxInactivityTime * 0.05);
+        private const int MaxInactivityTimeStep4 = (int)(MaxInactivityTime * 0.01);
+
         private readonly byte[] _markerDebugger = Encoding.UTF8.GetBytes(Packet.MARKER_DEBUGGER_V1);
         private readonly byte[] _markerPacket = Encoding.UTF8.GetBytes(Packet.MARKER_PACKET_V1);
 
         private readonly Controller _parent;
         private ReceiveState _state;
+        private ReceiveState _previousState;
 
         private MessageRaw _messageRaw;
         private int _rawPos;
         private MessageBase _messageBase;
 
+        /// <summary>
+        /// Timeout for the ongoing operation.
+        /// </summary>
+        private DateTime _messageEventTimeout;
+
+        /// <summary>
+        /// Time stamp of the last activity (data received).
+        /// </summary>
+        private DateTime _lastActivityTimeStamp;
+
+        private DateTime _lastInactivityReport;
+
         public MessageReassembler(Controller parent)
         {
             _parent = parent;
             _state = ReceiveState.Initialize;
+            _lastActivityTimeStamp = DateTime.UtcNow;
         }
 
         public IncomingMessage GetCompleteMessage()
@@ -50,192 +79,352 @@ public IncomingMessage GetCompleteMessage()
         /// Essential Rx method. Drives state machine by reading data and processing it. This works in
         /// conjunction with NotificationThreadWorker [Tx].
         /// </summary>
-        public async Task ProcessAsync(CancellationToken cancellationToken)
+        public void Process()
         {
             int count;
             int bytesRead;
+            int sleepTime = 0;
 
-            // compute operation timeout here to ease reuse on calls bellow
-            TimeSpan operationTimeout = new TimeSpan(0,0,0,0, 1000);
+            var inactivityTime = (DateTime.UtcNow - _lastActivityTimeStamp);
 
-            try
+            // activity check, if not exiting idle state
+            if (_state != ReceiveState.ExitingIdle)
             {
-                // while cancellation is NOT requested
-                while (!cancellationToken.IsCancellationRequested)
+                // progressive back-off 
+                if (inactivityTime.TotalMilliseconds >= MaxInactivityTime)
+                {
+                    sleepTime = MaxBackoffTime;
+                }
+                else if (inactivityTime.TotalMilliseconds >= MaxInactivityTimeStep1)
+                {
+                    sleepTime = BackoffTimeStep1;
+                }
+                else if (inactivityTime.TotalMilliseconds >= MaxInactivityTimeStep2)
+                {
+                    sleepTime = BackoffTimeStep2;
+                }
+                else if (inactivityTime.TotalMilliseconds >= MaxInactivityTimeStep3)
                 {
-                    DebuggerEventSource.Log.WireProtocolReceiveState(_state);
+                    sleepTime = BackoffTimeStep3;
+                }
+                else if (inactivityTime.TotalMilliseconds >= MaxInactivityTimeStep4)
+                {
+                    sleepTime = BackoffTimeStep4;
+                }
+
+                if (sleepTime > 0)
+                {
+                    _previousState = _state;
+                    _state = ReceiveState.Idle;
 
-                    switch (_state)
+                    if (_lastInactivityReport == DateTime.MinValue)
                     {
-                        case ReceiveState.Initialize:
-                            _rawPos = 0;
+                        _lastInactivityReport = DateTime.UtcNow.AddSeconds(10);
+                    }
+                }
+            }
+            else
+            {
+                // restore previous state
+                _state = _previousState;
+            }
+
+            try
+            {
+                switch (_state)
+                {
+                    case ReceiveState.Idle:
 
-                            _messageBase = new MessageBase
+                        if (DateTime.UtcNow > _lastInactivityReport)
+                        {
+                            DebuggerEventSource.Log.WireProtocolReceiveState(_state, inactivityTime);
+
+                            // reset 
+                            _lastInactivityReport = DateTime.MinValue;
+                        }
+
+                        // sleep now
+                        Thread.Sleep(sleepTime);
+
+                        // restore previous state
+                        _state = ReceiveState.ExitingIdle;
+
+                        break;
+
+                    case ReceiveState.Initialize:
+
+                        DebuggerEventSource.Log.WireProtocolReceiveState(_state);
+
+                        _rawPos = 0;
+
+                        _messageBase = new MessageBase
+                        {
+                            Header = new Packet()
+                        };
+
+                        _messageRaw = new MessageRaw
+                        {
+                            Header = _parent.CreateConverter().Serialize(_messageBase.Header)
+                        };
+
+                        // reset event timeout
+                        _messageEventTimeout = DateTime.MinValue;
+
+                        _state = ReceiveState.WaitingForHeader;
+
+                        DebuggerEventSource.Log.WireProtocolReceiveState(_state);
+
+                        goto case ReceiveState.WaitingForHeader;
+
+                    case ReceiveState.WaitingForHeader:
+
+                        // try to read marker
+                        count = Packet.SIZE_OF_MARKER - _rawPos;
+
+                        bytesRead = _parent.ReadBuffer(_messageRaw.Header, _rawPos, count);
+
+                        _rawPos += bytesRead;
+
+                        // activity check
+                        if (bytesRead > 0)
+                        {
+                            _lastActivityTimeStamp = DateTime.UtcNow;
+                        }
+
+                        // loop trying to find the markers in the stream
+                        while (_rawPos > 0)
+                        {
+                            int flag_Debugger = ValidMarker(_markerDebugger);
+                            int flag_Packet = ValidMarker(_markerPacket);
+
+                            if (flag_Debugger == 1 || flag_Packet == 1)
                             {
-                                Header = new Packet()
-                            };
+                                _state = ReceiveState.ReadingHeader;
+                                
+                                DebuggerEventSource.Log.WireProtocolReceiveState(_state);
 
-                            _messageRaw = new MessageRaw
+                                goto case ReceiveState.ReadingHeader;
+                            }
+
+                            if (flag_Debugger == 0 || flag_Packet == 0)
                             {
-                                Header = _parent.CreateConverter().Serialize(_messageBase.Header)
-                            };
+                                break; 
+                            }
 
-                            _state = ReceiveState.WaitingForHeader;
-                            break;
+                            _parent.App.SpuriousCharacters(_messageRaw.Header, 0, 1);
 
-                        case ReceiveState.WaitingForHeader:
-                            count = _messageRaw.Header.Length - _rawPos;
+                            Array.Copy(_messageRaw.Header, 1, _messageRaw.Header, 0, --_rawPos);
+                        }
 
-                            // need to have a timeout to cancel the read task otherwise it may end up waiting forever for this to return
-                            // because we have an external cancellation token and the above timeout cancellation token, need to combine both
-                            bytesRead = await _parent.ReadBufferAsync(_messageRaw.Header, _rawPos, count, operationTimeout, cancellationToken);
+                        break;
 
-                            _rawPos += bytesRead;
+                    case ReceiveState.ReadingHeader:
+                        count = _messageRaw.Header.Length - _rawPos;
 
-                            // sanity check
-                            if (bytesRead != 32)
+                        // check timeout
+                        if(_messageEventTimeout == DateTime.MinValue)
+                        {
+                            _messageEventTimeout = DateTime.UtcNow.AddSeconds(5);
+                        }
+                        else
+                        {
+                            if(DateTime.UtcNow > _messageEventTimeout )
                             {
-                                // doesn't look like a header, better restart
+                                // quit receiving this packet, abort
                                 _state = ReceiveState.Initialize;
+
+                                DebuggerEventSource.Log.WireProtocolReceiveState(_state);
+
+                                Debug.WriteLine("*** TIMEOUT ERROR waiting for header. Initializing.");
+
                                 break;
                             }
+                        }
 
-                            while (_rawPos > 0)
-                            {
-                                int flag_Debugger = ValidMarker(_markerDebugger);
-                                int flag_Packet = ValidMarker(_markerPacket);
+                        bytesRead = _parent.ReadBuffer(_messageRaw.Header, _rawPos, count);
 
-                                if (flag_Debugger == 1 || flag_Packet == 1)
-                                {
-                                    _state = ReceiveState.ReadingHeader;
-                                    break;
-                                }
+                        _rawPos += bytesRead;
 
-                                if (flag_Debugger == 0 || flag_Packet == 0)
-                                {
-                                    break; // Partial match.
-                                }
-
-                                _parent.App.SpuriousCharacters(_messageRaw.Header, 0, 1);
+                        // activity check
+                        if (bytesRead > 0)
+                        {
+                            _lastActivityTimeStamp = DateTime.UtcNow;
+                        }
 
-                                Array.Copy(_messageRaw.Header, 1, _messageRaw.Header, 0, --_rawPos);
-                            }
+                        if (bytesRead != count)
+                        {
                             break;
+                        }
 
-                        case ReceiveState.ReadingHeader:
-                            count = _messageRaw.Header.Length - _rawPos;
+                        _state = ReceiveState.CompleteHeader;
 
-                            // need to have a timeout to cancel the read task otherwise it may end up waiting forever for this to return
-                            // because we have an external cancellation token and the above timeout cancellation token, need to combine both
-                            bytesRead = await _parent.ReadBufferAsync(_messageRaw.Header, _rawPos, count, operationTimeout, cancellationToken);
+                        DebuggerEventSource.Log.WireProtocolReceiveState(_state);
 
-                            _rawPos += bytesRead;
+                        goto case ReceiveState.CompleteHeader;
 
-                            if (bytesRead != count) break;
+                    case ReceiveState.CompleteHeader:
+                        try
+                        {
+                            _parent.CreateConverter().Deserialize(_messageBase.Header, _messageRaw.Header);
 
-                            _state = ReceiveState.CompleteHeader;
-                            break;
+                            var request = ((Engine)(_parent.App)).FindRequest(_messageBase.Header);
 
-                        case ReceiveState.CompleteHeader:
-                            try
-                            {
-                                _parent.CreateConverter().Deserialize(_messageBase.Header, _messageRaw.Header);
+                            DebuggerEventSource.Log.WireProtocolRxHeader(
+                                _messageBase.Header.CrcHeader,
+                                _messageBase.Header.CrcData,
+                                _messageBase.Header.Cmd,
+                                _messageBase.Header.Flags,
+                                _messageBase.Header.Seq,
+                                _messageBase.Header.SeqReply,
+                                _messageBase.Header.Size,
+                                request != null ? request.RequestTimestamp : DateTime.MinValue);
 
-                                if (VerifyHeader())
-                                {
-                                    DebuggerEventSource.Log.WireProtocolRxHeader(_messageBase.Header.CrcHeader, _messageBase.Header.CrcData, _messageBase.Header.Cmd, _messageBase.Header.Flags, _messageBase.Header.Seq, _messageBase.Header.SeqReply, _messageBase.Header.Size);
+                            
 
-                                    if (_messageBase.Header.Size != 0)
-                                    {
-                                        // sanity check for wrong size (can happen with CRC32 turned off)
-                                        if(_messageBase.Header.Size > 2048)
-                                        {
-                                            Debug.WriteLine("Invalid payload requested. Initializing.");
-
-                                            _state = ReceiveState.Initialize;
-                                        }
-                                        _messageRaw.Payload = new byte[_messageBase.Header.Size];
-                                        //reuse m_rawPos for position in header to read.
-                                        _rawPos = 0;
-
-                                        _state = ReceiveState.ReadingPayload;
-                                        break;
-                                    }
-                                    else
+                            if (VerifyHeader())
+                            {
+                                if (_messageBase.Header.Size != 0)
+                                {
+                                    // sanity check for wrong size (can happen with CRC32 turned off)
+                                    if(_messageBase.Header.Size > 2048)
                                     {
-                                        _state = ReceiveState.CompletePayload;
+                                        Debug.WriteLine("Invalid payload requested. Initializing.");
+
+                                        _state = ReceiveState.Initialize;
+
+                                        DebuggerEventSource.Log.WireProtocolReceiveState(_state);
+
                                         break;
                                     }
+
+                                    // setup buffer to read payload
+                                    _messageRaw.Payload = new byte[_messageBase.Header.Size];
+
+                                    // reset timeout
+                                    _messageEventTimeout = DateTime.MinValue;
+
+                                    //reuse _rawPos for position in header for reading
+                                    _rawPos = 0;
+
+                                    _state = ReceiveState.ReadingPayload;
+
+                                    DebuggerEventSource.Log.WireProtocolReceiveState(_state);
+
+                                    goto case ReceiveState.ReadingPayload;
+                                }
+                                else
+                                {
+                                    _state = ReceiveState.CompletePayload;
+
+                                    DebuggerEventSource.Log.WireProtocolReceiveState(_state);
+
+                                    goto case ReceiveState.CompletePayload;
                                 }
                             }
-                            catch (AggregateException)
-                            {
-                                throw;
-                            }
-                            catch (Exception e)
+                        }
+                        catch (AggregateException)
+                        {
+                            throw;
+                        }
+                        catch (Exception e)
+                        {
+                            Debug.WriteLine("Fault at payload de-serialization:\n\n{0}", e.ToString());
+                        }
+
+                        _state = ReceiveState.Initialize;
+
+                        DebuggerEventSource.Log.WireProtocolReceiveState(_state);
+
+                        break;
+
+                    case ReceiveState.ReadingPayload:
+                        count = _messageRaw.Payload.Length - _rawPos;
+
+                        // check timeout
+                        if (_messageEventTimeout == DateTime.MinValue)
+                        {
+                            _messageEventTimeout = DateTime.UtcNow.AddMilliseconds(500);
+                        }
+                        else
+                        {
+                            if (DateTime.UtcNow > _messageEventTimeout)
                             {
-                                Debug.WriteLine("Fault at payload de-serialization:\n\n{0}", e.ToString());
-                            }
+                                Debug.WriteLine($"*** TIMEOUT ERROR waiting for payload. Missing {count}/{_messageRaw.Payload.Length}. Initializing.");
 
-                            _state = ReceiveState.Initialize;
-                            break;
+                                // quit receiving this packet, abort
+                                _state = ReceiveState.Initialize;
 
-                        case ReceiveState.ReadingPayload:
-                            count = _messageRaw.Payload.Length - _rawPos;
+                                DebuggerEventSource.Log.WireProtocolReceiveState(_state);
 
-                            // need to have a timeout to cancel the read task otherwise it may end up waiting forever for this to return
-                            // because we have an external cancellation token and the above timeout cancellation token, need to combine both
-                            bytesRead = await _parent.ReadBufferAsync(_messageRaw.Payload, _rawPos, count, operationTimeout, cancellationToken);
+                                break;
+                            }
+                        }
 
-                            _rawPos += bytesRead;
+                        bytesRead = _parent.ReadBuffer(_messageRaw.Payload, _rawPos, count);
 
-                            if (bytesRead != count) break;
+                        _rawPos += bytesRead;
 
-                            _state = ReceiveState.CompletePayload;
+                        // activity check
+                        if (bytesRead > 0)
+                        {
+                            _lastActivityTimeStamp = DateTime.UtcNow;
+                        }
 
+                        if (bytesRead != count)
+                        {
                             break;
+                        }
 
-                        case ReceiveState.CompletePayload:
-                            if (VerifyPayload())
-                            {
-                                try
-                                {
-                                    bool fReply = (_messageBase.Header.Flags & Flags.c_Reply) != 0;
+                        _state = ReceiveState.CompletePayload;
 
-                                    if ((_messageBase.Header.Flags & Flags.c_NACK) != 0)
-                                    {
-                                        _messageRaw.Payload = null;
-                                    }
+                        DebuggerEventSource.Log.WireProtocolReceiveState(_state);
 
-                                    _parent.App.ProcessMessage(GetCompleteMessage(), fReply);
+                        goto case ReceiveState.CompletePayload;
 
-                                    // setup restart
-                                    _state = ReceiveState.Initialize;
-                                    return;
-                                }
-                                catch (AggregateException)
-                                {
-                                    throw;
-                                }
-                                catch (Exception e)
+                    case ReceiveState.CompletePayload:
+                        if (VerifyPayload())
+                        {
+                            try
+                            {
+                                bool fReply = (_messageBase.Header.Flags & Flags.c_Reply) != 0;
+
+                                if ((_messageBase.Header.Flags & Flags.c_NACK) != 0)
                                 {
-                                    Debug.WriteLine("Fault at payload de-serialization:\n\n{0}", e.ToString());
+                                    _messageRaw.Payload = null;
                                 }
+
+                                _parent.App.ProcessMessage(GetCompleteMessage(), fReply);
+
+                                // setup restart
+                                _state = ReceiveState.Initialize;
+
+                                DebuggerEventSource.Log.WireProtocolReceiveState(_state);
+
+                                return;
+                            }
+                            catch (AggregateException)
+                            {
+                                throw;
                             }
+                            catch (Exception ex)
+                            {
+                                Debug.WriteLine($"Fault at payload de-serialization:\n\n{ex.Message}");
+                            }
+                        }
 
-                            _state = ReceiveState.Initialize;
-                            break;
-                    }
-                }
+                        _state = ReceiveState.Initialize;
 
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    Debug.WriteLine($"---- cancelling message re-assembler ----");
+                        DebuggerEventSource.Log.WireProtocolReceiveState(_state);
+
+                        break;
                 }
             }
             catch
             {
-                Debug.WriteLine("*** EXCEPTION IN STATE MACHINE***");
+                _state = ReceiveState.Initialize;
+                
+                DebuggerEventSource.Log.WireProtocolReceiveState(_state);
+
                 throw;
             }
         }
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/OutgoingMessage.cs b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/OutgoingMessage.cs
index 25fe3187..4b0e95a8 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/OutgoingMessage.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/OutgoingMessage.cs
@@ -17,6 +17,10 @@ public class OutgoingMessage
 
         public object Payload => Base.Payload;
 
+        public bool NeedsReply =>
+                    !(((Header.Flags & Flags.c_NonCritical) == Flags.c_NonCritical) ||
+                    ((Header.Flags & Flags.c_Reply) == Flags.c_Reply));
+
         public OutgoingMessage(ushort sequenceId, Converter converter, uint command, uint flags, object payload)
         {
             _sequenceId = sequenceId;
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/TargetInfo.cs b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/TargetInfo.cs
index 4d7c52dc..988ec942 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/TargetInfo.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/TargetInfo.cs
@@ -55,7 +55,7 @@ public void PrepareForDeserialize(int size, byte[] data, Converter converter)
 
         public Version BooterVersion => _booterVersion.Version;
 
-        public Version ClrVersion => _clrVersion.Version;
+        public Version CLRVersion => _clrVersion.Version;
 
         public string Info
         {
@@ -111,7 +111,7 @@ public override string ToString()
                 output.AppendLine($"  Target:     {TargetName?.ToString()}");
                 output.AppendLine($"  Platform:   {PlatformName?.ToString()}");
                 output.AppendLine($"  nanoBooter: v{BooterVersion}");
-                output.AppendLine($"  nanoCLR:    v{ClrVersion}");
+                output.AppendLine($"  nanoCLR:    v{CLRVersion}");
                 output.AppendLine($"  Type:       {PlatformInfo}");
                 output.AppendLine();
 
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/WireProtocolRequest.cs b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/WireProtocolRequest.cs
index 31e92f34..146262d1 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/WireProtocolRequest.cs
+++ b/nanoFramework.Tools.DebugLibrary.Shared/WireProtocol/WireProtocolRequest.cs
@@ -14,27 +14,31 @@ namespace nanoFramework.Tools.Debugger.WireProtocol
     public class WireProtocolRequest
     {
         private readonly CommandEventHandler _callback;
+        private readonly int _timeout;
 
         public CancellationToken CancellationToken { get; }
         public TaskCompletionSource<IncomingMessage> TaskCompletionSource { get; }
 
-        public DateTimeOffset Expires { get; }
+        public DateTimeOffset Expires { get; private set; } = DateTime.MaxValue;
+
+        public DateTime RequestTimestamp { get; private set; }
+
         public OutgoingMessage OutgoingMessage { get; }
 
-        public WireProtocolRequest(OutgoingMessage outgoingMessage, CancellationToken cancellationToken, int millisecondsTimeout = 5000, CommandEventHandler callback = null)
+        public bool NeedsReply => OutgoingMessage.NeedsReply;
+
+        public WireProtocolRequest(OutgoingMessage outgoingMessage, int millisecondsTimeout = 5000, CommandEventHandler callback = null)
         {
             OutgoingMessage = outgoingMessage;
             _callback = callback;
 
-            // set TTL for the request
-            Expires = DateTime.Now.AddMilliseconds(millisecondsTimeout);
+            _timeout = millisecondsTimeout;
 
             // https://blogs.msdn.microsoft.com/pfxteam/2009/06/02/the-nature-of-taskcompletionsourcetresult/
             TaskCompletionSource = new TaskCompletionSource<IncomingMessage>();
-            CancellationToken = cancellationToken;
         }
 
-        internal async Task<bool> PerformRequestAsync(IController controller)
+        internal bool PerformRequest(IController controller)
         {
             Debug.WriteLine($"Performing request");
 
@@ -44,10 +48,30 @@ internal async Task<bool> PerformRequestAsync(IController controller)
                                             , OutgoingMessage.Base.Header.Flags
                                             , OutgoingMessage.Base.Header.Seq
                                             , OutgoingMessage.Base.Header.SeqReply
-                                            , OutgoingMessage.Base.Header.Size
-                                            );
+                                            , OutgoingMessage.Base.Header.Size);
+
+            if(controller.Send(OutgoingMessage.Raw))
+            {
+                // set TTL for the request
+                Expires = DateTime.UtcNow.AddMilliseconds(_timeout);
+
+                // store start time
+                RequestTimestamp = DateTime.Now;
+
+                return true;
+            }
+
+            return false;
+        }
+
+        internal void RequestAborted()
+        {
+            DebuggerEventSource.Log.WireProtocolTimeout(
+                OutgoingMessage.Base.Header.Cmd,
+                OutgoingMessage.Base.Header.Seq,
+                OutgoingMessage.Base.Header.SeqReply,
+                RequestTimestamp);
 
-            return await controller.SendAsync(OutgoingMessage.Raw, CancellationToken);
         }
     }
 }
diff --git a/nanoFramework.Tools.DebugLibrary.Shared/nanoFramework.Tools.DebugLibrary.Net.projitems b/nanoFramework.Tools.DebugLibrary.Shared/nanoFramework.Tools.DebugLibrary.Net.projitems
index eaee33c3..9bc21699 100644
--- a/nanoFramework.Tools.DebugLibrary.Shared/nanoFramework.Tools.DebugLibrary.Net.projitems
+++ b/nanoFramework.Tools.DebugLibrary.Shared/nanoFramework.Tools.DebugLibrary.Net.projitems
@@ -36,6 +36,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Exceptions\DeviceNotConnectedException.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Exceptions\RemotedException.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\CancellationTokenExtensions.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Extensions\ConditionsStateExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\DeviceConfigurationExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\FlashSectorDataExtensions.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Extensions\DeploymentSectorExtensions.cs" />
@@ -74,14 +75,15 @@
     <Compile Include="$(MSBuildThisFileDirectory)NFDevice\NanoSerialDevice.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Exceptions\NanoUserExitException.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)NFDevice\SrecParseResult.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)NFDevice\NanoUsbDevice.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)PortDefinitions\IPort.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)PortDefinitions\PortMessageBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)PortDefinitions\PortBase.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)PortSerial\DeviceWatcher.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)PortSerial\DeviceWatcherStatus.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)PortSerial\SerialDeviceInformation.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)PortSerial\SerialDeviceProperties.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)PortSerial\SerialPort.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)PortSerial\SerialPortManager.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)PortSerial\PortSerial.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)PortSerial\PortSerialManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Runtime\ReflectionDefinition.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Runtime\RunTimeValue.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Runtime\RuntimeValue_Array.cs" />
@@ -96,11 +98,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Runtime\RuntimeValue_ValueType.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SRecordFile.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SupportedUSBDevices\STM_Discovery4.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)PortUSB\EventHandlerForUsbDevice.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)PortUSB\UsbPort.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)PortUSB\UsbDeviceInformation.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)PortUSB\UsbDeviceProperties.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)PortUSB\UsbDeviceRequestType.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)WireProtocol\Commands.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)WireProtocol\ConnectionSource.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)WireProtocol\Controller.cs" />
diff --git a/nanoFramework.Tools.DebugLibrary.UWP/ApplicationException.cs b/nanoFramework.Tools.DebugLibrary.UWP/ApplicationException.cs
deleted file mode 100644
index 9d7f9a54..00000000
--- a/nanoFramework.Tools.DebugLibrary.UWP/ApplicationException.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// Portions Copyright (c) Microsoft Corporation.  All rights reserved.
-// See LICENSE file in the project root for full license information.
-//
-
-using System;
-
-namespace nanoFramework.Tools.Debugger
-{
-    internal class ApplicationException : Exception
-    {
-        public ApplicationException()
-        {
-        }
-
-        public ApplicationException(string message) : base(message)
-        {
-        }
-
-        public ApplicationException(string message, Exception innerException) : base(message, innerException)
-        {
-        }
-    }
-}
\ No newline at end of file
diff --git a/nanoFramework.Tools.DebugLibrary.UWP/BinaryFormatter.cs b/nanoFramework.Tools.DebugLibrary.UWP/BinaryFormatter.cs
deleted file mode 100644
index dbcb81b2..00000000
--- a/nanoFramework.Tools.DebugLibrary.UWP/BinaryFormatter.cs
+++ /dev/null
@@ -1,2250 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// Portions Copyright (c) Microsoft Corporation.  All rights reserved.
-// See LICENSE file in the project root for full license information.
-//
-
-using System;
-using System.Collections;
-using System.Diagnostics;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-
-namespace nanoFramework.Tools.Debugger
-{
-    [Flags()]
-    public enum SerializationFlags
-    {
-        //
-        // Keep in sync with Microsoft.SPOT.SerializationHints!!!!
-        //
-
-        Encrypted = 0x00000001,
-        Compressed = 0x00000002, // Value uses range compression (max 2^30 values).
-        Optional = 0x00000004, // If the value cannot be deserialized, skip it.
-        PointerNeverNull = 0x00000010,
-        ElementsNeverNull = 0x00000020,
-        FixedType = 0x00000100,
-        DemandTrusted = 0x00010000,
-    }
-
-    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Class, Inherited = true)]
-    public class SerializationHintsAttribute : Attribute
-    {
-        //
-        // Keep in sync with Microsoft.SPOT.SerializationHintsAttribute!!!!
-        //
-
-        public SerializationFlags Flags;
-        public int ArraySize; // -1 == extend to the end of the stream.
-        public int BitPacked;     // In bits.
-        public long RangeBias;
-        public ulong Scale;         // For time, it's in ticks.
-    }
-
-    internal enum ElementType : byte // KEEP IN SYNC WITH CLR_CorElementType!!
-    {
-        //
-        // This is based on CorElementType, but adds a few types for support of boxing/unboxing.
-        //
-        PELEMENT_TYPE_END = 0x0,
-        PELEMENT_TYPE_VOID = 0x1,
-        PELEMENT_TYPE_BOOLEAN = 0x2,
-        PELEMENT_TYPE_CHAR = 0x3,
-        PELEMENT_TYPE_I1 = 0x4,
-        PELEMENT_TYPE_U1 = 0x5,
-        PELEMENT_TYPE_I2 = 0x6,
-        PELEMENT_TYPE_U2 = 0x7,
-        PELEMENT_TYPE_I4 = 0x8,
-        PELEMENT_TYPE_U4 = 0x9,
-        PELEMENT_TYPE_I8 = 0xa,
-        PELEMENT_TYPE_U8 = 0xb,
-        PELEMENT_TYPE_R4 = 0xc,
-        PELEMENT_TYPE_R8 = 0xd,
-        PELEMENT_TYPE_STRING = 0xe,
-
-        // every type above PTR will be simple type
-        PELEMENT_TYPE_PTR = 0xf,      // PTR <type>
-        PELEMENT_TYPE_BYREF = 0x10,     // BYREF <type>
-
-        // Please use ELEMENT_TYPE_VALUETYPE. ELEMENT_TYPE_VALUECLASS is deprecated.
-        PELEMENT_TYPE_VALUETYPE = 0x11,     // VALUETYPE <class Token>
-        PELEMENT_TYPE_CLASS = 0x12,     // CLASS <class Token>
-
-        PELEMENT_TYPE_ARRAY = 0x14,     // MDARRAY <type> <rank> <bcount> <bound1> ... <lbcount> <lb1> ...
-
-        PELEMENT_TYPE_TYPEDBYREF = 0x16,     // This is a simple type.
-
-        PELEMENT_TYPE_I = 0x18,     // native integer size
-        PELEMENT_TYPE_U = 0x19,     // native unsigned integer size
-        PELEMENT_TYPE_FNPTR = 0x1B,     // FNPTR <complete sig for the function including calling convention>
-        PELEMENT_TYPE_OBJECT = 0x1C,     // Shortcut for System.Object
-        PELEMENT_TYPE_SZARRAY = 0x1D,     // Shortcut for single dimension zero lower bound array
-        // SZARRAY <type>
-
-        // This is only for binding
-        PELEMENT_TYPE_CMOD_REQD = 0x1F,     // required C modifier : E_T_CMOD_REQD <mdTypeRef/mdTypeDef>
-        PELEMENT_TYPE_CMOD_OPT = 0x20,     // optional C modifier : E_T_CMOD_OPT <mdTypeRef/mdTypeDef>
-
-        // This is for signatures generated internally (which will not be persisted in any way).
-        PELEMENT_TYPE_INTERNAL = 0x21,     // INTERNAL <typehandle>
-
-        // Note that this is the max of base type excluding modifiers
-        PELEMENT_TYPE_MAX = 0x22,     // first invalid element type
-        //
-        // End of overlap with CorElementType.
-        //
-    };
-
-    public class BinaryFormatter
-    {
-        internal const int TE_L1 = 2;
-        internal const uint TE_L1_Null = 0x00000000;
-        internal const uint TE_L1_Duplicate = 0x00000001; // N bits for the duplicate id.
-        internal const uint TE_L1_Reference = 0x00000002; // 32 bits for the type.
-        internal const uint TE_L1_Other = 0x00000003;
-
-        internal const int TE_L2 = 2;
-        internal const uint TE_L2_Primitive = 0x00000000; // 4 bits for the type.
-        internal const uint TE_L2_Array = 0x00000001;
-        internal const uint TE_L2_ArrayList = 0x00000002;
-        internal const uint TE_L2_Other = 0x00000003;
-
-        internal const int TE_L3 = 4;
-        internal const uint TE_L3_Type = 0x00000000; // 32 bits for the type.
-        internal const uint TE_L3_Method = 0x00000001; // 32 bits for the type, N bits for the signature??
-        internal const uint TE_L3_Field = 0x00000002; // 32 bits for the type, N bits for the signature??
-
-        internal const int TE_ElementType = 4;
-        internal const int TE_ArrayDepth = 4;
-
-        internal const uint INVALID_HASH_ENTRY = 0xffffffff;
-
-        struct TypeDescriptorBasic
-        {
-            internal const int c_Primitive = 0x00000001;
-            internal const int c_Interface = 0x00000002;
-            internal const int c_Class = 0x00000004;
-            internal const int c_ValueType = 0x00000008;
-            internal const int c_Enum = 0x00000010;
-            internal const int c_SemanticMask = 0x0000001F;
-
-            internal const int c_Array = 0x00010000;
-            internal const int c_ArrayList = 0x00020000;
-
-            internal Type m_referenceType;
-            internal ElementType m_et;
-            internal int m_flags;
-
-            internal void SetType(Type t)
-            {
-                m_referenceType = t;
-                m_et = ElementType.PELEMENT_TYPE_VOID;
-                m_flags = 0;
-
-                //
-                // Not supported for now.
-                //
-                if (t == typeof(RuntimeFieldHandle)) goto Failure;
-                if (t == typeof(RuntimeMethodHandle)) goto Failure;
-
-                if (t == typeof(System.Boolean)) m_et = ElementType.PELEMENT_TYPE_BOOLEAN;
-                else if (t == typeof(System.Char)) m_et = ElementType.PELEMENT_TYPE_CHAR;
-                else if (t == typeof(System.SByte)) m_et = ElementType.PELEMENT_TYPE_I1;
-                else if (t == typeof(System.Byte)) m_et = ElementType.PELEMENT_TYPE_U1;
-                else if (t == typeof(System.Int16)) m_et = ElementType.PELEMENT_TYPE_I2;
-                else if (t == typeof(System.UInt16)) m_et = ElementType.PELEMENT_TYPE_U2;
-                else if (t == typeof(System.Int32)) m_et = ElementType.PELEMENT_TYPE_I4;
-                else if (t == typeof(System.UInt32)) m_et = ElementType.PELEMENT_TYPE_U4;
-                else if (t == typeof(System.Int64)) m_et = ElementType.PELEMENT_TYPE_I8;
-                else if (t == typeof(System.UInt64)) m_et = ElementType.PELEMENT_TYPE_U8;
-                else if (t == typeof(System.Single)) m_et = ElementType.PELEMENT_TYPE_R4;
-                else if (t == typeof(System.Double)) m_et = ElementType.PELEMENT_TYPE_R8;
-                else if (t == typeof(System.String)) m_et = ElementType.PELEMENT_TYPE_STRING;
-
-                if (m_et == ElementType.PELEMENT_TYPE_VOID)
-                {
-                    if (t == typeof(System.Object)) { m_et = ElementType.PELEMENT_TYPE_OBJECT; }
-                    else if (t.GetTypeInfo().IsEnum) { m_et = ElementType.PELEMENT_TYPE_VALUETYPE; m_flags |= c_Enum; }
-                    else if (t.GetTypeInfo().IsValueType) { m_et = ElementType.PELEMENT_TYPE_VALUETYPE; m_flags |= c_ValueType; }
-                    else if (t.GetTypeInfo().IsInterface) { m_et = ElementType.PELEMENT_TYPE_CLASS; m_flags |= c_Interface; }
-                    else if (t.GetTypeInfo().IsClass) { m_et = ElementType.PELEMENT_TYPE_CLASS; m_flags |= c_Class; }
-                    else
-                    {
-                        goto Failure;
-                    }
-
-                    if (t.IsArray)
-                    {
-                        m_flags |= c_Array;
-                    }
-
-                    if (t == typeof(ArrayList))
-                    {
-                        m_flags |= c_ArrayList;
-                    }
-                }
-                else
-                {
-                    m_flags |= c_Primitive;
-                }
-
-                return;
-
-
-                Failure:
-                throw Error(String.Format("Unsupported type: {0}", t.FullName));
-            }
-
-            internal void SetType(ElementType et)
-            {
-                m_et = et;
-                m_flags = c_Primitive;
-
-                switch (m_et)
-                {
-                    case ElementType.PELEMENT_TYPE_BOOLEAN: m_referenceType = typeof(System.Boolean); break;
-                    case ElementType.PELEMENT_TYPE_CHAR: m_referenceType = typeof(System.Char); break;
-                    case ElementType.PELEMENT_TYPE_I1: m_referenceType = typeof(System.SByte); break;
-                    case ElementType.PELEMENT_TYPE_U1: m_referenceType = typeof(System.Byte); break;
-                    case ElementType.PELEMENT_TYPE_I2: m_referenceType = typeof(System.Int16); break;
-                    case ElementType.PELEMENT_TYPE_U2: m_referenceType = typeof(System.UInt16); break;
-                    case ElementType.PELEMENT_TYPE_I4: m_referenceType = typeof(System.Int32); break;
-                    case ElementType.PELEMENT_TYPE_U4: m_referenceType = typeof(System.UInt32); break;
-                    case ElementType.PELEMENT_TYPE_I8: m_referenceType = typeof(System.Int64); break;
-                    case ElementType.PELEMENT_TYPE_U8: m_referenceType = typeof(System.UInt64); break;
-                    case ElementType.PELEMENT_TYPE_R4: m_referenceType = typeof(System.Single); break;
-                    case ElementType.PELEMENT_TYPE_R8: m_referenceType = typeof(System.Double); break;
-                    case ElementType.PELEMENT_TYPE_STRING: m_referenceType = typeof(System.String); break;
-
-                    default: throw Error(String.Format("Invalid primitive type: {0}", m_et));
-                }
-            }
-
-            static internal int NumberOfBits(ElementType et)
-            {
-                switch (et)
-                {
-                    case ElementType.PELEMENT_TYPE_BOOLEAN: return 1;
-                    case ElementType.PELEMENT_TYPE_CHAR: return 16;
-                    case ElementType.PELEMENT_TYPE_I1: return 8;
-                    case ElementType.PELEMENT_TYPE_U1: return 8;
-                    case ElementType.PELEMENT_TYPE_I2: return 16;
-                    case ElementType.PELEMENT_TYPE_U2: return 16;
-                    case ElementType.PELEMENT_TYPE_I4: return 32;
-                    case ElementType.PELEMENT_TYPE_U4: return 32;
-                    case ElementType.PELEMENT_TYPE_I8: return 64;
-                    case ElementType.PELEMENT_TYPE_U8: return 64;
-                    case ElementType.PELEMENT_TYPE_R4: return 32;
-                    case ElementType.PELEMENT_TYPE_R8: return 64;
-                    case ElementType.PELEMENT_TYPE_STRING: return -1;
-                    default: return -2;
-                }
-            }
-
-            static internal bool IsSigned(ElementType et)
-            {
-                switch (et)
-                {
-                    case ElementType.PELEMENT_TYPE_BOOLEAN: return false;
-                    case ElementType.PELEMENT_TYPE_CHAR: return false;
-                    case ElementType.PELEMENT_TYPE_I1: return true;
-                    case ElementType.PELEMENT_TYPE_U1: return false;
-                    case ElementType.PELEMENT_TYPE_I2: return true;
-                    case ElementType.PELEMENT_TYPE_U2: return false;
-                    case ElementType.PELEMENT_TYPE_I4: return true;
-                    case ElementType.PELEMENT_TYPE_U4: return false;
-                    case ElementType.PELEMENT_TYPE_I8: return true;
-                    case ElementType.PELEMENT_TYPE_U8: return false;
-                    case ElementType.PELEMENT_TYPE_R4: return true;
-                    case ElementType.PELEMENT_TYPE_R8: return true;
-                    default: return false;
-                }
-            }
-
-            internal Type Type { get { return m_referenceType; } }
-
-            internal bool IsPrimitive { get { return (m_flags & c_Primitive) != 0; } }
-            internal bool IsInterface { get { return (m_flags & c_Interface) != 0; } }
-            internal bool IsClass { get { return (m_flags & c_Class) != 0; } }
-            internal bool IsValueType { get { return (m_flags & c_ValueType) != 0; } }
-            internal bool IsEnum { get { return (m_flags & c_Enum) != 0; } }
-
-            internal bool NeedsSignature
-            {
-                get
-                {
-                    return !IsPrimitive && !IsEnum && !IsValueType;
-                }
-            }
-
-            internal bool IsArray { get { return (m_flags & c_Array) != 0; } }
-            internal bool IsArrayList { get { return (m_flags & c_ArrayList) != 0; } }
-
-            internal bool IsSealed { get { return m_referenceType != null && m_referenceType.GetTypeInfo().IsSealed; } }
-
-            static internal Exception Error(string msg)
-            {
-                return new System.Runtime.Serialization.SerializationException(msg);
-            }
-        }
-
-        class TypeDescriptor
-        {
-            internal TypeDescriptorBasic m_base;
-            internal int m_arrayDepth = 0;
-            internal TypeDescriptorBasic m_arrayElement = new TypeDescriptorBasic();
-
-            internal TypeDescriptor(Type t)
-            {
-                if (t == null)
-                {
-                    throw new ArgumentException("Unknown type");
-                }
-
-                m_base.SetType(t);
-
-                if (m_base.IsArray)
-                {
-                    Type sub = t;
-
-                    while (sub.IsArray)
-                    {
-                        m_arrayDepth++;
-
-                        sub = sub.GetElementType();
-
-                        if (sub == null)
-                        {
-                            throw new ApplicationException("cannot load type");
-                        }
-                    }
-
-                    m_arrayElement.SetType(sub);
-                    return;
-                }
-            }
-
-            internal TypeDescriptor(ElementType et)
-            {
-                m_base.SetType(et);
-            }
-
-            internal TypeDescriptor(ElementType et, int depth)
-            {
-                m_base.m_et = et;
-                m_base.m_flags = TypeDescriptorBasic.c_Array;
-                m_arrayDepth = depth;
-            }
-
-            internal Type Type
-            {
-                get
-                {
-                    if (m_base.IsArray)
-                    {
-                        Type res = m_arrayElement.Type;
-                        int depth = m_arrayDepth;
-
-                        while (depth-- > 0)
-                        {
-                            res = Array.CreateInstance(res, 1).GetType();
-                        }
-
-                        return res;
-                    }
-
-                    return m_base.Type;
-                }
-            }
-        }
-
-        class TypeHandler
-        {
-            //
-            // Type of signatures:
-            //
-            // 1) NULL
-            //
-            //      Invalid for NeverNull
-            //
-            // 2) DUPLICATE <num>
-            //
-            //      Invalid for Sealed/FixedType + NeverNull
-            //
-            // 3) PRIMITIVE <et>
-            //
-            //      <et>      optional for FixedType
-            //      PRIMITIVE optional for FixedType + NeverNull
-            //
-            // 4) REFERENCE <type>
-            //
-            //      <type>    optional for Sealed/FixedType
-            //      REFERENCE optional for Sealed/FixedType + NeverNull
-            //
-            // 5) ARRAYLIST <length>
-            //
-            //      <length>  optional for FixedSize
-            //      ARRAYLIST optional for FixedType + NeverNull
-            //
-            // 6) ARRAY <depth> <baseType> <length>
-            //
-            //      <length>           optional for FixedSize
-            //      <depth> <baseType> optional for FixedType
-            //      ARRAY              optional for FixedType + NeverNull
-            //
-            // Always match type if FixedTyped is specified.
-            //
-            internal const int c_Signature_Header = 0x01;
-            internal const int c_Signature_Type = 0x02;
-            internal const int c_Signature_Length = 0x04;
-
-            internal const int c_Action_None = 0;
-            internal const int c_Action_ObjectData = 1;
-            internal const int c_Action_ObjectFields = 2;
-            internal const int c_Action_ObjectElements = 3;
-
-            readonly BinaryFormatter m_bf;
-
-            internal object m_value;
-            internal TypeDescriptor m_type;
-            internal SerializationHintsAttribute m_hints;
-
-            internal TypeDescriptor m_typeExpected;
-            internal Type m_typeForced;
-
-            internal TypeHandler(BinaryFormatter bf, SerializationHintsAttribute hints, TypeDescriptor expected)
-            {
-                m_bf = bf;
-
-                m_value = null;
-                m_type = null;
-                m_hints = hints;
-
-                m_typeExpected = expected;
-                m_typeForced = null;
-            }
-
-            internal void SetValue(object v)
-            {
-                if (v != null)
-                {
-                    Type t = v.GetType();
-
-                    if (t.GetTypeInfo().IsEnum || t.GetTypeInfo().IsPrimitive || (t.GetTypeInfo().Attributes & TypeAttributes.Serializable) != 0)
-                    {
-                        m_value = v;
-                        m_type = new TypeDescriptor(v.GetType());
-                    }
-                }
-            }
-
-            internal int SignatureRequirements()
-            {
-                int res = c_Signature_Header | c_Signature_Type | c_Signature_Length;
-
-                if (Hints_ArraySize != 0)
-                {
-                    res &= ~c_Signature_Length;
-                }
-
-                m_typeForced = null;
-
-                if (m_typeExpected != null)
-                {
-                    if (!m_typeExpected.m_base.NeedsSignature)
-                    {
-                        res = 0;
-                    }
-                    else
-                    {
-                        if (Hints_FixedType)
-                        {
-                            res &= ~c_Signature_Type;
-                        }
-                        else
-                        {
-                            TypeDescriptorBasic td;
-
-                            if (m_typeExpected.m_base.IsArray)
-                            {
-                                td = m_typeExpected.m_arrayElement;
-                            }
-                            else
-                            {
-                                td = m_typeExpected.m_base;
-                            }
-
-                            if (td.IsSealed)
-                            {
-                                res &= ~c_Signature_Type;
-                            }
-                        }
-                    }
-                }
-
-                if ((res & c_Signature_Type) == 0)
-                {
-                    m_typeForced = m_typeExpected.Type;
-
-                    if (Hints_PointerNeverNull)
-                    {
-                        res &= ~c_Signature_Header;
-                    }
-                }
-
-                return res;
-            }
-
-            internal bool Hints_PointerNeverNull { get { return (m_hints != null && (m_hints.Flags & SerializationFlags.PointerNeverNull) != 0); } }
-
-            internal bool Hints_FixedType { get { return (m_hints != null && (m_hints.Flags & SerializationFlags.FixedType) != 0); } }
-
-            internal int Hints_ArraySize { get { return m_hints == null ? 0 : m_hints.ArraySize; } }
-
-            internal int Hints_BitPacked { get { return m_hints == null ? 0 : m_hints.BitPacked; } }
-            internal long Hints_RangeBias { get { return m_hints == null ? 0 : m_hints.RangeBias; } }
-            internal ulong Hints_Scale { get { return m_hints == null ? 0 : m_hints.Scale; } }
-
-            internal int EmitSignature()
-            {
-                int mask = SignatureRequirements();
-
-                if ((mask & c_Signature_Type) == 0)
-                {
-                    if (m_value != null && m_value.GetType() != m_typeForced)
-                    {
-                        if (m_typeForced == typeof(Type) && m_value.GetType().GetTypeInfo().IsSubclassOf(m_typeForced))
-                        {
-                        }
-                        else
-                        {
-                            throw TypeDescriptorBasic.Error("FixedType violation");
-                        }
-                    }
-                }
-
-                if (m_value == null)
-                {
-                    if (mask == 0)
-                    {
-                        //
-                        // Special case for null strings (strings don't emit an hash): send a string of length -1.
-                        //
-                        if (m_typeExpected != null && m_typeExpected.m_base.m_et == ElementType.PELEMENT_TYPE_STRING)
-                        {
-                            WriteLine("NULL STRING");
-
-                            m_bf.WriteCompressedUnsigned(0xFFFFFFFF);
-                            return c_Action_None;
-                        }
-
-                        throw TypeDescriptorBasic.Error("NoSignature violation");
-                    }
-
-                    if (Hints_PointerNeverNull)
-                    {
-                        throw TypeDescriptorBasic.Error("PointerNeverNull violation");
-                    }
-
-                    WriteLine("NULL Pointer");
-
-                    m_bf.WriteBits(TE_L1_Null, TE_L1);
-                    return c_Action_None;
-                }
-
-                int idx = m_bf.SearchDuplicate(m_value);
-                if (idx != -1)
-                {
-                    //
-                    // No duplicates allowed for fixed-type objects.
-                    //
-                    if ((mask & c_Signature_Header) == 0)
-                    {
-                        throw TypeDescriptorBasic.Error("No duplicates for FixedType+PointerNeverNull!");
-                    }
-
-                    WriteLine("Duplicate: {0}", idx);
-
-                    m_bf.WriteBits(TE_L1_Duplicate, TE_L1);
-                    m_bf.WriteCompressedUnsigned((uint)idx);
-                    return c_Action_None;
-                }
-
-                EmitSignature_Inner(mask, m_type.m_base, m_type, m_value);
-
-                return c_Action_ObjectData;
-            }
-
-            private void EmitSignature_Inner(int mask, TypeDescriptorBasic td, TypeDescriptor tdBase, object v)
-            {
-                int sizeReal = -1;
-
-                if (td.Type.GetTypeInfo().IsSubclassOf(typeof(Type)))
-                {
-                    Type t = (Type)v;
-
-                    WriteLine("Reference: {0} {1}", mask, t.FullName);
-
-                    if ((mask & c_Signature_Header) != 0)
-                    {
-                        m_bf.WriteBits(TE_L1_Other, TE_L1);
-                        m_bf.WriteBits(TE_L2_Other, TE_L2);
-                        m_bf.WriteBits(TE_L3_Type, TE_L3);
-                    }
-                }
-                else if (td.IsPrimitive)
-                {
-                    WriteLine("Primitive: {0} {1}", mask, td.m_et);
-
-                    if ((mask & c_Signature_Header) != 0)
-                    {
-                        m_bf.WriteBits(TE_L1_Other, TE_L1);
-                        m_bf.WriteBits(TE_L2_Primitive, TE_L2);
-                    }
-
-                    if ((mask & c_Signature_Type) != 0)
-                    {
-                        m_bf.WriteBits((uint)td.m_et, TE_ElementType);
-                    }
-                }
-                else if (td.IsArray)
-                {
-                    Array arr = (Array)v;
-
-                    WriteLine("Array: Depth {0} {1}", mask, tdBase.m_arrayDepth);
-
-                    if ((mask & c_Signature_Header) != 0)
-                    {
-                        m_bf.WriteBits(TE_L1_Other, TE_L1);
-                        m_bf.WriteBits(TE_L2_Array, TE_L2);
-                    }
-
-                    if ((mask & c_Signature_Type) != 0)
-                    {
-                        m_bf.WriteBits((uint)tdBase.m_arrayDepth, TE_ArrayDepth);
-
-                        EmitSignature_Inner(c_Signature_Header | c_Signature_Type, tdBase.m_arrayElement, null, null);
-                    }
-
-                    WriteLine("Array: Size {0}", arr.Length);
-
-                    sizeReal = arr.Length;
-                }
-                else if (td.IsArrayList && v != null)
-                {
-                    ArrayList lst = (ArrayList)v;
-
-                    WriteLine("ArrayList: Size {0}", lst.Count);
-
-                    if ((mask & c_Signature_Header) != 0)
-                    {
-                        m_bf.WriteBits(TE_L1_Other, TE_L1);
-                        m_bf.WriteBits(TE_L2_ArrayList, TE_L2);
-                    }
-
-                    sizeReal = lst.Count;
-                }
-                else
-                {
-                    Type t;
-
-                    if (v != null) t = v.GetType();
-                    else t = td.Type;
-
-                    WriteLine("Reference: {0} {1}", mask, t.FullName);
-
-                    if ((mask & c_Signature_Header) != 0)
-                    {
-                        m_bf.WriteBits(TE_L1_Reference, TE_L1);
-                    }
-
-                    if ((mask & c_Signature_Type) != 0)
-                    {
-                        m_bf.WriteType(t);
-                    }
-                }
-
-                if (sizeReal != -1)
-                {
-                    if ((mask & c_Signature_Length) != 0)
-                    {
-                        int bitsMax = Hints_BitPacked;
-
-                        if (bitsMax != 0)
-                        {
-                            if (sizeReal >= (1 << bitsMax))
-                            {
-                                throw TypeDescriptorBasic.Error(String.Format("Array size outside range: Bits={0}", bitsMax));
-                            }
-
-                            m_bf.WriteBits((uint)sizeReal, bitsMax);
-                        }
-                        else
-                        {
-                            m_bf.WriteCompressedUnsigned((uint)sizeReal);
-                        }
-                    }
-                    else
-                    {
-                        int sizeExpected = Hints_ArraySize;
-
-                        if (sizeExpected > 0 && sizeExpected != sizeReal)
-                        {
-                            throw TypeDescriptorBasic.Error(String.Format("ArraySize violation: (Expected: {0} Got:{1})", sizeReal, sizeExpected));
-                        }
-                    }
-                }
-            }
-
-            internal int ReadSignature()
-            {
-                int mask = SignatureRequirements();
-
-                m_value = null;
-                m_type = (m_typeForced == null) ? null : new TypeDescriptor(m_typeForced);
-
-                if ((mask & c_Signature_Header) != 0)
-                {
-                    uint levelOne;
-                    uint levelTwo;
-                    uint levelThree;
-
-
-                    levelOne = m_bf.ReadBits(TE_L1);
-                    if (levelOne == TE_L1_Null)
-                    {
-                        if (Hints_PointerNeverNull)
-                        {
-                            throw TypeDescriptorBasic.Error("PointerNeverNull violation");
-                        }
-
-                        WriteLine("NULL Pointer");
-
-                        return c_Action_None;
-                    }
-                    else if (levelOne == TE_L1_Duplicate)
-                    {
-                        int idx = (int)m_bf.ReadCompressedUnsigned();
-
-                        m_value = m_bf.GetDuplicate(idx);
-                        m_type = new TypeDescriptor(m_value.GetType());
-
-                        WriteLine("Duplicate: {0}", idx);
-
-                        return c_Action_None;
-                    }
-                    else if (levelOne == TE_L1_Reference)
-                    {
-                        if ((mask & c_Signature_Type) != 0)
-                        {
-                            m_type = new TypeDescriptor(m_bf.ReadType());
-                        }
-
-                        WriteLine("Reference: {0}", m_type.Type.FullName);
-                    }
-                    else
-                    {
-                        levelTwo = m_bf.ReadBits(TE_L2);
-                        if (levelTwo == TE_L2_Primitive)
-                        {
-                            if ((mask & c_Signature_Type) != 0)
-                            {
-                                m_type = new TypeDescriptor((ElementType)m_bf.ReadBits(TE_ElementType));
-                            }
-
-                            WriteLine("Primitive: {0}", m_type.m_base.m_et);
-                        }
-                        else if (levelTwo == TE_L2_Array)
-                        {
-                            if ((mask & c_Signature_Type) != 0)
-                            {
-                                m_type = new TypeDescriptor(ElementType.PELEMENT_TYPE_CLASS, (int)m_bf.ReadBits(TE_ArrayDepth));
-
-                                WriteLine("Array: Depth {0}", m_type.m_arrayDepth);
-
-                                levelOne = m_bf.ReadBits(TE_L1);
-                                if (levelOne == TE_L1_Reference)
-                                {
-                                    m_type.m_arrayElement.SetType(m_bf.ReadType());
-                                }
-                                else if (levelOne == TE_L1_Other)
-                                {
-                                    levelTwo = m_bf.ReadBits(TE_L2);
-
-                                    if (levelTwo == TE_L2_Primitive)
-                                    {
-                                        m_type.m_arrayElement.SetType((ElementType)m_bf.ReadBits(TE_ElementType));
-                                    }
-                                    else
-                                    {
-                                        throw TypeDescriptorBasic.Error(String.Format("Unexpected Level2 value: {0}", levelTwo));
-                                    }
-                                }
-                                else
-                                {
-                                    throw TypeDescriptorBasic.Error(String.Format("Unexpected Level1 value: {0}", levelOne));
-                                }
-                            }
-                        }
-                        else if (levelTwo == TE_L2_ArrayList)
-                        {
-                            if ((mask & c_Signature_Type) != 0)
-                            {
-                                m_type = new TypeDescriptor(typeof(ArrayList));
-                            }
-                        }
-                        else if (levelTwo == TE_L2_Other)
-                        {
-                            levelThree = m_bf.ReadBits(TE_L3);
-                            if (levelThree == TE_L3_Type)
-                            {
-                                m_type = new TypeDescriptor(typeof(Type));
-                            }
-                            else
-                            {
-                                throw TypeDescriptorBasic.Error(String.Format("Unexpected Level3 value: {0}", levelThree));
-                            }
-                        }
-                    }
-                }
-
-                if (m_type.m_base.IsArray || m_type.m_base.IsArrayList)
-                {
-                    int len;
-
-                    if ((mask & c_Signature_Length) != 0)
-                    {
-                        int bitsMax = Hints_BitPacked;
-
-                        if (bitsMax != 0)
-                        {
-                            len = (int)m_bf.ReadBits(bitsMax);
-                        }
-                        else
-                        {
-                            len = (int)m_bf.ReadCompressedUnsigned();
-                        }
-                    }
-                    else
-                    {
-                        len = Hints_ArraySize;
-
-                        if (len == -1)
-                        {
-                            int bits = TypeDescriptorBasic.NumberOfBits(m_type.m_arrayElement.m_et);
-
-                            if (bits < 0)
-                            {
-                                throw TypeDescriptorBasic.Error("Only primitive types allowed for ArraySize = -1");
-                            }
-
-                            len = m_bf.BitsAvailable() / bits;
-                        }
-                    }
-
-                    if (m_type.m_base.IsArrayList)
-                    {
-                        m_value = new ArrayList(len);
-                    }
-                    else
-                    {
-                        m_value = Array.CreateInstance(m_type.Type.GetElementType(), len);
-
-                        WriteLine("Array: Size {0}", ((Array)m_value).Length);
-                    }
-                }
-                else
-                {
-                    if (m_type.Type == typeof(Type))
-                    {
-                        m_value = m_bf.ReadType();
-
-                        return c_Action_None;
-                    }
-
-                    if (m_type.Type == typeof(string))
-                    {
-                        m_value = null;
-                    }
-                    else
-                    {
-                        //m_value = System.Runtime.Serialization.FormatterServices.GetUninitializedObject(m_type.Type);
-                    }
-                }
-
-                return c_Action_ObjectData;
-            }
-
-            private int TrackObject()
-            {
-                if (m_type.m_base.IsArray || m_type.m_base.IsArrayList)
-                {
-                    m_bf.TrackDuplicate(m_value);
-
-                    return c_Action_ObjectElements;
-                }
-                else
-                {
-                    if (m_typeExpected == null || m_typeExpected.m_base.NeedsSignature)
-                    {
-                        m_bf.TrackDuplicate(m_value);
-                    }
-
-                    return c_Action_ObjectFields;
-                }
-            }
-
-            internal int EmitValue()
-            {
-                if (m_type.Type.GetTypeInfo().IsSubclassOf(typeof(Type)))
-                {
-                    m_bf.WriteType((Type)m_value);
-
-                    return c_Action_None;
-                }
-
-                ulong val;
-                int bits;
-                bool fSigned;
-
-                if (m_type.m_base.IsPrimitive)
-                {
-                    switch (m_type.m_base.m_et)
-                    {
-                        case ElementType.PELEMENT_TYPE_BOOLEAN: val = (bool)m_value ? 1UL : 0UL; break;
-                        case ElementType.PELEMENT_TYPE_CHAR: val = (char)m_value; break;
-                        case ElementType.PELEMENT_TYPE_I1: val = (ulong)(sbyte)m_value; break;
-                        case ElementType.PELEMENT_TYPE_U1: val = (byte)m_value; break;
-                        case ElementType.PELEMENT_TYPE_I2: val = (ulong)(short)m_value; break;
-                        case ElementType.PELEMENT_TYPE_U2: val = (ushort)m_value; break;
-                        case ElementType.PELEMENT_TYPE_I4: val = (ulong)(int)m_value; break;
-                        case ElementType.PELEMENT_TYPE_U4: val = (uint)m_value; break;
-                        case ElementType.PELEMENT_TYPE_I8: val = (ulong)(long)m_value; break;
-                        case ElementType.PELEMENT_TYPE_U8: val = (ulong)m_value; break;
-                        case ElementType.PELEMENT_TYPE_R4: val = BytesFromFloat((float)m_value); break;
-                        case ElementType.PELEMENT_TYPE_R8: val = BytesFromDouble((double)m_value); break;
-
-                        case ElementType.PELEMENT_TYPE_STRING:
-                            {
-                                byte[] buf = Encoding.UTF8.GetBytes((string)m_value);
-
-                                m_bf.WriteCompressedUnsigned((uint)buf.Length);
-                                m_bf.WriteArray(buf, 0, buf.Length);
-
-                                WriteLine("Value: STRING {0}", m_value);
-
-                                return c_Action_None;
-                            }
-
-                        default:
-                            throw TypeDescriptorBasic.Error("Bad primitive");
-                    }
-
-                    bits = TypeDescriptorBasic.NumberOfBits(m_type.m_base.m_et);
-                    fSigned = TypeDescriptorBasic.IsSigned(m_type.m_base.m_et);
-                }
-                else if (m_value is DateTime)
-                {
-                    val = (ulong)((DateTime)m_value).Ticks;
-                    bits = 64;
-                    fSigned = false;
-                }
-                else if (m_value is TimeSpan)
-                {
-                    val = (ulong)((TimeSpan)m_value).Ticks;
-                    bits = 64;
-                    fSigned = true;
-                }
-                else
-                {
-                    return TrackObject();
-                }
-
-                WriteLine("Value: NUM {0}", val);
-
-                if (Hints_BitPacked != 0) bits = Hints_BitPacked;
-
-                bool fValid = true;
-
-                val -= (ulong)Hints_RangeBias;
-
-                if (fSigned)
-                {
-                    long valS = (long)val;
-
-                    if (Hints_Scale != 0) valS /= (long)Hints_Scale;
-
-                    if (bits != 64)
-                    {
-                        long maxVal = (1L << (bits - 1)) - 1;
-
-                        fValid = (valS <= maxVal) && (valS >= -maxVal - 1);
-                    }
-
-                    val = (ulong)valS;
-                }
-                else
-                {
-                    ulong valU = val;
-
-                    if (Hints_Scale != 0) valU /= Hints_Scale;
-
-                    if (bits != 64)
-                    {
-                        ulong maxVal = (1UL << bits) - 1;
-
-                        fValid = (valU <= maxVal);
-                    }
-
-                    val = valU;
-                }
-
-                if (!fValid)
-                {
-                    throw TypeDescriptorBasic.Error(String.Format("Value outside range: Bits={0} Bias={1} Scale={2}", bits, Hints_RangeBias, Hints_Scale));
-                }
-
-                m_bf.WriteBitsLong(val, bits);
-
-                return c_Action_None;
-            }
-
-            internal int ReadValue()
-            {
-                ulong val;
-                int bits;
-                bool fSigned;
-
-                if (m_type.m_base.IsPrimitive)
-                {
-                    if (m_type.m_base.m_et == ElementType.PELEMENT_TYPE_STRING)
-                    {
-                        uint len = m_bf.ReadCompressedUnsigned();
-
-                        if (len == 0xFFFFFFFF)
-                        {
-                            m_value = null;
-                        }
-                        else
-                        {
-                            byte[] buf = new byte[len];
-
-                            m_bf.ReadArray(buf, 0, (int)len);
-
-                            m_value = Encoding.UTF8.GetString(buf);
-                        }
-
-                        WriteLine("Value: STRING {0}", m_value);
-
-                        return c_Action_None;
-                    }
-
-                    bits = TypeDescriptorBasic.NumberOfBits(m_type.m_base.m_et);
-                    fSigned = TypeDescriptorBasic.IsSigned(m_type.m_base.m_et);
-
-                    if (bits < 0)
-                    {
-                        throw TypeDescriptorBasic.Error("Bad primitive");
-                    }
-                }
-                else if (m_type.Type == typeof(DateTime))
-                {
-                    bits = 64;
-                    fSigned = false;
-                }
-                else if (m_type.Type == typeof(TimeSpan))
-                {
-                    bits = 64;
-                    fSigned = true;
-                }
-                else
-                {
-                    return TrackObject();
-                }
-
-                if (Hints_BitPacked != 0) bits = Hints_BitPacked;
-                val = m_bf.ReadBitsLong(bits);
-
-                if (fSigned)
-                {
-                    long valS;
-
-                    if (bits != 64)
-                    {
-                        valS = (long)(val << (64 - bits));
-                        val = (ulong)(valS >> (64 - bits));
-                    }
-
-                    valS = (long)val;
-
-                    if (Hints_Scale != 0) valS *= (long)Hints_Scale;
-
-                    val = (ulong)valS;
-                }
-                else
-                {
-                    ulong valU;
-
-                    if (bits != 64)
-                    {
-                        valU = val << (64 - bits);
-                        val = valU >> (64 - bits);
-                    }
-
-                    valU = val;
-
-                    if (Hints_Scale != 0) valU *= Hints_Scale;
-
-                    val = valU;
-                }
-
-                val += (ulong)Hints_RangeBias;
-
-                WriteLine("Value: NUM {0}", val);
-
-                if (m_type.Type == typeof(DateTime))
-                {
-                    m_value = new DateTime((long)val);
-                }
-                else if (m_type.Type == typeof(TimeSpan))
-                {
-                    m_value = new TimeSpan((long)val);
-                }
-                else
-                {
-                    switch (m_type.m_base.m_et)
-                    {
-                        case ElementType.PELEMENT_TYPE_BOOLEAN: m_value = val != 0; break;
-                        case ElementType.PELEMENT_TYPE_CHAR: m_value = (char)val; break;
-                        case ElementType.PELEMENT_TYPE_I1: m_value = (sbyte)val; break;
-                        case ElementType.PELEMENT_TYPE_U1: m_value = (byte)val; break;
-                        case ElementType.PELEMENT_TYPE_I2: m_value = (short)val; break;
-                        case ElementType.PELEMENT_TYPE_U2: m_value = (ushort)val; break;
-                        case ElementType.PELEMENT_TYPE_I4: m_value = (int)val; break;
-                        case ElementType.PELEMENT_TYPE_U4: m_value = (uint)val; break;
-                        case ElementType.PELEMENT_TYPE_I8: m_value = (long)val; break;
-                        case ElementType.PELEMENT_TYPE_U8: m_value = val; break;
-                        case ElementType.PELEMENT_TYPE_R4: m_value = FloatFromBytes(val); break;
-                        case ElementType.PELEMENT_TYPE_R8: m_value = DoubleFromBytes(val); break;
-                    }
-                }
-
-                return c_Action_None;
-            }
-
-            unsafe float FloatFromBytes(ulong val)
-            {
-                float ret = 0.0f;
-
-                if (m_bf.m_capabilities.FloatingPoint)
-                {
-                    uint val2 = (uint)val;
-
-                    uint* ptr = &val2;
-
-                    ret = *(float*)ptr;
-                }
-                else
-                {
-                    ret = ((float)val) / 1024;
-                }
-
-                return ret;
-            }
-
-            unsafe double DoubleFromBytes(ulong val)
-            {
-                double ret = 0.0;
-
-                if (m_bf.m_capabilities.FloatingPoint)
-                {
-                    ulong* ptr = &val;
-
-                    ret = *(double*)ptr;
-                }
-                else
-                {
-                    ret = ((double)val) / 65536;
-                }
-
-                return ret;
-            }
-
-            unsafe ulong BytesFromFloat(float val)
-            {
-                ulong ret = 0;
-
-                if (m_bf.m_capabilities.FloatingPoint)
-                {
-                    float* ptr = &val;
-
-                    ret = *(uint*)ptr;
-                }
-                else
-                {
-                    ret = (ulong)(long)(val * 1024);
-                }
-
-                return ret;
-            }
-
-            unsafe ulong BytesFromDouble(double val)
-            {
-                ulong ret = 0;
-
-                if (m_bf.m_capabilities.FloatingPoint)
-                {
-                    double* ptr = &val;
-
-                    ret = *(ulong*)ptr;
-                }
-                else
-                {
-                    ret = (ulong)(long)(val * 65536);
-                }
-
-                return ret;
-            }
-        }
-
-        class State
-        {
-            readonly BinaryFormatter m_parent;
-            State m_next = null;
-            State m_prev = null;
-
-            bool m_value_NeedProcessing = true;
-            readonly TypeHandler m_value;
-
-            bool m_fields_NeedProcessing = false;
-            Type m_fields_CurrentClass = null;
-            FieldInfo[] m_fields_Fields = null;
-            int m_fields_CurrentField = 0;
-
-            bool m_array_NeedProcessing = false;
-            Type m_array_ExpectedType = null;
-            int m_array_CurrentPos = 0;
-            int m_array_LastPos = 0;
-
-            internal State(BinaryFormatter parent, SerializationHintsAttribute hints, Type t)
-            {
-                WriteLine("New State: {0}", t != null ? t.FullName : "<null>");
-
-                TypeDescriptor td = (t != null) ? new TypeDescriptor(t) : null;
-
-                m_parent = parent;
-                m_value = new TypeHandler(parent, hints, td);
-            }
-
-            State CreateInstance(SerializationHintsAttribute hints, Type t)
-            {
-                State next = new State(m_parent, hints, t);
-
-                m_next = next;
-                next.m_prev = this;
-
-                return next;
-            }
-
-            void GetValue()
-            {
-                State prev = m_prev;
-                object o = null;
-
-                if (prev == null)
-                {
-                    o = m_parent.m_value;
-                }
-                else
-                {
-                    if (prev.m_fields_NeedProcessing)
-                    {
-                        o = prev.m_fields_Fields[prev.m_fields_CurrentField - 1].GetValue(prev.m_value.m_value);
-                    }
-
-                    if (prev.m_array_NeedProcessing)
-                    {
-                        if (prev.m_value.m_type.m_base.IsArrayList)
-                        {
-                            ArrayList lst = (ArrayList)prev.m_value.m_value;
-
-                            o = lst[prev.m_array_CurrentPos - 1];
-                        }
-                        else
-                        {
-                            Array arr = (Array)prev.m_value.m_value;
-
-                            o = arr.GetValue(prev.m_array_CurrentPos - 1);
-                        }
-                    }
-                }
-
-                WriteLine("New Object: {0}", o != null ? o.GetType().FullName : "<null>");
-
-                m_value.SetValue(o);
-            }
-
-            State SetValueAndDestroyInstance()
-            {
-                State prev = m_prev;
-
-                if (prev == null)
-                {
-                    if (m_parent.m_fDeserialize)
-                    {
-                        m_parent.m_value = m_value.m_value;
-                    }
-                }
-                else
-                {
-                    if (m_parent.m_fDeserialize)
-                    {
-                        object o = m_value.m_value;
-
-                        if (prev.m_fields_NeedProcessing)
-                        {
-                            prev.m_fields_Fields[prev.m_fields_CurrentField - 1].SetValue(prev.m_value.m_value, o);
-                        }
-
-                        if (prev.m_array_NeedProcessing)
-                        {
-                            if (prev.m_value.m_type.m_base.IsArrayList)
-                            {
-                                ArrayList lst = (ArrayList)prev.m_value.m_value;
-
-                                lst.Add(o);
-                            }
-                            else
-                            {
-                                Array arr = (Array)prev.m_value.m_value;
-
-                                arr.SetValue(o, prev.m_array_CurrentPos - 1);
-                            }
-                        }
-                    }
-
-                    prev.m_next = null;
-                }
-
-                return prev;
-            }
-
-            internal State Advance()
-            {
-                if (m_value_NeedProcessing)
-                {
-                    int res;
-
-                    m_value_NeedProcessing = false;
-
-                    if (m_parent.m_fDeserialize)
-                    {
-                        res = m_value.ReadSignature();
-                    }
-                    else
-                    {
-                        GetValue();
-
-                        res = m_value.EmitSignature();
-                    }
-
-                    if (res != TypeHandler.c_Action_None)
-                    {
-                        object o;
-
-                        if (m_parent.m_fDeserialize)
-                        {
-                            res = m_value.ReadValue();
-                        }
-                        else
-                        {
-                            res = m_value.EmitValue();
-                        }
-
-                        o = m_value.m_value;
-
-                        switch (res)
-                        {
-                            case TypeHandler.c_Action_None:
-                                break;
-
-                            case TypeHandler.c_Action_ObjectFields:
-                                {
-                                    m_fields_NeedProcessing = true;
-                                    m_fields_CurrentClass = o.GetType();
-                                    m_fields_Fields = null;
-                                    break;
-                                }
-
-                            case TypeHandler.c_Action_ObjectElements:
-                                {
-                                    m_array_NeedProcessing = true;
-                                    m_array_CurrentPos = 0;
-
-                                    if (o is ArrayList)
-                                    {
-                                        ArrayList lst = (ArrayList)o;
-
-                                        m_array_ExpectedType = null;
-                                        m_array_LastPos = m_parent.m_fDeserialize ? lst.Capacity : lst.Count;
-                                    }
-                                    else
-                                    {
-                                        Array arr = (Array)o;
-
-                                        m_array_ExpectedType = arr.GetType().GetElementType();
-                                        m_array_LastPos = arr.Length;
-                                    }
-
-                                    break;
-                                }
-
-                            default:
-                                throw new System.Runtime.Serialization.SerializationException();
-                        }
-                    }
-                }
-
-                if (m_fields_NeedProcessing)
-                {
-                    return AdvanceToTheNextField();
-                }
-
-                if (m_array_NeedProcessing)
-                {
-                    return AdvanceToTheNextElement();
-                }
-
-                return SetValueAndDestroyInstance();
-            }
-
-            private State AdvanceToTheNextField()
-            {
-                while (m_fields_CurrentClass != null)
-                {
-                    if (m_fields_Fields == null)
-                    {
-                        m_fields_Fields = m_fields_CurrentClass.GetFields(BindingFlags.DeclaredOnly | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
-                        m_fields_CurrentField = 0;
-                    }
-
-                    if (m_fields_CurrentField < m_fields_Fields.Length)
-                    {
-                        FieldInfo f = m_fields_Fields[m_fields_CurrentField++];
-
-                        if ((f.Attributes & FieldAttributes.NotSerialized) == 0)
-                        {
-                            SerializationHintsAttribute hints;
-
-                            if (m_value.m_type.m_base.IsEnum)
-                            {
-                                hints = m_value.m_hints;
-                            }
-                            else
-                            {
-                                hints = GetHints(f);
-                            }
-
-                            WriteLine("Field: {0} {1}", f.Name, f.FieldType);
-
-                            return CreateInstance(hints, f.FieldType);
-                        }
-                    }
-                    else
-                    {
-                        m_fields_CurrentClass = m_fields_CurrentClass.GetTypeInfo().BaseType;
-                        m_fields_Fields = null;
-                    }
-                }
-
-                return SetValueAndDestroyInstance();
-            }
-
-            private State AdvanceToTheNextElement()
-            {
-                if (m_array_CurrentPos++ < m_array_LastPos)
-                {
-                    SerializationHintsAttribute hints;
-
-                    if (m_value.m_hints != null && (m_value.m_hints.Flags & (SerializationFlags.FixedType | SerializationFlags.PointerNeverNull)) != 0)
-                    {
-                        hints = new SerializationHintsAttribute();
-
-                        hints.BitPacked = 0;
-                        hints.Flags = m_value.m_hints.Flags & (SerializationFlags.FixedType | SerializationFlags.PointerNeverNull);
-                    }
-                    else
-                    {
-                        hints = null;
-                    }
-
-                    return CreateInstance(hints, m_array_ExpectedType);
-                }
-
-                return SetValueAndDestroyInstance();
-            }
-        }
-
-        static private bool s_fOnlySerializableObjects = false;
-        static private Hashtable s_htLookupType;
-        static private Hashtable s_htLookupHash;
-        static private ArrayList s_lstProcessedAssemblies;
-
-        BitStream m_stream;
-        State m_first;
-        object m_value;
-        bool m_fDeserialize;
-        readonly CLRCapabilities m_capabilities;
-
-        readonly Hashtable m_htDuplicates = new Hashtable();
-        readonly ArrayList m_lstObjects = new ArrayList();
-
-        public BinaryFormatter(CLRCapabilities capabilities)
-        {
-            if (capabilities == null) capabilities = new CLRCapabilities();
-
-            m_capabilities = capabilities;
-        }
-
-        public BinaryFormatter() : this(null)
-        {
-        }
-
-        private void Initialize(Type t, bool fDeserialize)
-        {
-            m_first = new State(this, BuildHints(t), t);
-            m_fDeserialize = fDeserialize;
-            m_htDuplicates.Clear();
-            m_lstObjects.Clear();
-        }
-
-        private void InitializeForSerialization(Type t, object o)
-        {
-            m_stream = new BitStream();
-            m_value = o;
-            Initialize(t, false);
-        }
-
-        private void InitializeForDeserialization(Type t, byte[] data, int pos, int len)
-        {
-            m_stream = new BitStream(data, pos, len);
-            m_value = null;
-            Initialize(t, true);
-        }
-
-        private SerializationHintsAttribute BuildHints(Type t)
-        {
-            if (t == null) return null;
-
-            SerializationHintsAttribute hints = new SerializationHintsAttribute();
-
-            hints.Flags = SerializationFlags.FixedType | SerializationFlags.PointerNeverNull;
-
-            return hints;
-        }
-
-        static BinaryFormatter()
-        {
-            Reset();
-        }
-
-        static public void Initialize()
-        {
-            Initialize(false);
-        }
-
-        static public void Initialize(bool fOnlySerializableObjects)
-        {
-            s_fOnlySerializableObjects = fOnlySerializableObjects;
-
-            Reset();
-            MonitorAssemblies = true;
-            //LoadTypesFromAppDomain();
-        }
-
-        static public void Reset()
-        {
-            s_htLookupType = new Hashtable();
-            s_htLookupHash = new Hashtable();
-            s_lstProcessedAssemblies = new ArrayList();
-
-            AddType(typeof(RemotedException));
-        }
-
-        static public bool MonitorAssemblies
-        {
-            set
-            {
-                //AssemblyLoadEventHandler handler = new AssemblyLoadEventHandler(LoadTypesFromAssembly);
-
-                if (value)
-                {
-                    //AppDomain.CurrentDomain.AssemblyLoad += handler;
-                }
-                else
-                {
-                    //AppDomain.CurrentDomain.AssemblyLoad -= handler;
-                }
-            }
-        }
-
-        //static private void LoadTypesFromAssembly(object sender, AssemblyLoadEventArgs args)
-        //{
-        //    LoadTypeFromAssembly(args.LoadedAssembly);
-        //}
-
-        //static public void LoadTypesFromAppDomain()
-        //{
-        //    foreach (Assembly assm in AppDomain.CurrentDomain.GetAssemblies())
-        //    {
-        //        LoadTypeFromAssembly(assm);
-
-        //        foreach (AssemblyName assmName in assm.GetReferencedAssemblies())
-        //        {
-        //            LoadTypeFromAssembly(Assembly.Load(assmName));
-        //        }
-        //    }
-        //}
-
-
-        //static public void LoadTypeFromAssembly(Assembly assm)
-        //{
-        //    if (s_lstProcessedAssemblies.Contains(assm) == false)
-        //    {
-        //        s_lstProcessedAssemblies.Add(assm);
-
-        //        foreach (Type t in assm.GetTypes())
-        //        {
-        //            if (s_fOnlySerializableObjects && t.GetTypeInfo().IsSerializable == false) continue;
-
-        //            AddType(t);
-        //        }
-        //    }
-        //}
-
-        //static public void LoadAllAssembliesFromDirectory(string dir)
-        //{
-        //    try
-        //    {
-        //        DirectoryInfo di = new DirectoryInfo(dir);
-
-        //        foreach (FileInfo fi in di.GetFiles())
-        //        {
-        //            try
-        //            {
-        //                if (fi.Name.EndsWith(".dll") && fi.Name != "mscorlib.dll")
-        //                {
-        //                    Assembly.LoadFrom(fi.FullName);
-        //                }
-        //            }
-        //            catch
-        //            {
-        //            }
-        //        }
-        //    }
-        //    catch
-        //    {
-        //    }
-        //}
-
-        static internal void PopulateFromTypeForce(Type t)
-        {
-            LookupHash(t);
-        }
-
-        static public void PopulateFromType(Type t)
-        {
-            LookupHash(t);
-        }
-
-        static public void PopulateFromAssembly(Assembly assm)
-        {
-            foreach (Type t in assm.GetTypes())
-            {
-                LookupHash(t);
-            }
-        }
-
-        static public Hashtable GetAllTypeHashes()
-        {
-            return (Hashtable)s_htLookupHash.Clone();
-        }
-
-        static private void ConvertObject(object dst, object src)
-        {
-            BindingFlags bindingFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic;
-            FieldInfo[] fi = src.GetType().GetFields(bindingFlags);
-            for (int iField = 0; iField < fi.Length; iField++)
-            {
-                FieldInfo fieldSrc = fi[iField];
-
-                FieldInfo fieldDst = dst.GetType().GetField(fieldSrc.Name, bindingFlags);
-
-                if (fieldSrc.FieldType == typeof(Type))
-                {
-                    continue;
-                }
-
-                if (fieldDst == null)
-                {
-                    Debug.Assert(false, "ConvertObject Incompatibility");
-                    continue;
-                }
-
-                object valSrc = fieldSrc.GetValue(src);
-                object valDst = null;
-
-                if ((fieldSrc.FieldType.GetTypeInfo().IsValueType || fieldSrc.FieldType.GetTypeInfo().IsEnum) && (!fieldSrc.FieldType.GetTypeInfo().IsPrimitive))
-                {
-                    valDst = fieldDst.GetValue(dst);
-
-                    ConvertObject(valDst, valSrc);
-                }
-                else
-                {
-                    valDst = valSrc;
-                }
-
-                fieldDst.SetValue(dst, valDst);
-            }
-        }
-
-        static public SerializationHintsAttribute GetHints(MemberInfo mi)
-        {
-            SerializationHintsAttribute hintsDst = null;
-
-            if (mi != null)
-            {
-                //In order to break the dependency between Microsoft.SPOT.Debugger and Microsoft.SPOT.Native
-                //SerializationHintsAttribute class is defined in both places. 
-                //Microsoft.SPOT.Debugger.SerializationHintsAttribute needs to remain backwards compatible with 
-                //Microsoft.SPOT.SerializationHintsAttribute.  This method converts the attributes applied to a 
-                //client assembly with Native class to the debugger class.
-
-
-                var lst = mi.GetCustomAttributes(false);
-                bool fFoundSerializationHints = false;
-
-                for (int iAttr = 0; iAttr < lst.Count(); iAttr++)
-                {
-                    object hintsSrc = lst.ElementAt(iAttr);
-
-                    if (hintsSrc.GetType().FullName == "Microsoft.SPOT.SerializationHintsAttribute")
-                    {
-                        if (fFoundSerializationHints)
-                        {
-                            throw new NotSupportedException("Only one attribute per type!");
-                        }
-
-                        fFoundSerializationHints = true;
-
-                        hintsDst = new SerializationHintsAttribute();
-
-                        ConvertObject(hintsDst, hintsSrc);
-                    }
-                }
-            }
-
-            return hintsDst;
-        }
-
-        public byte[] Serialize(object o)
-        {
-            return Serialize(null, o);
-        }
-
-        public object Deserialize(byte[] v)
-        {
-            return Deserialize(null, v, 0, v.Length);
-        }
-
-        public object Deserialize(Type t, byte[] v)
-        {
-            return Deserialize(t, v, 0, v.Length);
-        }
-
-        public byte[] Serialize(Type t, object o)
-        {
-            InitializeForSerialization(t, o);
-
-            State current = m_first;
-
-            while (current != null)
-            {
-                current = current.Advance();
-            }
-
-            return m_stream.ToArray();
-        }
-
-        private object Deserialize(Type t, byte[] v, int pos, int len)
-        {
-            InitializeForDeserialization(t, v, pos, len);
-
-            State current = m_first;
-
-            while (current != null)
-            {
-                current = current.Advance();
-            }
-
-            return m_value;
-        }
-
-        void TrackDuplicate(object o)
-        {
-            if (o is Type) return;
-
-            m_htDuplicates[o] = m_htDuplicates.Count;
-            m_lstObjects.Add(o);
-        }
-
-        int SearchDuplicate(object o)
-        {
-            if (o is Type) return -1;
-
-            if (!m_htDuplicates.Contains(o)) return -1;
-
-            return (int)m_htDuplicates[o];
-        }
-
-        object GetDuplicate(int idx)
-        {
-            return m_lstObjects[idx];
-        }
-
-        static internal void AddType(Type t)
-        {
-            if (t == null) return;
-
-            if (s_htLookupHash.Contains(t)) return;
-
-            //Ok, this is really evil. But it's this or 800 exceptions trying to load assemblies through BF.Initialize            
-            //This is for dealing with generics                        
-            if (t.FullName.IndexOf('`') >= 0) return;
-            //Lots of autogenerated code to ignore
-            if (t.FullName.StartsWith("Microsoft.Internal.Deployment")) return;
-            if (t.FullName == "ThisAssembly") return;
-            if (t.FullName == "AssemblyRef") return;
-            if (t.FullName.StartsWith("<PrivateImplementationDetails>")) return;
-
-            AddTypeCore(t);
-
-            AddType(t.GetElementType());
-            AddType(t.GetTypeInfo().BaseType);
-
-            foreach (FieldInfo f in t.GetFields(BindingFlags.DeclaredOnly | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic))
-            {
-                if ((f.Attributes & FieldAttributes.NotSerialized) != 0) continue;
-
-                AddType(f.FieldType);
-            }
-        }
-        
-        static private void AddTypeCore(Type t)
-        {
-            try
-            {
-                uint hash = 0;
-
-                //
-                // Handling of special cases.
-                //
-                if (t == typeof(ArrayList))
-                {
-                    hash = 0xEDDD427F;
-                }
-                else
-                {
-                    hash = ComputeHashForType(t, 0);
-                }
-
-                Type tExists = s_htLookupType[hash] as Type;
-                if (tExists != null)
-                {
-                    string error = string.Format("Hash conflict: 0x{0:x8} {1}", hash, t.AssemblyQualifiedName, tExists.AssemblyQualifiedName);
-                    WriteLine(error);
-
-                    throw new ApplicationException(error);
-                }
-
-                WriteLine("Hash: 0x{0:x8} {1}", hash, t.FullName);
-
-                s_htLookupType[hash] = t;
-                s_htLookupHash[t] = hash;
-            }
-            catch
-            {
-                WriteLine("AddType failed: {0}", t.FullName);
-                s_htLookupHash[t] = INVALID_HASH_ENTRY;
-            }
-        }
-
-        static public Type LookupType(uint hash)
-        {
-            Type t = s_htLookupType[hash] as Type;
-
-            return t;
-        }
-
-        static public uint LookupHash(Type t)
-        {
-            object o = s_htLookupHash[t];
-            if (o == null)
-            {
-                AddType(t);
-
-                o = s_htLookupHash[t];
-            }
-
-            if (o == null)
-            {
-                throw new System.Runtime.Serialization.SerializationException();
-            }
-
-            return (uint)o;
-        }
-
-        static public uint LookupAssemblyHash(Assembly assm)
-        {
-            AssemblyName name = assm.GetName();
-
-            return LookupAssemblyHash(name.Name, name.Version);
-        }
-
-        static public uint LookupAssemblyHash(string assemblyName, Version version)
-        {
-            uint hash;
-
-            hash = ComputeHashForName(assemblyName, 0);
-            hash = ComputeHashForUShort((ushort)version.Major, hash);
-            hash = ComputeHashForUShort((ushort)version.Minor, hash);
-            hash = ComputeHashForUShort((ushort)version.Build, hash);
-            hash = ComputeHashForUShort((ushort)version.Revision, hash);
-
-            return hash;
-        }
-
-        private static uint ComputeHashForType(Type t, uint hash)
-        {
-            hash = ComputeHashForName(t.FullName, hash);
-
-            while (t != null)
-            {
-                foreach (FieldInfo f in t.GetFields(BindingFlags.DeclaredOnly | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic))
-                {
-                    if ((f.Attributes & FieldAttributes.NotSerialized) != 0) continue;
-
-                    hash = ComputeHashForField(f, hash);
-                }
-
-                t = t.GetTypeInfo().BaseType;
-            }
-
-            return hash;
-        }
-
-        private static uint ComputeHashForField(FieldInfo f, uint hash)
-        {
-            Type t = f.FieldType;
-            TypeDescriptor td;
-            TypeDescriptorBasic tdSub;
-            string name = f.Name;
-
-            //
-            // Special case for core types that have different representation on client and server.
-            //
-            if (f.DeclaringType == typeof(MemberInfo))
-            {
-                if (name == "m_cachedData") return hash;
-            }
-
-            if (f.DeclaringType == typeof(DateTime))
-            {
-                if (name == "ticks") name = "m_ticks";
-
-                if (name == "dateData")
-                {
-                    name = "m_ticks";
-                    t = typeof(System.Int64);
-                }
-            }
-
-            if (f.DeclaringType == typeof(TimeSpan))
-            {
-                if (name == "_ticks") name = "m_ticks";
-            }
-
-            td = new TypeDescriptor(t);
-
-            if (td.m_base.IsArray)
-            {
-                int depth = td.m_arrayDepth;
-                while (depth-- > 0)
-                {
-                    hash = ComputeHashForType(ElementType.PELEMENT_TYPE_SZARRAY, hash);
-                }
-
-                tdSub = td.m_arrayElement;
-            }
-            else
-            {
-                tdSub = td.m_base;
-            }
-
-            hash = ComputeHashForType(tdSub.m_et, hash);
-
-            switch (tdSub.m_et)
-            {
-                case ElementType.PELEMENT_TYPE_CLASS:
-                case ElementType.PELEMENT_TYPE_VALUETYPE:
-                    hash = ComputeHashForName(tdSub.Type.FullName, hash);
-                    break;
-            }
-
-            hash = ComputeHashForName(name, hash);
-
-            return hash;
-        }
-
-        private static uint ComputeHashForType(ElementType et, uint hash)
-        {
-            uint hashPost = CRC.ComputeCRC((byte)et, hash);
-
-            return hashPost;
-        }
-
-        private static uint ComputeHashForName(string s, uint hash)
-        {
-            uint hashPost = CRC.ComputeCRC(Encoding.UTF8.GetBytes(s), hash);
-
-            return hashPost;
-        }
-
-        private static uint ComputeHashForUShort(ushort val, uint hash)
-        {
-            hash = CRC.ComputeCRC((byte)(val >> 0), hash);
-            hash = CRC.ComputeCRC((byte)(val >> 8), hash);
-
-            return hash;
-        }
-
-        [Conditional("TRACE_SERIALIZATION")]
-        static public void WriteLine(string fmt, params object[] lst)
-        {
-            Debug.WriteLine(fmt, lst);
-        }
-
-        internal int BitsAvailable()
-        {
-            return m_stream.BitsAvailable;
-        }
-
-        internal void WriteBits(uint val, int bits)
-        {
-            m_stream.WriteBits(val, bits);
-        }
-
-        internal uint ReadBits(int bits)
-        {
-            return m_stream.ReadBits(bits);
-        }
-
-        internal void WriteBitsLong(ulong val, int bits)
-        {
-            int extra = bits - 32;
-            if (extra > 0)
-            {
-                m_stream.WriteBits((uint)(val >> 32), extra);
-
-                bits = 32;
-            }
-
-            m_stream.WriteBits((uint)val, bits);
-        }
-
-        internal ulong ReadBitsLong(int bits)
-        {
-            ulong val;
-
-            int extra = bits - 32;
-            if (extra > 0)
-            {
-                val = (ulong)m_stream.ReadBits(extra) << 32;
-                bits = 32;
-            }
-            else
-            {
-                val = 0;
-            }
-
-            val |= m_stream.ReadBits(bits);
-
-            return val;
-        }
-
-        internal void WriteArray(byte[] data, int pos, int len)
-        {
-            m_stream.WriteArray(data, pos, len);
-        }
-
-        internal void ReadArray(byte[] data, int pos, int len)
-        {
-            m_stream.ReadArray(data, pos, len);
-        }
-
-        internal void WriteCompressedUnsigned(uint val)
-        {
-            if (val == 0xFFFFFFFF)
-            {
-                m_stream.WriteBits(0xFF, 8);
-            }
-            else if (val < 0x80)
-            {
-                m_stream.WriteBits(val, 8);
-            }
-            else
-            {
-                if (val < 0x3F00)
-                {
-                    m_stream.WriteBits(0x8000 | val, 16);
-                }
-                else if (val < 0x3F000000)
-                {
-                    m_stream.WriteBits(0xC0000000 | val, 32);
-                }
-                else
-                {
-                    throw new ArgumentException("Max value is 0x3F000000");
-                }
-            }
-        }
-
-        internal uint ReadCompressedUnsigned()
-        {
-            uint val = m_stream.ReadBits(8);
-
-            if (val == 0xFF) return 0xFFFFFFFF;
-
-            switch (val & 0xC0)
-            {
-                case 0x00: break;
-                case 0x40: break;
-                case 0x80: val = ((val & ~0xC0U) << 8) | m_stream.ReadBits(8); break;
-                case 0xC0: val = ((val & ~0xC0U) << 24) | m_stream.ReadBits(24); break;
-            }
-
-            return val;
-        }
-
-        internal void WriteType(Type t)
-        {
-            m_stream.WriteBits(LookupHash(t), 32);
-        }
-
-        internal Type ReadType()
-        {
-            uint hash = m_stream.ReadBits(32);
-            Type t = LookupType(hash);
-
-            if (t == null)
-            {
-                throw new System.Runtime.Serialization.SerializationException(String.Format("Cannot find type for hash {0:X8}", hash));
-            }
-
-            return t;
-        }
-
-#if DEBUG
-
-        public byte[] DebugSerialize(object o, string pathPrefix)
-        {
-            return DebugSerialize(o, null, pathPrefix);
-        }
-
-        public byte[] DebugSerialize(object o, Type type, string pathPrefix)
-        {
-            byte[] buf;
-
-            try
-            {
-                buf = Serialize(type, o);
-            }
-            catch
-            {
-                DateTime dt = DateTime.Now;
-
-                // can't implement in UWP
-                //TraceDumpOriginalObject(o, pathPrefix, dt);
-
-                throw;
-            }
-
-            if (buf != null)
-            {
-                object o2;
-
-                try
-                {
-                    o2 = Deserialize(type, buf);
-                }
-                catch
-                {
-                    DateTime dt = DateTime.Now;
-
-                    // can't implement in UWP
-                    //TraceDumpOriginalObject(o, pathPrefix, dt);
-                    //TraceDumpSerializedObject(buf, pathPrefix, dt);
-
-                    throw;
-                }
-            }
-
-            return buf;
-        }
-
-        //void TraceDumpOriginalObject(object o, string pathPrefix, DateTime dt)
-        //{
-        //    try
-        //    {
-        //        MemoryStream stream = new MemoryStream();
-        //        System.Runtime.Serialization.Formatters.Binary.BinaryFormatter bf = new System.Runtime.Serialization.Formatters.Binary.BinaryFormatter();
-
-        //        bf.Serialize(stream, o);
-
-        //        SaveToFile(stream.ToArray(), pathPrefix, "orig", dt);
-        //    }
-        //    catch
-        //    {
-        //    }
-        //}
-
-        //void TraceDumpSerializedObject(byte[] buf, string pathPrefix, DateTime dt)
-        //{
-        //    try
-        //    {
-        //        SaveToFile(buf, pathPrefix, "ser", dt);
-        //    }
-        //    catch
-        //    {
-        //    }
-        //}
-
-        //void SaveToFile(byte[] buf, string pathPrefix, string pathSuffix, DateTime dt)
-        //{
-        //    string file = String.Format("{0}_{2:yyyyMMdd}_{2:Hmmss}.{1}", pathPrefix, pathSuffix, dt);
-
-        //    using (FileStream s = new FileStream(file, FileMode.Create, FileAccess.Write))
-        //    {
-        //        s.Write(buf, 0, buf.Length);
-        //        s.Flush();
-        //    }
-        //}
-
-#endif //DEBUG
-
-    }
-}
-
diff --git a/nanoFramework.Tools.DebugLibrary.UWP/FodyWeavers.xml b/nanoFramework.Tools.DebugLibrary.UWP/FodyWeavers.xml
deleted file mode 100644
index 4e68ed1a..00000000
--- a/nanoFramework.Tools.DebugLibrary.UWP/FodyWeavers.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-  <PropertyChanged />
-</Weavers>
\ No newline at end of file
diff --git a/nanoFramework.Tools.DebugLibrary.UWP/FodyWeavers.xsd b/nanoFramework.Tools.DebugLibrary.UWP/FodyWeavers.xsd
deleted file mode 100644
index 2f1b8aae..00000000
--- a/nanoFramework.Tools.DebugLibrary.UWP/FodyWeavers.xsd
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
-  <xs:element name="Weavers">
-    <xs:complexType>
-      <xs:all>
-        <xs:element name="PropertyChanged" minOccurs="0" maxOccurs="1">
-          <xs:complexType>
-            <xs:attribute name="InjectOnPropertyNameChanged" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Used to control if the On_PropertyName_Changed feature is enabled.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="EventInvokerNames" type="xs:string">
-              <xs:annotation>
-                <xs:documentation>Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="CheckForEquality" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Used to control if equality checks should be inserted. If false, equality checking will be disabled for the project.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="CheckForEqualityUsingBaseEquals" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Used to control if equality checks should use the Equals method resolved from the base class.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="UseStaticEqualsFromBase" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Used to control if equality checks should use the static Equals method resolved from the base class.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-          </xs:complexType>
-        </xs:element>
-      </xs:all>
-      <xs:attribute name="VerifyAssembly" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
-        <xs:annotation>
-          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-      <xs:attribute name="GenerateXsd" type="xs:boolean">
-        <xs:annotation>
-          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
-        </xs:annotation>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
\ No newline at end of file
diff --git a/nanoFramework.Tools.DebugLibrary.UWP/PortDefinitions/PortBase.cs b/nanoFramework.Tools.DebugLibrary.UWP/PortDefinitions/PortBase.cs
deleted file mode 100644
index ff6057ff..00000000
--- a/nanoFramework.Tools.DebugLibrary.UWP/PortDefinitions/PortBase.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-
-using nanoFramework.Tools.Debugger.PortSerial;
-using nanoFramework.Tools.Debugger.Usb;
-using Windows.UI.Xaml;
-
-namespace nanoFramework.Tools.Debugger
-{
-    public abstract partial class PortBase : PortMessageBase
-    {
-        public static PortBase CreateInstanceForSerial(string displayName, Application callerApp, bool startDeviceWatchers = true)
-        {
-            return new SerialPortManager(callerApp, startDeviceWatchers);
-        }
-
-        public static PortBase CreateInstanceForUsb(string displayName, Application callerApp, bool startDeviceWatchers = true)
-        {
-            return new UsbPort(callerApp, startDeviceWatchers);
-        }
-    }
-}
diff --git a/nanoFramework.Tools.DebugLibrary.UWP/PortSerial/SerialPortManager.cs b/nanoFramework.Tools.DebugLibrary.UWP/PortSerial/SerialPortManager.cs
deleted file mode 100644
index e03b85c1..00000000
--- a/nanoFramework.Tools.DebugLibrary.UWP/PortSerial/SerialPortManager.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Threading.Tasks;
-using Windows.Devices.Enumeration;
-using Windows.UI.Xaml;
-
-namespace nanoFramework.Tools.Debugger.PortSerial
-{
-    public partial class SerialPortManager : PortBase
-    {
-        /// <summary>
-        /// Creates an Serial debug client
-        /// </summary>
-        public SerialPortManager(Application callerApp, bool startDeviceWatchers = true)
-        {
-            _mapDeviceWatchersToDeviceSelector = new Dictionary<DeviceWatcher, String>();
-            NanoFrameworkDevices = new ObservableCollection<NanoDeviceBase>();
-
-            // set caller app property
-            CallerApp = callerApp;
-
-            Task.Factory.StartNew(() =>
-            {
-                if (startDeviceWatchers)
-                {
-                    StartSerialDeviceWatchers();
-                }
-            });
-        }
-    }
-}
diff --git a/nanoFramework.Tools.DebugLibrary.UWP/PortUsb/EventHandlerForUsbDevice.cs b/nanoFramework.Tools.DebugLibrary.UWP/PortUsb/EventHandlerForUsbDevice.cs
deleted file mode 100644
index 389b4d59..00000000
--- a/nanoFramework.Tools.DebugLibrary.UWP/PortUsb/EventHandlerForUsbDevice.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-//
-// Copyright (c) .NET Foundation and Contributors
-// See LICENSE file in the project root for full license information.
-//
-
-using System;
-using System.Diagnostics;
-using System.Threading.Tasks;
-using Windows.Devices.Enumeration;
-using Windows.Foundation;
-
-namespace nanoFramework.Tools.Debugger.Usb
-{
-    /// <summary>
-    /// This class handles the required changes and operation of an UsbDevice when a specific app event
-    /// is raised (app suspension and resume) or when the device is disconnected. The device watcher events are also handled here.
-    /// </summary>
-    public partial class EventHandlerForUsbDevice
-    {
-        /// <summary>
-        /// Listen for any changed in device access permission. The user can block access to the device while the device is in use.
-        /// If the user blocks access to the device while the device is opened, the device's handle will be closed automatically by
-        /// the system; it is still a good idea to close the device explicitly so that resources are cleaned up.
-        /// 
-        /// Note that by the time the AccessChanged event is raised, the device handle may already be closed by the system.
-        /// </summary>
-        private void RegisterForDeviceAccessStatusChange()
-        {
-            deviceAccessInformation = DeviceAccessInformation.CreateFromId(deviceInformation.Id);
-
-            deviceAccessEventHandler = new TypedEventHandler<DeviceAccessInformation, DeviceAccessChangedEventArgs>(OnDeviceAccessChanged);
-            deviceAccessInformation.AccessChanged += deviceAccessEventHandler;
-        }
-
-        /// <summary>
-        /// This method opens the device using the WinRT Usb API. After the device is opened, save the device
-        /// so that it can be used across scenarios.
-        ///
-        /// It is important that the FromIdAsync call is made on the UI thread because the consent prompt can only be displayed
-        /// on the UI thread.
-        /// 
-        /// This method is used to reopen the device after the device reconnects to the computer and when the app resumes.
-        /// </summary>
-        /// <param name="deviceInfo">Device information of the device to be opened</param>
-        /// <param name="deviceSelector">The AQS used to find this device</param>
-        /// <returns>True if the device was successfully opened, false if the device could not be opened for well known reasons.
-        /// An exception may be thrown if the device could not be opened for extraordinary reasons.</returns>
-        public async Task<bool> OpenDeviceAsync(DeviceInformation deviceInfo, String deviceSelector)
-        {
-            device = await Windows.Devices.Usb.UsbDevice.FromIdAsync(deviceInfo.Id);
-
-            bool successfullyOpenedDevice = false;
-
-            try
-            {
-                // Device could have been blocked by user or the device has already been opened by another app.
-                if (device != null)
-                {
-                    successfullyOpenedDevice = true;
-
-                    deviceInformation = deviceInfo;
-                    this.deviceSelector = deviceSelector;
-
-                    Debug.WriteLine($"Device {deviceInformation.Id} opened");
-
-                    // Notify registered callback handle that the device has been opened
-                    deviceConnectedCallback?.Invoke(this, deviceInformation);
-
-                    // Background tasks are not part of the app, so app events will not have an affect on the device
-                    if (!isBackgroundTask && (appSuspendEventHandler == null || appResumeEventHandler == null))
-                    {
-                        RegisterForAppEvents();
-                    }
-
-                    // User can block the device after it has been opened in the Settings charm. We can detect this by registering for the 
-                    // DeviceAccessInformation.AccessChanged event
-                    if (deviceAccessEventHandler == null)
-                    {
-                        RegisterForDeviceAccessStatusChange();
-                    }
-
-                    // Create and register device watcher events for the device to be opened unless we're reopening the device
-                    if (deviceWatcher == null)
-                    {
-                        deviceWatcher = DeviceInformation.CreateWatcher(deviceSelector);
-
-                        RegisterForDeviceWatcherEvents();
-                    }
-
-                    if (!watcherStarted)
-                    {
-                        // Start the device watcher after we made sure that the device is opened.
-                        StartDeviceWatcher();
-                    }
-                }
-                else
-                {
-                    successfullyOpenedDevice = false;
-
-                    //notificationStatus = NotifyType.ErrorMessage;
-
-                    var deviceAccessStatus = DeviceAccessInformation.CreateFromId(deviceInfo.Id).CurrentStatus;
-
-                    switch (deviceAccessStatus)
-                    {
-                        case DeviceAccessStatus.DeniedByUser:
-                            Debug.WriteLine($"Access to the device was blocked by the user : {deviceInfo.Id}");
-                            break;
-
-                        case DeviceAccessStatus.DeniedBySystem:
-                            // This status is most likely caused by app permissions (did not declare the device in the app's package.appxmanifest)
-                            // This status does not cover the case where the device is already opened by another app.
-                            Debug.WriteLine($"Access to the device was blocked by the system : {deviceInfo.Id}");
-                            break;
-
-                        default:
-                            // Most likely the device is opened by another app, but cannot be sure
-                            Debug.WriteLine($"Unknown error, possibly opened by another app : {deviceInfo.Id}");
-                            break;
-                    }
-                }
-            }
-            // catch all because the device open might fail for a number of reasons
-            catch { }
-
-            return successfullyOpenedDevice;
-        }
-
-        /// <summary>
-        /// Close the device if the device access was denied by anyone (system or the user) and reopen it if permissions are allowed again
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="eventArgs"></param>
-        private void OnDeviceAccessChanged(DeviceAccessInformation sender, DeviceAccessChangedEventArgs eventArgs)
-        {
-            if ((eventArgs.Status == DeviceAccessStatus.DeniedBySystem)
-                || (eventArgs.Status == DeviceAccessStatus.DeniedByUser))
-            {
-                CloseCurrentlyConnectedDevice();
-            }
-            else if ((eventArgs.Status == DeviceAccessStatus.Allowed) && (deviceInformation != null) && isEnabledAutoReconnect)
-            {
-            }
-        }
-    }
-}
diff --git a/nanoFramework.Tools.DebugLibrary.UWP/Properties/AssemblyInfo.cs b/nanoFramework.Tools.DebugLibrary.UWP/Properties/AssemblyInfo.cs
deleted file mode 100644
index f25a9aec..00000000
--- a/nanoFramework.Tools.DebugLibrary.UWP/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System.Reflection;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("nanoFramework Debug Library")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("The nanoFramework project contributors")]
-[assembly: AssemblyProduct("nanoFramework Debug Library")]
-[assembly: AssemblyCopyright("Copyright © 2017 nanoFramework project contributors")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-////////////////////////////////////////////////
-// Assembly*Version managed by GitVersionTask //
-////////////////////////////////////////////////
diff --git a/nanoFramework.Tools.DebugLibrary.UWP/Properties/nanoFramework.Tools.DebugLibrary.UWP.rd.xml b/nanoFramework.Tools.DebugLibrary.UWP/Properties/nanoFramework.Tools.DebugLibrary.UWP.rd.xml
deleted file mode 100644
index 338c81da..00000000
--- a/nanoFramework.Tools.DebugLibrary.UWP/Properties/nanoFramework.Tools.DebugLibrary.UWP.rd.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file contains Runtime Directives, specifications about types your application accesses
-    through reflection and other dynamic code patterns. Runtime Directives are used to control the
-    .NET Native optimizer and ensure that it does not remove code accessed by your library. If your
-    library does not do any reflection, then you generally do not need to edit this file. However,
-    if your library reflects over types, especially types passed to it or derived from its types,
-    then you should write Runtime Directives.
-
-    The most common use of reflection in libraries is to discover information about types passed
-    to the library. Runtime Directives have three ways to express requirements on types passed to
-    your library.
-
-    1.  Parameter, GenericParameter, TypeParameter, TypeEnumerableParameter
-        Use these directives to reflect over types passed as a parameter.
-
-    2.  SubTypes
-        Use a SubTypes directive to reflect over types derived from another type.
-
-    3.  AttributeImplies
-        Use an AttributeImplies directive to indicate that your library needs to reflect over
-        types or methods decorated with an attribute.
-
-    For more information on writing Runtime Directives for libraries, please visit
-    https://go.microsoft.com/fwlink/?LinkID=391919
--->
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Library Name="nanoFramework.Tools.DebugLibrary.UWP">
-
-  	<!-- add directives for your library here -->
-
-  </Library>
-</Directives>
diff --git a/nanoFramework.Tools.DebugLibrary.UWP/key.snk b/nanoFramework.Tools.DebugLibrary.UWP/key.snk
deleted file mode 100644
index 04deb093..00000000
Binary files a/nanoFramework.Tools.DebugLibrary.UWP/key.snk and /dev/null differ
diff --git a/nanoFramework.Tools.DebugLibrary.UWP/nanoFramework.Tools.DebugLibrary.UWP.csproj b/nanoFramework.Tools.DebugLibrary.UWP/nanoFramework.Tools.DebugLibrary.UWP.csproj
deleted file mode 100644
index 8cf01c4d..00000000
--- a/nanoFramework.Tools.DebugLibrary.UWP/nanoFramework.Tools.DebugLibrary.UWP.csproj
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="16.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nanoFramework.Tools.Debugger</RootNamespace>
-    <AssemblyName>nanoFramework.Tools.Debugger.UWP</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17134.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>16</MinimumVisualStudioVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <Deterministic>true</Deterministic>
-    <ContinuousIntegrationBuild Condition="'$(TF_BUILD)' == 'true'">True</ContinuousIntegrationBuild>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <!-- need this here to rebuild the packages.lock.json file in case the hashes fail to validate -->
-    <!-- <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder> -->
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>portable</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>$(NoWarn);NU1603;2008</NoWarn>
-    <DebugType>portable</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <PlatformTarget>ARM</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <PlatformTarget>ARM</PlatformTarget>
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>$(NoWarn);NU1603;2008</NoWarn>
-    <DebugType>portable</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>$(NoWarn);NU1603;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="ApplicationException.cs" />
-    <Compile Include="BinaryFormatter.cs" />
-    <Compile Include="PortDefinitions\PortBase.cs" />
-    <Compile Include="PortSerial\SerialPortManager.cs" />
-    <Compile Include="PortUsb\EventHandlerForUsbDevice.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <EmbeddedResource Include="Properties\nanoFramework.Tools.DebugLibrary.UWP.rd.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.lock.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.11</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.SourceLink.GitHub">
-      <Version>1.1.0-beta-20204-02</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Nerdbank.GitVersioning">
-      <Version>3.3.37</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Polly">
-      <Version>7.2.1</Version>
-    </PackageReference>
-    <PackageReference Include="Polly.Contrib.WaitAndRetry">
-      <Version>1.1.1</Version>
-    </PackageReference>
-    <PackageReference Include="PropertyChanged.Fody">
-      <Version>2.6.1</Version>
-    </PackageReference>
-    <PackageReference Include="System.Threading.Tasks.Extensions">
-      <Version>4.5.4</Version>
-    </PackageReference>
-    <PackageReference Include="System.ValueTuple">
-      <Version>4.5.0</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="key.snk" />
-  </ItemGroup>
-  <Import Project="..\nanoFramework.Tools.DebugLibrary.Shared\nanoFramework.Tools.DebugLibrary.Net.projitems" Label="Shared" />
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>15.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/nanoFramework.Tools.DebugLibrary.UWP/nanoFramework.Tools.DebugLibrary.UWP.nuspec b/nanoFramework.Tools.DebugLibrary.UWP/nanoFramework.Tools.DebugLibrary.UWP.nuspec
deleted file mode 100644
index 31df68ab..00000000
--- a/nanoFramework.Tools.DebugLibrary.UWP/nanoFramework.Tools.DebugLibrary.UWP.nuspec
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package >
-  <metadata>
-    <id>nanoFramework.Tools.Debugger.UWP</id>
-    <version>$version$</version>
-    <title>.NET nanoFramework debug library (UWP)</title>
-    <authors>nanoFramework project contributors</authors>
-    <owners>nanoFramework project contributors,dotnetfoundation</owners>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <license type="file">LICENSE.md</license>
-    <projectUrl>https://github.com/nanoframework/nf-debugger</projectUrl>
-    <icon>images\nf-logo.png</icon>
-    <iconUrl>https://secure.gravatar.com/avatar/97d0e092247f0716db6d4b47b7d1d1ad</iconUrl>
-    <repository type="git" url="https://github.com/nanoframework/nf-debugger" commit="$commit$" />
-    <copyright>Copyright (c) .NET Foundation and Contributors</copyright>
-    <description>This UWP library provides a debug client for nanoFramework devices using USB or Serial connection to a board.</description>
-    <releaseNotes>This package provides the UWP version of the debug library.&#10;For .NET look for the respective Nuget package.
-    </releaseNotes>
-    <tags>nanoFramework C# csharp netmf netnf</tags>
-    <dependencies>
-      <dependency id="Polly" version="7.2.1" />
-      <dependency id="Polly.Contrib.WaitAndRetry" version="1.1.1" />
-      <dependency id="PropertyChanged.Fody" version="2.6.1" />
-      <dependency id="System.Threading.Tasks.Extensions" version="4.5.4" />
-      <dependency id="System.ValueTuple" version="4.5.0" />
-    </dependencies>
-  </metadata>
-  <files>
-      <file src="bin\Release\nanoFramework.Tools.Debugger.UWP.dll" target="lib/net472" />
-      <file src="bin\Release\nanoFramework.Tools.Debugger.UWP.pdb" target="lib/net472" />
-      <file src="..\assets\nf-logo.png" target="images" />
-      <file src="..\LICENSE.md" target="" />
-  </files>
-</package>
diff --git a/nanoFramework.Tools.Debugger.sln b/nanoFramework.Tools.Debugger.sln
index 9da56f61..aee159ce 100644
--- a/nanoFramework.Tools.Debugger.sln
+++ b/nanoFramework.Tools.Debugger.sln
@@ -3,12 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.30717.126
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "USB Test App UWP", "USB Test App UWP\USB Test App UWP.csproj", "{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debug Components", "Debug Components", "{5318C561-62E1-49CB-8A94-D704CFBAEE5B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serial Test App UWP", "Serial Test App UWP\Serial Test App UWP.csproj", "{7E524678-9200-46C8-AB75-EFA8CB35F437}"
-EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "nanoFramework.Tools.DebugLibrary.Shared", "nanoFramework.Tools.DebugLibrary.Shared\nanoFramework.Tools.DebugLibrary.Shared.shproj", "{31472CAE-4B1A-4AB9-9B2A-8F28DBE01BCF}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nanoFramework.Tools.DebugLibrary.Net", "nanoFramework.Tools.DebugLibrary.Net\nanoFramework.Tools.DebugLibrary.Net.csproj", "{101D57AD-D22F-4905-A992-DE15E723F164}"
@@ -17,8 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test Apps", "Test Apps", "{
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Serial Test App WPF", "USB Test App WPF\Serial Test App WPF.csproj", "{654CCB72-B942-4FFA-AA2B-17F9F85310EE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "nanoFramework.Tools.DebugLibrary.UWP", "nanoFramework.Tools.DebugLibrary.UWP\nanoFramework.Tools.DebugLibrary.UWP.csproj", "{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C4E43092-51E8-46C3-8C7A-FD05E9A29FE2}"
 	ProjectSection(SolutionItems) = preProject
 		..\azure-pipelines.yml = ..\azure-pipelines.yml
@@ -29,7 +23,6 @@ EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		nanoFramework.Tools.DebugLibrary.Shared\nanoFramework.Tools.DebugLibrary.Net.projitems*{101d57ad-d22f-4905-a992-de15e723f164}*SharedItemsImports = 4
-		nanoFramework.Tools.DebugLibrary.Shared\nanoFramework.Tools.DebugLibrary.Net.projitems*{21e5a6a5-f4f7-411a-80dc-f49e62d8a7c3}*SharedItemsImports = 4
 		nanoFramework.Tools.DebugLibrary.Shared\nanoFramework.Tools.DebugLibrary.Net.projitems*{31472cae-4b1a-4ab9-9b2a-8f28dbe01bcf}*SharedItemsImports = 13
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -43,45 +36,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Debug|Any CPU.Build.0 = Debug|x86
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Debug|Any CPU.Deploy.0 = Debug|x86
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Debug|ARM.ActiveCfg = Debug|ARM
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Debug|ARM.Build.0 = Debug|ARM
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Debug|ARM.Deploy.0 = Debug|ARM
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Debug|x64.ActiveCfg = Debug|x64
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Debug|x64.Build.0 = Debug|x64
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Debug|x64.Deploy.0 = Debug|x64
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Debug|x86.ActiveCfg = Debug|x86
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Debug|x86.Build.0 = Debug|x86
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Debug|x86.Deploy.0 = Debug|x86
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Release|Any CPU.ActiveCfg = Release|x86
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Release|ARM.ActiveCfg = Release|ARM
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Release|ARM.Build.0 = Release|ARM
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Release|ARM.Deploy.0 = Release|ARM
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Release|x64.ActiveCfg = Release|x64
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Release|x64.Deploy.0 = Release|x64
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Release|x86.ActiveCfg = Release|x86
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95}.Release|x86.Deploy.0 = Release|x86
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Debug|Any CPU.Build.0 = Debug|x86
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Debug|ARM.ActiveCfg = Debug|ARM
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Debug|ARM.Build.0 = Debug|ARM
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Debug|ARM.Deploy.0 = Debug|ARM
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Debug|x64.ActiveCfg = Debug|x64
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Debug|x64.Build.0 = Debug|x64
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Debug|x64.Deploy.0 = Debug|x64
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Debug|x86.ActiveCfg = Debug|x86
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Debug|x86.Build.0 = Debug|x86
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Debug|x86.Deploy.0 = Debug|x86
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Release|Any CPU.ActiveCfg = Release|x86
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Release|ARM.ActiveCfg = Release|ARM
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Release|ARM.Build.0 = Release|ARM
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Release|ARM.Deploy.0 = Release|ARM
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Release|x64.ActiveCfg = Release|x64
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Release|x64.Deploy.0 = Release|x64
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Release|x86.ActiveCfg = Release|x86
-		{7E524678-9200-46C8-AB75-EFA8CB35F437}.Release|x86.Deploy.0 = Release|x86
 		{101D57AD-D22F-4905-A992-DE15E723F164}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{101D57AD-D22F-4905-A992-DE15E723F164}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{101D57AD-D22F-4905-A992-DE15E723F164}.Debug|ARM.ActiveCfg = Debug|Any CPU
@@ -111,33 +65,14 @@ Global
 		{654CCB72-B942-4FFA-AA2B-17F9F85310EE}.Release|ARM.Build.0 = Release|Any CPU
 		{654CCB72-B942-4FFA-AA2B-17F9F85310EE}.Release|x64.ActiveCfg = Release|Any CPU
 		{654CCB72-B942-4FFA-AA2B-17F9F85310EE}.Release|x86.ActiveCfg = Release|Any CPU
-		{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}.Debug|ARM.ActiveCfg = Debug|ARM
-		{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}.Debug|ARM.Build.0 = Debug|ARM
-		{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}.Debug|x64.ActiveCfg = Debug|x64
-		{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}.Debug|x64.Build.0 = Debug|x64
-		{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}.Debug|x86.ActiveCfg = Debug|x86
-		{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}.Debug|x86.Build.0 = Debug|x86
-		{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}.Release|ARM.ActiveCfg = Release|ARM
-		{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}.Release|ARM.Build.0 = Release|ARM
-		{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}.Release|x64.ActiveCfg = Release|x64
-		{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}.Release|x64.Build.0 = Release|x64
-		{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}.Release|x86.ActiveCfg = Release|x86
-		{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{FE93C38E-DFDB-475F-BB5D-DC1288EA2D95} = {4BB47DB4-92A3-4DE9-81C0-462373258F49}
-		{7E524678-9200-46C8-AB75-EFA8CB35F437} = {4BB47DB4-92A3-4DE9-81C0-462373258F49}
 		{31472CAE-4B1A-4AB9-9B2A-8F28DBE01BCF} = {5318C561-62E1-49CB-8A94-D704CFBAEE5B}
 		{101D57AD-D22F-4905-A992-DE15E723F164} = {5318C561-62E1-49CB-8A94-D704CFBAEE5B}
 		{654CCB72-B942-4FFA-AA2B-17F9F85310EE} = {4BB47DB4-92A3-4DE9-81C0-462373258F49}
-		{21E5A6A5-F4F7-411A-80DC-F49E62D8A7C3} = {5318C561-62E1-49CB-8A94-D704CFBAEE5B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0E005ECA-A03A-4A11-BB97-0C89AEC45CF3}
diff --git a/version.json b/version.json
index 89d6a972..90b7a0b1 100644
--- a/version.json
+++ b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.30.0-preview.{height}",
+  "version": "2.0.0-preview.{height}",
   "assemblyVersion": {
     "precision": "revision"
   },