From 262d065d2aa244b33719811ba5d6a6ab16b56810 Mon Sep 17 00:00:00 2001
From: Greg Pettyjohn <grpettyj@microsoft.com>
Date: Thu, 11 Aug 2016 17:26:53 -0700
Subject: [PATCH 01/51] DeviceLab sample

---
 Samples/DeviceLab/App.config                  |   6 +
 Samples/DeviceLab/App.xaml                    |   9 +
 Samples/DeviceLab/App.xaml.cs                 |  17 +
 Samples/DeviceLab/BindablePassword.xaml       |  11 +
 Samples/DeviceLab/BindablePassword.xaml.cs    |  38 ++
 Samples/DeviceLab/DeviceLab.csproj            | 136 +++++++
 Samples/DeviceLab/DeviceLab.sln               |  31 ++
 Samples/DeviceLab/DevicePortalView.xaml       | 104 +++++
 Samples/DeviceLab/DevicePortalView.xaml.cs    |  34 ++
 Samples/DeviceLab/DevicePortalViewModel.cs    | 359 ++++++++++++++++++
 Samples/DeviceLab/DeviceSignInViewModel.cs    | 255 +++++++++++++
 .../DeviceLab/DiagnosticOutputViewModel.cs    | 163 ++++++++
 Samples/DeviceLab/MainViewModel.cs            |  67 ++++
 Samples/DeviceLab/MainWindow.xaml             |  74 ++++
 Samples/DeviceLab/MainWindow.xaml.cs          |  40 ++
 Samples/DeviceLab/Properties/AssemblyInfo.cs  |  55 +++
 .../Properties/Resources.Designer.cs          |  71 ++++
 Samples/DeviceLab/Properties/Resources.resx   | 117 ++++++
 .../DeviceLab/Properties/Settings.Designer.cs |  30 ++
 .../DeviceLab/Properties/Settings.settings    |   7 +
 .../DeviceLab/XboxDevicePortalConnection.cs   | 172 +++++++++
 Samples/DeviceLab/packages.config             |   4 +
 22 files changed, 1800 insertions(+)
 create mode 100644 Samples/DeviceLab/App.config
 create mode 100644 Samples/DeviceLab/App.xaml
 create mode 100644 Samples/DeviceLab/App.xaml.cs
 create mode 100644 Samples/DeviceLab/BindablePassword.xaml
 create mode 100644 Samples/DeviceLab/BindablePassword.xaml.cs
 create mode 100644 Samples/DeviceLab/DeviceLab.csproj
 create mode 100644 Samples/DeviceLab/DeviceLab.sln
 create mode 100644 Samples/DeviceLab/DevicePortalView.xaml
 create mode 100644 Samples/DeviceLab/DevicePortalView.xaml.cs
 create mode 100644 Samples/DeviceLab/DevicePortalViewModel.cs
 create mode 100644 Samples/DeviceLab/DeviceSignInViewModel.cs
 create mode 100644 Samples/DeviceLab/DiagnosticOutputViewModel.cs
 create mode 100644 Samples/DeviceLab/MainViewModel.cs
 create mode 100644 Samples/DeviceLab/MainWindow.xaml
 create mode 100644 Samples/DeviceLab/MainWindow.xaml.cs
 create mode 100644 Samples/DeviceLab/Properties/AssemblyInfo.cs
 create mode 100644 Samples/DeviceLab/Properties/Resources.Designer.cs
 create mode 100644 Samples/DeviceLab/Properties/Resources.resx
 create mode 100644 Samples/DeviceLab/Properties/Settings.Designer.cs
 create mode 100644 Samples/DeviceLab/Properties/Settings.settings
 create mode 100644 Samples/DeviceLab/XboxDevicePortalConnection.cs
 create mode 100644 Samples/DeviceLab/packages.config

diff --git a/Samples/DeviceLab/App.config b/Samples/DeviceLab/App.config
new file mode 100644
index 00000000..88fa4027
--- /dev/null
+++ b/Samples/DeviceLab/App.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    </startup>
+</configuration>
\ No newline at end of file
diff --git a/Samples/DeviceLab/App.xaml b/Samples/DeviceLab/App.xaml
new file mode 100644
index 00000000..12fbc02f
--- /dev/null
+++ b/Samples/DeviceLab/App.xaml
@@ -0,0 +1,9 @@
+<Application x:Class="DeviceLab.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:DeviceLab"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>
diff --git a/Samples/DeviceLab/App.xaml.cs b/Samples/DeviceLab/App.xaml.cs
new file mode 100644
index 00000000..32b134b3
--- /dev/null
+++ b/Samples/DeviceLab/App.xaml.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Windows;
+
+namespace DeviceLab
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+    }
+}
diff --git a/Samples/DeviceLab/BindablePassword.xaml b/Samples/DeviceLab/BindablePassword.xaml
new file mode 100644
index 00000000..a31e1b81
--- /dev/null
+++ b/Samples/DeviceLab/BindablePassword.xaml
@@ -0,0 +1,11 @@
+<UserControl x:Class="DeviceLab.BindablePassword"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             mc:Ignorable="d" 
+             d:DesignHeight="23" d:DesignWidth="200">
+    <Grid>
+        <PasswordBox Name="PasswordBox" PasswordChanged="PasswordBox_PasswordChanged"/>
+    </Grid>
+</UserControl>
diff --git a/Samples/DeviceLab/BindablePassword.xaml.cs b/Samples/DeviceLab/BindablePassword.xaml.cs
new file mode 100644
index 00000000..2cf6964e
--- /dev/null
+++ b/Samples/DeviceLab/BindablePassword.xaml.cs
@@ -0,0 +1,38 @@
+using System.Security;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace DeviceLab
+{
+    /// <summary>
+    /// Interaction logic for BindablePassword.xaml
+    /// </summary>
+    public partial class BindablePassword : UserControl
+    {
+        public SecureString Password
+        {
+            get
+            {
+                return (SecureString)GetValue(PasswordProperty);
+            }
+            set
+            {
+                SetValue(PasswordProperty, value);
+            }
+        }
+
+        public static readonly DependencyProperty PasswordProperty =
+        DependencyProperty.Register("Password", typeof(SecureString), typeof(BindablePassword),
+            new PropertyMetadata(default(SecureString)));
+
+        public BindablePassword()
+        {
+            InitializeComponent();
+        }
+
+        private void PasswordBox_PasswordChanged(object sender, RoutedEventArgs e)
+        {
+            Password = ((PasswordBox)sender).SecurePassword;
+        }
+    }
+}
diff --git a/Samples/DeviceLab/DeviceLab.csproj b/Samples/DeviceLab/DeviceLab.csproj
new file mode 100644
index 00000000..d188e6a5
--- /dev/null
+++ b/Samples/DeviceLab/DeviceLab.csproj
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.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>{C0C9CBEF-E460-431B-90DD-4B1EFEBB9445}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DeviceLab</RootNamespace>
+    <AssemblyName>DeviceLab</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </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</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Prism, Version=6.1.0.0, Culture=neutral, PublicKeyToken=91a96d2a154366d8, processorArchitecture=MSIL">
+      <HintPath>packages\Prism.Core.6.1.0\lib\net45\Prism.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Compile Include="DevicePortalView.xaml.cs">
+      <DependentUpon>DevicePortalView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DevicePortalViewModel.cs" />
+    <Compile Include="MainViewModel.cs" />
+    <Compile Include="XboxDevicePortalConnection.cs" />
+    <Page Include="BindablePassword.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DevicePortalView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BindablePassword.xaml.cs">
+      <DependentUpon>BindablePassword.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="DeviceSignInViewModel.cs" />
+    <Compile Include="DiagnosticOutputViewModel.cs" />
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <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="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\WindowsDevicePortalWrapper\WindowsDevicePortalWrapper\WindowsDevicePortalWrapper.csproj">
+      <Project>{6a9e862e-5cda-4a8a-bbc0-56e9ea921e39}</Project>
+      <Name>WindowsDevicePortalWrapper</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.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/Samples/DeviceLab/DeviceLab.sln b/Samples/DeviceLab/DeviceLab.sln
new file mode 100644
index 00000000..0e1b1c70
--- /dev/null
+++ b/Samples/DeviceLab/DeviceLab.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeviceLab", "DeviceLab.csproj", "{C0C9CBEF-E460-431B-90DD-4B1EFEBB9445}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsDevicePortalWrapper", "..\..\WindowsDevicePortalWrapper\WindowsDevicePortalWrapper\WindowsDevicePortalWrapper.csproj", "{6A9E862E-5CDA-4A8A-BBC0-56E9EA921E39}"
+EndProject
+Global
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		..\..\WindowsDevicePortalWrapper\WindowsDevicePortalWrapper.Shared\WindowsDevicePortalWrapper.Shared.projitems*{6a9e862e-5cda-4a8a-bbc0-56e9ea921e39}*SharedItemsImports = 4
+	EndGlobalSection
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{C0C9CBEF-E460-431B-90DD-4B1EFEBB9445}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C0C9CBEF-E460-431B-90DD-4B1EFEBB9445}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C0C9CBEF-E460-431B-90DD-4B1EFEBB9445}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C0C9CBEF-E460-431B-90DD-4B1EFEBB9445}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A9E862E-5CDA-4A8A-BBC0-56E9EA921E39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A9E862E-5CDA-4A8A-BBC0-56E9EA921E39}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A9E862E-5CDA-4A8A-BBC0-56E9EA921E39}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A9E862E-5CDA-4A8A-BBC0-56E9EA921E39}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/Samples/DeviceLab/DevicePortalView.xaml b/Samples/DeviceLab/DevicePortalView.xaml
new file mode 100644
index 00000000..e63cdc5d
--- /dev/null
+++ b/Samples/DeviceLab/DevicePortalView.xaml
@@ -0,0 +1,104 @@
+<UserControl x:Class="DeviceLab.DevicePortalView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:DeviceLab"
+             mc:Ignorable="d" 
+             Background="White"
+             d:DesignHeight="100" d:DesignWidth="500">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <Grid Background="LightGreen">
+            <TextBlock Grid.Row="0" HorizontalAlignment="Left" Width="200" Text="{Binding DeviceName}" VerticalAlignment="Top"/>
+            <TextBlock Grid.Row="0" HorizontalAlignment="Right" Width="100" Text="{Binding Address}" VerticalAlignment="Top"/>
+        </Grid>
+        <TabControl Grid.Row="1">
+            <TabItem Header="Device Name">
+                <Grid >
+                    <TextBlock HorizontalAlignment="Left" Margin="57,25,0,0" TextWrapping="Wrap" Text="Device Name" VerticalAlignment="Top"/>
+                    <TextBox
+                        x:Name="textBoxDeviceName"
+                        HorizontalAlignment="Left" Height="23" Margin="138,24,0,0" VerticalAlignment="Top" Width="171"
+                        TextChanged="textBoxDeviceName_TextChanged"
+                        Text="{Binding DeviceNameEntry}"/>
+                    <Button
+                        HorizontalAlignment="Left" Margin="323,26,0,0" VerticalAlignment="Top" Width="89"
+                        Content="Change Name"
+                        Command="{Binding RenameCommand}"/>
+                </Grid>
+            </TabItem>
+            <TabItem Header="CPU Performance">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="100"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="100"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBlock Grid.Column="0" Text="CPU Load: "/>
+                    <TextBlock Grid.Column="1" Text="{Binding CPULoad}" />
+                    <TextBlock Grid.Column="2" Text="TBD: " />
+                    <TextBlock Grid.Column="3" Text="Grab some other CPU data" />
+                </Grid>
+            </TabItem>
+            <TabItem Header="Device Info">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="50" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <StackPanel Grid.Column="0">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="150"/>
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Grid.Column="0">Address</TextBlock>
+                            <TextBlock Grid.Column="1" Text="{Binding Address}"/>
+                        </Grid>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="150"/>
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Grid.Column="0">Platform</TextBlock>
+                            <TextBlock Grid.Column="1" Text="{Binding Platform}" />
+                        </Grid>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="150"/>
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Grid.Column="0">Platform Name</TextBlock>
+                            <TextBlock Grid.Column="1" Text="{Binding PlatformName}" />
+                        </Grid>
+                    </StackPanel>
+                    <StackPanel Grid.Column="2">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="150"/>
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Grid.Column="0">Device Family</TextBlock>
+                            <TextBlock Grid.Column="1" Text="{Binding DeviceFamily}" />
+                        </Grid>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="150"/>
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock Grid.Column="0">Operating System Version</TextBlock>
+                            <TextBlock Grid.Column="1" Text="{Binding OperatingSystemVersion}" />
+                        </Grid>
+                    </StackPanel>
+                </Grid>
+            </TabItem>
+        </TabControl>
+    </Grid>
+
+</UserControl>
diff --git a/Samples/DeviceLab/DevicePortalView.xaml.cs b/Samples/DeviceLab/DevicePortalView.xaml.cs
new file mode 100644
index 00000000..910e0227
--- /dev/null
+++ b/Samples/DeviceLab/DevicePortalView.xaml.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace DeviceLab
+{
+    /// <summary>
+    /// Interaction logic for DevicePortalView.xaml
+    /// </summary>
+    public partial class DevicePortalView : UserControl
+    {
+        public DevicePortalView()
+        {
+            InitializeComponent();
+        }
+
+        private void textBoxDeviceName_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            var binding = ((TextBox)sender).GetBindingExpression(TextBox.TextProperty);
+            binding.UpdateSource();
+        }
+    }
+}
diff --git a/Samples/DeviceLab/DevicePortalViewModel.cs b/Samples/DeviceLab/DevicePortalViewModel.cs
new file mode 100644
index 00000000..5122032e
--- /dev/null
+++ b/Samples/DeviceLab/DevicePortalViewModel.cs
@@ -0,0 +1,359 @@
+using Microsoft.Tools.WindowsDevicePortal;
+using Prism.Commands;
+using Prism.Mvvm;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
+
+namespace DeviceLab
+{
+    public class DevicePortalViewModel : BindableBase
+    {
+        //-------------------------------------------------------------------
+        //  Private Members
+        //-------------------------------------------------------------------
+        #region Private Members
+        private IDiagnosticSink diagnostics;
+
+        private string diagnosticMoniker
+        {
+            get
+            {
+                return !string.IsNullOrWhiteSpace(this.deviceName) ? this.deviceName : this.Address;
+            }
+        }
+        #endregion // Private Members
+        
+        //-------------------------------------------------------------------
+        //  Constructors
+        //-------------------------------------------------------------------
+        #region Constructors
+        public DevicePortalViewModel(DevicePortal portal, IDiagnosticSink diags)
+        {
+            this.diagnostics = diags;
+            this.portal = portal;
+            this.Ready = true;
+            Task t = GetDeviceNameAsync();
+            HookupWebSocket();
+        }
+        #endregion // Cosntructors
+
+        //-------------------------------------------------------------------
+        //  Properties
+        //-------------------------------------------------------------------
+        #region Properties
+        #region Portal
+        private DevicePortal portal;
+
+        private DevicePortal Portal
+        {
+            get { return this.portal; }
+            set
+            {
+                SetProperty(ref this.portal, value);
+                OnPropertyChanged("Address");
+                OnPropertyChanged("DeviceFamily");
+                OnPropertyChanged("OperatingSystemVersion");
+                OnPropertyChanged("Platform");
+                OnPropertyChanged("PlatformName");
+            }
+        }
+        #endregion // Portal
+
+        #region Ready
+        private bool ready;
+        public bool Ready
+        {
+            get
+            {
+                return this.ready;
+            }
+            private set
+            {
+                SetProperty(ref this.ready, value);
+            }
+        }
+        #endregion // Ready
+
+        #region DeviceName
+        private string deviceName;
+        public string DeviceName
+        {
+            get
+            {
+                return string.IsNullOrWhiteSpace(this.deviceName) ? "<unknown>" : this.deviceName;
+            }
+
+            private set
+            {
+                SetProperty(ref this.deviceName, value);
+            }
+        }
+        #endregion //DeviceName
+
+        #region DeviceNameEntry
+        private string deviceNameEntry;
+        public string DeviceNameEntry
+        {
+            get
+            {
+                return this.deviceNameEntry;
+            }
+
+            set
+            {
+                SetProperty(ref this.deviceNameEntry, value);
+            }
+        }
+        #endregion // DeviceNameEntry
+
+        #region Address
+        public string Address
+        {
+            get
+            {
+                return this.portal == null ? "<unknown>" : this.portal.Address;
+            }
+        }
+        #endregion // Address
+
+        #region DeviceFamily
+        public string DeviceFamily
+        {
+            get
+            {
+                return this.portal == null ? "<unknown>" : this.portal.DeviceFamily;
+            }
+        }
+        #endregion // DeviceFamily
+
+        #region OperatingSystemVersion
+        public string OperatingSystemVersion
+        {
+            get
+            {
+                return this.portal == null ? "<unknown>" : this.portal.OperatingSystemVersion;
+            }
+        }
+        #endregion // OperatingSystemVersion
+
+        #region Platform
+        public string Platform
+        {
+            get
+            {
+                return this.portal == null ? "<unknown>" : this.portal.Platform.ToString();
+            }
+        }
+        #endregion // Platform
+
+        #region PlatformName
+        #endregion // PlatformName
+        public string PlatformName
+        {
+            get
+            {
+                return this.portal == null ? "<unknown>" : this.portal.PlatformName;
+            }
+        }
+
+        #region // CPULoad
+        private int cpuLoad;
+        public string CPULoad
+        {
+            get
+            {
+                return this.cpuLoad.ToString();
+            }
+        }
+        #endregion // CPULoad
+        #endregion // Properties
+
+        //-------------------------------------------------------------------
+        //  Commands
+        //-------------------------------------------------------------------
+        #region Commands
+
+        #region RenameCommand
+        private DelegateCommand renameCommand;
+        public ICommand RenameCommand
+        {
+            get
+            {
+                if(this.renameCommand == null)
+                {
+                    this.renameCommand = DelegateCommand.FromAsyncHandler(ExecuteRenameAsync, CanExecuteRename);
+                    this.renameCommand.ObservesProperty(() => this.Ready);
+                    this.renameCommand.ObservesProperty(() => this.DeviceNameEntry);
+                }
+                return this.renameCommand;
+            }
+        }
+
+        private bool CanExecuteRename()
+        {
+            return
+                this.Ready &&
+                !string.IsNullOrWhiteSpace(this.deviceNameEntry);
+        }
+
+        private async Task ExecuteRenameAsync()
+        {
+            this.Ready = false;
+            try
+            {
+                string newName = this.deviceNameEntry;
+                this.DeviceNameEntry = "";
+                this.diagnostics.OutputDiagnosticString("[{0}] Attempting to rename device to {1}\n", this.diagnosticMoniker, newName);
+                await this.Portal.SetDeviceName(newName);
+            }
+            catch (Exception exn)
+            {
+                ReportException("Rename", exn);
+            }
+            await ExecuteRebootAsync();
+            if (this.Ready)
+            {
+                await GetDeviceNameAsync();
+            }
+        }
+
+        private async Task GetDeviceNameAsync()
+        {
+            this.Ready = false;
+            try
+            {
+                this.DeviceName = await this.Portal.GetDeviceName();
+            }
+            catch (Exception exn)
+            {
+                ReportException("Rename", exn);
+            }
+            this.diagnostics.OutputDiagnosticString("[{0}] Retrieved device name.\n", this.diagnosticMoniker);
+            this.Ready = true;
+        }
+        #endregion // RenameCommand
+
+        #region Reboot Command
+        private DelegateCommand rebootCommand;
+        public ICommand RebootCommand
+        {
+            get
+            {
+                if(this.rebootCommand == null)
+                {
+                    this.rebootCommand = DelegateCommand.FromAsyncHandler(ExecuteRebootAsync, CanExecuteReboot);
+                    this.rebootCommand.ObservesProperty(() => this.Ready);
+                }
+                return this.rebootCommand;
+            }
+        }
+
+        private bool CanExecuteReboot()
+        {
+            return this.Ready;
+        }
+
+        private async Task ExecuteRebootAsync()
+        {
+            this.Ready = false;
+            try
+            {
+                this.diagnostics.OutputDiagnosticString("[{0}] Attempting to reboot device.\n", this.diagnosticMoniker);
+                await this.Portal.Reboot();
+            }
+            catch (Exception exn)
+            {
+                ReportException("Rename", exn);
+            }
+            await ExecuteReestablishConnectionAsync();
+        }
+        #endregion // Reboot Comment
+
+        #region ReestablishConnectionCommand
+        private DelegateCommand reestablishConnectionCommand;
+        public ICommand ReestablishConnectionCommand
+        {
+            get
+            {
+                if(this.reestablishConnectionCommand == null)
+                {
+                    this.reestablishConnectionCommand = DelegateCommand.FromAsyncHandler(ExecuteReestablishConnectionAsync, CanExecuteReestablishConnection);
+                    this.reestablishConnectionCommand.ObservesProperty(() => this.Ready);
+                }
+                return this.reestablishConnectionCommand;
+            }
+        }
+
+        private bool CanExecuteReestablishConnection()
+        {
+            return this.Ready;
+        }
+
+        private async Task ExecuteReestablishConnectionAsync()
+        {
+            int numTries = 1;
+
+            DeviceConnectionStatusEventHandler handler = (DevicePortal sender, DeviceConnectionStatusEventArgs args) =>
+            {
+                this.diagnostics.OutputDiagnosticString("[{0}] Connection status update: Status: {1}, Phase: {2}\n", this.diagnosticMoniker, args.Status, args.Phase);
+                if (args.Status == DeviceConnectionStatus.Connected)
+                {
+                    this.diagnostics.OutputDiagnosticString("[{0}] Connection succeeded after {1} tries.\n", this.diagnosticMoniker, numTries);
+                }
+                else if (args.Status == DeviceConnectionStatus.Failed)
+                {
+                    this.diagnostics.OutputDiagnosticString("[{0}] Connection failed after {1} tries.\n", this.diagnosticMoniker, numTries);
+                }
+            };
+            this.portal.ConnectionStatus += handler;
+
+            this.Ready = false;
+            try
+            {
+                do
+                {
+                    await this.portal.Connect();
+                    ++numTries;
+                } while (this.portal.ConnectionHttpStatusCode != HttpStatusCode.OK);
+                this.Ready = true;
+            }
+            catch (Exception exn)
+            {
+                ReportException("Rename", exn);
+            }
+            this.portal.ConnectionStatus -= handler;
+        }
+        #endregion // ReestablishConnectionCommand
+
+
+
+        #endregion // Commands
+
+        private async void HookupWebSocket()
+        {
+            this.Ready = false;
+            this.portal.SystemPerfMessageReceived += OnSystemPerfReceived;
+            await this.portal.StartListeningForSystemPerf();
+            this.Ready = true;
+        }
+
+        private void OnSystemPerfReceived(DevicePortal sender, WebSocketMessageReceivedEventArgs<DevicePortal.SystemPerformanceInformation> args)
+        {
+            this.cpuLoad = args.Message.CpuLoad;
+            OnPropertyChanged("CPULoad");
+        }
+
+        private void ReportException(string commandName, Exception exn)
+        {
+            this.diagnostics.OutputDiagnosticString(
+                "[{0}] Exception during {1} command:\n[{0}] {2}\nStackTrace: \n[{0}] {3}\n",
+                this.diagnosticMoniker, commandName, exn.Message, exn.StackTrace);
+        }
+    }
+}
diff --git a/Samples/DeviceLab/DeviceSignInViewModel.cs b/Samples/DeviceLab/DeviceSignInViewModel.cs
new file mode 100644
index 00000000..a8216d4f
--- /dev/null
+++ b/Samples/DeviceLab/DeviceSignInViewModel.cs
@@ -0,0 +1,255 @@
+using Microsoft.Tools.WindowsDevicePortal;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Security;
+using System.Text;
+using System.Threading.Tasks;
+using Prism.Commands;
+using Prism.Mvvm;
+using System.Collections.ObjectModel;
+using System.Windows.Input;
+
+namespace DeviceLab
+{
+
+    public interface IDevicePortalConnectionFactory
+    {
+        IDevicePortalConnection CreateConnection(
+            string address,
+            string userName,
+            SecureString password);
+
+        string Name { get; }
+    }
+
+    class XboxDevicePortalConnectionFactory : IDevicePortalConnectionFactory
+    {
+        public string Name { get { return "Xbox One"; } }
+
+        public IDevicePortalConnection CreateConnection(
+            string address,
+            string userName,
+            SecureString password)
+        {
+            return new XboxDevicePortalConnection(address, userName, password);
+        }
+    }
+
+    class GenericDevicePortalConnectionFactory : IDevicePortalConnectionFactory
+    {
+        public string Name { get { return "Generic Device"; } }
+
+        public IDevicePortalConnection CreateConnection(string address, string userName, SecureString password)
+        {
+            return new DefaultDevicePortalConnection(address, userName, password);
+        }
+    }
+
+    public delegate void DeviceSignInEventHandler(DeviceSignInViewModel sender, DeviceSignInEventArgs args);
+
+    public class DeviceSignInEventArgs : System.EventArgs
+    {
+        internal DeviceSignInEventArgs(HttpStatusCode statusCode, DevicePortal portal)
+        {
+            this.StatusCode = statusCode;
+            this.Portal = portal;
+        }
+
+        public HttpStatusCode StatusCode { get; private set; }
+
+        public DevicePortal Portal { get; private set; }
+    }
+
+    public class DeviceSignInViewModel : BindableBase
+    {
+        //-------------------------------------------------------------------
+        //  Private Members
+        //-------------------------------------------------------------------
+        #region Private Members
+        private IDiagnosticSink diagnostics;
+        #endregion // Private Members
+
+        //-------------------------------------------------------------------
+        //  Constructors
+        //-------------------------------------------------------------------
+        #region Constructors
+        /// <summary>
+        ///  Default constructor creates a null diagnostic sink
+        /// </summary>
+        /// <remarks>Diagnostic output will be lost</remarks>
+        public DeviceSignInViewModel()
+        {
+            this.ready = true;
+            this.diagnostics = new NullDiagnosticSink();
+
+        }
+
+        /// <summary>
+        /// Use this constructor to specify a diagnostic sink for diagnostic output
+        /// </summary>
+        /// <param name="diags">Diagnostic sink that will receive all the diagnostic output</param>
+        public DeviceSignInViewModel(IDiagnosticSink diags)
+        {
+            this.ready = true;
+            this.diagnostics = diags;
+        }
+        #endregion // Constructors
+
+        //-------------------------------------------------------------------
+        //  Properties
+        //-------------------------------------------------------------------
+        #region Properties
+        #region DeviceIP
+        private string deviceIP;
+        public string DeviceIP
+        {
+            get { return this.deviceIP; }
+            set { SetProperty(ref this.deviceIP, value); }
+        }
+        #endregion // DeviceIP
+
+        #region UserName
+        private string userName;
+        public string UserName
+        {
+            get { return this.userName; }
+            set { SetProperty(ref this.userName, value); }
+        }
+        #endregion // UserName
+
+        #region Password
+        private SecureString password;
+        public SecureString Password
+        {
+            get { return this.password; }
+            set { SetProperty(ref this.password, value); }
+        }
+        #endregion // Password
+
+        #region Ready
+        private bool ready;
+        public bool Ready
+        {
+            get { return this.ready; }
+            private set { SetProperty(ref this.ready, value); }
+        }
+        #endregion // Ready
+
+        #region Connection Types
+        private ObservableCollection<IDevicePortalConnectionFactory> connectionTypes;
+        public ObservableCollection<IDevicePortalConnectionFactory> ConnectionTypes
+        {
+            get
+            {
+                if (this.connectionTypes == null)
+                {
+                    this.connectionTypes = new ObservableCollection<IDevicePortalConnectionFactory>();
+                }
+                return this.connectionTypes;
+            }
+        }
+        #endregion // Connection Types
+
+        #region ConnectionTypeSelection
+        private IDevicePortalConnectionFactory connectionTypeSelection;
+        public IDevicePortalConnectionFactory ConnectionTypeSelection
+        {
+            get { return this.connectionTypeSelection; }
+            set { SetProperty(ref this.connectionTypeSelection, value); }
+        }
+        #endregion // ConnectionTypeSelection
+        #endregion // Properties
+
+        //-------------------------------------------------------------------
+        //  Commands
+        //-------------------------------------------------------------------
+        #region Commands
+
+        #region Connect Command
+        private DelegateCommand connectCommand;
+        public ICommand ConnectCommand
+        {
+            get
+            {
+                if (connectCommand == null)
+                {
+                    connectCommand = DelegateCommand.FromAsyncHandler(ExecuteConnectAsync, CanExecuteConnect);
+                    connectCommand.ObservesProperty(() => this.DeviceIP);
+                    connectCommand.ObservesProperty(() => this.UserName);
+                    connectCommand.ObservesProperty(() => this.Password);
+                    connectCommand.ObservesProperty(() => this.Ready);
+                    connectCommand.ObservesProperty(() => this.ConnectionTypeSelection);
+                }
+                return connectCommand;
+            }
+        }
+
+        private async Task ExecuteConnectAsync()
+        {
+            this.diagnostics.OutputDiagnosticString("[{0}] Attempting to connect.\n", this.deviceIP);
+
+            IDevicePortalConnection conn = this.ConnectionTypeSelection.CreateConnection(this.DeviceIP, this.UserName, this.Password);
+
+            DevicePortal portal = new DevicePortal(conn);
+            DeviceConnectionStatusEventHandler handler = (DevicePortal sender, DeviceConnectionStatusEventArgs args) =>
+            {
+                this.diagnostics.OutputDiagnosticString("[{0}] Connection status update: Status: {1}, Phase: {2}\n", portal.Address, args.Status, args.Phase);
+                if (args.Status == DeviceConnectionStatus.Connected)
+                {
+                    this.diagnostics.OutputDiagnosticString("[{0}] Language: {1}\n", portal.Address, conn.OsInfo.Language);
+                    this.diagnostics.OutputDiagnosticString("[{0}] Name: {1}\n", portal.Address, conn.OsInfo.Name);
+                    this.diagnostics.OutputDiagnosticString("[{0}] OsEdition: {1}\n", portal.Address, conn.OsInfo.OsEdition);
+                    this.diagnostics.OutputDiagnosticString("[{0}] OsEditionId: {1}\n", portal.Address, conn.OsInfo.OsEditionId);
+                    this.diagnostics.OutputDiagnosticString("[{0}] OsVersionString: {1}\n", portal.Address, conn.OsInfo.OsVersionString);
+                    this.diagnostics.OutputDiagnosticString("[{0}] Platform: {1}\n", portal.Address, conn.OsInfo.Platform);
+                    this.diagnostics.OutputDiagnosticString("[{0}] PlatformName: {1}\n", portal.Address, conn.OsInfo.PlatformName);
+                }
+                else if (args.Status == DeviceConnectionStatus.Failed)
+                {
+                    this.diagnostics.OutputDiagnosticString("[{0}] Bummer.\n", portal.Address);
+                }
+            };
+            portal.ConnectionStatus += handler;
+
+            try
+            {
+                this.Ready = false;
+                await portal.Connect();
+            }
+            catch (Exception exn)
+            {
+                this.diagnostics.OutputDiagnosticString("[{0}] Exception when trying to connect:\n[{0}] {1}\nStackTrace: \n[{0}] {2}\n", portal.Address, exn.Message, exn.StackTrace);
+            }
+            this.SignInAttempts?.Invoke(this, new DeviceSignInEventArgs(portal.ConnectionHttpStatusCode, portal));
+            portal.ConnectionStatus -= handler;
+            this.Ready = true;
+        }
+
+        private bool CanExecuteConnect()
+        {
+            return
+                Ready &&
+                !string.IsNullOrWhiteSpace(this.DeviceIP) &&
+                !string.IsNullOrWhiteSpace(this.UserName) &&
+                this.Password != null &&
+                this.Password.Length > 0 &&
+                this.ConnectionTypeSelection != null;
+        }
+        #endregion // Connect Command
+        #endregion // Commands
+
+        #region Public Methods
+        public void AddDevicePortalConnectionFactory(IDevicePortalConnectionFactory factory)
+        {
+            this.ConnectionTypes.Add(factory);
+        }
+        #endregion // Public Methods
+
+        #region Events
+        public event DeviceSignInEventHandler SignInAttempts;
+        #endregion // Events
+
+    }
+}
diff --git a/Samples/DeviceLab/DiagnosticOutputViewModel.cs b/Samples/DeviceLab/DiagnosticOutputViewModel.cs
new file mode 100644
index 00000000..baa41eea
--- /dev/null
+++ b/Samples/DeviceLab/DiagnosticOutputViewModel.cs
@@ -0,0 +1,163 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DeviceLab
+{
+    /// <summary>
+    /// Interface describes a destination for diagnostic output
+    /// </summary>
+    public interface IDiagnosticSink
+    {
+        void OutputDiagnosticString(string fmt, params object[] args);
+    }
+
+    /// <summary>
+    /// Discards all diagnostic output
+    /// </summary>
+    public class NullDiagnosticSink : IDiagnosticSink
+    {
+        public void OutputDiagnosticString(string fmt, params object[] args)
+        {
+        }
+    }
+
+    /// <summary>
+    /// Sends diagnostic output to the console
+    /// </summary>
+    public class ConsoleDiagnositcSink : IDiagnosticSink
+    {
+        public void OutputDiagnosticString(string fmt, params object[] args)
+        {
+            Console.Write(string.Format(fmt, args));
+        }
+    }
+
+    /// <summary>
+    /// Sends diagnostic output to the debug channel (i.e. OutputDebugString)
+    /// </summary>
+    public class DebugDiagnosticSink : IDiagnosticSink
+    {
+        public void OutputDiagnosticString(string fmt, params object[] args)
+        {
+            Debug.Write(string.Format(fmt, args));
+        }
+    }
+
+    /// <summary>
+    /// Combines several diagnostic sinks together
+    /// </summary>
+    public class AggregateDiagnosticSink : IDiagnosticSink
+    {
+        private IEnumerable<IDiagnosticSink> sinks;
+
+        public AggregateDiagnosticSink(params IDiagnosticSink[] args)
+        {
+            sinks = args;
+        }
+
+
+        public void OutputDiagnosticString(string fmt, params object[] args)
+        {
+            foreach (var diag in sinks)
+            {
+                diag.OutputDiagnosticString(fmt, args);
+            }
+        }
+    }
+
+
+    /// <summary>
+    /// View Model to provide diagnostic output to a view through the OutputStream string property
+    /// </summary>
+    public class DiagnosticOutputViewModel : INotifyPropertyChanged, IDiagnosticSink
+    {
+        //-------------------------------------------------------------------
+        //  Private Members
+        //-------------------------------------------------------------------
+        #region Private Members
+        private const int cMaxBufferSize = 65535;
+        #endregion // Private Members
+
+
+        //-------------------------------------------------------------------
+        //  Properties
+        //-------------------------------------------------------------------
+        #region Properties
+        #region OutputStream
+        private string mOutputStream;
+        public string OutputStream
+        {
+            get
+            {
+                return mOutputStream;
+            }
+
+            private set
+            {
+                SetField(ref mOutputStream, value, "OutputStream");
+            }
+        }
+        #endregion // OutputStream
+        #endregion // Properties
+
+        //-------------------------------------------------------------------
+        //  IDiagnosticSink Implementation
+        //-------------------------------------------------------------------
+        #region IDiagnosticSink Implementation
+        /// <summary>
+        /// Prints a formatted diagnostic string to the output stream
+        /// </summary>
+        /// <param name="fmt">Format string</param>
+        /// <param name="args">Format arguments</param>
+        /// <remarks>Automatically flushes the output</remarks>
+        public void OutputDiagnosticString(string fmt, params object[] args)
+        {
+            mOutputStream += string.Format(fmt, args);
+            FlushOutput();
+        }
+        #endregion // IDiagnosticSink Implementation
+
+        //-------------------------------------------------------------------
+        //  Private Methods
+        //-------------------------------------------------------------------
+        #region Private Methods
+        /// <summary>
+        /// Flush pending output
+        /// </summary>
+        private void FlushOutput()
+        {
+            int len = mOutputStream.Length;
+            if (len > cMaxBufferSize)
+            {
+                mOutputStream = mOutputStream.Substring(len - cMaxBufferSize);
+            }
+            OnPropertyChanged("OutputStream");
+        }
+        #endregion // Private Methods
+
+        //-------------------------------------------------------------------
+        //  INotifyPropertyChanged Implementation
+        //-------------------------------------------------------------------
+        #region INotifyPropertyChanged implementation
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected virtual void OnPropertyChanged(string propertyName)
+        {
+            PropertyChangedEventHandler handler = PropertyChanged;
+            if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));
+        }
+        protected bool SetField<T>(ref T field, T value, string propertyName)
+        {
+            if (EqualityComparer<T>.Default.Equals(field, value)) return false;
+            field = value;
+            OnPropertyChanged(propertyName);
+            return true;
+        }
+        #endregion // INotifyPropertyChanged implementation
+    }
+}
diff --git a/Samples/DeviceLab/MainViewModel.cs b/Samples/DeviceLab/MainViewModel.cs
new file mode 100644
index 00000000..13153061
--- /dev/null
+++ b/Samples/DeviceLab/MainViewModel.cs
@@ -0,0 +1,67 @@
+using Prism.Mvvm;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DeviceLab
+{
+    public class MainViewModel : BindableBase
+    {
+        //-------------------------------------------------------------------
+        //  Constructors
+        //-------------------------------------------------------------------
+        #region Constructors
+        public MainViewModel()
+        {
+
+
+            Diagnostics = new DiagnosticOutputViewModel();
+
+            DebugDiagnosticSink debugDiags = new DebugDiagnosticSink();
+            AggregateDiagnosticSink aggDiags = new AggregateDiagnosticSink(Diagnostics, debugDiags);
+
+            this.SignIn = new DeviceSignInViewModel(aggDiags);
+            this.SignIn.AddDevicePortalConnectionFactory(new XboxDevicePortalConnectionFactory());
+            this.SignIn.AddDevicePortalConnectionFactory(new GenericDevicePortalConnectionFactory());
+
+            this.SignIn.SignInAttempts += OnSignInAttemptCompleted;
+        }
+
+        private void OnSignInAttemptCompleted(DeviceSignInViewModel sender, DeviceSignInEventArgs args)
+        {
+            if(args.StatusCode == System.Net.HttpStatusCode.OK)
+            {
+                connectedDevices.Add(new DevicePortalViewModel(args.Portal, Diagnostics));
+            }
+        }
+        #endregion // Constructors
+
+        //-------------------------------------------------------------------
+        //  Properties
+        //-------------------------------------------------------------------
+        #region Properties
+        public DiagnosticOutputViewModel Diagnostics { get; private set; }
+        public DeviceSignInViewModel SignIn { get; private set; }
+
+        #region Connected Devices
+        private ObservableCollection<DevicePortalViewModel> connectedDevices;
+        public ObservableCollection<DevicePortalViewModel> ConnectedDevices
+        {
+            get
+            {
+                if(this.connectedDevices == null)
+                {
+                    this.connectedDevices = new ObservableCollection<DevicePortalViewModel>();
+                    OnPropertyChanged("ConnectedDevices");
+                }
+                return this.connectedDevices;
+            }
+        }
+        #endregion // Connected Devices
+
+        #endregion // Properties
+    }
+}
diff --git a/Samples/DeviceLab/MainWindow.xaml b/Samples/DeviceLab/MainWindow.xaml
new file mode 100644
index 00000000..ab7f7d91
--- /dev/null
+++ b/Samples/DeviceLab/MainWindow.xaml
@@ -0,0 +1,74 @@
+<Window x:Class="DeviceLab.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:DeviceLab"
+        mc:Ignorable="d"
+        Title="Device Lab" Height="600" Width="525">
+    <Window.DataContext>
+        <local:MainViewModel />
+    </Window.DataContext>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition />
+            <RowDefinition />
+        </Grid.RowDefinitions>
+        <Grid Grid.Row="0" DataContext="{Binding SignIn}">
+            <TextBlock x:Name="labelAddress" Text="Address" HorizontalAlignment="Left" Margin="97,5,0,0" VerticalAlignment="Top"/>
+            <TextBox
+                x:Name="addressEntry"
+                HorizontalAlignment="Left" Height="23" Margin="155,8,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="285"
+                Text="{Binding DeviceIP}"
+                IsEnabled="{Binding Ready}"
+                TextChanged="addressEntry_TextChanged" />
+            <TextBlock x:Name="labelUserName" Text="UserName" HorizontalAlignment="Left" Margin="85,33,0,0" VerticalAlignment="Top"/>
+            <TextBox
+                x:Name="userNameEntry" HorizontalAlignment="Left" Height="23" Margin="155,36,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="285"
+                Text="{Binding UserName}"
+                IsEnabled="{Binding Ready}"
+                TextChanged="userNameEntry_TextChanged"/>
+            <TextBlock x:Name="labelPassword" Text="Password" HorizontalAlignment="Left" Margin="90,62,0,0" VerticalAlignment="Top"/>
+            <local:BindablePassword
+                x:Name="passwordBox" HorizontalAlignment="Left" Margin="155,64,0,0" VerticalAlignment="Top" Width="285" Height="21"
+                Password="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                IsEnabled="{Binding Ready}" />
+            <TextBlock x:Name="lableConnectionType" Text="Connection Type" HorizontalAlignment="Left" Margin="51,86,0,0" VerticalAlignment="Top"/>
+            <ComboBox
+                x:Name="connectionTypeBox" HorizontalAlignment="Left" Margin="155,90,0,0" VerticalAlignment="Top" Width="204"
+                ItemsSource="{Binding ConnectionTypes}"
+                SelectedItem="{Binding ConnectionTypeSelection}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Name}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+            <Button
+                x:Name="buttonConnect" Content="Connect" HorizontalAlignment="Left" Margin="364,90,0,0" VerticalAlignment="Top" Width="76"
+                Command="{Binding ConnectCommand}"
+                IsEnabled="{Binding Ready}" />
+        </Grid>
+        <Grid Grid.Row="1">
+            <ListBox x:Name="listBoxConnectedDevices" HorizontalAlignment="Left" VerticalAlignment="Top"
+                     Height="{Binding Path=ActualHeight, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Grid}}}"
+                     Width="{Binding Path=ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Grid}}}"
+                     ItemsSource="{Binding ConnectedDevices}" >
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <local:DevicePortalView Width="{Binding Path=ActualWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsPresenter}}}"/>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+            </ListBox>
+        </Grid>
+        <Grid Grid.Row="2" DataContext="{Binding Diagnostics}">
+            <TextBox x:Name="Output"
+                     Text="{Binding OutputStream, Mode=OneWay}"
+                     VerticalScrollBarVisibility="Visible"
+                     HorizontalScrollBarVisibility="Auto"
+                     IsReadOnly="True"/>
+        </Grid>
+
+    </Grid>
+</Window>
diff --git a/Samples/DeviceLab/MainWindow.xaml.cs b/Samples/DeviceLab/MainWindow.xaml.cs
new file mode 100644
index 00000000..72dadbd2
--- /dev/null
+++ b/Samples/DeviceLab/MainWindow.xaml.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace DeviceLab
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void addressEntry_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            var binding = ((TextBox)sender).GetBindingExpression(TextBox.TextProperty);
+            binding.UpdateSource();
+        }
+
+        private void userNameEntry_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            var binding = ((TextBox)sender).GetBindingExpression(TextBox.TextProperty);
+            binding.UpdateSource();
+        }
+    }
+}
diff --git a/Samples/DeviceLab/Properties/AssemblyInfo.cs b/Samples/DeviceLab/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000..62360021
--- /dev/null
+++ b/Samples/DeviceLab/Properties/AssemblyInfo.cs
@@ -0,0 +1,55 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// 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("DeviceLab")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("DeviceLab")]
+[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)]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page, 
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page, 
+                                              // app, or any theme specific resource dictionaries)
+)]
+
+
+// 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/Samples/DeviceLab/Properties/Resources.Designer.cs b/Samples/DeviceLab/Properties/Resources.Designer.cs
new file mode 100644
index 00000000..f083c487
--- /dev/null
+++ b/Samples/DeviceLab/Properties/Resources.Designer.cs
@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <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 DeviceLab.Properties
+{
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // 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", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources
+    {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources()
+        {
+        }
+
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager
+        {
+            get
+            {
+                if ((resourceMan == null))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DeviceLab.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture
+        {
+            get
+            {
+                return resourceCulture;
+            }
+            set
+            {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/Samples/DeviceLab/Properties/Resources.resx b/Samples/DeviceLab/Properties/Resources.resx
new file mode 100644
index 00000000..af7dbebb
--- /dev/null
+++ b/Samples/DeviceLab/Properties/Resources.resx
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/Samples/DeviceLab/Properties/Settings.Designer.cs b/Samples/DeviceLab/Properties/Settings.Designer.cs
new file mode 100644
index 00000000..0d6835be
--- /dev/null
+++ b/Samples/DeviceLab/Properties/Settings.Designer.cs
@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <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 DeviceLab.Properties
+{
+
+
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.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/Samples/DeviceLab/Properties/Settings.settings b/Samples/DeviceLab/Properties/Settings.settings
new file mode 100644
index 00000000..033d7a5e
--- /dev/null
+++ b/Samples/DeviceLab/Properties/Settings.settings
@@ -0,0 +1,7 @@
+<?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/Samples/DeviceLab/XboxDevicePortalConnection.cs b/Samples/DeviceLab/XboxDevicePortalConnection.cs
new file mode 100644
index 00000000..aeb1b7c5
--- /dev/null
+++ b/Samples/DeviceLab/XboxDevicePortalConnection.cs
@@ -0,0 +1,172 @@
+using System;
+using System.Net;
+using System.Security;
+using System.Security.Cryptography.X509Certificates;
+using System.Text.RegularExpressions;
+using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
+
+namespace Microsoft.Tools.WindowsDevicePortal
+{
+    public class XboxDevicePortalConnection : IDevicePortalConnection
+    {
+        /// <summary>
+        /// Device Certificate
+        /// </summary>
+        private X509Certificate2 deviceCertificate = null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="XboxDevicePortalConnection"/> class.
+        /// </summary>
+        /// <param name="address">device identifier</param>
+        /// <param name="userName">WDP username</param>
+        /// <param name="password">WDP password</param>
+        public XboxDevicePortalConnection(
+            string address,
+            string userName,
+            string password)
+        {
+            this.Connection = new Uri(string.Format("https://{0}:11443", address));
+            this.Credentials = new NetworkCredential(userName, password);
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="XboxDevicePortalConnection"/> class, using a SecureString to secure the password.
+        /// </summary>
+        /// <param name="address">device identifier</param>
+        /// <param name="userName">WDP username</param>
+        /// <param name="password">WDP password</param>
+        public XboxDevicePortalConnection(
+            string address,
+            string userName,
+            SecureString password)
+        {
+            this.Connection = new Uri(string.Format("https://{0}:11443", address));
+            this.Credentials = new NetworkCredential(userName, password);
+        }
+
+        /// <summary>
+        /// Gets Connection property
+        /// </summary>
+        public Uri Connection
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Gets Web Socket Connection property
+        /// </summary>
+        public Uri WebSocketConnection
+        {
+            get
+            {
+                if (this.Connection == null)
+                {
+                    return null;
+                }
+
+                string absoluteUri = this.Connection.AbsoluteUri;
+
+                if (absoluteUri.StartsWith("https", StringComparison.OrdinalIgnoreCase))
+                {
+                    return new Uri(Regex.Replace(absoluteUri, "https", "wss", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant));
+                }
+                else
+                {
+                    return new Uri(Regex.Replace(absoluteUri, "http", "ws", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant));
+                }
+            }
+        }
+
+        /// <summary>
+        /// Gets Credentials property
+        /// </summary>
+        public NetworkCredential Credentials
+        {
+            get;
+            private set;
+        }
+
+        /// <summary>
+        /// Gets or sets device family
+        /// </summary>
+        public string Family
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the device name
+        /// </summary>
+        public string Name
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets device OS Info
+        /// </summary>
+        public OperatingSystemInformation OsInfo
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the device's qualified name
+        /// </summary>
+        public string QualifiedName
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Returns certificate data
+        /// </summary>
+        /// <returns>certificate data</returns>
+        public byte[] GetDeviceCertificateData()
+        {
+            return this.deviceCertificate.GetRawCertData();
+        }
+
+        /// <summary>
+        /// Validates and sets the device certificate.
+        /// </summary>
+        /// <param name="certificate">The device's root certificate.</param>
+        public void SetDeviceCertificate(X509Certificate2 certificate)
+        {
+            if (!certificate.IssuerName.Name.Contains(DevicePortalCertificateIssuer))
+            {
+                throw new DevicePortalException(
+                    (HttpStatusCode)0,
+                    "Invalid certificate issuer",
+                    null,
+                    "Failed to download device certificate");
+            }
+
+            this.deviceCertificate = certificate;
+        }
+
+        /// <summary>
+        /// Xbox will never update the connection.
+        /// </summary>
+        /// <param name="requiresHttps">https required</param>
+        public void UpdateConnection(bool requiresHttps)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <summary>
+        ///  Xbox will never update the connection.
+        /// </summary>
+        /// <param name="ipConfig">IP info</param>
+        /// <param name="requiresHttps">https required</param>
+        public void UpdateConnection(IpConfiguration ipConfig, bool requiresHttps)
+        {
+            //throw new NotImplementedException();
+        }
+    }
+}
diff --git a/Samples/DeviceLab/packages.config b/Samples/DeviceLab/packages.config
new file mode 100644
index 00000000..7d9d6c5c
--- /dev/null
+++ b/Samples/DeviceLab/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Prism.Core" version="6.1.0" targetFramework="net452" />
+</packages>
\ No newline at end of file

From 94cca6f9db48c8c4208c7c43ded1e90a2d10d5f0 Mon Sep 17 00:00:00 2001
From: Greg Pettyjohn <grpettyj@microsoft.com>
Date: Fri, 12 Aug 2016 11:09:51 -0700
Subject: [PATCH 02/51] This is what I showed to Dave

---
 Samples/DeviceLab/DevicePortalViewModel.cs       |  2 +-
 Samples/DeviceLab/XboxDevicePortalConnection.cs  | 13 +++++++++++++
 .../DefaultDevicePortalConnection.cs             | 16 ++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/Samples/DeviceLab/DevicePortalViewModel.cs b/Samples/DeviceLab/DevicePortalViewModel.cs
index 5122032e..35c78f80 100644
--- a/Samples/DeviceLab/DevicePortalViewModel.cs
+++ b/Samples/DeviceLab/DevicePortalViewModel.cs
@@ -273,7 +273,7 @@ private async Task ExecuteRebootAsync()
             }
             await ExecuteReestablishConnectionAsync();
         }
-        #endregion // Reboot Comment
+        #endregion // Reboot Command
 
         #region ReestablishConnectionCommand
         private DelegateCommand reestablishConnectionCommand;
diff --git a/Samples/DeviceLab/XboxDevicePortalConnection.cs b/Samples/DeviceLab/XboxDevicePortalConnection.cs
index aeb1b7c5..05499818 100644
--- a/Samples/DeviceLab/XboxDevicePortalConnection.cs
+++ b/Samples/DeviceLab/XboxDevicePortalConnection.cs
@@ -123,6 +123,19 @@ public string QualifiedName
             set;
         }
 
+        public bool AllowCertOverride
+        {
+            get
+            {
+                throw new NotImplementedException();
+            }
+
+            set
+            {
+                throw new NotImplementedException();
+            }
+        }
+
         /// <summary>
         /// Returns certificate data
         /// </summary>
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs
index 76871906..e6457e65 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs
@@ -6,6 +6,7 @@
 
 using System;
 using System.Net;
+using System.Security;
 using System.Security.Cryptography.X509Certificates;
 using System.Text.RegularExpressions;
 using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
@@ -43,6 +44,21 @@ public DefaultDevicePortalConnection(
             }
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="XboxDevicePortalConnection"/> class, using a SecureString to secure the password.
+        /// </summary>
+        /// <param name="address">device identifier</param>
+        /// <param name="userName">WDP username</param>
+        /// <param name="password">WDP password</param>
+        public DefaultDevicePortalConnection(
+            string address,
+            string userName,
+            SecureString password)
+        {
+            this.Connection = new Uri(string.Format("https://{0}:11443", address));
+            this.Credentials = new NetworkCredential(userName, password);
+        }
+
         /// <summary>
         /// Gets the URI used to connect to the device.
         /// </summary>

From 46cabd4c99baeae46e362f9859d6a20d5e7c0a27 Mon Sep 17 00:00:00 2001
From: Greg Pettyjohn <grpettyj@microsoft.com>
Date: Mon, 22 Aug 2016 15:51:46 -0700
Subject: [PATCH 03/51] Committing so that I can change machines and not loose
 my work

---
 Samples/DeviceLab/DeviceCollectionView.xaml   | 258 ++++++++++++++++++
 ...w.xaml.cs => DeviceCollectionView.xaml.cs} |  11 +-
 Samples/DeviceLab/DeviceLab.csproj            |  18 +-
 Samples/DeviceLab/DevicePortalView.xaml       | 104 -------
 Samples/DeviceLab/DevicePortalViewModel.cs    |  92 ++++++-
 Samples/DeviceLab/DeviceSignInView.xaml       |  70 +++++
 Samples/DeviceLab/DeviceSignInView.xaml.cs    |  28 ++
 Samples/DeviceLab/MainViewModel.cs            | 242 +++++++++++++++-
 Samples/DeviceLab/MainWindow.xaml             |  73 ++---
 Samples/DeviceLab/MainWindow.xaml.cs          |  12 -
 Samples/DeviceLab/SelectionListBox.cs         |  75 +++++
 Samples/DeviceLab/Themes/Generic.xaml         |   5 +
 sync.cmd                                      |  21 ++
 13 files changed, 825 insertions(+), 184 deletions(-)
 create mode 100644 Samples/DeviceLab/DeviceCollectionView.xaml
 rename Samples/DeviceLab/{DevicePortalView.xaml.cs => DeviceCollectionView.xaml.cs} (60%)
 delete mode 100644 Samples/DeviceLab/DevicePortalView.xaml
 create mode 100644 Samples/DeviceLab/DeviceSignInView.xaml
 create mode 100644 Samples/DeviceLab/DeviceSignInView.xaml.cs
 create mode 100644 Samples/DeviceLab/SelectionListBox.cs
 create mode 100644 Samples/DeviceLab/Themes/Generic.xaml
 create mode 100644 sync.cmd

diff --git a/Samples/DeviceLab/DeviceCollectionView.xaml b/Samples/DeviceLab/DeviceCollectionView.xaml
new file mode 100644
index 00000000..52a66946
--- /dev/null
+++ b/Samples/DeviceLab/DeviceCollectionView.xaml
@@ -0,0 +1,258 @@
+<UserControl x:Class="DeviceLab.DeviceCollectionView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:DeviceLab"
+             mc:Ignorable="d" 
+             d:DesignHeight="228.52" d:DesignWidth="517">
+    <UserControl.Resources>
+        <Storyboard x:Key="TextSpinnerAnimationStoryboard">
+            <StringAnimationUsingKeyFrames Storyboard.TargetProperty="Text" RepeatBehavior="Forever">
+                <DiscreteStringKeyFrame Value="|" KeyTime="0:0:0.0" />
+                <DiscreteStringKeyFrame Value="/" KeyTime="0:0:0.3" />
+                <DiscreteStringKeyFrame Value="-" KeyTime="0:0:0.6" />
+                <DiscreteStringKeyFrame Value="&#92;" KeyTime="0:0:0.9" />
+                <DiscreteStringKeyFrame Value="&#92;" KeyTime="0:0:1.2" />
+            </StringAnimationUsingKeyFrames>
+        </Storyboard>
+        <Style x:Key="FocusVisual">
+            <Setter Property="Control.Template">
+                <Setter.Value>
+                    <ControlTemplate>
+                        <Rectangle Margin="2" SnapsToDevicePixels="true" Stroke="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" StrokeThickness="1" StrokeDashArray="1 2"/>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <SolidColorBrush x:Key="Item.Background" Color="#FFD0F5B1" />
+        <SolidColorBrush x:Key="Item.BorderBrush" Color="Gray" />
+        <SolidColorBrush x:Key="Item.MouseOver.Background" Color="#1F26A0DA"/>
+        <SolidColorBrush x:Key="Item.MouseOver.Border" Color="#a826A0Da"/>
+        <SolidColorBrush x:Key="Item.SelectedInactive.Background" Color="#3DDADADA"/>
+        <SolidColorBrush x:Key="Item.SelectedInactive.Border" Color="#FFDADADA"/>
+        <SolidColorBrush x:Key="Item.SelectedActive.Background" Color="#3D26A0DA"/>
+        <SolidColorBrush x:Key="Item.SelectedActive.Border" Color="#FF26A0DA"/>
+        <Style x:Key="DeviceCollectionItemStyle" TargetType="{x:Type ListBoxItem}">
+            <Setter Property="SnapsToDevicePixels" Value="True"/>
+            <Setter Property="Padding" Value="4,1"/>
+            <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+            <Setter Property="VerticalContentAlignment" Value="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
+            <Setter Property="Background" Value="{StaticResource Item.Background}"/>
+            <Setter Property="BorderBrush" Value="{StaticResource Item.BorderBrush}"/>
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="FocusVisualStyle" Value="{StaticResource FocusVisual}"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                        <Border
+                            x:Name="Bd"
+                            MouseDown="EatMouseClicks"
+                            Margin="2,1,2,1"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Background="Transparent"
+                            Padding="{TemplateBinding Padding}"
+                            SnapsToDevicePixels="true">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <Grid.IsEnabled>
+                                    <Binding Path="Ready"  />
+                                </Grid.IsEnabled>
+                                <TextBlock Grid.Row="0" Grid.RowSpan="2" FontSize="30" FontWeight="Bold" Foreground="Gray" Panel.ZIndex="3" HorizontalAlignment="Center" VerticalAlignment="Center">
+                                    <TextBlock.Style>
+                                        <Style>
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding Ready}" Value="False">
+                                                    <DataTrigger.EnterActions>
+                                                        <BeginStoryboard x:Name="spinnerStoryboard" Storyboard="{StaticResource TextSpinnerAnimationStoryboard}" />
+                                                    </DataTrigger.EnterActions>
+                                                </DataTrigger>
+                                                <DataTrigger Binding="{Binding Ready}" Value="True">
+                                                    <DataTrigger.EnterActions>
+                                                        <StopStoryboard BeginStoryboardName="spinnerStoryboard"/>
+                                                    </DataTrigger.EnterActions>
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </TextBlock.Style>
+                                </TextBlock>
+                                <Border
+                                    x:Name="itemHeading" Grid.Row="0"
+                                    Margin="-5,-2,-5,-1"
+                                    BorderBrush="Gray"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    Background="{TemplateBinding Background}"
+                                    Padding="{TemplateBinding Padding}"
+                                    SnapsToDevicePixels="true">
+                                    <DockPanel>
+                                        <CheckBox Margin="0,0,4,0">
+                                            <CheckBox.IsChecked>
+                                                <Binding Path="IsSelected" RelativeSource="{RelativeSource AncestorType=ListBoxItem}" />
+                                            </CheckBox.IsChecked>
+                                        </CheckBox>
+                                        <TextBlock Margin="0,0,4,0" Text="Device Name:" />
+                                        <TextBlock Text="{Binding DeviceName}"/>
+                                        <Button
+                                            DockPanel.Dock="Right"
+                                            Height="16" Width="16"
+                                            Padding="0,-3,0,0"
+                                            HorizontalAlignment="Right"
+                                            Content="x">
+                                            <Button.Command>
+                                                <Binding Path="DataContext.RemoveDeviceCommand" RelativeSource="{RelativeSource AncestorType=local:SelectionListBox}" />
+                                            </Button.Command>
+                                            <Button.CommandParameter>
+                                                <Binding Path="DataContext" RelativeSource="{RelativeSource AncestorType=ListBoxItem}"/>
+                                            </Button.CommandParameter>
+                                        </Button>
+                                    </DockPanel>
+                                </Border>
+                                <ContentPresenter Grid.Row="1"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                            </Grid>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsSelected" Value="True">
+                                <Setter Property="Background" TargetName="itemHeading" Value="{StaticResource Item.SelectedActive.Background}"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+
+                    <!--<ControlTemplate TargetType="{x:Type ListBoxItem}">
+                        <Border x:Name="Bd"
+                                MouseDown="EatMouseClicks"
+                                BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="IsMouseOver" Value="True"/>
+                                </MultiTrigger.Conditions>
+                                <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.MouseOver.Background}"/>
+                                <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.MouseOver.Border}"/>
+                            </MultiTrigger>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="Selector.IsSelectionActive" Value="False"/>
+                                    <Condition Property="IsSelected" Value="True"/>
+                                </MultiTrigger.Conditions>
+                                <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Background}"/>
+                                <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Border}"/>
+                            </MultiTrigger>
+                            <MultiTrigger>
+                                <MultiTrigger.Conditions>
+                                    <Condition Property="Selector.IsSelectionActive" Value="True"/>
+                                    <Condition Property="IsSelected" Value="True"/>
+                                </MultiTrigger.Conditions>
+                                <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Background}"/>
+                                <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Border}"/>
+                            </MultiTrigger>
+                            <Trigger Property="IsEnabled" Value="False">
+                                <Setter Property="TextElement.Foreground" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>-->
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <DataTemplate x:Key="DevicePortalView">
+            <TabControl Height="80">
+                <TabItem Header="Manage">
+                    <StackPanel>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock Margin="0,0,8,0" Text="Name:" />
+                            <TextBox Width="100" Margin="0,0,4,0" Text="{Binding DeviceNameEntry, UpdateSourceTrigger=PropertyChanged}" />
+                            <Button Padding="2,1,2,1" Command="{Binding RenameCommand}" Content="Rename" />
+                        </StackPanel>
+                    </StackPanel>
+                </TabItem>
+                <TabItem Header="Info">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                                <ColumnDefinition />
+                            </Grid.ColumnDefinitions>
+                            <StackPanel Grid.Column="0">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="100" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Grid.Column="0" Text="Device Name" />
+                                    <TextBlock Grid.Column="1" Text="{Binding DeviceName}" />
+                                </Grid>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="100" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Grid.Column="0" Text="Device Address" />
+                                    <TextBlock Grid.Column="1" Text="{Binding Address}" />
+                                </Grid>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="100" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Grid.Column="0" Text="Device Family" />
+                                    <TextBlock Grid.Column="1" Text="{Binding DeviceFamily}" />
+                                </Grid>
+                            </StackPanel>
+                            <Rectangle Grid.Column="1" Width="2" Fill="Gray" Margin="10,3,10,2" />
+                            <StackPanel Grid.Column="2">
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="150" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Grid.Column="0" Text="Platform" />
+                                    <TextBlock Grid.Column="1" Text="{Binding Platform}" />
+                                </Grid>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="150" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Grid.Column="0" Text="Platform Name" />
+                                    <TextBlock Grid.Column="1" Text="{Binding PlatformName}" />
+                                </Grid>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="150" />
+                                        <ColumnDefinition Width="*" />
+                                    </Grid.ColumnDefinitions>
+                                    <TextBlock Grid.Column="0" Text="Operating System Version" />
+                                    <TextBlock Grid.Column="1" Text="{Binding OperatingSystemVersion}" />
+                                </Grid>
+                            </StackPanel>
+                        </Grid>
+                    </Grid>
+                </TabItem>
+                <TabItem Header="CPU">
+                    <StackPanel Orientation="Horizontal" VerticalAlignment="Center" HorizontalAlignment="Center">
+                        <TextBlock Text="CPU Load:" />
+                        <TextBlock Margin="10,0,0,0" Width="50" Text="{Binding CPULoad}" />
+                    </StackPanel>
+                </TabItem>
+            </TabControl>
+        </DataTemplate>
+    </UserControl.Resources>
+    <local:SelectionListBox
+        SelectionMode="Multiple"
+        ItemsSource="{Binding ConnectedDevices}"
+        ItemContainerStyle="{DynamicResource DeviceCollectionItemStyle}"
+        ItemTemplate="{DynamicResource DevicePortalView}"
+        SelectionList="{Binding SelectedDevices}" />
+</UserControl>
diff --git a/Samples/DeviceLab/DevicePortalView.xaml.cs b/Samples/DeviceLab/DeviceCollectionView.xaml.cs
similarity index 60%
rename from Samples/DeviceLab/DevicePortalView.xaml.cs
rename to Samples/DeviceLab/DeviceCollectionView.xaml.cs
index 910e0227..33ec7f38 100644
--- a/Samples/DeviceLab/DevicePortalView.xaml.cs
+++ b/Samples/DeviceLab/DeviceCollectionView.xaml.cs
@@ -16,19 +16,18 @@
 namespace DeviceLab
 {
     /// <summary>
-    /// Interaction logic for DevicePortalView.xaml
+    /// Interaction logic for DeviceCollectionView.xaml
     /// </summary>
-    public partial class DevicePortalView : UserControl
+    public partial class DeviceCollectionView : UserControl
     {
-        public DevicePortalView()
+        public DeviceCollectionView()
         {
             InitializeComponent();
         }
 
-        private void textBoxDeviceName_TextChanged(object sender, TextChangedEventArgs e)
+        private void EatMouseClicks(object sender, MouseButtonEventArgs e)
         {
-            var binding = ((TextBox)sender).GetBindingExpression(TextBox.TextProperty);
-            binding.UpdateSource();
+            e.Handled = true;
         }
     }
 }
diff --git a/Samples/DeviceLab/DeviceLab.csproj b/Samples/DeviceLab/DeviceLab.csproj
index d188e6a5..cf8fd55e 100644
--- a/Samples/DeviceLab/DeviceLab.csproj
+++ b/Samples/DeviceLab/DeviceLab.csproj
@@ -59,20 +59,28 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="DevicePortalView.xaml.cs">
-      <DependentUpon>DevicePortalView.xaml</DependentUpon>
+    <Compile Include="DeviceCollectionView.xaml.cs">
+      <DependentUpon>DeviceCollectionView.xaml</DependentUpon>
     </Compile>
     <Compile Include="DevicePortalViewModel.cs" />
+    <Compile Include="DeviceSignInView.xaml.cs">
+      <DependentUpon>DeviceSignInView.xaml</DependentUpon>
+    </Compile>
     <Compile Include="MainViewModel.cs" />
+    <Compile Include="SelectionListBox.cs" />
     <Compile Include="XboxDevicePortalConnection.cs" />
     <Page Include="BindablePassword.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="DevicePortalView.xaml">
+    <Page Include="DeviceCollectionView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="DeviceSignInView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -90,6 +98,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/Samples/DeviceLab/DevicePortalView.xaml b/Samples/DeviceLab/DevicePortalView.xaml
deleted file mode 100644
index e63cdc5d..00000000
--- a/Samples/DeviceLab/DevicePortalView.xaml
+++ /dev/null
@@ -1,104 +0,0 @@
-<UserControl x:Class="DeviceLab.DevicePortalView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:DeviceLab"
-             mc:Ignorable="d" 
-             Background="White"
-             d:DesignHeight="100" d:DesignWidth="500">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-        <Grid Background="LightGreen">
-            <TextBlock Grid.Row="0" HorizontalAlignment="Left" Width="200" Text="{Binding DeviceName}" VerticalAlignment="Top"/>
-            <TextBlock Grid.Row="0" HorizontalAlignment="Right" Width="100" Text="{Binding Address}" VerticalAlignment="Top"/>
-        </Grid>
-        <TabControl Grid.Row="1">
-            <TabItem Header="Device Name">
-                <Grid >
-                    <TextBlock HorizontalAlignment="Left" Margin="57,25,0,0" TextWrapping="Wrap" Text="Device Name" VerticalAlignment="Top"/>
-                    <TextBox
-                        x:Name="textBoxDeviceName"
-                        HorizontalAlignment="Left" Height="23" Margin="138,24,0,0" VerticalAlignment="Top" Width="171"
-                        TextChanged="textBoxDeviceName_TextChanged"
-                        Text="{Binding DeviceNameEntry}"/>
-                    <Button
-                        HorizontalAlignment="Left" Margin="323,26,0,0" VerticalAlignment="Top" Width="89"
-                        Content="Change Name"
-                        Command="{Binding RenameCommand}"/>
-                </Grid>
-            </TabItem>
-            <TabItem Header="CPU Performance">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="100"/>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="100"/>
-                    </Grid.ColumnDefinitions>
-                    <TextBlock Grid.Column="0" Text="CPU Load: "/>
-                    <TextBlock Grid.Column="1" Text="{Binding CPULoad}" />
-                    <TextBlock Grid.Column="2" Text="TBD: " />
-                    <TextBlock Grid.Column="3" Text="Grab some other CPU data" />
-                </Grid>
-            </TabItem>
-            <TabItem Header="Device Info">
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="50" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <StackPanel Grid.Column="0">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="150"/>
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-                            <TextBlock Grid.Column="0">Address</TextBlock>
-                            <TextBlock Grid.Column="1" Text="{Binding Address}"/>
-                        </Grid>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="150"/>
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-                            <TextBlock Grid.Column="0">Platform</TextBlock>
-                            <TextBlock Grid.Column="1" Text="{Binding Platform}" />
-                        </Grid>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="150"/>
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-                            <TextBlock Grid.Column="0">Platform Name</TextBlock>
-                            <TextBlock Grid.Column="1" Text="{Binding PlatformName}" />
-                        </Grid>
-                    </StackPanel>
-                    <StackPanel Grid.Column="2">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="150"/>
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-                            <TextBlock Grid.Column="0">Device Family</TextBlock>
-                            <TextBlock Grid.Column="1" Text="{Binding DeviceFamily}" />
-                        </Grid>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="150"/>
-                                <ColumnDefinition />
-                            </Grid.ColumnDefinitions>
-                            <TextBlock Grid.Column="0">Operating System Version</TextBlock>
-                            <TextBlock Grid.Column="1" Text="{Binding OperatingSystemVersion}" />
-                        </Grid>
-                    </StackPanel>
-                </Grid>
-            </TabItem>
-        </TabControl>
-    </Grid>
-
-</UserControl>
diff --git a/Samples/DeviceLab/DevicePortalViewModel.cs b/Samples/DeviceLab/DevicePortalViewModel.cs
index 35c78f80..d364e787 100644
--- a/Samples/DeviceLab/DevicePortalViewModel.cs
+++ b/Samples/DeviceLab/DevicePortalViewModel.cs
@@ -38,8 +38,6 @@ public DevicePortalViewModel(DevicePortal portal, IDiagnosticSink diags)
             this.diagnostics = diags;
             this.portal = portal;
             this.Ready = true;
-            Task t = GetDeviceNameAsync();
-            HookupWebSocket();
         }
         #endregion // Cosntructors
 
@@ -153,7 +151,6 @@ public string Platform
         #endregion // Platform
 
         #region PlatformName
-        #endregion // PlatformName
         public string PlatformName
         {
             get
@@ -161,6 +158,7 @@ public string PlatformName
                 return this.portal == null ? "<unknown>" : this.portal.PlatformName;
             }
         }
+        #endregion // PlatformName
 
         #region // CPULoad
         private int cpuLoad;
@@ -217,13 +215,40 @@ private async Task ExecuteRenameAsync()
                 ReportException("Rename", exn);
             }
             await ExecuteRebootAsync();
+                        
             if (this.Ready)
             {
-                await GetDeviceNameAsync();
+                await RefreshDeviceNameAsync();
+            }
+            else
+            {
+                // TODO: Need to decide what to do if this.Ready == false;
+                // ALTERNATIVLEY: Need to decide how to recover after an error
+            }
+        }
+        #endregion // RenameCommand
+
+        #region RefreshDeviceName
+        private DelegateCommand refreshDeviceNameCommand;
+        public ICommand RefreshDeviceNameCommand
+        {
+            get
+            {
+                if(this.refreshDeviceNameCommand == null)
+                {
+                    this.refreshDeviceNameCommand = DelegateCommand.FromAsyncHandler(RefreshDeviceNameAsync, CanExecuteRefreshDeviceName);
+                    this.refreshDeviceNameCommand.ObservesProperty(() => this.Ready);
+                }
+                return this.refreshDeviceNameCommand;
             }
         }
 
-        private async Task GetDeviceNameAsync()
+        private bool CanExecuteRefreshDeviceName()
+        {
+            return this.Ready;
+        }
+
+        private async Task RefreshDeviceNameAsync()
         {
             this.Ready = false;
             try
@@ -237,7 +262,7 @@ private async Task GetDeviceNameAsync()
             this.diagnostics.OutputDiagnosticString("[{0}] Retrieved device name.\n", this.diagnosticMoniker);
             this.Ready = true;
         }
-        #endregion // RenameCommand
+        #endregion // RefreshDeviceName
 
         #region Reboot Command
         private DelegateCommand rebootCommand;
@@ -331,17 +356,66 @@ private async Task ExecuteReestablishConnectionAsync()
         }
         #endregion // ReestablishConnectionCommand
 
+        #region StartListeningForSystemPerfCommand
+        private DelegateCommand startListeningForSystemPerfCommand;
+        public ICommand StartListeningForSystemPerfCommand
+        {
+            get
+            {
+                if(this.startListeningForSystemPerfCommand == null)
+                {
+                    this.startListeningForSystemPerfCommand = DelegateCommand.FromAsyncHandler(ExecuteStartListeningForSystemPerfAsync, CanStartListeningForSystemPerf);
+                    this.startListeningForSystemPerfCommand.ObservesProperty(() => this.Ready);
+                }
+                return startListeningForSystemPerfCommand;
+            }
+        }
 
+        private bool CanStartListeningForSystemPerf()
+        {
+            return this.Ready;
+        }
 
-        #endregion // Commands
-
-        private async void HookupWebSocket()
+        private async Task ExecuteStartListeningForSystemPerfAsync()
         {
             this.Ready = false;
             this.portal.SystemPerfMessageReceived += OnSystemPerfReceived;
             await this.portal.StartListeningForSystemPerf();
             this.Ready = true;
         }
+        #endregion // StartListeningForSystemPerfCommand
+
+        #region StopListeningForSystemPerfCommand
+        private DelegateCommand stopListeningForSystemPerfCommand;
+        public ICommand StopListeningForSystemPerfCommand
+        {
+            get
+            {
+                if(this.stopListeningForSystemPerfCommand == null)
+                {
+                    this.stopListeningForSystemPerfCommand = DelegateCommand.FromAsyncHandler(ExecuteStopListeningForSystemPerfAsync, CanStopListeningForSystemPerf);
+                    this.stopListeningForSystemPerfCommand.ObservesProperty(() => this.Ready);
+                }
+                return stopListeningForSystemPerfCommand;
+            }
+        }
+
+        private bool CanStopListeningForSystemPerf()
+        {
+            return this.Ready;
+        }
+
+        private async Task ExecuteStopListeningForSystemPerfAsync()
+        {
+            this.Ready = false;
+            this.portal.SystemPerfMessageReceived -= OnSystemPerfReceived;
+            await this.portal.StopListeningForSystemPerf();
+            this.Ready = true;
+        }
+        #endregion // StopListeningForSystemPerfCommand
+        #endregion // Commands
+             
+
 
         private void OnSystemPerfReceived(DevicePortal sender, WebSocketMessageReceivedEventArgs<DevicePortal.SystemPerformanceInformation> args)
         {
diff --git a/Samples/DeviceLab/DeviceSignInView.xaml b/Samples/DeviceLab/DeviceSignInView.xaml
new file mode 100644
index 00000000..a4164067
--- /dev/null
+++ b/Samples/DeviceLab/DeviceSignInView.xaml
@@ -0,0 +1,70 @@
+<UserControl x:Class="DeviceLab.DeviceSignInView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:DeviceLab"
+             mc:Ignorable="d" 
+             >
+    <UserControl.Resources>
+        <Style x:Key="fieldNameStyle" TargetType="{x:Type TextBlock}">
+            <Setter Property="Margin" Value="0,0,5,0" />
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="HorizontalAlignment" Value="Right" />
+        </Style>
+        <Style x:Key="entryBoxStyle" TargetType="{x:Type TextBox}">
+            <Setter Property="HorizontalAlignment" Value="Left" />
+            <Setter Property="Height" Value="23" />
+            <Setter Property="TextWrapping" Value="Wrap" />
+            <Setter Property="VerticalAlignment" Value="Top" />
+            <Setter Property="Width" Value="285" />
+        </Style>
+        <Style x:Key="rowStyle" TargetType="{x:Type StackPanel}">
+            <Setter Property="Orientation" Value="Horizontal" />
+            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="Margin" Value="0,2,0,0" />
+        </Style>
+    </UserControl.Resources>
+    <StackPanel DataContext="{Binding SignIn}">
+        <StackPanel Style="{StaticResource rowStyle}">
+            <TextBlock Text="Address" Style="{StaticResource fieldNameStyle}" />
+            <TextBox
+                Style="{StaticResource entryBoxStyle}"
+                Text="{Binding DeviceIP, UpdateSourceTrigger=PropertyChanged}"
+                IsEnabled="{Binding Ready}" />
+        </StackPanel>
+        <StackPanel Style="{StaticResource rowStyle}">
+            <TextBlock Text="UserName" Style="{StaticResource fieldNameStyle}" />
+            <TextBox
+                Style="{StaticResource entryBoxStyle}"
+                Text="{Binding UserName, UpdateSourceTrigger=PropertyChanged}"
+                IsEnabled="{Binding Ready}" />
+        </StackPanel>
+        <StackPanel Style="{StaticResource rowStyle}">
+            <TextBlock Text="Password" Style="{StaticResource fieldNameStyle}" />
+            <local:BindablePassword
+                HorizontalAlignment="Right" VerticalAlignment="Top" Width="285" Height="21"
+                Password="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                IsEnabled="{Binding Ready}" />
+        </StackPanel>
+        <StackPanel Style="{StaticResource rowStyle}">
+            <TextBlock Text="Connection Type" Style="{StaticResource fieldNameStyle}" />
+            <ComboBox
+                HorizontalAlignment="Left" VerticalAlignment="Top" Width="207"
+                Margin="0,0,2,0"
+                ItemsSource="{Binding ConnectionTypes}"
+                SelectedItem="{Binding ConnectionTypeSelection}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Name}" />
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </ComboBox>
+            <Button
+                Content="Connect" HorizontalAlignment="Left" VerticalAlignment="Top" Width="76"
+                
+                Command="{Binding ConnectCommand}"
+                IsEnabled="{Binding Ready}" />
+        </StackPanel>
+    </StackPanel>
+</UserControl>
diff --git a/Samples/DeviceLab/DeviceSignInView.xaml.cs b/Samples/DeviceLab/DeviceSignInView.xaml.cs
new file mode 100644
index 00000000..893ad45f
--- /dev/null
+++ b/Samples/DeviceLab/DeviceSignInView.xaml.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace DeviceLab
+{
+    /// <summary>
+    /// Interaction logic for DeviceSignInView.xaml
+    /// </summary>
+    public partial class DeviceSignInView : UserControl
+    {
+        public DeviceSignInView()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/Samples/DeviceLab/MainViewModel.cs b/Samples/DeviceLab/MainViewModel.cs
index 13153061..fdbf154b 100644
--- a/Samples/DeviceLab/MainViewModel.cs
+++ b/Samples/DeviceLab/MainViewModel.cs
@@ -1,13 +1,107 @@
-using Prism.Mvvm;
+using Prism.Commands;
+using Prism.Mvvm;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Input;
+using System.Collections.Specialized;
+using System.Collections;
+using System.ComponentModel;
 
 namespace DeviceLab
 {
+    public static class CommandExtensions
+    {
+        public class ChainedCommand
+        {
+            
+            private ICommand executeMe;
+            private object arg;
+
+            private ChainedCommand nextChainedCommand;
+
+            public ChainedCommand(ICommand executeMe, object arg, bool start = true)
+            {
+                this.executeMe = executeMe;
+                this.arg = arg;
+                this.nextChainedCommand = null;
+                this.Status = State.NotStarted;
+                if(start)
+                {
+                    Start();
+                }
+            }
+
+            public enum State
+            {
+                NotStarted,
+                Waiting,
+                Canceled,
+                Completed
+            };
+
+            public State Status { get; private set; }
+
+            public void Start()
+            {
+                if(this.Status != State.NotStarted)
+                {
+                    throw new InvalidOperationException("Must be in the NotStarted state");
+                }
+                this.Status = State.Waiting;
+                this.executeMe.CanExecuteChanged += ExecuteMe_CanExecuteChanged;
+                TryExecute();
+            }
+
+            public State Cancel()
+            {
+                this.executeMe.CanExecuteChanged -= ExecuteMe_CanExecuteChanged;
+                State oldState = this.Status;
+                this.Status = State.Canceled;
+                return oldState;
+            }
+
+            public ChainedCommand ExecuteNext(ICommand next, object arg)
+            {
+                this.nextChainedCommand = new ChainedCommand(next, arg, false);
+                TryExecuteNext();
+                return this.nextChainedCommand;
+            }
+
+            private void ExecuteMe_CanExecuteChanged(object sender, EventArgs e)
+            {
+                TryExecute();
+            }
+
+            private void TryExecute()
+            {
+                if (this.executeMe.CanExecute(arg))
+                {
+                    this.executeMe.Execute(arg);
+                    this.executeMe.CanExecuteChanged -= ExecuteMe_CanExecuteChanged;
+                    this.Status = State.Completed;
+                    TryExecuteNext();
+                }
+            }
+
+            private void TryExecuteNext()
+            {
+                if(this.Status == State.Completed && this.nextChainedCommand != null)
+                {
+                    this.nextChainedCommand.Start();
+                }
+            }
+        }
+
+        public static ChainedCommand ExecuteWhenReady(this ICommand executeMe, object arg)
+        {
+            return new ChainedCommand(executeMe, arg);
+        }
+    }
+
     public class MainViewModel : BindableBase
     {
         //-------------------------------------------------------------------
@@ -16,8 +110,6 @@ public class MainViewModel : BindableBase
         #region Constructors
         public MainViewModel()
         {
-
-
             Diagnostics = new DiagnosticOutputViewModel();
 
             DebugDiagnosticSink debugDiags = new DebugDiagnosticSink();
@@ -28,13 +120,16 @@ public MainViewModel()
             this.SignIn.AddDevicePortalConnectionFactory(new GenericDevicePortalConnectionFactory());
 
             this.SignIn.SignInAttempts += OnSignInAttemptCompleted;
+
+            this.ConnectedDevices.CollectionChanged += OnConnectedDevicesChanged;
         }
 
+
         private void OnSignInAttemptCompleted(DeviceSignInViewModel sender, DeviceSignInEventArgs args)
         {
             if(args.StatusCode == System.Net.HttpStatusCode.OK)
             {
-                connectedDevices.Add(new DevicePortalViewModel(args.Portal, Diagnostics));
+                this.ConnectedDevices.Add(new DevicePortalViewModel(args.Portal, Diagnostics));
             }
         }
         #endregion // Constructors
@@ -62,6 +157,145 @@ public ObservableCollection<DevicePortalViewModel> ConnectedDevices
         }
         #endregion // Connected Devices
 
+        #region SelectedDevices
+        private IList selectedDevices;
+        public IList SelectedDevices
+        {
+            get
+            {
+                if(selectedDevices == null)
+                {
+                    selectedDevices = new List<DevicePortalViewModel>();
+                }
+                return selectedDevices;
+            }
+
+            set
+            {
+                SetProperty(ref selectedDevices, value);
+                OnPropertyChanged("SomeSelectedDevicesReady");
+                OnPropertyChanged("AllSelectedDevicesReady");
+            }
+        }
+        #endregion // SelectedDevices
+
+        #region SomeDevicesReady
+        public bool SomeDevicesReady
+        {
+            get
+            {
+                foreach(DevicePortalViewModel dpvm in ConnectedDevices)
+                {
+                    if(dpvm.Ready)
+                    {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        }
+        #endregion // SomeDevicesReady
+
+        #region AllDevicesReady
+        public bool AllDevicesReady
+        {
+            get
+            {
+                foreach(DevicePortalViewModel dpvm in ConnectedDevices)
+                {
+                    if(!dpvm.Ready)
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        }
+        #endregion // AllDevicesReady
+
+        #region SomeSelectedDevicesReady
+        public bool SomeSelectedDevicesReady
+        {
+            get
+            {
+                foreach (DevicePortalViewModel dpvm in SelectedDevices)
+                {
+                    if (dpvm.Ready)
+                    {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        }
+        #endregion // SomeDevicesReady
+
+        #region AllSelectedDevicesReady
+        public bool AllSelectedDevicesReady
+        {
+            get
+            {
+                foreach (DevicePortalViewModel dpvm in ConnectedDevices)
+                {
+                    if (!dpvm.Ready)
+                    {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        }
+        #endregion // AllDevicesReady
         #endregion // Properties
+
+        private void OnConnectedDevicesChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == NotifyCollectionChangedAction.Add)
+            {
+                if (e.NewItems != null)
+                {
+                    foreach (DevicePortalViewModel dpvm in e.NewItems)
+                    {
+                        OnDeviceAdded(dpvm);
+                    }
+                }
+            }
+            else if (e.Action == NotifyCollectionChangedAction.Remove)
+            {
+                if(e.OldItems != null)
+                {
+                    foreach(DevicePortalViewModel dpvm in e.OldItems)
+                    {
+                        OnDeviceRemoved(dpvm);
+                    }
+                }
+            }
+        }
+
+        private void OnDeviceAdded(DevicePortalViewModel dpvm)
+        {
+            dpvm.PropertyChanged += DevicePropertyChanged;
+            dpvm.RefreshDeviceNameCommand.ExecuteWhenReady(this).ExecuteNext(dpvm.StartListeningForSystemPerfCommand, this);
+        }
+
+        private void OnDeviceRemoved(DevicePortalViewModel dpvm)
+        {
+            dpvm.PropertyChanged -= DevicePropertyChanged;
+            if(dpvm.StopListeningForSystemPerfCommand.CanExecute(this))
+            {
+                dpvm.StopListeningForSystemPerfCommand.Execute(this);
+            }
+        }
+
+        private void DevicePropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if(e.PropertyName == "Ready")
+            {
+                OnPropertyChanged("SomeDevicesReady");
+                OnPropertyChanged("AllDevicesReady");
+                OnPropertyChanged("SomeSelectedDevicesReady");
+                OnPropertyChanged("AllSelectedDevicesReady");
+            }
+        }
     }
 }
diff --git a/Samples/DeviceLab/MainWindow.xaml b/Samples/DeviceLab/MainWindow.xaml
index ab7f7d91..5ae38dbe 100644
--- a/Samples/DeviceLab/MainWindow.xaml
+++ b/Samples/DeviceLab/MainWindow.xaml
@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:DeviceLab"
         mc:Ignorable="d"
-        Title="Device Lab" Height="600" Width="525">
+        Title="Device Lab" Height="600" Width="700">
     <Window.DataContext>
         <local:MainViewModel />
     </Window.DataContext>
@@ -15,52 +15,34 @@
             <RowDefinition />
             <RowDefinition />
         </Grid.RowDefinitions>
-        <Grid Grid.Row="0" DataContext="{Binding SignIn}">
-            <TextBlock x:Name="labelAddress" Text="Address" HorizontalAlignment="Left" Margin="97,5,0,0" VerticalAlignment="Top"/>
-            <TextBox
-                x:Name="addressEntry"
-                HorizontalAlignment="Left" Height="23" Margin="155,8,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="285"
-                Text="{Binding DeviceIP}"
-                IsEnabled="{Binding Ready}"
-                TextChanged="addressEntry_TextChanged" />
-            <TextBlock x:Name="labelUserName" Text="UserName" HorizontalAlignment="Left" Margin="85,33,0,0" VerticalAlignment="Top"/>
-            <TextBox
-                x:Name="userNameEntry" HorizontalAlignment="Left" Height="23" Margin="155,36,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="285"
-                Text="{Binding UserName}"
-                IsEnabled="{Binding Ready}"
-                TextChanged="userNameEntry_TextChanged"/>
-            <TextBlock x:Name="labelPassword" Text="Password" HorizontalAlignment="Left" Margin="90,62,0,0" VerticalAlignment="Top"/>
-            <local:BindablePassword
-                x:Name="passwordBox" HorizontalAlignment="Left" Margin="155,64,0,0" VerticalAlignment="Top" Width="285" Height="21"
-                Password="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                IsEnabled="{Binding Ready}" />
-            <TextBlock x:Name="lableConnectionType" Text="Connection Type" HorizontalAlignment="Left" Margin="51,86,0,0" VerticalAlignment="Top"/>
-            <ComboBox
-                x:Name="connectionTypeBox" HorizontalAlignment="Left" Margin="155,90,0,0" VerticalAlignment="Top" Width="204"
-                ItemsSource="{Binding ConnectionTypes}"
-                SelectedItem="{Binding ConnectionTypeSelection}">
-                <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding Name}" />
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
-            <Button
-                x:Name="buttonConnect" Content="Connect" HorizontalAlignment="Left" Margin="364,90,0,0" VerticalAlignment="Top" Width="76"
-                Command="{Binding ConnectCommand}"
-                IsEnabled="{Binding Ready}" />
+        
+        <!--<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center">-->
+
+        <Grid Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" MinWidth="10" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" MinWidth="20" />
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition Width="*" MinWidth="10"/>
+            </Grid.ColumnDefinitions>
+        
+            
+            <local:DeviceSignInView Grid.Column="1"/>
+
+            <Rectangle Grid.Column="2" Fill="Gray" Width="2" Margin="0,2,0,2"/>
+
+            <StackPanel Grid.Column="3" VerticalAlignment="Center" >
+                <Button Margin="0,0,0,2">Select All</Button>
+                <Button Margin="0,0,0,2">Unselecte All</Button>
+                <Button Margin="0,0,0,2">Reboot Selected Devices</Button>
+            </StackPanel>
+
         </Grid>
+        <!--</StackPanel>-->
+        
         <Grid Grid.Row="1">
-            <ListBox x:Name="listBoxConnectedDevices" HorizontalAlignment="Left" VerticalAlignment="Top"
-                     Height="{Binding Path=ActualHeight, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Grid}}}"
-                     Width="{Binding Path=ActualWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Grid}}}"
-                     ItemsSource="{Binding ConnectedDevices}" >
-                <ListBox.ItemTemplate>
-                    <DataTemplate>
-                        <local:DevicePortalView Width="{Binding Path=ActualWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type ItemsPresenter}}}"/>
-                    </DataTemplate>
-                </ListBox.ItemTemplate>
-            </ListBox>
+            <local:DeviceCollectionView />
         </Grid>
         <Grid Grid.Row="2" DataContext="{Binding Diagnostics}">
             <TextBox x:Name="Output"
@@ -69,6 +51,5 @@
                      HorizontalScrollBarVisibility="Auto"
                      IsReadOnly="True"/>
         </Grid>
-
     </Grid>
 </Window>
diff --git a/Samples/DeviceLab/MainWindow.xaml.cs b/Samples/DeviceLab/MainWindow.xaml.cs
index 72dadbd2..316d16ee 100644
--- a/Samples/DeviceLab/MainWindow.xaml.cs
+++ b/Samples/DeviceLab/MainWindow.xaml.cs
@@ -24,17 +24,5 @@ public MainWindow()
         {
             InitializeComponent();
         }
-
-        private void addressEntry_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            var binding = ((TextBox)sender).GetBindingExpression(TextBox.TextProperty);
-            binding.UpdateSource();
-        }
-
-        private void userNameEntry_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            var binding = ((TextBox)sender).GetBindingExpression(TextBox.TextProperty);
-            binding.UpdateSource();
-        }
     }
 }
diff --git a/Samples/DeviceLab/SelectionListBox.cs b/Samples/DeviceLab/SelectionListBox.cs
new file mode 100644
index 00000000..5f84f343
--- /dev/null
+++ b/Samples/DeviceLab/SelectionListBox.cs
@@ -0,0 +1,75 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace DeviceLab
+{
+    /// <summary>
+    /// Custom ListBox that exposes a SelectionList Dependency property to enable two-way binding.
+    /// Internally, SelectionList is kept in sink with the SelectedItems property of the base
+    /// class
+    /// </summary>
+    public class SelectionListBox : ListBox
+    {
+        static SelectionListBox()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(SelectionListBox), new FrameworkPropertyMetadata(typeof(SelectionListBox)));
+        }
+
+        protected override void OnSelectionChanged(SelectionChangedEventArgs e)
+        {
+            base.OnSelectionChanged(e);
+            SetValue(SelectionListProperty, this.SelectedItems);
+        }
+
+        public IList SelectionList
+        {
+            get { return (IList)GetValue(SelectionListProperty); }
+            set { SetValue(SelectionListProperty, value); }
+        }
+
+        public static readonly DependencyProperty SelectionListProperty =
+            DependencyProperty.Register("SelectionList", typeof(IList), typeof(SelectionListBox), new PropertyMetadata(null, null, CoerceSelectionList));
+
+        /// <summary>
+        /// Coerce the value of SelectionList so that it is identical to (i.e. the same object as) the
+        /// value of SelectedItems
+        /// </summary>
+        /// <param name="d">SelectionListBox instance</param>
+        /// <param name="baseValue">New list of selected items</param>
+        /// <returns>The list of selected items of the list</returns>
+        private static object CoerceSelectionList(DependencyObject d, object baseValue)
+        {
+            SelectionListBox thisDCV = d as SelectionListBox;
+            IList selectedItems = thisDCV.SelectedItems;
+            IList baseList = baseValue as IList;
+            if (baseList == selectedItems)
+            {
+                // Must have been called from OnSelectionChanged...
+                // ...implies nothing to do so early out
+                return selectedItems;
+            }
+
+            // baseValue is not identical to SelectedItems, so fixup SelectedItems
+            // to have the same elements as baseValue...
+            // Note: This will result in multiple calls to OnSelectionChanged which
+            // will subsequently call this method but will early out according to
+            // the condition described above.
+            thisDCV.SelectedItems.Clear();
+            if (baseList != null)
+            {
+                foreach (object itm in baseList)
+                {
+                    thisDCV.SelectedItems.Add(itm);
+                }
+            }
+
+            return selectedItems;
+        }
+    }
+}
diff --git a/Samples/DeviceLab/Themes/Generic.xaml b/Samples/DeviceLab/Themes/Generic.xaml
new file mode 100644
index 00000000..c5a45f41
--- /dev/null
+++ b/Samples/DeviceLab/Themes/Generic.xaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:DeviceLab">
+    <Style TargetType="{x:Type local:SelectionListBox}" BasedOn="{StaticResource {x:Type ListBox}}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/sync.cmd b/sync.cmd
new file mode 100644
index 00000000..27b718fd
--- /dev/null
+++ b/sync.cmd
@@ -0,0 +1,21 @@
+@echo off
+echo --- Fetching master branch
+git fetch upstream
+echo --- Merging contents of master
+git merge upstream/master
+set /p response=Push merged to fork (Y/N)? 
+if /i "%response:~,1%" equ "Y" goto push
+if /i "%response:~,1%" equ "y" goto push
+goto done
+
+:push
+echo --- Pushing merged fork
+git push origin
+goto done
+
+:done
+echo --- Done
+exit /b
+
+
+   

From aaa9c9104555721f795c71c9a3b87d4be8f35cb6 Mon Sep 17 00:00:00 2001
From: Greg Pettyjohn <grpettyj@microsoft.com>
Date: Wed, 24 Aug 2016 16:12:13 -0700
Subject: [PATCH 04/51] Added a bunch of finishing touches

---
 Samples/DeviceLab/App.xaml                  |   2 +-
 Samples/DeviceLab/App.xaml.cs               |   8 +-
 Samples/DeviceLab/AutoScrollTextBox.cs      |  25 +++
 Samples/DeviceLab/DeviceCollectionView.xaml |  43 +----
 Samples/DeviceLab/DeviceLab.csproj          |   5 +
 Samples/DeviceLab/DevicePortalViewModel.cs  |  10 +-
 Samples/DeviceLab/DeviceSignInView.xaml     |   5 +-
 Samples/DeviceLab/DeviceSignInView.xaml.cs  |  15 +-
 Samples/DeviceLab/MainViewModel.cs          | 175 +++++++++++++++++---
 Samples/DeviceLab/MainWindow.xaml           |  22 +--
 Samples/DeviceLab/SelectionListBox.cs       |  10 +-
 Samples/DeviceLab/Themes/CustomStyles.xaml  |  75 +++++++++
 Samples/DeviceLab/Themes/Generic.xaml       |   1 +
 13 files changed, 289 insertions(+), 107 deletions(-)
 create mode 100644 Samples/DeviceLab/AutoScrollTextBox.cs
 create mode 100644 Samples/DeviceLab/Themes/CustomStyles.xaml

diff --git a/Samples/DeviceLab/App.xaml b/Samples/DeviceLab/App.xaml
index 12fbc02f..aa1b6c03 100644
--- a/Samples/DeviceLab/App.xaml
+++ b/Samples/DeviceLab/App.xaml
@@ -4,6 +4,6 @@
              xmlns:local="clr-namespace:DeviceLab"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
-         
+        <ResourceDictionary Source="Themes\CustomStyles.xaml" />
     </Application.Resources>
 </Application>
diff --git a/Samples/DeviceLab/App.xaml.cs b/Samples/DeviceLab/App.xaml.cs
index 32b134b3..a009b6a9 100644
--- a/Samples/DeviceLab/App.xaml.cs
+++ b/Samples/DeviceLab/App.xaml.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
+using System.Windows;
 
 namespace DeviceLab
 {
diff --git a/Samples/DeviceLab/AutoScrollTextBox.cs b/Samples/DeviceLab/AutoScrollTextBox.cs
new file mode 100644
index 00000000..6c2ff25a
--- /dev/null
+++ b/Samples/DeviceLab/AutoScrollTextBox.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace DeviceLab
+{
+    public class AutoScrollTextBox : TextBox
+    {
+        static AutoScrollTextBox()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(AutoScrollTextBox), new FrameworkPropertyMetadata(typeof(AutoScrollTextBox)));
+        }
+
+        protected override void OnTextChanged(TextChangedEventArgs e)
+        {
+            base.OnTextChanged(e);
+            CaretIndex = Text.Length;
+            ScrollToEnd();
+        }
+    }
+}
diff --git a/Samples/DeviceLab/DeviceCollectionView.xaml b/Samples/DeviceLab/DeviceCollectionView.xaml
index 52a66946..4c76dd42 100644
--- a/Samples/DeviceLab/DeviceCollectionView.xaml
+++ b/Samples/DeviceLab/DeviceCollectionView.xaml
@@ -123,42 +123,6 @@
                             </Trigger>
                         </ControlTemplate.Triggers>
                     </ControlTemplate>
-
-                    <!--<ControlTemplate TargetType="{x:Type ListBoxItem}">
-                        <Border x:Name="Bd"
-                                MouseDown="EatMouseClicks"
-                                BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
-                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                        </Border>
-                        <ControlTemplate.Triggers>
-                            <MultiTrigger>
-                                <MultiTrigger.Conditions>
-                                    <Condition Property="IsMouseOver" Value="True"/>
-                                </MultiTrigger.Conditions>
-                                <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.MouseOver.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.MouseOver.Border}"/>
-                            </MultiTrigger>
-                            <MultiTrigger>
-                                <MultiTrigger.Conditions>
-                                    <Condition Property="Selector.IsSelectionActive" Value="False"/>
-                                    <Condition Property="IsSelected" Value="True"/>
-                                </MultiTrigger.Conditions>
-                                <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedInactive.Border}"/>
-                            </MultiTrigger>
-                            <MultiTrigger>
-                                <MultiTrigger.Conditions>
-                                    <Condition Property="Selector.IsSelectionActive" Value="True"/>
-                                    <Condition Property="IsSelected" Value="True"/>
-                                </MultiTrigger.Conditions>
-                                <Setter Property="Background" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Background}"/>
-                                <Setter Property="BorderBrush" TargetName="Bd" Value="{StaticResource Item.SelectedActive.Border}"/>
-                            </MultiTrigger>
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter Property="TextElement.Foreground" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                            </Trigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>-->
                 </Setter.Value>
             </Setter>
         </Style>
@@ -171,6 +135,10 @@
                             <TextBox Width="100" Margin="0,0,4,0" Text="{Binding DeviceNameEntry, UpdateSourceTrigger=PropertyChanged}" />
                             <Button Padding="2,1,2,1" Command="{Binding RenameCommand}" Content="Rename" />
                         </StackPanel>
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                            <Button Content="Reboot" Width="60" Command="{Binding RebootCommand}" />
+                            <Button Content="Reestablish Connection" Width="140" Margin="2,0,0,0" Command="{Binding ReestablishConnectionCommand}" />
+                        </StackPanel>
                     </StackPanel>
                 </TabItem>
                 <TabItem Header="Info">
@@ -251,8 +219,9 @@
     </UserControl.Resources>
     <local:SelectionListBox
         SelectionMode="Multiple"
+        ScrollViewer.CanContentScroll="False"
         ItemsSource="{Binding ConnectedDevices}"
         ItemContainerStyle="{DynamicResource DeviceCollectionItemStyle}"
         ItemTemplate="{DynamicResource DevicePortalView}"
-        SelectionList="{Binding SelectedDevices}" />
+        SelectionList="{Binding SelectedDevices, Mode=TwoWay}" />
 </UserControl>
diff --git a/Samples/DeviceLab/DeviceLab.csproj b/Samples/DeviceLab/DeviceLab.csproj
index cf8fd55e..df2abed7 100644
--- a/Samples/DeviceLab/DeviceLab.csproj
+++ b/Samples/DeviceLab/DeviceLab.csproj
@@ -59,6 +59,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="AutoScrollTextBox.cs" />
     <Compile Include="DeviceCollectionView.xaml.cs">
       <DependentUpon>DeviceCollectionView.xaml</DependentUpon>
     </Compile>
@@ -98,6 +99,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="Themes\CustomStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Samples/DeviceLab/DevicePortalViewModel.cs b/Samples/DeviceLab/DevicePortalViewModel.cs
index d364e787..0015e6d4 100644
--- a/Samples/DeviceLab/DevicePortalViewModel.cs
+++ b/Samples/DeviceLab/DevicePortalViewModel.cs
@@ -257,7 +257,7 @@ private async Task RefreshDeviceNameAsync()
             }
             catch (Exception exn)
             {
-                ReportException("Rename", exn);
+                ReportException("RefreshDeviceName", exn);
             }
             this.diagnostics.OutputDiagnosticString("[{0}] Retrieved device name.\n", this.diagnosticMoniker);
             this.Ready = true;
@@ -291,10 +291,14 @@ private async Task ExecuteRebootAsync()
             {
                 this.diagnostics.OutputDiagnosticString("[{0}] Attempting to reboot device.\n", this.diagnosticMoniker);
                 await this.Portal.Reboot();
+
+                // Sometimes able to reestablish the connection prematurely before the console has a chance to shut down
+                // So adding a delay here before trying to reestablish the connection.
+                await Task.Delay(1000 * 5);
             }
             catch (Exception exn)
             {
-                ReportException("Rename", exn);
+                ReportException("Reboot", exn);
             }
             await ExecuteReestablishConnectionAsync();
         }
@@ -350,7 +354,7 @@ private async Task ExecuteReestablishConnectionAsync()
             }
             catch (Exception exn)
             {
-                ReportException("Rename", exn);
+                ReportException("ReestablishConnection", exn);
             }
             this.portal.ConnectionStatus -= handler;
         }
diff --git a/Samples/DeviceLab/DeviceSignInView.xaml b/Samples/DeviceLab/DeviceSignInView.xaml
index a4164067..2cb870e4 100644
--- a/Samples/DeviceLab/DeviceSignInView.xaml
+++ b/Samples/DeviceLab/DeviceSignInView.xaml
@@ -4,8 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:DeviceLab"
-             mc:Ignorable="d" 
-             >
+             mc:Ignorable="d" >
     <UserControl.Resources>
         <Style x:Key="fieldNameStyle" TargetType="{x:Type TextBlock}">
             <Setter Property="Margin" Value="0,0,5,0" />
@@ -25,7 +24,7 @@
             <Setter Property="Margin" Value="0,2,0,0" />
         </Style>
     </UserControl.Resources>
-    <StackPanel DataContext="{Binding SignIn}">
+    <StackPanel>
         <StackPanel Style="{StaticResource rowStyle}">
             <TextBlock Text="Address" Style="{StaticResource fieldNameStyle}" />
             <TextBox
diff --git a/Samples/DeviceLab/DeviceSignInView.xaml.cs b/Samples/DeviceLab/DeviceSignInView.xaml.cs
index 893ad45f..8e0cb238 100644
--- a/Samples/DeviceLab/DeviceSignInView.xaml.cs
+++ b/Samples/DeviceLab/DeviceSignInView.xaml.cs
@@ -1,17 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
+using System.Windows.Controls;
 
 namespace DeviceLab
 {
diff --git a/Samples/DeviceLab/MainViewModel.cs b/Samples/DeviceLab/MainViewModel.cs
index fdbf154b..9c491346 100644
--- a/Samples/DeviceLab/MainViewModel.cs
+++ b/Samples/DeviceLab/MainViewModel.cs
@@ -172,9 +172,14 @@ public IList SelectedDevices
 
             set
             {
-                SetProperty(ref selectedDevices, value);
-                OnPropertyChanged("SomeSelectedDevicesReady");
-                OnPropertyChanged("AllSelectedDevicesReady");
+                // This will be called when the contents of the list change without changing
+                // the actual list itself (i.e. same list, but different contents)
+                if(this.selectedDevices != value)
+                {
+                    this.selectedDevices = value;
+                }
+                // We always want to fire the event to handle the case when contents change
+                OnPropertyChanged("SelectedDevices");
             }
         }
         #endregion // SelectedDevices
@@ -212,41 +217,148 @@ public bool AllDevicesReady
             }
         }
         #endregion // AllDevicesReady
+        #endregion // Properties
 
-        #region SomeSelectedDevicesReady
-        public bool SomeSelectedDevicesReady
+        //-------------------------------------------------------------------
+        // Commands
+        //-------------------------------------------------------------------
+        #region Commands
+        #region SelectAllDevicesCommand
+        private DelegateCommand selectAllDevicesCommand;
+        public ICommand SelectAllDevicesCommand
         {
             get
             {
-                foreach (DevicePortalViewModel dpvm in SelectedDevices)
+                if(this.selectAllDevicesCommand == null)
                 {
-                    if (dpvm.Ready)
-                    {
-                        return true;
-                    }
+                    this.selectAllDevicesCommand = new DelegateCommand(ExecuteSelectAllDevices, CanExecuteSelectAllDevices);
+                    this.selectAllDevicesCommand.ObservesProperty(() => SomeDevicesReady);
+                    this.selectAllDevicesCommand.ObservesProperty(() => SelectedDevices);
                 }
-                return false;
+                return this.selectAllDevicesCommand;
             }
         }
-        #endregion // SomeDevicesReady
 
-        #region AllSelectedDevicesReady
-        public bool AllSelectedDevicesReady
+        private bool CanExecuteSelectAllDevices()
+        {
+            return this.SomeDevicesReady && (this.SelectedDevices.Count < this.ConnectedDevices.Count);
+        }
+
+        private void ExecuteSelectAllDevices()
+        {
+            List<DevicePortalViewModel> newSelection = new List<DevicePortalViewModel>();
+            foreach(DevicePortalViewModel dpvm in this.ConnectedDevices)
+            {
+                if (dpvm.Ready)
+                {
+                    newSelection.Add(dpvm);
+                }
+            }
+            this.SelectedDevices = newSelection;
+        }
+        #endregion // SelectAllDevicesCommand
+
+        #region UnSelectAllDevicesCommand
+        private DelegateCommand unSelectAllDevicesCommand;
+        public ICommand UnSelectAllDevicesCommand
         {
             get
             {
-                foreach (DevicePortalViewModel dpvm in ConnectedDevices)
+                if(this.unSelectAllDevicesCommand == null)
                 {
-                    if (!dpvm.Ready)
-                    {
-                        return false;
-                    }
+                    this.unSelectAllDevicesCommand = new DelegateCommand(ExecuteUnSelectAllDevices, CanExecuteUnSelectAllDevices);
+                    this.unSelectAllDevicesCommand.ObservesProperty(() => SelectedDevices);
                 }
-                return true;
+                return this.unSelectAllDevicesCommand;
             }
         }
-        #endregion // AllDevicesReady
-        #endregion // Properties
+
+        private bool CanExecuteUnSelectAllDevices()
+        {
+            return this.SelectedDevices.Count > 0;
+        }
+
+        private void ExecuteUnSelectAllDevices()
+        {
+            this.SelectedDevices = new List<DevicePortalViewModel>();
+        }
+        #endregion // UnSelectAllDevicesCommand
+
+        #region RebootSelectedDevicesCommand
+        private DelegateCommand rebootSelectedDevicesCommand;
+        public ICommand RebootSelectedDevicesCommand
+        {
+            get
+            {
+                if(this.rebootSelectedDevicesCommand == null)
+                {
+                    this.rebootSelectedDevicesCommand = new DelegateCommand(ExecuteRebootSelectedDevices, CanExecuteRebootSelectedDevices);
+                    this.rebootSelectedDevicesCommand.ObservesProperty(() => this.SelectedDevices);
+                }
+                return rebootSelectedDevicesCommand;
+            }
+        }
+
+        private bool CanExecuteRebootSelectedDevices()
+        {
+            return this.SelectedDevices.Count > 0;
+        }
+
+        private void ExecuteRebootSelectedDevices()
+        {
+            // When devices become busy, they will be reomoved from the selected devices collection.
+            // So, make a local copy of the devices we want to reboot:
+            List<DevicePortalViewModel> rebootList = new List<DevicePortalViewModel>();
+            foreach(DevicePortalViewModel dpvm in this.SelectedDevices)
+            {
+                if(dpvm.RebootCommand.CanExecute(this))
+                {
+                    rebootList.Add(dpvm);
+                }
+            }
+
+            foreach(DevicePortalViewModel dpvm in rebootList)
+            {
+                dpvm.RebootCommand.Execute(this);
+            }
+        }
+        #endregion // RebootSelectedDevicesCommand
+
+        #region RemoveDeviceCommand
+        private DelegateCommand<DevicePortalViewModel> removeDeviceCommand;
+        public ICommand RemoveDeviceCommand
+        {
+            get
+            {
+                if(this.removeDeviceCommand == null)
+                {
+                    this.removeDeviceCommand = new DelegateCommand<DevicePortalViewModel>(ExecuteRemoveDeviceCommand, CanExecuteRemoveDeviceCommand);
+                    this.removeDeviceCommand.ObservesProperty(() => SomeDevicesReady);
+                }
+                return this.removeDeviceCommand;
+            }
+        }
+
+        private bool CanExecuteRemoveDeviceCommand(DevicePortalViewModel arg)
+        {
+            if (arg != null)
+            {
+                return arg.Ready;
+            }
+            return false;
+        }
+
+        private void ExecuteRemoveDeviceCommand(DevicePortalViewModel obj)
+        {
+            if (obj != null)
+            {
+                OnDeviceRemoved(obj);
+                this.ConnectedDevices.Remove(obj);
+            }
+        }
+        #endregion // RemoveDeviceCommand
+
+        #endregion // Commands
 
         private void OnConnectedDevicesChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
@@ -266,7 +378,7 @@ private void OnConnectedDevicesChanged(object sender, NotifyCollectionChangedEve
                 {
                     foreach(DevicePortalViewModel dpvm in e.OldItems)
                     {
-                        OnDeviceRemoved(dpvm);
+                        //OnDeviceRemoved(dpvm);
                     }
                 }
             }
@@ -291,10 +403,23 @@ private void DevicePropertyChanged(object sender, PropertyChangedEventArgs e)
         {
             if(e.PropertyName == "Ready")
             {
+                DevicePortalViewModel dpvmSender = sender as DevicePortalViewModel;
+                if (dpvmSender != null && !dpvmSender.Ready)
+                { 
+                    // A device is no-longer ready, so remove it from the current selection
+                    List<DevicePortalViewModel> updatedSelection = new List<DevicePortalViewModel>();
+                    foreach(DevicePortalViewModel dpvm in this.SelectedDevices)
+                    {
+                        if(dpvm.Ready)
+                        {
+                            updatedSelection.Add(dpvm);
+                        }
+                    }
+                    this.SelectedDevices = updatedSelection;
+                }
+
                 OnPropertyChanged("SomeDevicesReady");
                 OnPropertyChanged("AllDevicesReady");
-                OnPropertyChanged("SomeSelectedDevicesReady");
-                OnPropertyChanged("AllSelectedDevicesReady");
             }
         }
     }
diff --git a/Samples/DeviceLab/MainWindow.xaml b/Samples/DeviceLab/MainWindow.xaml
index 5ae38dbe..8ae0bdda 100644
--- a/Samples/DeviceLab/MainWindow.xaml
+++ b/Samples/DeviceLab/MainWindow.xaml
@@ -13,11 +13,9 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="Auto"/>
             <RowDefinition />
+            <RowDefinition Height="Auto" />
             <RowDefinition />
         </Grid.RowDefinitions>
-        
-        <!--<StackPanel Grid.Row="0" Orientation="Horizontal" HorizontalAlignment="Center">-->
-
         <Grid Grid.Row="0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" MinWidth="10" />
@@ -26,26 +24,24 @@
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="*" MinWidth="10"/>
             </Grid.ColumnDefinitions>
-        
-            
-            <local:DeviceSignInView Grid.Column="1"/>
+
+            <local:DeviceSignInView Grid.Column="1" DataContext="{Binding SignIn}" />
 
             <Rectangle Grid.Column="2" Fill="Gray" Width="2" Margin="0,2,0,2"/>
 
             <StackPanel Grid.Column="3" VerticalAlignment="Center" >
-                <Button Margin="0,0,0,2">Select All</Button>
-                <Button Margin="0,0,0,2">Unselecte All</Button>
-                <Button Margin="0,0,0,2">Reboot Selected Devices</Button>
+                <Button Margin="0,0,0,2" Content="Select All" Command="{Binding SelectAllDevicesCommand}" />
+                <Button Margin="0,0,0,2" Content="Unselect All" Command="{Binding UnSelectAllDevicesCommand}"/>
+                <Button Margin="0,0,0,2" Content="Reboot Selected Devices" Command="{Binding RebootSelectedDevicesCommand}" />
             </StackPanel>
 
         </Grid>
-        <!--</StackPanel>-->
-        
         <Grid Grid.Row="1">
             <local:DeviceCollectionView />
         </Grid>
-        <Grid Grid.Row="2" DataContext="{Binding Diagnostics}">
-            <TextBox x:Name="Output"
+        <GridSplitter Grid.Row="2" Style="{StaticResource horzSplitterStyle}" />
+        <Grid Grid.Row="3" DataContext="{Binding Diagnostics}">
+            <local:AutoScrollTextBox x:Name="Output"
                      Text="{Binding OutputStream, Mode=OneWay}"
                      VerticalScrollBarVisibility="Visible"
                      HorizontalScrollBarVisibility="Auto"
diff --git a/Samples/DeviceLab/SelectionListBox.cs b/Samples/DeviceLab/SelectionListBox.cs
index 5f84f343..d50f4ff3 100644
--- a/Samples/DeviceLab/SelectionListBox.cs
+++ b/Samples/DeviceLab/SelectionListBox.cs
@@ -36,6 +36,7 @@ public IList SelectionList
         public static readonly DependencyProperty SelectionListProperty =
             DependencyProperty.Register("SelectionList", typeof(IList), typeof(SelectionListBox), new PropertyMetadata(null, null, CoerceSelectionList));
 
+ 
         /// <summary>
         /// Coerce the value of SelectionList so that it is identical to (i.e. the same object as) the
         /// value of SelectedItems
@@ -45,13 +46,14 @@ public IList SelectionList
         /// <returns>The list of selected items of the list</returns>
         private static object CoerceSelectionList(DependencyObject d, object baseValue)
         {
-            SelectionListBox thisDCV = d as SelectionListBox;
-            IList selectedItems = thisDCV.SelectedItems;
+            SelectionListBox thisSLB = d as SelectionListBox;
+            IList selectedItems = thisSLB.SelectedItems;
             IList baseList = baseValue as IList;
             if (baseList == selectedItems)
             {
                 // Must have been called from OnSelectionChanged...
                 // ...implies nothing to do so early out
+                thisSLB.OnPropertyChanged(new DependencyPropertyChangedEventArgs(SelectionListProperty, null, selectedItems));
                 return selectedItems;
             }
 
@@ -60,12 +62,12 @@ private static object CoerceSelectionList(DependencyObject d, object baseValue)
             // Note: This will result in multiple calls to OnSelectionChanged which
             // will subsequently call this method but will early out according to
             // the condition described above.
-            thisDCV.SelectedItems.Clear();
+            thisSLB.SelectedItems.Clear();
             if (baseList != null)
             {
                 foreach (object itm in baseList)
                 {
-                    thisDCV.SelectedItems.Add(itm);
+                    thisSLB.SelectedItems.Add(itm);
                 }
             }
 
diff --git a/Samples/DeviceLab/Themes/CustomStyles.xaml b/Samples/DeviceLab/Themes/CustomStyles.xaml
new file mode 100644
index 00000000..3e2ddd5a
--- /dev/null
+++ b/Samples/DeviceLab/Themes/CustomStyles.xaml
@@ -0,0 +1,75 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:DeviceLab.Themes">
+
+    <!-- GridSplitter Control Styling -->
+    <Style TargetType="{x:Type Ellipse}" x:Key="splitterDot">
+        <Setter Property="Width" Value="3" />
+        <Setter Property="Height" Value="3" />
+        <Setter Property="Fill" Value="Black" />
+    </Style>
+
+    <Style TargetType="{x:Type Ellipse}" x:Key="horzSplitterDot" BasedOn="{StaticResource splitterDot}">
+        <Setter Property="Margin" Value="0,0,2,0" />
+    </Style>
+
+    <Style TargetType="{x:Type Ellipse}" x:Key="vertSplitterDot" BasedOn="{StaticResource splitterDot}">
+        <Setter Property="Margin" Value="0,0,0,2" />
+    </Style>
+
+    <Style TargetType="{x:Type GridSplitter}" x:Key="baseSplitterStyle">
+        <Setter Property="Background" Value="LightGray" />
+    </Style>
+
+    <Style TargetType="{x:Type GridSplitter}" x:Key="horzSplitterStyle" BasedOn="{StaticResource baseSplitterStyle}">
+        <Setter Property="Height" Value="7" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type GridSplitter}">
+                    <Grid Background="{TemplateBinding Background}">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Ellipse Grid.Column="1" Style="{StaticResource horzSplitterDot}"/>
+                        <Ellipse Grid.Column="2" Style="{StaticResource horzSplitterDot}"/>
+                        <Ellipse Grid.Column="3" Style="{StaticResource horzSplitterDot}"/>
+                        <Ellipse Grid.Column="4" Style="{StaticResource horzSplitterDot}"/>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type GridSplitter}" x:Key="vertSplitterStyle" BasedOn="{StaticResource baseSplitterStyle}">
+        <Setter Property="Width" Value="7" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type GridSplitter}">
+                    <Grid Background="{TemplateBinding Background}">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+                        <Ellipse Grid.Row="1" Style="{StaticResource vertSplitterDot}" />
+                        <Ellipse Grid.Row="2" Style="{StaticResource vertSplitterDot}" />
+                        <Ellipse Grid.Row="3" Style="{StaticResource vertSplitterDot}" />
+                        <Ellipse Grid.Row="4" Style="{StaticResource vertSplitterDot}" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file
diff --git a/Samples/DeviceLab/Themes/Generic.xaml b/Samples/DeviceLab/Themes/Generic.xaml
index c5a45f41..ad0d898c 100644
--- a/Samples/DeviceLab/Themes/Generic.xaml
+++ b/Samples/DeviceLab/Themes/Generic.xaml
@@ -2,4 +2,5 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:DeviceLab">
     <Style TargetType="{x:Type local:SelectionListBox}" BasedOn="{StaticResource {x:Type ListBox}}" />
+    <Style TargetType="{x:Type local:AutoScrollTextBox}" BasedOn="{StaticResource {x:Type TextBox}}" />
 </ResourceDictionary>
\ No newline at end of file

From cfd71a83f4b020c69af77684ca2916b7c18f725c Mon Sep 17 00:00:00 2001
From: Greg Pettyjohn <grpettyj@microsoft.com>
Date: Mon, 29 Aug 2016 09:02:24 -0700
Subject: [PATCH 05/51] Latest polish

---
 Samples/DeviceLab/DeviceCollectionView.xaml |   6 +-
 Samples/DeviceLab/DeviceLab.csproj          |   7 +
 Samples/DeviceLab/DevicePortalViewModel.cs  |  40 ++++-
 Samples/DeviceLab/DeviceSignInViewModel.cs  |  91 +++++-----
 Samples/DeviceLab/MainViewModel.cs          | 177 +++++++++++---------
 Samples/DeviceLab/NumberEntryBox.xaml       |  21 +++
 Samples/DeviceLab/NumberEntryBox.xaml.cs    | 109 ++++++++++++
 7 files changed, 330 insertions(+), 121 deletions(-)
 create mode 100644 Samples/DeviceLab/NumberEntryBox.xaml
 create mode 100644 Samples/DeviceLab/NumberEntryBox.xaml.cs

diff --git a/Samples/DeviceLab/DeviceCollectionView.xaml b/Samples/DeviceLab/DeviceCollectionView.xaml
index 4c76dd42..734cea42 100644
--- a/Samples/DeviceLab/DeviceCollectionView.xaml
+++ b/Samples/DeviceLab/DeviceCollectionView.xaml
@@ -96,6 +96,8 @@
                                         </CheckBox>
                                         <TextBlock Margin="0,0,4,0" Text="Device Name:" />
                                         <TextBlock Text="{Binding DeviceName}"/>
+                                        <TextBlock Margin="50,0,4,0" Text="Device Address:" />
+                                        <TextBlock Text="{Binding Address}"/>
                                         <Button
                                             DockPanel.Dock="Right"
                                             Height="16" Width="16"
@@ -135,9 +137,11 @@
                             <TextBox Width="100" Margin="0,0,4,0" Text="{Binding DeviceNameEntry, UpdateSourceTrigger=PropertyChanged}" />
                             <Button Padding="2,1,2,1" Command="{Binding RenameCommand}" Content="Rename" />
                         </StackPanel>
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Height="20" Margin="0,5,0,0">
                             <Button Content="Reboot" Width="60" Command="{Binding RebootCommand}" />
                             <Button Content="Reestablish Connection" Width="140" Margin="2,0,0,0" Command="{Binding ReestablishConnectionCommand}" />
+                            <TextBlock Text="Retry Attempts:" Width="86" Margin="15,0,-5,0" />
+                            <local:NumberEntryBox Value="{Binding ConnectionRetryAttempts}" />
                         </StackPanel>
                     </StackPanel>
                 </TabItem>
diff --git a/Samples/DeviceLab/DeviceLab.csproj b/Samples/DeviceLab/DeviceLab.csproj
index df2abed7..953617db 100644
--- a/Samples/DeviceLab/DeviceLab.csproj
+++ b/Samples/DeviceLab/DeviceLab.csproj
@@ -68,6 +68,9 @@
       <DependentUpon>DeviceSignInView.xaml</DependentUpon>
     </Compile>
     <Compile Include="MainViewModel.cs" />
+    <Compile Include="NumberEntryBox.xaml.cs">
+      <DependentUpon>NumberEntryBox.xaml</DependentUpon>
+    </Compile>
     <Compile Include="SelectionListBox.cs" />
     <Compile Include="XboxDevicePortalConnection.cs" />
     <Page Include="BindablePassword.xaml">
@@ -99,6 +102,10 @@
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Page Include="NumberEntryBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\CustomStyles.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Samples/DeviceLab/DevicePortalViewModel.cs b/Samples/DeviceLab/DevicePortalViewModel.cs
index 0015e6d4..a56b351a 100644
--- a/Samples/DeviceLab/DevicePortalViewModel.cs
+++ b/Samples/DeviceLab/DevicePortalViewModel.cs
@@ -35,6 +35,7 @@ private string diagnosticMoniker
         #region Constructors
         public DevicePortalViewModel(DevicePortal portal, IDiagnosticSink diags)
         {
+            this.ConnectionRetryAttempts = 5;
             this.diagnostics = diags;
             this.portal = portal;
             this.Ready = true;
@@ -160,7 +161,7 @@ public string PlatformName
         }
         #endregion // PlatformName
 
-        #region // CPULoad
+        #region CPULoad
         private int cpuLoad;
         public string CPULoad
         {
@@ -170,6 +171,22 @@ public string CPULoad
             }
         }
         #endregion // CPULoad
+
+        #region ConnectionRetryAttempts
+        private int connectionRetryAttempts;
+        public int ConnectionRetryAttempts
+        {
+            get
+            {
+                return this.connectionRetryAttempts;
+            }
+
+            set
+            {
+                SetProperty(ref this.connectionRetryAttempts, value);
+            }
+        }
+        #endregion // ConnectionRetryAttempts
         #endregion // Properties
 
         //-------------------------------------------------------------------
@@ -286,6 +303,7 @@ private bool CanExecuteReboot()
 
         private async Task ExecuteRebootAsync()
         {
+            await ExecuteStopListeningForSystemPerfAsync();
             this.Ready = false;
             try
             {
@@ -301,6 +319,7 @@ private async Task ExecuteRebootAsync()
                 ReportException("Reboot", exn);
             }
             await ExecuteReestablishConnectionAsync();
+            await ExecuteStartListeningForSystemPerfAsync();
         }
         #endregion // Reboot Command
 
@@ -349,7 +368,7 @@ private async Task ExecuteReestablishConnectionAsync()
                 {
                     await this.portal.Connect();
                     ++numTries;
-                } while (this.portal.ConnectionHttpStatusCode != HttpStatusCode.OK);
+                } while (this.portal.ConnectionHttpStatusCode != HttpStatusCode.OK && numTries < this.ConnectionRetryAttempts);
                 this.Ready = true;
             }
             catch (Exception exn)
@@ -384,9 +403,15 @@ private async Task ExecuteStartListeningForSystemPerfAsync()
         {
             this.Ready = false;
             this.portal.SystemPerfMessageReceived += OnSystemPerfReceived;
-            await this.portal.StartListeningForSystemPerf();
+            await Task.Run(StartListeningHelper);
             this.Ready = true;
         }
+
+        private async Task StartListeningHelper()
+        {
+            await this.portal.StartListeningForSystemPerf().ConfigureAwait(false);
+        }
+
         #endregion // StartListeningForSystemPerfCommand
 
         #region StopListeningForSystemPerfCommand
@@ -413,9 +438,16 @@ private async Task ExecuteStopListeningForSystemPerfAsync()
         {
             this.Ready = false;
             this.portal.SystemPerfMessageReceived -= OnSystemPerfReceived;
-            await this.portal.StopListeningForSystemPerf();
+            await StopListeningHelper();
+            //await Task.Run(StopListeningHelper);
+            await StopListeningHelper();
             this.Ready = true;
         }
+
+        private async Task StopListeningHelper()
+        {
+            await this.portal.StopListeningForSystemPerf();
+        }
         #endregion // StopListeningForSystemPerfCommand
         #endregion // Commands
              
diff --git a/Samples/DeviceLab/DeviceSignInViewModel.cs b/Samples/DeviceLab/DeviceSignInViewModel.cs
index a8216d4f..0bcef57c 100644
--- a/Samples/DeviceLab/DeviceSignInViewModel.cs
+++ b/Samples/DeviceLab/DeviceSignInViewModel.cs
@@ -51,15 +51,14 @@ public IDevicePortalConnection CreateConnection(string address, string userName,
 
     public class DeviceSignInEventArgs : System.EventArgs
     {
-        internal DeviceSignInEventArgs(HttpStatusCode statusCode, DevicePortal portal)
+        internal DeviceSignInEventArgs(DevicePortal portal, IDevicePortalConnection conn)
         {
-            this.StatusCode = statusCode;
             this.Portal = portal;
+            this.Connection = conn;
         }
 
-        public HttpStatusCode StatusCode { get; private set; }
-
         public DevicePortal Portal { get; private set; }
+        public IDevicePortalConnection Connection { get; private set; }
     }
 
     public class DeviceSignInViewModel : BindableBase
@@ -175,7 +174,9 @@ public ICommand ConnectCommand
             {
                 if (connectCommand == null)
                 {
-                    connectCommand = DelegateCommand.FromAsyncHandler(ExecuteConnectAsync, CanExecuteConnect);
+                    // TODO
+                    //connectCommand = DelegateCommand.FromAsyncHandler(ExecuteConnect, CanExecuteConnect);
+                    connectCommand = new DelegateCommand(ExecuteConnect, CanExecuteConnect);
                     connectCommand.ObservesProperty(() => this.DeviceIP);
                     connectCommand.ObservesProperty(() => this.UserName);
                     connectCommand.ObservesProperty(() => this.Password);
@@ -186,47 +187,55 @@ public ICommand ConnectCommand
             }
         }
 
-        private async Task ExecuteConnectAsync()
+        private void ExecuteConnect()
         {
-            this.diagnostics.OutputDiagnosticString("[{0}] Attempting to connect.\n", this.deviceIP);
-
             IDevicePortalConnection conn = this.ConnectionTypeSelection.CreateConnection(this.DeviceIP, this.UserName, this.Password);
-
             DevicePortal portal = new DevicePortal(conn);
-            DeviceConnectionStatusEventHandler handler = (DevicePortal sender, DeviceConnectionStatusEventArgs args) =>
-            {
-                this.diagnostics.OutputDiagnosticString("[{0}] Connection status update: Status: {1}, Phase: {2}\n", portal.Address, args.Status, args.Phase);
-                if (args.Status == DeviceConnectionStatus.Connected)
-                {
-                    this.diagnostics.OutputDiagnosticString("[{0}] Language: {1}\n", portal.Address, conn.OsInfo.Language);
-                    this.diagnostics.OutputDiagnosticString("[{0}] Name: {1}\n", portal.Address, conn.OsInfo.Name);
-                    this.diagnostics.OutputDiagnosticString("[{0}] OsEdition: {1}\n", portal.Address, conn.OsInfo.OsEdition);
-                    this.diagnostics.OutputDiagnosticString("[{0}] OsEditionId: {1}\n", portal.Address, conn.OsInfo.OsEditionId);
-                    this.diagnostics.OutputDiagnosticString("[{0}] OsVersionString: {1}\n", portal.Address, conn.OsInfo.OsVersionString);
-                    this.diagnostics.OutputDiagnosticString("[{0}] Platform: {1}\n", portal.Address, conn.OsInfo.Platform);
-                    this.diagnostics.OutputDiagnosticString("[{0}] PlatformName: {1}\n", portal.Address, conn.OsInfo.PlatformName);
-                }
-                else if (args.Status == DeviceConnectionStatus.Failed)
-                {
-                    this.diagnostics.OutputDiagnosticString("[{0}] Bummer.\n", portal.Address);
-                }
-            };
-            portal.ConnectionStatus += handler;
-
-            try
-            {
-                this.Ready = false;
-                await portal.Connect();
-            }
-            catch (Exception exn)
-            {
-                this.diagnostics.OutputDiagnosticString("[{0}] Exception when trying to connect:\n[{0}] {1}\nStackTrace: \n[{0}] {2}\n", portal.Address, exn.Message, exn.StackTrace);
-            }
-            this.SignInAttempts?.Invoke(this, new DeviceSignInEventArgs(portal.ConnectionHttpStatusCode, portal));
-            portal.ConnectionStatus -= handler;
-            this.Ready = true;
+            this.SignInAttempts?.Invoke(this, new DeviceSignInEventArgs(portal, conn));
         }
 
+        // TODO
+        //private async Task OldExecuteConnectAsync()
+        //{
+        //    this.diagnostics.OutputDiagnosticString("[{0}] Attempting to connect.\n", this.deviceIP);
+
+        //    IDevicePortalConnection conn = this.ConnectionTypeSelection.CreateConnection(this.DeviceIP, this.UserName, this.Password);
+
+        //    DevicePortal portal = new DevicePortal(conn);
+        //    DeviceConnectionStatusEventHandler handler = (DevicePortal sender, DeviceConnectionStatusEventArgs args) =>
+        //    {
+        //        this.diagnostics.OutputDiagnosticString("[{0}] Connection status update: Status: {1}, Phase: {2}\n", portal.Address, args.Status, args.Phase);
+        //        if (args.Status == DeviceConnectionStatus.Connected)
+        //        {
+        //            this.diagnostics.OutputDiagnosticString("[{0}] Language: {1}\n", portal.Address, conn.OsInfo.Language);
+        //            this.diagnostics.OutputDiagnosticString("[{0}] Name: {1}\n", portal.Address, conn.OsInfo.Name);
+        //            this.diagnostics.OutputDiagnosticString("[{0}] OsEdition: {1}\n", portal.Address, conn.OsInfo.OsEdition);
+        //            this.diagnostics.OutputDiagnosticString("[{0}] OsEditionId: {1}\n", portal.Address, conn.OsInfo.OsEditionId);
+        //            this.diagnostics.OutputDiagnosticString("[{0}] OsVersionString: {1}\n", portal.Address, conn.OsInfo.OsVersionString);
+        //            this.diagnostics.OutputDiagnosticString("[{0}] Platform: {1}\n", portal.Address, conn.OsInfo.Platform);
+        //            this.diagnostics.OutputDiagnosticString("[{0}] PlatformName: {1}\n", portal.Address, conn.OsInfo.PlatformName);
+        //        }
+        //        else if (args.Status == DeviceConnectionStatus.Failed)
+        //        {
+        //            this.diagnostics.OutputDiagnosticString("[{0}] Bummer.\n", portal.Address);
+        //        }
+        //    };
+        //    portal.ConnectionStatus += handler;
+
+        //    try
+        //    {
+        //        this.Ready = false;
+        //        await portal.Connect();
+        //    }
+        //    catch (Exception exn)
+        //    {
+        //        this.diagnostics.OutputDiagnosticString("[{0}] Exception when trying to connect:\n[{0}] {1}\nStackTrace: \n[{0}] {2}\n", portal.Address, exn.Message, exn.StackTrace);
+        //    }
+        //    this.SignInAttempts?.Invoke(this, new DeviceSignInEventArgs(portal.ConnectionHttpStatusCode, portal));
+        //    portal.ConnectionStatus -= handler;
+        //    this.Ready = true;
+        //}
+
         private bool CanExecuteConnect()
         {
             return
diff --git a/Samples/DeviceLab/MainViewModel.cs b/Samples/DeviceLab/MainViewModel.cs
index 9c491346..7b069dba 100644
--- a/Samples/DeviceLab/MainViewModel.cs
+++ b/Samples/DeviceLab/MainViewModel.cs
@@ -1,104 +1,109 @@
 using Prism.Commands;
 using Prism.Mvvm;
-using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Input;
 using System.Collections.Specialized;
 using System.Collections;
 using System.ComponentModel;
+using System;
+using Microsoft.Tools.WindowsDevicePortal;
 
 namespace DeviceLab
 {
-    public static class CommandExtensions
+    public class NewDeviceHelper : ICommand
     {
-        public class ChainedCommand
+        // TODO: Don't close over a DevicePortalViewModel
+        // Instead, should just hook up the CanExecuteChanged events on
+        // the commands
+        private DevicePortalViewModel dpvm;
+        private Queue<ICommand> commandQueue;
+        private bool executionStarted;
+
+        // TODO:
+        public event EventHandler CanExecuteChanged;
+
+        public NewDeviceHelper(DevicePortalViewModel dpvm)
         {
+            this.dpvm = dpvm;
             
-            private ICommand executeMe;
-            private object arg;
-
-            private ChainedCommand nextChainedCommand;
+            this.commandQueue = new Queue<ICommand>();
+            this.executionStarted = false;
+        }
 
-            public ChainedCommand(ICommand executeMe, object arg, bool start = true)
+        public void Enqueue(ICommand command)
+        {
+            if (this.executionStarted)
             {
-                this.executeMe = executeMe;
-                this.arg = arg;
-                this.nextChainedCommand = null;
-                this.Status = State.NotStarted;
-                if(start)
-                {
-                    Start();
-                }
+                throw new InvalidOperationException("Execution already started");
             }
 
-            public enum State
-            {
-                NotStarted,
-                Waiting,
-                Canceled,
-                Completed
-            };
-
-            public State Status { get; private set; }
+            this.commandQueue.Enqueue(command);
+        }
 
-            public void Start()
+        private void Dpvm_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if(e.PropertyName == "Ready")
             {
-                if(this.Status != State.NotStarted)
+                if(this.dpvm.Ready)
                 {
-                    throw new InvalidOperationException("Must be in the NotStarted state");
+                    DoNextCommand();
                 }
-                this.Status = State.Waiting;
-                this.executeMe.CanExecuteChanged += ExecuteMe_CanExecuteChanged;
-                TryExecute();
             }
+        }
 
-            public State Cancel()
+        private void DoNextCommand()
+        {
+            if(this.commandQueue == null)
             {
-                this.executeMe.CanExecuteChanged -= ExecuteMe_CanExecuteChanged;
-                State oldState = this.Status;
-                this.Status = State.Canceled;
-                return oldState;
+                throw new InvalidOperationException("Attempting to execute commands without a command queue");
             }
 
-            public ChainedCommand ExecuteNext(ICommand next, object arg)
+            if(this.commandQueue.Count == 0)
             {
-                this.nextChainedCommand = new ChainedCommand(next, arg, false);
-                TryExecuteNext();
-                return this.nextChainedCommand;
+                throw new InvalidOperationException("Attempting to execute command on an empty command queue");
             }
 
-            private void ExecuteMe_CanExecuteChanged(object sender, EventArgs e)
+            if(this.commandQueue.Peek().CanExecute(null))
             {
-                TryExecute();
-            }
+                ICommand nextCommand = this.commandQueue.Dequeue();
 
-            private void TryExecute()
-            {
-                if (this.executeMe.CanExecute(arg))
+                if (this.commandQueue.Count == 0)
                 {
-                    this.executeMe.Execute(arg);
-                    this.executeMe.CanExecuteChanged -= ExecuteMe_CanExecuteChanged;
-                    this.Status = State.Completed;
-                    TryExecuteNext();
+                    // Executing the next command will probably trigger property changed
+                    // events and since this is the last command we want to disconnect from 
+                    // those events
+                    this.dpvm.PropertyChanged -= Dpvm_PropertyChanged;
+                    this.executionStarted = false;
                 }
+                nextCommand.Execute(null);
             }
+        }
 
-            private void TryExecuteNext()
+        public bool CanExecute(object parameter)
+        {
+            if(this.executionStarted)
             {
-                if(this.Status == State.Completed && this.nextChainedCommand != null)
-                {
-                    this.nextChainedCommand.Start();
-                }
+                return false;
             }
+
+            if(this.commandQueue.Count > 0)
+            {
+                return this.commandQueue.Peek().CanExecute(null);
+            }
+
+            return false;
         }
 
-        public static ChainedCommand ExecuteWhenReady(this ICommand executeMe, object arg)
+        public void Execute(object parameter)
         {
-            return new ChainedCommand(executeMe, arg);
+            if(this.executionStarted)
+            {
+                throw new InvalidOperationException("Execution already started");
+            }
+
+            dpvm.PropertyChanged += Dpvm_PropertyChanged;
+            DoNextCommand();
         }
     }
 
@@ -124,13 +129,20 @@ public MainViewModel()
             this.ConnectedDevices.CollectionChanged += OnConnectedDevicesChanged;
         }
 
-
         private void OnSignInAttemptCompleted(DeviceSignInViewModel sender, DeviceSignInEventArgs args)
         {
-            if(args.StatusCode == System.Net.HttpStatusCode.OK)
+            DevicePortal portal = args.Portal;
+            // See if the device is already in the list
+            foreach (DevicePortalViewModel dpvm in this.ConnectedDevices)
             {
-                this.ConnectedDevices.Add(new DevicePortalViewModel(args.Portal, Diagnostics));
+                if(dpvm.Address == portal.Address)
+                {
+                    this.Diagnostics.OutputDiagnosticString("[!!] The device with address {0} is already in the list\n", portal.Address);
+                    return;
+                }
             }
+
+            this.ConnectedDevices.Add(new DevicePortalViewModel(args.Portal, Diagnostics));
         }
         #endregion // Constructors
 
@@ -325,39 +337,44 @@ private void ExecuteRebootSelectedDevices()
         #endregion // RebootSelectedDevicesCommand
 
         #region RemoveDeviceCommand
-        private DelegateCommand<DevicePortalViewModel> removeDeviceCommand;
+        // NOTE: Ideally, the template parameter would be DevicePortalViewMOdel, rather than object.
+        // Unfortunately, this would sporadically throw an invalid cast exception from within the
+        // DelegateCommand<> constructor in the PRISM library. Apparently, the object passed to the
+        // constructor cannot always be cast to something that would rightfully belong to the 
+        // collection. 
+        private DelegateCommand<object> removeDeviceCommand;
         public ICommand RemoveDeviceCommand
         {
             get
             {
                 if(this.removeDeviceCommand == null)
                 {
-                    this.removeDeviceCommand = new DelegateCommand<DevicePortalViewModel>(ExecuteRemoveDeviceCommand, CanExecuteRemoveDeviceCommand);
+                    this.removeDeviceCommand = new DelegateCommand<object>(ExecuteRemoveDeviceCommand, CanExecuteRemoveDeviceCommand);
                     this.removeDeviceCommand.ObservesProperty(() => SomeDevicesReady);
                 }
                 return this.removeDeviceCommand;
             }
         }
 
-        private bool CanExecuteRemoveDeviceCommand(DevicePortalViewModel arg)
+        private bool CanExecuteRemoveDeviceCommand(object arg)
         {
-            if (arg != null)
+            DevicePortalViewModel dpvm = arg as DevicePortalViewModel;
+            if (dpvm != null)
             {
-                return arg.Ready;
+                return dpvm.Ready;
             }
             return false;
         }
 
-        private void ExecuteRemoveDeviceCommand(DevicePortalViewModel obj)
+        private void ExecuteRemoveDeviceCommand(object obj)
         {
-            if (obj != null)
+            DevicePortalViewModel dpvm = obj as DevicePortalViewModel;
+            if (dpvm != null)
             {
-                OnDeviceRemoved(obj);
-                this.ConnectedDevices.Remove(obj);
+                this.ConnectedDevices.Remove(dpvm);
             }
         }
         #endregion // RemoveDeviceCommand
-
         #endregion // Commands
 
         private void OnConnectedDevicesChanged(object sender, NotifyCollectionChangedEventArgs e)
@@ -378,7 +395,7 @@ private void OnConnectedDevicesChanged(object sender, NotifyCollectionChangedEve
                 {
                     foreach(DevicePortalViewModel dpvm in e.OldItems)
                     {
-                        //OnDeviceRemoved(dpvm);
+                        OnDeviceRemoved(dpvm);
                     }
                 }
             }
@@ -387,7 +404,17 @@ private void OnConnectedDevicesChanged(object sender, NotifyCollectionChangedEve
         private void OnDeviceAdded(DevicePortalViewModel dpvm)
         {
             dpvm.PropertyChanged += DevicePropertyChanged;
-            dpvm.RefreshDeviceNameCommand.ExecuteWhenReady(this).ExecuteNext(dpvm.StartListeningForSystemPerfCommand, this);
+            // TODO:
+            //CompositeCommand command = new CompositeCommand();
+            //command.RegisterCommand(dpvm.RefreshDeviceNameCommand);
+            //command.RegisterCommand(dpvm.StartListeningForSystemPerfCommand);
+            //command.Execute(null);
+
+            NewDeviceHelper ndh = new NewDeviceHelper(dpvm);
+            ndh.Enqueue(dpvm.ReestablishConnectionCommand);
+            ndh.Enqueue(dpvm.RefreshDeviceNameCommand);
+            ndh.Enqueue(dpvm.StartListeningForSystemPerfCommand);
+            ndh.Execute(null);
         }
 
         private void OnDeviceRemoved(DevicePortalViewModel dpvm)
diff --git a/Samples/DeviceLab/NumberEntryBox.xaml b/Samples/DeviceLab/NumberEntryBox.xaml
new file mode 100644
index 00000000..e717ebfe
--- /dev/null
+++ b/Samples/DeviceLab/NumberEntryBox.xaml
@@ -0,0 +1,21 @@
+<UserControl
+    x:Class="DeviceLab.NumberEntryBox"
+    x:Name="root"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+    xmlns:local="clr-namespace:DeviceLab"
+    mc:Ignorable="d" 
+    d:DesignHeight="18" d:DesignWidth="55">
+    <Grid Background="White" DataContext="{Binding ElementName=root}">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="Auto"/>
+        </Grid.ColumnDefinitions>
+        <Label Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="1,-5,1,0" Content="{Binding Value}"/>
+        <Button Grid.Column="1" Width="16" Content="-" Margin="0,1,1,1" Padding="0,-2,0,0" Command="{Binding DecrementCommand}"/>
+        <Button Grid.Column="2" Width="16" Content="+" Margin="0,1,1,1" Padding="0,-2,0,0" Command="{Binding IncrementCommand}"/>
+    </Grid>
+</UserControl>
diff --git a/Samples/DeviceLab/NumberEntryBox.xaml.cs b/Samples/DeviceLab/NumberEntryBox.xaml.cs
new file mode 100644
index 00000000..9263df12
--- /dev/null
+++ b/Samples/DeviceLab/NumberEntryBox.xaml.cs
@@ -0,0 +1,109 @@
+using Prism.Commands;
+using Prism.Mvvm;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace DeviceLab
+{
+    /// <summary>
+    /// Interaction logic for NumberEntryBox.xaml
+    /// </summary>
+    public partial class NumberEntryBox : UserControl, INotifyPropertyChanged
+    {
+        public NumberEntryBox()
+        {
+            InitializeComponent();
+        }
+
+        public int Value
+        {
+            get { return (int)GetValue(ValueProperty); }
+            set { SetValue(ValueProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for Value.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty ValueProperty =
+            DependencyProperty.Register("Value", typeof(int), typeof(NumberEntryBox), new PropertyMetadata(0, OnValueChanged, CoerceValue));
+
+        private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            NumberEntryBox thisNEB = d as NumberEntryBox;
+            if (thisNEB != null)
+            {
+                thisNEB.PropertyChanged?.Invoke(thisNEB, new PropertyChangedEventArgs("Value"));
+            }
+        }
+
+        private static object CoerceValue(DependencyObject d, object baseValue)
+        {
+            int val = (int)baseValue > 0 ? (int)baseValue : 1;
+            return val;
+        }
+
+        //-------------------------------------------------------------------
+        // Commands
+        //-------------------------------------------------------------------
+        #region Commands
+        #region DecrementCommand
+        private DelegateCommand decrementCommand;
+        public ICommand DecrementCommand
+        {
+            get
+            {
+                if(this.decrementCommand == null)
+                {
+                    this.decrementCommand = new DelegateCommand(ExecuteDecrement, CanExecuteDecrement);
+                    this.decrementCommand.ObservesProperty(() => Value);
+                }
+                return this.decrementCommand;
+            }
+        }
+
+        private bool CanExecuteDecrement()
+        {
+            return this.Value > 1;
+        }
+
+        private void ExecuteDecrement()
+        {
+            this.Value = this.Value - 1;
+        }
+        #endregion // DecrementCommand
+
+        #region IncrementCommand
+        private DelegateCommand incrementCommand;
+        public ICommand IncrementCommand
+        {
+            get
+            {
+                if(this.incrementCommand == null)
+                {
+                    this.incrementCommand = new DelegateCommand(ExecuteIncrement);
+                }
+                return this.incrementCommand;
+            }
+        }
+
+        private void ExecuteIncrement()
+        {
+            this.Value = this.Value + 1;
+        }
+        #endregion // IncrementCommand
+        #endregion // Commands
+
+        public event PropertyChangedEventHandler PropertyChanged;
+    }
+}

From 078c278d49d39e90de79c7f0fa7846704bb199d7 Mon Sep 17 00:00:00 2001
From: Greg Pettyjohn <grpettyj@microsoft.com>
Date: Mon, 29 Aug 2016 13:37:07 -0700
Subject: [PATCH 06/51] Added a nifty CommandSequence class

---
 Samples/DeviceLab/CommandSequence.cs       | 134 +++++++++++++++++++++
 Samples/DeviceLab/DeviceLab.csproj         |   1 +
 Samples/DeviceLab/DevicePortalViewModel.cs |   2 +
 Samples/DeviceLab/DeviceSignInViewModel.cs |  59 +--------
 Samples/DeviceLab/MainViewModel.cs         | 116 ++----------------
 5 files changed, 146 insertions(+), 166 deletions(-)
 create mode 100644 Samples/DeviceLab/CommandSequence.cs

diff --git a/Samples/DeviceLab/CommandSequence.cs b/Samples/DeviceLab/CommandSequence.cs
new file mode 100644
index 00000000..d8f6726d
--- /dev/null
+++ b/Samples/DeviceLab/CommandSequence.cs
@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace DeviceLab
+{
+    public class CommandSequence : ICommand
+    {
+        private List<ICommand> registeredCommands;
+        private Queue<ICommand> commandQueue;
+        private object sharedParameter;
+
+        //-------------------------------------------------------------------
+        // Constructor
+        //-------------------------------------------------------------------
+        #region Constructor
+        public CommandSequence(Queue<ICommand> commandQueue = null)
+        {
+            this.registeredCommands = new List<ICommand>();
+            this.commandQueue = commandQueue == null ? new Queue<ICommand>() : commandQueue;
+        }
+        #endregion // Constructor
+
+        //-------------------------------------------------------------------
+        // Command Registration
+        //-------------------------------------------------------------------
+        public void RegisterCommand(ICommand cmd)
+        {
+            if (cmd == null)
+            {
+                throw new ArgumentException(nameof(cmd));
+            }
+
+            if (cmd == this)
+            {
+                throw new ArgumentException("Cannot register a CommandSequence with itself");
+            }
+
+            lock (this.registeredCommands)
+            {
+                CommandSequence seq = cmd as CommandSequence;
+                if (seq == null)
+                {
+                    this.registeredCommands.Add(cmd);
+                }
+                else
+                {
+                    foreach (ICommand subcmd in seq.registeredCommands)
+                    {
+                        this.registeredCommands.Add(subcmd);
+                    }
+                }
+            }
+            OnCanExecuteChanged();
+        }
+
+        //-------------------------------------------------------------------
+        // ICommand Implementation
+        //-------------------------------------------------------------------
+        public event EventHandler CanExecuteChanged;
+        private void OnCanExecuteChanged()
+        {
+            this.CanExecuteChanged?.Invoke(this, new EventArgs());
+        }
+
+        public bool CanExecute(object parameter)
+        {
+            if (this.registeredCommands.Count == 0)
+            {
+                return false;
+            }
+
+            if (this.commandQueue.Count > 0)
+            {
+                return false;
+            }
+
+            return this.registeredCommands[0].CanExecute(parameter);
+        }
+
+        public void Execute(object parameter)
+        {
+            lock (this.commandQueue)
+            {
+                if (this.registeredCommands.Count > 0 && this.commandQueue.Count == 0)
+                {
+                    foreach (ICommand cmd in this.registeredCommands)
+                    {
+                        this.commandQueue.Enqueue(cmd);
+                        this.sharedParameter = parameter;
+                    }
+                }
+                else
+                {
+                    return;
+                }
+            }
+
+            OnCanExecuteChanged();
+            ExecuteNext();
+        }
+
+        private void CurrentCommand_CanExecuteChanged(object sender, EventArgs e)
+        {
+            ICommand cmd = sender as ICommand;
+            cmd.CanExecuteChanged -= CurrentCommand_CanExecuteChanged;
+            ExecuteNext();
+        }
+
+        private void ExecuteNext()
+        {
+            lock (this.commandQueue)
+            {
+                while (this.commandQueue.Count > 0 && this.commandQueue.Peek().CanExecute(this.sharedParameter))
+                {
+                    ICommand cmd = this.commandQueue.Dequeue();
+                    cmd.Execute(this.sharedParameter);
+                }
+
+                if (this.commandQueue.Count > 0)
+                {
+                    this.commandQueue.Peek().CanExecuteChanged += CurrentCommand_CanExecuteChanged;
+                }
+                else
+                {
+                    OnCanExecuteChanged();
+                }
+            }
+        }
+    }
+}
diff --git a/Samples/DeviceLab/DeviceLab.csproj b/Samples/DeviceLab/DeviceLab.csproj
index 953617db..cfa55069 100644
--- a/Samples/DeviceLab/DeviceLab.csproj
+++ b/Samples/DeviceLab/DeviceLab.csproj
@@ -60,6 +60,7 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="AutoScrollTextBox.cs" />
+    <Compile Include="CommandSequence.cs" />
     <Compile Include="DeviceCollectionView.xaml.cs">
       <DependentUpon>DeviceCollectionView.xaml</DependentUpon>
     </Compile>
diff --git a/Samples/DeviceLab/DevicePortalViewModel.cs b/Samples/DeviceLab/DevicePortalViewModel.cs
index a56b351a..b0f6bd3a 100644
--- a/Samples/DeviceLab/DevicePortalViewModel.cs
+++ b/Samples/DeviceLab/DevicePortalViewModel.cs
@@ -12,6 +12,8 @@
 
 namespace DeviceLab
 {
+
+
     public class DevicePortalViewModel : BindableBase
     {
         //-------------------------------------------------------------------
diff --git a/Samples/DeviceLab/DeviceSignInViewModel.cs b/Samples/DeviceLab/DeviceSignInViewModel.cs
index 0bcef57c..047d383c 100644
--- a/Samples/DeviceLab/DeviceSignInViewModel.cs
+++ b/Samples/DeviceLab/DeviceSignInViewModel.cs
@@ -80,7 +80,6 @@ public class DeviceSignInViewModel : BindableBase
         /// <remarks>Diagnostic output will be lost</remarks>
         public DeviceSignInViewModel()
         {
-            this.ready = true;
             this.diagnostics = new NullDiagnosticSink();
 
         }
@@ -91,7 +90,6 @@ public DeviceSignInViewModel()
         /// <param name="diags">Diagnostic sink that will receive all the diagnostic output</param>
         public DeviceSignInViewModel(IDiagnosticSink diags)
         {
-            this.ready = true;
             this.diagnostics = diags;
         }
         #endregion // Constructors
@@ -127,15 +125,6 @@ public SecureString Password
         }
         #endregion // Password
 
-        #region Ready
-        private bool ready;
-        public bool Ready
-        {
-            get { return this.ready; }
-            private set { SetProperty(ref this.ready, value); }
-        }
-        #endregion // Ready
-
         #region Connection Types
         private ObservableCollection<IDevicePortalConnectionFactory> connectionTypes;
         public ObservableCollection<IDevicePortalConnectionFactory> ConnectionTypes
@@ -174,13 +163,10 @@ public ICommand ConnectCommand
             {
                 if (connectCommand == null)
                 {
-                    // TODO
-                    //connectCommand = DelegateCommand.FromAsyncHandler(ExecuteConnect, CanExecuteConnect);
                     connectCommand = new DelegateCommand(ExecuteConnect, CanExecuteConnect);
                     connectCommand.ObservesProperty(() => this.DeviceIP);
                     connectCommand.ObservesProperty(() => this.UserName);
                     connectCommand.ObservesProperty(() => this.Password);
-                    connectCommand.ObservesProperty(() => this.Ready);
                     connectCommand.ObservesProperty(() => this.ConnectionTypeSelection);
                 }
                 return connectCommand;
@@ -193,53 +179,10 @@ private void ExecuteConnect()
             DevicePortal portal = new DevicePortal(conn);
             this.SignInAttempts?.Invoke(this, new DeviceSignInEventArgs(portal, conn));
         }
-
-        // TODO
-        //private async Task OldExecuteConnectAsync()
-        //{
-        //    this.diagnostics.OutputDiagnosticString("[{0}] Attempting to connect.\n", this.deviceIP);
-
-        //    IDevicePortalConnection conn = this.ConnectionTypeSelection.CreateConnection(this.DeviceIP, this.UserName, this.Password);
-
-        //    DevicePortal portal = new DevicePortal(conn);
-        //    DeviceConnectionStatusEventHandler handler = (DevicePortal sender, DeviceConnectionStatusEventArgs args) =>
-        //    {
-        //        this.diagnostics.OutputDiagnosticString("[{0}] Connection status update: Status: {1}, Phase: {2}\n", portal.Address, args.Status, args.Phase);
-        //        if (args.Status == DeviceConnectionStatus.Connected)
-        //        {
-        //            this.diagnostics.OutputDiagnosticString("[{0}] Language: {1}\n", portal.Address, conn.OsInfo.Language);
-        //            this.diagnostics.OutputDiagnosticString("[{0}] Name: {1}\n", portal.Address, conn.OsInfo.Name);
-        //            this.diagnostics.OutputDiagnosticString("[{0}] OsEdition: {1}\n", portal.Address, conn.OsInfo.OsEdition);
-        //            this.diagnostics.OutputDiagnosticString("[{0}] OsEditionId: {1}\n", portal.Address, conn.OsInfo.OsEditionId);
-        //            this.diagnostics.OutputDiagnosticString("[{0}] OsVersionString: {1}\n", portal.Address, conn.OsInfo.OsVersionString);
-        //            this.diagnostics.OutputDiagnosticString("[{0}] Platform: {1}\n", portal.Address, conn.OsInfo.Platform);
-        //            this.diagnostics.OutputDiagnosticString("[{0}] PlatformName: {1}\n", portal.Address, conn.OsInfo.PlatformName);
-        //        }
-        //        else if (args.Status == DeviceConnectionStatus.Failed)
-        //        {
-        //            this.diagnostics.OutputDiagnosticString("[{0}] Bummer.\n", portal.Address);
-        //        }
-        //    };
-        //    portal.ConnectionStatus += handler;
-
-        //    try
-        //    {
-        //        this.Ready = false;
-        //        await portal.Connect();
-        //    }
-        //    catch (Exception exn)
-        //    {
-        //        this.diagnostics.OutputDiagnosticString("[{0}] Exception when trying to connect:\n[{0}] {1}\nStackTrace: \n[{0}] {2}\n", portal.Address, exn.Message, exn.StackTrace);
-        //    }
-        //    this.SignInAttempts?.Invoke(this, new DeviceSignInEventArgs(portal.ConnectionHttpStatusCode, portal));
-        //    portal.ConnectionStatus -= handler;
-        //    this.Ready = true;
-        //}
-
+        
         private bool CanExecuteConnect()
         {
             return
-                Ready &&
                 !string.IsNullOrWhiteSpace(this.DeviceIP) &&
                 !string.IsNullOrWhiteSpace(this.UserName) &&
                 this.Password != null &&
diff --git a/Samples/DeviceLab/MainViewModel.cs b/Samples/DeviceLab/MainViewModel.cs
index 7b069dba..8fad8ed7 100644
--- a/Samples/DeviceLab/MainViewModel.cs
+++ b/Samples/DeviceLab/MainViewModel.cs
@@ -11,102 +11,6 @@
 
 namespace DeviceLab
 {
-    public class NewDeviceHelper : ICommand
-    {
-        // TODO: Don't close over a DevicePortalViewModel
-        // Instead, should just hook up the CanExecuteChanged events on
-        // the commands
-        private DevicePortalViewModel dpvm;
-        private Queue<ICommand> commandQueue;
-        private bool executionStarted;
-
-        // TODO:
-        public event EventHandler CanExecuteChanged;
-
-        public NewDeviceHelper(DevicePortalViewModel dpvm)
-        {
-            this.dpvm = dpvm;
-            
-            this.commandQueue = new Queue<ICommand>();
-            this.executionStarted = false;
-        }
-
-        public void Enqueue(ICommand command)
-        {
-            if (this.executionStarted)
-            {
-                throw new InvalidOperationException("Execution already started");
-            }
-
-            this.commandQueue.Enqueue(command);
-        }
-
-        private void Dpvm_PropertyChanged(object sender, PropertyChangedEventArgs e)
-        {
-            if(e.PropertyName == "Ready")
-            {
-                if(this.dpvm.Ready)
-                {
-                    DoNextCommand();
-                }
-            }
-        }
-
-        private void DoNextCommand()
-        {
-            if(this.commandQueue == null)
-            {
-                throw new InvalidOperationException("Attempting to execute commands without a command queue");
-            }
-
-            if(this.commandQueue.Count == 0)
-            {
-                throw new InvalidOperationException("Attempting to execute command on an empty command queue");
-            }
-
-            if(this.commandQueue.Peek().CanExecute(null))
-            {
-                ICommand nextCommand = this.commandQueue.Dequeue();
-
-                if (this.commandQueue.Count == 0)
-                {
-                    // Executing the next command will probably trigger property changed
-                    // events and since this is the last command we want to disconnect from 
-                    // those events
-                    this.dpvm.PropertyChanged -= Dpvm_PropertyChanged;
-                    this.executionStarted = false;
-                }
-                nextCommand.Execute(null);
-            }
-        }
-
-        public bool CanExecute(object parameter)
-        {
-            if(this.executionStarted)
-            {
-                return false;
-            }
-
-            if(this.commandQueue.Count > 0)
-            {
-                return this.commandQueue.Peek().CanExecute(null);
-            }
-
-            return false;
-        }
-
-        public void Execute(object parameter)
-        {
-            if(this.executionStarted)
-            {
-                throw new InvalidOperationException("Execution already started");
-            }
-
-            dpvm.PropertyChanged += Dpvm_PropertyChanged;
-            DoNextCommand();
-        }
-    }
-
     public class MainViewModel : BindableBase
     {
         //-------------------------------------------------------------------
@@ -128,6 +32,8 @@ public MainViewModel()
 
             this.ConnectedDevices.CollectionChanged += OnConnectedDevicesChanged;
         }
+        #endregion // Constructors
+
 
         private void OnSignInAttemptCompleted(DeviceSignInViewModel sender, DeviceSignInEventArgs args)
         {
@@ -144,7 +50,6 @@ private void OnSignInAttemptCompleted(DeviceSignInViewModel sender, DeviceSignIn
 
             this.ConnectedDevices.Add(new DevicePortalViewModel(args.Portal, Diagnostics));
         }
-        #endregion // Constructors
 
         //-------------------------------------------------------------------
         //  Properties
@@ -404,17 +309,12 @@ private void OnConnectedDevicesChanged(object sender, NotifyCollectionChangedEve
         private void OnDeviceAdded(DevicePortalViewModel dpvm)
         {
             dpvm.PropertyChanged += DevicePropertyChanged;
-            // TODO:
-            //CompositeCommand command = new CompositeCommand();
-            //command.RegisterCommand(dpvm.RefreshDeviceNameCommand);
-            //command.RegisterCommand(dpvm.StartListeningForSystemPerfCommand);
-            //command.Execute(null);
-
-            NewDeviceHelper ndh = new NewDeviceHelper(dpvm);
-            ndh.Enqueue(dpvm.ReestablishConnectionCommand);
-            ndh.Enqueue(dpvm.RefreshDeviceNameCommand);
-            ndh.Enqueue(dpvm.StartListeningForSystemPerfCommand);
-            ndh.Execute(null);
+            
+            CommandSequence cmdSeq = new CommandSequence();
+            cmdSeq.RegisterCommand(dpvm.ReestablishConnectionCommand);
+            cmdSeq.RegisterCommand(dpvm.RefreshDeviceNameCommand);
+            cmdSeq.RegisterCommand(dpvm.StartListeningForSystemPerfCommand);
+            cmdSeq.Execute(null);
         }
 
         private void OnDeviceRemoved(DevicePortalViewModel dpvm)

From 7a1388e576366bf17c0286f99d851fc96959ad84 Mon Sep 17 00:00:00 2001
From: Greg Pettyjohn <grpettyj@microsoft.com>
Date: Mon, 29 Aug 2016 18:56:07 -0700
Subject: [PATCH 07/51] Implemented a nifty CommandSequence class and then used
 it for the DevicePortalCommand model

---
 Samples/DeviceLab/CommandSequence.cs          |  98 ++++++++--
 Samples/DeviceLab/DeviceLab.csproj            |   1 +
 Samples/DeviceLab/DevicePortalCommandModel.cs |  81 ++++++++
 Samples/DeviceLab/DevicePortalViewModel.cs    | 175 ++++++++----------
 Samples/DeviceLab/MainViewModel.cs            |   7 +-
 5 files changed, 252 insertions(+), 110 deletions(-)
 create mode 100644 Samples/DeviceLab/DevicePortalCommandModel.cs

diff --git a/Samples/DeviceLab/CommandSequence.cs b/Samples/DeviceLab/CommandSequence.cs
index d8f6726d..bf140136 100644
--- a/Samples/DeviceLab/CommandSequence.cs
+++ b/Samples/DeviceLab/CommandSequence.cs
@@ -7,21 +7,73 @@
 
 namespace DeviceLab
 {
+    public class ObservableCommandQueue
+    {
+        private Queue<ICommand> commands;
+
+        public ObservableCommandQueue()
+        {
+            this.commands = new Queue<ICommand>();
+        }
+
+        public event EventHandler QueueChanged;
+
+        public int Count
+        {
+            get
+            {
+                return this.commands.Count;
+            }
+        }
+
+        public void Clear()
+        {
+            this.commands.Clear();
+            OnQueueChanged();
+        }
+
+        public ICommand Peek()
+        {
+            return this.commands.Peek();
+        }
+
+        public void Enqueue(ICommand cmd)
+        {
+            this.commands.Enqueue(cmd);
+            OnQueueChanged();
+        }
+
+        public ICommand Dequeue()
+        {
+            ICommand cmd = this.commands.Dequeue();
+            OnQueueChanged();
+            return cmd;
+        }
+
+        private void OnQueueChanged()
+        {
+            this.QueueChanged?.Invoke(this, new EventArgs());
+        }
+    }
+
+
     public class CommandSequence : ICommand
     {
         private List<ICommand> registeredCommands;
-        private Queue<ICommand> commandQueue;
+        private ObservableCommandQueue commandQueue;
         private object sharedParameter;
 
         //-------------------------------------------------------------------
         // Constructor
         //-------------------------------------------------------------------
         #region Constructor
-        public CommandSequence(Queue<ICommand> commandQueue = null)
+        public CommandSequence(ObservableCommandQueue commandQueue = null)
         {
             this.registeredCommands = new List<ICommand>();
-            this.commandQueue = commandQueue == null ? new Queue<ICommand>() : commandQueue;
+            this.commandQueue = commandQueue == null ? new ObservableCommandQueue() : commandQueue;
+            this.commandQueue.QueueChanged += CommandQueue_QueueChanged;
         }
+
         #endregion // Constructor
 
         //-------------------------------------------------------------------
@@ -44,28 +96,48 @@ public void RegisterCommand(ICommand cmd)
                 CommandSequence seq = cmd as CommandSequence;
                 if (seq == null)
                 {
-                    this.registeredCommands.Add(cmd);
+                    AddCommand(cmd);
                 }
                 else
                 {
                     foreach (ICommand subcmd in seq.registeredCommands)
                     {
-                        this.registeredCommands.Add(subcmd);
+                        AddCommand(subcmd);
                     }
                 }
             }
             OnCanExecuteChanged();
         }
 
+        private void AddCommand(ICommand cmd)
+        {
+            if(this.registeredCommands.Count == 0)
+            {
+                cmd.CanExecuteChanged += Forward_CanExecuteChanged;
+            }
+            this.registeredCommands.Add(cmd);
+        }
+
         //-------------------------------------------------------------------
         // ICommand Implementation
         //-------------------------------------------------------------------
         public event EventHandler CanExecuteChanged;
+
         private void OnCanExecuteChanged()
         {
             this.CanExecuteChanged?.Invoke(this, new EventArgs());
         }
 
+        /// <summary>
+        /// Forward on the CanExecuteChanged event from the first command in the list
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Forward_CanExecuteChanged(object sender, EventArgs e)
+        {
+            this.CanExecuteChanged?.Invoke(sender, e);
+        }
+
         public bool CanExecute(object parameter)
         {
             if (this.registeredCommands.Count == 0)
@@ -106,8 +178,11 @@ public void Execute(object parameter)
         private void CurrentCommand_CanExecuteChanged(object sender, EventArgs e)
         {
             ICommand cmd = sender as ICommand;
-            cmd.CanExecuteChanged -= CurrentCommand_CanExecuteChanged;
-            ExecuteNext();
+            if (cmd.CanExecute(this.sharedParameter))
+            {
+                cmd.CanExecuteChanged -= CurrentCommand_CanExecuteChanged;
+                ExecuteNext();
+            }
         }
 
         private void ExecuteNext()
@@ -124,11 +199,12 @@ private void ExecuteNext()
                 {
                     this.commandQueue.Peek().CanExecuteChanged += CurrentCommand_CanExecuteChanged;
                 }
-                else
-                {
-                    OnCanExecuteChanged();
-                }
             }
         }
+
+        private void CommandQueue_QueueChanged(object sender, EventArgs e)
+        {
+            OnCanExecuteChanged();
+        }
     }
 }
diff --git a/Samples/DeviceLab/DeviceLab.csproj b/Samples/DeviceLab/DeviceLab.csproj
index cfa55069..c88fdbce 100644
--- a/Samples/DeviceLab/DeviceLab.csproj
+++ b/Samples/DeviceLab/DeviceLab.csproj
@@ -64,6 +64,7 @@
     <Compile Include="DeviceCollectionView.xaml.cs">
       <DependentUpon>DeviceCollectionView.xaml</DependentUpon>
     </Compile>
+    <Compile Include="DevicePortalCommandModel.cs" />
     <Compile Include="DevicePortalViewModel.cs" />
     <Compile Include="DeviceSignInView.xaml.cs">
       <DependentUpon>DeviceSignInView.xaml</DependentUpon>
diff --git a/Samples/DeviceLab/DevicePortalCommandModel.cs b/Samples/DeviceLab/DevicePortalCommandModel.cs
new file mode 100644
index 00000000..5193c366
--- /dev/null
+++ b/Samples/DeviceLab/DevicePortalCommandModel.cs
@@ -0,0 +1,81 @@
+using Microsoft.Tools.WindowsDevicePortal;
+using Prism.Commands;
+using Prism.Mvvm;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace DeviceLab
+{
+    public class DevicePortalCommandModel : BindableBase
+    {
+        //-------------------------------------------------------------------
+        //  Protected Members
+        //-------------------------------------------------------------------
+        #region Protected Members
+        protected IDiagnosticSink diagnostics;
+        protected DevicePortal portal;
+
+        #endregion // Protected Members
+
+        //-------------------------------------------------------------------
+        // Constructors
+        //-------------------------------------------------------------------
+        #region Constructors
+        public DevicePortalCommandModel(DevicePortal portal, IDiagnosticSink diags)
+        {
+            this.portal = portal;
+            this.diagnostics = diags;
+            this.commandQueue = new ObservableCommandQueue();
+            this.Ready = true;
+        }
+        #endregion // Constructors
+
+        //-------------------------------------------------------------------
+        //  Properties
+        //-------------------------------------------------------------------
+        #region Properties
+
+        /// <summary>
+        /// The Ready property indicates that there are no REST calls in flight via
+        /// the underlying DevicePortal object
+        /// </summary>
+        #region Ready
+        private bool ready;
+        public bool Ready
+        {
+            get
+            {
+                return this.ready;
+            }
+            protected set
+            {
+                SetProperty(ref this.ready, value);
+            }
+        }
+        #endregion // Ready
+        #endregion // Properties
+
+        //-------------------------------------------------------------------
+        // Command Sequences
+        //-------------------------------------------------------------------
+        #region Command Sequences
+        private ObservableCommandQueue commandQueue;
+
+        protected void ClearCommandQueue()
+        {
+            this.commandQueue.Clear();
+        }
+
+        public CommandSequence CreateCommandSequence()
+        {
+            return new CommandSequence(this.commandQueue);
+        }
+
+        #endregion // Command Sequences
+
+    }
+}
diff --git a/Samples/DeviceLab/DevicePortalViewModel.cs b/Samples/DeviceLab/DevicePortalViewModel.cs
index b0f6bd3a..3ff33bcf 100644
--- a/Samples/DeviceLab/DevicePortalViewModel.cs
+++ b/Samples/DeviceLab/DevicePortalViewModel.cs
@@ -12,35 +12,16 @@
 
 namespace DeviceLab
 {
-
-
-    public class DevicePortalViewModel : BindableBase
+    public class DevicePortalViewModel : DevicePortalCommandModel
     {
-        //-------------------------------------------------------------------
-        //  Private Members
-        //-------------------------------------------------------------------
-        #region Private Members
-        private IDiagnosticSink diagnostics;
-
-        private string diagnosticMoniker
-        {
-            get
-            {
-                return !string.IsNullOrWhiteSpace(this.deviceName) ? this.deviceName : this.Address;
-            }
-        }
-        #endregion // Private Members
-        
         //-------------------------------------------------------------------
         //  Constructors
         //-------------------------------------------------------------------
         #region Constructors
         public DevicePortalViewModel(DevicePortal portal, IDiagnosticSink diags)
+            : base(portal, diags)
         {
             this.ConnectionRetryAttempts = 5;
-            this.diagnostics = diags;
-            this.portal = portal;
-            this.Ready = true;
         }
         #endregion // Cosntructors
 
@@ -48,38 +29,15 @@ public DevicePortalViewModel(DevicePortal portal, IDiagnosticSink diags)
         //  Properties
         //-------------------------------------------------------------------
         #region Properties
-        #region Portal
-        private DevicePortal portal;
-
-        private DevicePortal Portal
-        {
-            get { return this.portal; }
-            set
-            {
-                SetProperty(ref this.portal, value);
-                OnPropertyChanged("Address");
-                OnPropertyChanged("DeviceFamily");
-                OnPropertyChanged("OperatingSystemVersion");
-                OnPropertyChanged("Platform");
-                OnPropertyChanged("PlatformName");
-            }
-        }
-        #endregion // Portal
-
-        #region Ready
-        private bool ready;
-        public bool Ready
+        #region Diagnostic Moniker
+        private string diagnosticMoniker
         {
             get
             {
-                return this.ready;
-            }
-            private set
-            {
-                SetProperty(ref this.ready, value);
+                return !string.IsNullOrWhiteSpace(this.deviceName) ? this.deviceName : this.Address;
             }
         }
-        #endregion // Ready
+        #endregion // Diagnostic Moniker
 
         #region DeviceName
         private string deviceName;
@@ -197,16 +155,20 @@ public int ConnectionRetryAttempts
         #region Commands
 
         #region RenameCommand
-        private DelegateCommand renameCommand;
+        private CommandSequence renameCommand;
         public ICommand RenameCommand
         {
             get
             {
                 if(this.renameCommand == null)
                 {
-                    this.renameCommand = DelegateCommand.FromAsyncHandler(ExecuteRenameAsync, CanExecuteRename);
-                    this.renameCommand.ObservesProperty(() => this.Ready);
-                    this.renameCommand.ObservesProperty(() => this.DeviceNameEntry);
+                    this.renameCommand = CreateCommandSequence();
+                    DelegateCommand renameDC = DelegateCommand.FromAsyncHandler(ExecuteRenameAsync, CanExecuteRename);
+                    renameDC.ObservesProperty(() => this.Ready);
+                    renameDC.ObservesProperty(() => this.DeviceNameEntry);
+                    this.renameCommand.RegisterCommand(renameDC);
+                    this.renameCommand.RegisterCommand(this.RebootCommand);
+                    this.renameCommand.RegisterCommand(this.RefreshDeviceNameCommand);
                 }
                 return this.renameCommand;
             }
@@ -214,6 +176,8 @@ public ICommand RenameCommand
 
         private bool CanExecuteRename()
         {
+            //return
+            //    this.Ready;
             return
                 this.Ready &&
                 !string.IsNullOrWhiteSpace(this.deviceNameEntry);
@@ -221,42 +185,35 @@ private bool CanExecuteRename()
 
         private async Task ExecuteRenameAsync()
         {
+            this.diagnostics.OutputDiagnosticString("[{0}] ExecuteRenameAsync\n", this.diagnosticMoniker);
             this.Ready = false;
             try
             {
                 string newName = this.deviceNameEntry;
                 this.DeviceNameEntry = "";
                 this.diagnostics.OutputDiagnosticString("[{0}] Attempting to rename device to {1}\n", this.diagnosticMoniker, newName);
-                await this.Portal.SetDeviceName(newName);
+                await this.portal.SetDeviceName(newName);
             }
             catch (Exception exn)
             {
                 ReportException("Rename", exn);
             }
-            await ExecuteRebootAsync();
-                        
-            if (this.Ready)
-            {
-                await RefreshDeviceNameAsync();
-            }
-            else
-            {
-                // TODO: Need to decide what to do if this.Ready == false;
-                // ALTERNATIVLEY: Need to decide how to recover after an error
-            }
+            this.Ready = true;
         }
         #endregion // RenameCommand
 
         #region RefreshDeviceName
-        private DelegateCommand refreshDeviceNameCommand;
+        private CommandSequence refreshDeviceNameCommand;
         public ICommand RefreshDeviceNameCommand
         {
             get
             {
                 if(this.refreshDeviceNameCommand == null)
                 {
-                    this.refreshDeviceNameCommand = DelegateCommand.FromAsyncHandler(RefreshDeviceNameAsync, CanExecuteRefreshDeviceName);
-                    this.refreshDeviceNameCommand.ObservesProperty(() => this.Ready);
+                    DelegateCommand refreshDeviceNameDC = DelegateCommand.FromAsyncHandler(RefreshDeviceNameAsync, CanExecuteRefreshDeviceName);
+                    refreshDeviceNameDC.ObservesProperty(() => this.Ready);
+                    this.refreshDeviceNameCommand = CreateCommandSequence();
+                    this.refreshDeviceNameCommand.RegisterCommand(refreshDeviceNameDC);
                 }
                 return this.refreshDeviceNameCommand;
             }
@@ -269,30 +226,36 @@ private bool CanExecuteRefreshDeviceName()
 
         private async Task RefreshDeviceNameAsync()
         {
+            this.diagnostics.OutputDiagnosticString("[{0}] RefreshDeviceNameAsync\n", this.diagnosticMoniker);
             this.Ready = false;
             try
             {
-                this.DeviceName = await this.Portal.GetDeviceName();
+                this.DeviceName = await this.portal.GetDeviceName();
             }
             catch (Exception exn)
             {
                 ReportException("RefreshDeviceName", exn);
             }
-            this.diagnostics.OutputDiagnosticString("[{0}] Retrieved device name.\n", this.diagnosticMoniker);
             this.Ready = true;
         }
         #endregion // RefreshDeviceName
 
         #region Reboot Command
-        private DelegateCommand rebootCommand;
+        private CommandSequence rebootCommand;
         public ICommand RebootCommand
         {
             get
             {
                 if(this.rebootCommand == null)
                 {
-                    this.rebootCommand = DelegateCommand.FromAsyncHandler(ExecuteRebootAsync, CanExecuteReboot);
-                    this.rebootCommand.ObservesProperty(() => this.Ready);
+                    this.rebootCommand = CreateCommandSequence();
+                    DelegateCommand rebootDC = DelegateCommand.FromAsyncHandler(ExecuteRebootAsync, CanExecuteReboot);
+                    rebootDC.ObservesProperty(() => this.Ready);
+                    this.rebootCommand.RegisterCommand(StopListeningForSystemPerfCommand);
+                    this.rebootCommand.RegisterCommand(rebootDC);
+                    this.rebootCommand.RegisterCommand(this.ReestablishConnectionCommand);
+                    this.rebootCommand.RegisterCommand(this.refreshDeviceNameCommand);
+                    this.rebootCommand.RegisterCommand(this.StartListeningForSystemPerfCommand);
                 }
                 return this.rebootCommand;
             }
@@ -305,12 +268,12 @@ private bool CanExecuteReboot()
 
         private async Task ExecuteRebootAsync()
         {
-            await ExecuteStopListeningForSystemPerfAsync();
+            this.diagnostics.OutputDiagnosticString("[{0}] ExecuteRebootAsync\n", this.diagnosticMoniker);
             this.Ready = false;
             try
             {
                 this.diagnostics.OutputDiagnosticString("[{0}] Attempting to reboot device.\n", this.diagnosticMoniker);
-                await this.Portal.Reboot();
+                await this.portal.Reboot();
 
                 // Sometimes able to reestablish the connection prematurely before the console has a chance to shut down
                 // So adding a delay here before trying to reestablish the connection.
@@ -320,21 +283,22 @@ private async Task ExecuteRebootAsync()
             {
                 ReportException("Reboot", exn);
             }
-            await ExecuteReestablishConnectionAsync();
-            await ExecuteStartListeningForSystemPerfAsync();
+            this.Ready = true;
         }
         #endregion // Reboot Command
 
         #region ReestablishConnectionCommand
-        private DelegateCommand reestablishConnectionCommand;
+        private CommandSequence reestablishConnectionCommand;
         public ICommand ReestablishConnectionCommand
         {
             get
             {
                 if(this.reestablishConnectionCommand == null)
                 {
-                    this.reestablishConnectionCommand = DelegateCommand.FromAsyncHandler(ExecuteReestablishConnectionAsync, CanExecuteReestablishConnection);
-                    this.reestablishConnectionCommand.ObservesProperty(() => this.Ready);
+                    this.reestablishConnectionCommand = CreateCommandSequence();
+                    DelegateCommand reestablishConnectionDC = DelegateCommand.FromAsyncHandler(ExecuteReestablishConnectionAsync, CanExecuteReestablishConnection);
+                    reestablishConnectionDC.ObservesProperty(() => this.Ready);
+                    this.reestablishConnectionCommand.RegisterCommand(reestablishConnectionDC);
                 }
                 return this.reestablishConnectionCommand;
             }
@@ -347,6 +311,7 @@ private bool CanExecuteReestablishConnection()
 
         private async Task ExecuteReestablishConnectionAsync()
         {
+            this.diagnostics.OutputDiagnosticString("[{0}] ExecuteReestablishConnectionAsync\n", this.diagnosticMoniker);
             int numTries = 1;
 
             DeviceConnectionStatusEventHandler handler = (DevicePortal sender, DeviceConnectionStatusEventArgs args) =>
@@ -371,26 +336,28 @@ private async Task ExecuteReestablishConnectionAsync()
                     await this.portal.Connect();
                     ++numTries;
                 } while (this.portal.ConnectionHttpStatusCode != HttpStatusCode.OK && numTries < this.ConnectionRetryAttempts);
-                this.Ready = true;
             }
             catch (Exception exn)
             {
                 ReportException("ReestablishConnection", exn);
             }
             this.portal.ConnectionStatus -= handler;
+            this.Ready = true;
         }
         #endregion // ReestablishConnectionCommand
 
         #region StartListeningForSystemPerfCommand
-        private DelegateCommand startListeningForSystemPerfCommand;
+        private CommandSequence startListeningForSystemPerfCommand;
         public ICommand StartListeningForSystemPerfCommand
         {
             get
             {
                 if(this.startListeningForSystemPerfCommand == null)
                 {
-                    this.startListeningForSystemPerfCommand = DelegateCommand.FromAsyncHandler(ExecuteStartListeningForSystemPerfAsync, CanStartListeningForSystemPerf);
-                    this.startListeningForSystemPerfCommand.ObservesProperty(() => this.Ready);
+                    this.startListeningForSystemPerfCommand = CreateCommandSequence();
+                    DelegateCommand startListeningForSystemPerfDC = DelegateCommand.FromAsyncHandler(ExecuteStartListeningForSystemPerfAsync, CanStartListeningForSystemPerf);
+                    startListeningForSystemPerfDC.ObservesProperty(() => this.Ready);
+                    this.startListeningForSystemPerfCommand.RegisterCommand(startListeningForSystemPerfDC);
                 }
                 return startListeningForSystemPerfCommand;
             }
@@ -403,9 +370,17 @@ private bool CanStartListeningForSystemPerf()
 
         private async Task ExecuteStartListeningForSystemPerfAsync()
         {
+            this.diagnostics.OutputDiagnosticString("[{0}] ExecuteStartListeningForSystemPerfAsync\n", this.diagnosticMoniker);
             this.Ready = false;
-            this.portal.SystemPerfMessageReceived += OnSystemPerfReceived;
-            await Task.Run(StartListeningHelper);
+            try
+            {
+                this.portal.SystemPerfMessageReceived += OnSystemPerfReceived;
+                await Task.Run(StartListeningHelper);
+            }
+            catch(Exception exn)
+            {
+                ReportException("StartListeningForSystemPerf", exn);
+            }
             this.Ready = true;
         }
 
@@ -413,19 +388,20 @@ private async Task StartListeningHelper()
         {
             await this.portal.StartListeningForSystemPerf().ConfigureAwait(false);
         }
-
         #endregion // StartListeningForSystemPerfCommand
 
         #region StopListeningForSystemPerfCommand
-        private DelegateCommand stopListeningForSystemPerfCommand;
+        private CommandSequence stopListeningForSystemPerfCommand;
         public ICommand StopListeningForSystemPerfCommand
         {
             get
             {
                 if(this.stopListeningForSystemPerfCommand == null)
                 {
-                    this.stopListeningForSystemPerfCommand = DelegateCommand.FromAsyncHandler(ExecuteStopListeningForSystemPerfAsync, CanStopListeningForSystemPerf);
-                    this.stopListeningForSystemPerfCommand.ObservesProperty(() => this.Ready);
+                    this.stopListeningForSystemPerfCommand = CreateCommandSequence();
+                    DelegateCommand stopListeningForSystemPerfDC = DelegateCommand.FromAsyncHandler(ExecuteStopListeningForSystemPerfAsync, CanStopListeningForSystemPerf);
+                    stopListeningForSystemPerfDC.ObservesProperty(() => this.Ready);
+                    this.stopListeningForSystemPerfCommand.RegisterCommand(stopListeningForSystemPerfDC);
                 }
                 return stopListeningForSystemPerfCommand;
             }
@@ -438,11 +414,18 @@ private bool CanStopListeningForSystemPerf()
 
         private async Task ExecuteStopListeningForSystemPerfAsync()
         {
+            this.diagnostics.OutputDiagnosticString("[{0}] ExecuteStopListeningForSystemPerfAsync\n", this.diagnosticMoniker);
             this.Ready = false;
-            this.portal.SystemPerfMessageReceived -= OnSystemPerfReceived;
-            await StopListeningHelper();
-            //await Task.Run(StopListeningHelper);
-            await StopListeningHelper();
+            try
+            {
+                this.portal.SystemPerfMessageReceived -= OnSystemPerfReceived;
+                await StopListeningHelper();
+                await StopListeningHelper();
+            }
+            catch(Exception exn)
+            {
+                ReportException("StopListeningForSystemPerf", exn);
+            }
             this.Ready = true;
         }
 
@@ -452,8 +435,6 @@ private async Task StopListeningHelper()
         }
         #endregion // StopListeningForSystemPerfCommand
         #endregion // Commands
-             
-
 
         private void OnSystemPerfReceived(DevicePortal sender, WebSocketMessageReceivedEventArgs<DevicePortal.SystemPerformanceInformation> args)
         {
@@ -466,6 +447,10 @@ private void ReportException(string commandName, Exception exn)
             this.diagnostics.OutputDiagnosticString(
                 "[{0}] Exception during {1} command:\n[{0}] {2}\nStackTrace: \n[{0}] {3}\n",
                 this.diagnosticMoniker, commandName, exn.Message, exn.StackTrace);
+
+            // Clear the command queue to prevent executing any more commands
+            this.diagnostics.OutputDiagnosticString("[{0}] Clearing any queued commands\n", this.diagnosticMoniker);
+            ClearCommandQueue();
         }
     }
 }
diff --git a/Samples/DeviceLab/MainViewModel.cs b/Samples/DeviceLab/MainViewModel.cs
index 8fad8ed7..55e697ee 100644
--- a/Samples/DeviceLab/MainViewModel.cs
+++ b/Samples/DeviceLab/MainViewModel.cs
@@ -33,8 +33,7 @@ public MainViewModel()
             this.ConnectedDevices.CollectionChanged += OnConnectedDevicesChanged;
         }
         #endregion // Constructors
-
-
+        
         private void OnSignInAttemptCompleted(DeviceSignInViewModel sender, DeviceSignInEventArgs args)
         {
             DevicePortal portal = args.Portal;
@@ -309,8 +308,8 @@ private void OnConnectedDevicesChanged(object sender, NotifyCollectionChangedEve
         private void OnDeviceAdded(DevicePortalViewModel dpvm)
         {
             dpvm.PropertyChanged += DevicePropertyChanged;
-            
-            CommandSequence cmdSeq = new CommandSequence();
+
+            CommandSequence cmdSeq = dpvm.CreateCommandSequence();
             cmdSeq.RegisterCommand(dpvm.ReestablishConnectionCommand);
             cmdSeq.RegisterCommand(dpvm.RefreshDeviceNameCommand);
             cmdSeq.RegisterCommand(dpvm.StartListeningForSystemPerfCommand);

From 66cd7f7a510e10ef79ecdcb95979afc86b376ab9 Mon Sep 17 00:00:00 2001
From: Greg Pettyjohn <grpettyj@microsoft.com>
Date: Tue, 30 Aug 2016 15:28:43 -0700
Subject: [PATCH 08/51] Code cleanup + style cop. Checking in for demo

---
 Samples/DeviceLab/App.xaml.cs                 |   7 +-
 Samples/DeviceLab/AutoScrollTextBox.cs        |  25 ---
 .../DeviceLab/Controls/AutoScrollTextBox.cs   |  36 ++++
 .../{ => Controls}/NumberEntryBox.xaml        |   0
 .../DeviceLab/Controls/NumberEntryBox.xaml.cs | 167 ++++++++++++++++
 .../{ => Controls}/SelectionListBox.cs        |  52 +++--
 Samples/DeviceLab/DeviceLab.csproj            |  32 +--
 Samples/DeviceLab/MainWindow.xaml.cs          |  23 +--
 Samples/DeviceLab/NumberEntryBox.xaml.cs      | 109 ----------
 Samples/DeviceLab/Properties/AssemblyInfo.cs  |  13 +-
 Samples/DeviceLab/Settings.StyleCop           |  54 +++++
 .../{ => ViewModels}/CommandSequence.cs       | 188 ++++++++++++------
 .../DevicePortalCommandModel.cs               |   0
 .../{ => ViewModels}/DevicePortalViewModel.cs |   0
 .../{ => ViewModels}/DeviceSignInViewModel.cs |   0
 .../DiagnosticOutputViewModel.cs              |   0
 .../{ => ViewModels}/MainViewModel.cs         |   0
 .../{ => Views}/BindablePassword.xaml         |   0
 .../{ => Views}/BindablePassword.xaml.cs      |   0
 .../{ => Views}/DeviceCollectionView.xaml     |   0
 .../{ => Views}/DeviceCollectionView.xaml.cs  |   0
 .../{ => Views}/DeviceSignInView.xaml         |   0
 .../{ => Views}/DeviceSignInView.xaml.cs      |   0
 23 files changed, 461 insertions(+), 245 deletions(-)
 delete mode 100644 Samples/DeviceLab/AutoScrollTextBox.cs
 create mode 100644 Samples/DeviceLab/Controls/AutoScrollTextBox.cs
 rename Samples/DeviceLab/{ => Controls}/NumberEntryBox.xaml (100%)
 create mode 100644 Samples/DeviceLab/Controls/NumberEntryBox.xaml.cs
 rename Samples/DeviceLab/{ => Controls}/SelectionListBox.cs (60%)
 delete mode 100644 Samples/DeviceLab/NumberEntryBox.xaml.cs
 create mode 100644 Samples/DeviceLab/Settings.StyleCop
 rename Samples/DeviceLab/{ => ViewModels}/CommandSequence.cs (60%)
 rename Samples/DeviceLab/{ => ViewModels}/DevicePortalCommandModel.cs (100%)
 rename Samples/DeviceLab/{ => ViewModels}/DevicePortalViewModel.cs (100%)
 rename Samples/DeviceLab/{ => ViewModels}/DeviceSignInViewModel.cs (100%)
 rename Samples/DeviceLab/{ => ViewModels}/DiagnosticOutputViewModel.cs (100%)
 rename Samples/DeviceLab/{ => ViewModels}/MainViewModel.cs (100%)
 rename Samples/DeviceLab/{ => Views}/BindablePassword.xaml (100%)
 rename Samples/DeviceLab/{ => Views}/BindablePassword.xaml.cs (100%)
 rename Samples/DeviceLab/{ => Views}/DeviceCollectionView.xaml (100%)
 rename Samples/DeviceLab/{ => Views}/DeviceCollectionView.xaml.cs (100%)
 rename Samples/DeviceLab/{ => Views}/DeviceSignInView.xaml (100%)
 rename Samples/DeviceLab/{ => Views}/DeviceSignInView.xaml.cs (100%)

diff --git a/Samples/DeviceLab/App.xaml.cs b/Samples/DeviceLab/App.xaml.cs
index a009b6a9..bf0bfb95 100644
--- a/Samples/DeviceLab/App.xaml.cs
+++ b/Samples/DeviceLab/App.xaml.cs
@@ -1,4 +1,9 @@
-using System.Windows;
+//----------------------------------------------------------------------------------------------
+// <copyright file="App.xaml.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+using System.Windows;
 
 namespace DeviceLab
 {
diff --git a/Samples/DeviceLab/AutoScrollTextBox.cs b/Samples/DeviceLab/AutoScrollTextBox.cs
deleted file mode 100644
index 6c2ff25a..00000000
--- a/Samples/DeviceLab/AutoScrollTextBox.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace DeviceLab
-{
-    public class AutoScrollTextBox : TextBox
-    {
-        static AutoScrollTextBox()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(AutoScrollTextBox), new FrameworkPropertyMetadata(typeof(AutoScrollTextBox)));
-        }
-
-        protected override void OnTextChanged(TextChangedEventArgs e)
-        {
-            base.OnTextChanged(e);
-            CaretIndex = Text.Length;
-            ScrollToEnd();
-        }
-    }
-}
diff --git a/Samples/DeviceLab/Controls/AutoScrollTextBox.cs b/Samples/DeviceLab/Controls/AutoScrollTextBox.cs
new file mode 100644
index 00000000..7ebfff23
--- /dev/null
+++ b/Samples/DeviceLab/Controls/AutoScrollTextBox.cs
@@ -0,0 +1,36 @@
+//----------------------------------------------------------------------------------------------
+// <copyright file="AutoScrollTextBox.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+using System.Windows;
+using System.Windows.Controls;
+
+namespace DeviceLab
+{
+    /// <summary>
+    /// A TextBox derrivative that automatically scrolls to end whenever new text is added.
+    /// This is used for presenting scrolling output spew.
+    /// </summary>
+    public class AutoScrollTextBox : TextBox
+    {
+        /// <summary>
+        /// Initializes static members of the <see cref="AutoScrollTextBox" /> class.
+        /// </summary>
+        static AutoScrollTextBox()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(AutoScrollTextBox), new FrameworkPropertyMetadata(typeof(AutoScrollTextBox)));
+        }
+
+        /// <summary>
+        /// Override OnTextChanged to automatically scroll to the end
+        /// </summary>
+        /// <param name="e">The arguments associated with this event</param>
+        protected override void OnTextChanged(TextChangedEventArgs e)
+        {
+            base.OnTextChanged(e);
+            this.CaretIndex = Text.Length;
+            this.ScrollToEnd();
+        }
+    }
+}
diff --git a/Samples/DeviceLab/NumberEntryBox.xaml b/Samples/DeviceLab/Controls/NumberEntryBox.xaml
similarity index 100%
rename from Samples/DeviceLab/NumberEntryBox.xaml
rename to Samples/DeviceLab/Controls/NumberEntryBox.xaml
diff --git a/Samples/DeviceLab/Controls/NumberEntryBox.xaml.cs b/Samples/DeviceLab/Controls/NumberEntryBox.xaml.cs
new file mode 100644
index 00000000..9bce6971
--- /dev/null
+++ b/Samples/DeviceLab/Controls/NumberEntryBox.xaml.cs
@@ -0,0 +1,167 @@
+//----------------------------------------------------------------------------------------------
+// <copyright file="NumberEntryBox.xaml.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using Prism.Commands;
+
+namespace DeviceLab
+{
+    /// <summary>
+    /// Interaction logic for NumberEntryBox.xaml
+    /// </summary>
+    public partial class NumberEntryBox : UserControl, INotifyPropertyChanged
+    {
+        //-------------------------------------------------------------------
+        // Constructors
+        //-------------------------------------------------------------------
+        #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NumberEntryBox" /> class.
+        /// </summary>
+        public NumberEntryBox()
+        {
+            this.InitializeComponent();
+        }
+        #endregion // Constructors
+
+        //-------------------------------------------------------------------
+        // Dependency Properties
+        //-------------------------------------------------------------------
+        #region DependencyProperties
+        #region Value Dependency Property
+        /// <summary>
+        /// Gets or sets the instance property backing the Value Dependency Property
+        /// </summary>
+        public int Value
+        {
+            get { return (int)GetValue(ValueProperty); }
+            set { this.SetValue(ValueProperty, value); }
+        }
+
+        /// <summary>
+        /// Value Dependency Property static association
+        /// </summary>
+        public static readonly DependencyProperty ValueProperty =
+            DependencyProperty.Register("Value", typeof(int), typeof(NumberEntryBox), new PropertyMetadata(0, OnValueChanged, CoerceValue));
+
+        /// <summary>
+        /// Forward the dependency property changes through the INotifyPropertyChanged interface
+        /// </summary>
+        /// <param name="d">Dependency opbject that bears the property's value</param>
+        /// <param name="e">The arguments associated with this event</param>
+        private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            NumberEntryBox thisNEB = d as NumberEntryBox;
+            if (thisNEB != null)
+            {
+                thisNEB.PropertyChanged?.Invoke(thisNEB, new PropertyChangedEventArgs("Value"));
+            }
+        }
+
+        /// <summary>
+        /// Coerce the value to keep it inside the expected range. The value should not be less than 1
+        /// </summary>
+        /// <param name="d">Dependency opbject that bears the property's value</param>
+        /// <param name="baseValue">The value the property would have taken before being coerced</param>
+        /// <returns>The coerced value</returns>
+        private static object CoerceValue(DependencyObject d, object baseValue)
+        {
+            int val = (int)baseValue > 0 ? (int)baseValue : 1;
+            return val;
+        }
+        #endregion // Value Dependency Property
+        #endregion // Dependency Properties
+
+        //-------------------------------------------------------------------
+        // Commands
+        //-------------------------------------------------------------------
+        #region Commands
+        #region DecrementCommand
+        /// <summary>
+        /// The DecrementCommand decrements the number in the Value Depencency Property
+        /// </summary>
+        private DelegateCommand decrementCommand;
+        
+        /// <summary>
+        /// Gets the DecrementCommand
+        /// </summary>
+        public ICommand DecrementCommand
+        {
+            get
+            {
+                if (this.decrementCommand == null)
+                {
+                    this.decrementCommand = new DelegateCommand(this.ExecuteDecrement, this.CanExecuteDecrement);
+                    this.decrementCommand.ObservesProperty(() => this.Value);
+                }
+
+                return this.decrementCommand;
+            }
+        }
+
+        /// <summary>
+        /// Predicate for the DecrementCommand
+        /// </summary>
+        /// <returns>True if the command can be executed</returns>
+        private bool CanExecuteDecrement()
+        {
+            return this.Value > 1;
+        }
+
+        /// <summary>
+        /// Performs the operation of the DecrementCommand
+        /// </summary>
+        private void ExecuteDecrement()
+        {
+            this.Value = this.Value - 1;
+        }
+        #endregion // DecrementCommand
+
+        #region IncrementCommand
+        /// <summary>
+        /// The DecrementCommand decrements the number in the Value Depencency Property
+        /// </summary>
+        private DelegateCommand incrementCommand;
+
+        /// <summary>
+        /// Gets the IncrementCommand
+        /// </summary>
+        public ICommand IncrementCommand
+        {
+            get
+            {
+                if (this.incrementCommand == null)
+                {
+                    this.incrementCommand = new DelegateCommand(this.ExecuteIncrement);
+                }
+
+                return this.incrementCommand;
+            }
+        }
+
+        /// <summary>
+        /// Performs the operation of the Increment command
+        /// </summary>
+        private void ExecuteIncrement()
+        {
+            this.Value = this.Value + 1;
+        }
+        #endregion // IncrementCommand
+        #endregion // Commands
+
+        //-------------------------------------------------------------------
+        // INotifyPropertyChanged implementation
+        //-------------------------------------------------------------------
+        #region INotifyPropertyChanged implementation
+        /// <summary>
+        /// PropertyChanged event for the INotifyPropertyChanged implementation
+        /// </summary>
+        public event PropertyChangedEventHandler PropertyChanged;
+        #endregion // INotifyPropertyChanged implementation
+    }
+}
diff --git a/Samples/DeviceLab/SelectionListBox.cs b/Samples/DeviceLab/Controls/SelectionListBox.cs
similarity index 60%
rename from Samples/DeviceLab/SelectionListBox.cs
rename to Samples/DeviceLab/Controls/SelectionListBox.cs
index d50f4ff3..ad65cfdc 100644
--- a/Samples/DeviceLab/SelectionListBox.cs
+++ b/Samples/DeviceLab/Controls/SelectionListBox.cs
@@ -1,9 +1,9 @@
-using System;
+//----------------------------------------------------------------------------------------------
+// <copyright file="SelectionListBox.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
 using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -11,31 +11,43 @@ namespace DeviceLab
 {
     /// <summary>
     /// Custom ListBox that exposes a SelectionList Dependency property to enable two-way binding.
-    /// Internally, SelectionList is kept in sink with the SelectedItems property of the base
-    /// class
+    /// Internally, SelectionList is kept in sink with the SelectedItems property of the base class
     /// </summary>
     public class SelectionListBox : ListBox
     {
+        //-------------------------------------------------------------------
+        // Constructors
+        //-------------------------------------------------------------------
+        #region Constructors
+        /// <summary>
+        /// Initializes static members of the <see cref="SelectionListBox" /> class.
+        /// </summary>
         static SelectionListBox()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(SelectionListBox), new FrameworkPropertyMetadata(typeof(SelectionListBox)));
         }
+        #endregion // Cosntructors
 
-        protected override void OnSelectionChanged(SelectionChangedEventArgs e)
-        {
-            base.OnSelectionChanged(e);
-            SetValue(SelectionListProperty, this.SelectedItems);
-        }
+        //-------------------------------------------------------------------
+        // Depenency Properties
+        //-------------------------------------------------------------------
+        #region Dependency Properties
+        #region SelectionList Dependency Property
 
+        /// <summary>
+        /// Gets or sets the SelectionList dependency property for the instance of the class
+        /// </summary>
         public IList SelectionList
         {
             get { return (IList)GetValue(SelectionListProperty); }
-            set { SetValue(SelectionListProperty, value); }
+            set { this.SetValue(SelectionListProperty, value); }
         }
 
+        /// <summary>
+        /// SelectionList Dependency Property static association
+        /// </summary>
         public static readonly DependencyProperty SelectionListProperty =
             DependencyProperty.Register("SelectionList", typeof(IList), typeof(SelectionListBox), new PropertyMetadata(null, null, CoerceSelectionList));
-
  
         /// <summary>
         /// Coerce the value of SelectionList so that it is identical to (i.e. the same object as) the
@@ -73,5 +85,17 @@ private static object CoerceSelectionList(DependencyObject d, object baseValue)
 
             return selectedItems;
         }
+
+        /// <summary>
+        /// OnSelectionChange needs to drive changes to the SelectionList Dependency Property
+        /// </summary>
+        /// <param name="e">The arguments associated with this event</param>
+        protected override void OnSelectionChanged(SelectionChangedEventArgs e)
+        {
+            base.OnSelectionChanged(e);
+            this.SetValue(SelectionListProperty, this.SelectedItems);
+        }
+        #endregion // SelectionList Dependency Property
+        #endregion // Dependency Properties
     }
 }
diff --git a/Samples/DeviceLab/DeviceLab.csproj b/Samples/DeviceLab/DeviceLab.csproj
index c88fdbce..a257b039 100644
--- a/Samples/DeviceLab/DeviceLab.csproj
+++ b/Samples/DeviceLab/DeviceLab.csproj
@@ -59,31 +59,31 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
-    <Compile Include="AutoScrollTextBox.cs" />
-    <Compile Include="CommandSequence.cs" />
-    <Compile Include="DeviceCollectionView.xaml.cs">
+    <Compile Include="Controls\AutoScrollTextBox.cs" />
+    <Compile Include="ViewModels\CommandSequence.cs" />
+    <Compile Include="Views\DeviceCollectionView.xaml.cs">
       <DependentUpon>DeviceCollectionView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="DevicePortalCommandModel.cs" />
-    <Compile Include="DevicePortalViewModel.cs" />
-    <Compile Include="DeviceSignInView.xaml.cs">
+    <Compile Include="ViewModels\DevicePortalCommandModel.cs" />
+    <Compile Include="ViewModels\DevicePortalViewModel.cs" />
+    <Compile Include="Views\DeviceSignInView.xaml.cs">
       <DependentUpon>DeviceSignInView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="MainViewModel.cs" />
-    <Compile Include="NumberEntryBox.xaml.cs">
+    <Compile Include="ViewModels\MainViewModel.cs" />
+    <Compile Include="Controls\NumberEntryBox.xaml.cs">
       <DependentUpon>NumberEntryBox.xaml</DependentUpon>
     </Compile>
-    <Compile Include="SelectionListBox.cs" />
+    <Compile Include="Controls\SelectionListBox.cs" />
     <Compile Include="XboxDevicePortalConnection.cs" />
-    <Page Include="BindablePassword.xaml">
+    <Page Include="Views\BindablePassword.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="DeviceCollectionView.xaml">
+    <Page Include="Views\DeviceCollectionView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="DeviceSignInView.xaml">
+    <Page Include="Views\DeviceSignInView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -95,16 +95,16 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="BindablePassword.xaml.cs">
+    <Compile Include="Views\BindablePassword.xaml.cs">
       <DependentUpon>BindablePassword.xaml</DependentUpon>
     </Compile>
-    <Compile Include="DeviceSignInViewModel.cs" />
-    <Compile Include="DiagnosticOutputViewModel.cs" />
+    <Compile Include="ViewModels\DeviceSignInViewModel.cs" />
+    <Compile Include="ViewModels\DiagnosticOutputViewModel.cs" />
     <Compile Include="MainWindow.xaml.cs">
       <DependentUpon>MainWindow.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Page Include="NumberEntryBox.xaml">
+    <Page Include="Controls\NumberEntryBox.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/Samples/DeviceLab/MainWindow.xaml.cs b/Samples/DeviceLab/MainWindow.xaml.cs
index 316d16ee..a357767d 100644
--- a/Samples/DeviceLab/MainWindow.xaml.cs
+++ b/Samples/DeviceLab/MainWindow.xaml.cs
@@ -1,17 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+//----------------------------------------------------------------------------------------------
+// <copyright file="MainWindow.xaml.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace DeviceLab
 {
@@ -20,9 +12,12 @@ namespace DeviceLab
     /// </summary>
     public partial class MainWindow : Window
     {
+        /// <summary>
+        ///  Initializes a new instance of the <see cref="MainWindow" /> class.
+        /// </summary>
         public MainWindow()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
     }
 }
diff --git a/Samples/DeviceLab/NumberEntryBox.xaml.cs b/Samples/DeviceLab/NumberEntryBox.xaml.cs
deleted file mode 100644
index 9263df12..00000000
--- a/Samples/DeviceLab/NumberEntryBox.xaml.cs
+++ /dev/null
@@ -1,109 +0,0 @@
-using Prism.Commands;
-using Prism.Mvvm;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace DeviceLab
-{
-    /// <summary>
-    /// Interaction logic for NumberEntryBox.xaml
-    /// </summary>
-    public partial class NumberEntryBox : UserControl, INotifyPropertyChanged
-    {
-        public NumberEntryBox()
-        {
-            InitializeComponent();
-        }
-
-        public int Value
-        {
-            get { return (int)GetValue(ValueProperty); }
-            set { SetValue(ValueProperty, value); }
-        }
-
-        // Using a DependencyProperty as the backing store for Value.  This enables animation, styling, binding, etc...
-        public static readonly DependencyProperty ValueProperty =
-            DependencyProperty.Register("Value", typeof(int), typeof(NumberEntryBox), new PropertyMetadata(0, OnValueChanged, CoerceValue));
-
-        private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            NumberEntryBox thisNEB = d as NumberEntryBox;
-            if (thisNEB != null)
-            {
-                thisNEB.PropertyChanged?.Invoke(thisNEB, new PropertyChangedEventArgs("Value"));
-            }
-        }
-
-        private static object CoerceValue(DependencyObject d, object baseValue)
-        {
-            int val = (int)baseValue > 0 ? (int)baseValue : 1;
-            return val;
-        }
-
-        //-------------------------------------------------------------------
-        // Commands
-        //-------------------------------------------------------------------
-        #region Commands
-        #region DecrementCommand
-        private DelegateCommand decrementCommand;
-        public ICommand DecrementCommand
-        {
-            get
-            {
-                if(this.decrementCommand == null)
-                {
-                    this.decrementCommand = new DelegateCommand(ExecuteDecrement, CanExecuteDecrement);
-                    this.decrementCommand.ObservesProperty(() => Value);
-                }
-                return this.decrementCommand;
-            }
-        }
-
-        private bool CanExecuteDecrement()
-        {
-            return this.Value > 1;
-        }
-
-        private void ExecuteDecrement()
-        {
-            this.Value = this.Value - 1;
-        }
-        #endregion // DecrementCommand
-
-        #region IncrementCommand
-        private DelegateCommand incrementCommand;
-        public ICommand IncrementCommand
-        {
-            get
-            {
-                if(this.incrementCommand == null)
-                {
-                    this.incrementCommand = new DelegateCommand(ExecuteIncrement);
-                }
-                return this.incrementCommand;
-            }
-        }
-
-        private void ExecuteIncrement()
-        {
-            this.Value = this.Value + 1;
-        }
-        #endregion // IncrementCommand
-        #endregion // Commands
-
-        public event PropertyChangedEventHandler PropertyChanged;
-    }
-}
diff --git a/Samples/DeviceLab/Properties/AssemblyInfo.cs b/Samples/DeviceLab/Properties/AssemblyInfo.cs
index 62360021..d0049244 100644
--- a/Samples/DeviceLab/Properties/AssemblyInfo.cs
+++ b/Samples/DeviceLab/Properties/AssemblyInfo.cs
@@ -1,6 +1,9 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
+//----------------------------------------------------------------------------------------------
+// <copyright file="AssemblyInfo.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
@@ -28,8 +31,7 @@
 //the NeutralResourceLanguage attribute below.  Update the "en-US" in
 //the line below to match the UICulture setting in the project file.
 
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
+////[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
@@ -40,7 +42,6 @@
                                               // app, or any theme specific resource dictionaries)
 )]
 
-
 // Version information for an assembly consists of the following four values:
 //
 //      Major Version
diff --git a/Samples/DeviceLab/Settings.StyleCop b/Samples/DeviceLab/Settings.StyleCop
new file mode 100644
index 00000000..ce95989a
--- /dev/null
+++ b/Samples/DeviceLab/Settings.StyleCop
@@ -0,0 +1,54 @@
+<StyleCopSettings Version="105">
+  <Analyzers>
+    <Analyzer AnalyzerId="StyleCop.CSharp.DocumentationRules">
+      <Rules>
+        <Rule Name="ElementDocumentationMustBeSpelledCorrectly">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.CSharp.LayoutRules">
+      <Rules>
+        <Rule Name="SingleLineCommentMustBePrecededByBlankLine">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.CSharp.OrderingRules">
+      <Rules>
+        <Rule Name="UsingDirectivesMustBePlacedWithinNamespace">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementsMustAppearInTheCorrectOrder">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+        <Rule Name="ElementsMustBeOrderedByAccess">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.CSharp.SpacingRules">
+      <Rules>
+        <Rule Name="SingleLineCommentsMustBeginWithSingleSpace">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
+      </Rules>
+      <AnalyzerSettings />
+    </Analyzer>
+  </Analyzers>
+</StyleCopSettings>
\ No newline at end of file
diff --git a/Samples/DeviceLab/CommandSequence.cs b/Samples/DeviceLab/ViewModels/CommandSequence.cs
similarity index 60%
rename from Samples/DeviceLab/CommandSequence.cs
rename to Samples/DeviceLab/ViewModels/CommandSequence.cs
index bf140136..127f1178 100644
--- a/Samples/DeviceLab/CommandSequence.cs
+++ b/Samples/DeviceLab/ViewModels/CommandSequence.cs
@@ -1,81 +1,58 @@
-using System;
+//----------------------------------------------------------------------------------------------
+// <copyright file="CommandSequence.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Input;
 
 namespace DeviceLab
 {
-    public class ObservableCommandQueue
-    {
-        private Queue<ICommand> commands;
-
-        public ObservableCommandQueue()
-        {
-            this.commands = new Queue<ICommand>();
-        }
-
-        public event EventHandler QueueChanged;
-
-        public int Count
-        {
-            get
-            {
-                return this.commands.Count;
-            }
-        }
-
-        public void Clear()
-        {
-            this.commands.Clear();
-            OnQueueChanged();
-        }
-
-        public ICommand Peek()
-        {
-            return this.commands.Peek();
-        }
-
-        public void Enqueue(ICommand cmd)
-        {
-            this.commands.Enqueue(cmd);
-            OnQueueChanged();
-        }
-
-        public ICommand Dequeue()
-        {
-            ICommand cmd = this.commands.Dequeue();
-            OnQueueChanged();
-            return cmd;
-        }
-
-        private void OnQueueChanged()
-        {
-            this.QueueChanged?.Invoke(this, new EventArgs());
-        }
-    }
-
-
+    /// <summary>
+    /// Composes several ICommand implementations to run in sequence with each command executing
+    /// as soon as the command's predicate is satisfied. Can be used to construct sophisticated
+    /// commands by sequencing several smaller commands.
+    /// </summary>
     public class CommandSequence : ICommand
     {
-        private List<ICommand> registeredCommands;
-        private ObservableCommandQueue commandQueue;
-        private object sharedParameter;
-
         //-------------------------------------------------------------------
         // Constructor
         //-------------------------------------------------------------------
         #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CommandSequence" /> class.
+        /// </summary>
+        /// <param name="commandQueue">
+        /// Multiple CommandSequences may share the same ObservableCommandQueue.
+        /// The predicate for the CommandSequence will return fale in the case
+        /// when another command sequence is using the shared queue
+        /// </param>
         public CommandSequence(ObservableCommandQueue commandQueue = null)
         {
             this.registeredCommands = new List<ICommand>();
             this.commandQueue = commandQueue == null ? new ObservableCommandQueue() : commandQueue;
-            this.commandQueue.QueueChanged += CommandQueue_QueueChanged;
+            this.commandQueue.QueueChanged += this.CommandQueue_QueueChanged;
         }
-
         #endregion // Constructor
 
+        //-------------------------------------------------------------------
+        // Private Class Members
+        //-------------------------------------------------------------------
+        #region Private Class Members
+        /// <summary>
+        /// The ICommand instances that are composed together in this CommandSequence
+        /// </summary>
+        private List<ICommand> registeredCommands;
+
+        /// <summary>
+        /// The CommandSequence is executed by first placing all the commands into a queue
+        /// and then executing each command as it becomes ready
+        /// </summary>
+        private ObservableCommandQueue commandQueue;
+        private object sharedParameter;
+        #endregion // Private Class Members
+
         //-------------------------------------------------------------------
         // Command Registration
         //-------------------------------------------------------------------
@@ -207,4 +184,95 @@ private void CommandQueue_QueueChanged(object sender, EventArgs e)
             OnCanExecuteChanged();
         }
     }
+
+    /// <summary>
+    /// A simple queue of commands that provides notifications whenever the contents changed.
+    /// </summary>
+    public class ObservableCommandQueue
+    {
+        /// <summary>
+        /// Underlying Queue for the commands
+        /// </summary>
+        private Queue<ICommand> commands;
+
+        //-------------------------------------------------------------------
+        // Constructor
+        //-------------------------------------------------------------------
+        #region Constructor
+        /// <summary>
+        /// blah blah blah StyleCop will tell me what to put here
+        /// </summary>
+        public ObservableCommandQueue()
+        {
+            this.commands = new Queue<ICommand>();
+        }
+        #endregion
+
+        //-------------------------------------------------------------------
+        // Queue Operations
+        //-------------------------------------------------------------------
+        #region Queue Operations
+        /// <summary>
+        /// Gets the Count of elements contained in the queue
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                return this.commands.Count;
+            }
+        }
+
+        /// <summary>
+        /// Clears all elements from the queue
+        /// </summary>
+        public void Clear()
+        {
+            this.commands.Clear();
+            this.OnQueueChanged();
+        }
+
+        /// <summary>
+        /// Retrieves the element at the front of the queue without modifying the contents of the queue
+        /// </summary>
+        /// <returns>The element at the front of the queue</returns>
+        public ICommand Peek()
+        {
+            return this.commands.Peek();
+        }
+
+        /// <summary>
+        /// Inserts a new element at the back of the queue
+        /// </summary>
+        /// <param name="cmd">The new element to be inserted</param>
+        public void Enqueue(ICommand cmd)
+        {
+            this.commands.Enqueue(cmd);
+            OnQueueChanged();
+        }
+
+        /// <summary>
+        /// Removes the element at the front of the queue
+        /// </summary>
+        /// <returns>The element that was removed from the front of the queue</returns>
+        public ICommand Dequeue()
+        {
+            ICommand cmd = this.commands.Dequeue();
+            this.OnQueueChanged();
+            return cmd;
+        }
+        #endregion // Queue Operations
+
+        //-------------------------------------------------------------------
+        // QueueChanged Event
+        //-------------------------------------------------------------------
+        #region QueueChanged Event
+        public event EventHandler QueueChanged;
+
+        private void OnQueueChanged()
+        {
+            this.QueueChanged?.Invoke(this, new EventArgs());
+        }
+        #endregion // QueueChanged Event
+    }
 }
diff --git a/Samples/DeviceLab/DevicePortalCommandModel.cs b/Samples/DeviceLab/ViewModels/DevicePortalCommandModel.cs
similarity index 100%
rename from Samples/DeviceLab/DevicePortalCommandModel.cs
rename to Samples/DeviceLab/ViewModels/DevicePortalCommandModel.cs
diff --git a/Samples/DeviceLab/DevicePortalViewModel.cs b/Samples/DeviceLab/ViewModels/DevicePortalViewModel.cs
similarity index 100%
rename from Samples/DeviceLab/DevicePortalViewModel.cs
rename to Samples/DeviceLab/ViewModels/DevicePortalViewModel.cs
diff --git a/Samples/DeviceLab/DeviceSignInViewModel.cs b/Samples/DeviceLab/ViewModels/DeviceSignInViewModel.cs
similarity index 100%
rename from Samples/DeviceLab/DeviceSignInViewModel.cs
rename to Samples/DeviceLab/ViewModels/DeviceSignInViewModel.cs
diff --git a/Samples/DeviceLab/DiagnosticOutputViewModel.cs b/Samples/DeviceLab/ViewModels/DiagnosticOutputViewModel.cs
similarity index 100%
rename from Samples/DeviceLab/DiagnosticOutputViewModel.cs
rename to Samples/DeviceLab/ViewModels/DiagnosticOutputViewModel.cs
diff --git a/Samples/DeviceLab/MainViewModel.cs b/Samples/DeviceLab/ViewModels/MainViewModel.cs
similarity index 100%
rename from Samples/DeviceLab/MainViewModel.cs
rename to Samples/DeviceLab/ViewModels/MainViewModel.cs
diff --git a/Samples/DeviceLab/BindablePassword.xaml b/Samples/DeviceLab/Views/BindablePassword.xaml
similarity index 100%
rename from Samples/DeviceLab/BindablePassword.xaml
rename to Samples/DeviceLab/Views/BindablePassword.xaml
diff --git a/Samples/DeviceLab/BindablePassword.xaml.cs b/Samples/DeviceLab/Views/BindablePassword.xaml.cs
similarity index 100%
rename from Samples/DeviceLab/BindablePassword.xaml.cs
rename to Samples/DeviceLab/Views/BindablePassword.xaml.cs
diff --git a/Samples/DeviceLab/DeviceCollectionView.xaml b/Samples/DeviceLab/Views/DeviceCollectionView.xaml
similarity index 100%
rename from Samples/DeviceLab/DeviceCollectionView.xaml
rename to Samples/DeviceLab/Views/DeviceCollectionView.xaml
diff --git a/Samples/DeviceLab/DeviceCollectionView.xaml.cs b/Samples/DeviceLab/Views/DeviceCollectionView.xaml.cs
similarity index 100%
rename from Samples/DeviceLab/DeviceCollectionView.xaml.cs
rename to Samples/DeviceLab/Views/DeviceCollectionView.xaml.cs
diff --git a/Samples/DeviceLab/DeviceSignInView.xaml b/Samples/DeviceLab/Views/DeviceSignInView.xaml
similarity index 100%
rename from Samples/DeviceLab/DeviceSignInView.xaml
rename to Samples/DeviceLab/Views/DeviceSignInView.xaml
diff --git a/Samples/DeviceLab/DeviceSignInView.xaml.cs b/Samples/DeviceLab/Views/DeviceSignInView.xaml.cs
similarity index 100%
rename from Samples/DeviceLab/DeviceSignInView.xaml.cs
rename to Samples/DeviceLab/Views/DeviceSignInView.xaml.cs

From 1239e9067e82ef1956e14654844934c511ada58f Mon Sep 17 00:00:00 2001
From: Greg Pettyjohn <grpettyj@microsoft.com>
Date: Wed, 31 Aug 2016 17:09:51 -0700
Subject: [PATCH 09/51] Finished satisfyint StyleCop

---
 .../{Views => Controls}/BindablePassword.xaml |   0
 .../Controls/BindablePassword.xaml.cs         |  73 ++++
 Samples/DeviceLab/DeviceLab.csproj            |   8 +-
 Samples/DeviceLab/Settings.StyleCop           |   7 +
 .../DeviceLab/ViewModels/CommandSequence.cs   | 188 ++++-----
 .../ViewModels/DevicePortalCommandModel.cs    | 204 +++++++++-
 .../ViewModels/DevicePortalViewModel.cs       | 359 +++++++++++-------
 .../ViewModels/DeviceSignInViewModel.cs       | 218 +++++++----
 .../ViewModels/DiagnosticOutputViewModel.cs   | 130 ++-----
 .../DeviceLab/ViewModels/DiagnosticSinks.cs   | 110 ++++++
 .../GenericDevicePortalConnectionFactory.cs   |  36 ++
 Samples/DeviceLab/ViewModels/MainViewModel.cs | 238 +++++++++---
 .../ViewModels/ObservableCommandQueue.cs      | 108 ++++++
 .../XboxDevicePortalConnectionFactory.cs      |  39 ++
 .../DeviceLab/Views/BindablePassword.xaml.cs  |  38 --
 .../Views/DeviceCollectionView.xaml.cs        |  27 +-
 .../DeviceLab/Views/DeviceSignInView.xaml.cs  |  12 +-
 .../DeviceLab/XboxDevicePortalConnection.cs   |  13 +-
 18 files changed, 1257 insertions(+), 551 deletions(-)
 rename Samples/DeviceLab/{Views => Controls}/BindablePassword.xaml (100%)
 create mode 100644 Samples/DeviceLab/Controls/BindablePassword.xaml.cs
 create mode 100644 Samples/DeviceLab/ViewModels/DiagnosticSinks.cs
 create mode 100644 Samples/DeviceLab/ViewModels/GenericDevicePortalConnectionFactory.cs
 create mode 100644 Samples/DeviceLab/ViewModels/ObservableCommandQueue.cs
 create mode 100644 Samples/DeviceLab/ViewModels/XboxDevicePortalConnectionFactory.cs
 delete mode 100644 Samples/DeviceLab/Views/BindablePassword.xaml.cs

diff --git a/Samples/DeviceLab/Views/BindablePassword.xaml b/Samples/DeviceLab/Controls/BindablePassword.xaml
similarity index 100%
rename from Samples/DeviceLab/Views/BindablePassword.xaml
rename to Samples/DeviceLab/Controls/BindablePassword.xaml
diff --git a/Samples/DeviceLab/Controls/BindablePassword.xaml.cs b/Samples/DeviceLab/Controls/BindablePassword.xaml.cs
new file mode 100644
index 00000000..d3c3eb2b
--- /dev/null
+++ b/Samples/DeviceLab/Controls/BindablePassword.xaml.cs
@@ -0,0 +1,73 @@
+//----------------------------------------------------------------------------------------------
+// <copyright file="BindablePassword.xaml.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+using System.Security;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace DeviceLab
+{
+    /// <summary>
+    /// Interaction logic for BindablePassword.xaml
+    /// </summary>
+    public partial class BindablePassword : UserControl
+    {
+        //-------------------------------------------------------------------
+        // Constructors
+        //-------------------------------------------------------------------
+        #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BindablePassword" /> class.
+        /// </summary>
+        public BindablePassword()
+        {
+            this.InitializeComponent();
+        }
+        #endregion // Constructors
+
+        //-------------------------------------------------------------------
+        // Dependency Properties
+        //-------------------------------------------------------------------
+        #region Dependency Properties
+        #region Password Dependency Property
+        /// <summary>
+        /// Gets or sets the Password dependency property
+        /// </summary>
+        public SecureString Password
+        {
+            get
+            {
+                return (SecureString)GetValue(PasswordProperty);
+            }
+
+            set
+            {
+                this.SetValue(PasswordProperty, value);
+            }
+        }
+
+        /// <summary>
+        /// Password Dependeny Property static association
+        /// </summary>
+        public static readonly DependencyProperty PasswordProperty =
+            DependencyProperty.Register(
+                "Password",
+                typeof(SecureString),
+                typeof(BindablePassword),
+                new PropertyMetadata(default(SecureString)));
+
+        /// <summary>
+        /// Forwards change events to the password box's secure string to the Password dependency property
+        /// </summary>
+        /// <param name="sender">object that originated the event</param>
+        /// <param name="e">Parameters for the event</param>
+        private void PasswordBox_PasswordChanged(object sender, RoutedEventArgs e)
+        {
+            this.Password = ((PasswordBox)sender).SecurePassword;
+        }
+        #endregion // Password Dependency Property
+        #endregion // Dependency Properties
+    }
+}
diff --git a/Samples/DeviceLab/DeviceLab.csproj b/Samples/DeviceLab/DeviceLab.csproj
index a257b039..ffe46f14 100644
--- a/Samples/DeviceLab/DeviceLab.csproj
+++ b/Samples/DeviceLab/DeviceLab.csproj
@@ -61,6 +61,10 @@
     </ApplicationDefinition>
     <Compile Include="Controls\AutoScrollTextBox.cs" />
     <Compile Include="ViewModels\CommandSequence.cs" />
+    <Compile Include="ViewModels\DiagnosticSinks.cs" />
+    <Compile Include="ViewModels\GenericDevicePortalConnectionFactory.cs" />
+    <Compile Include="ViewModels\ObservableCommandQueue.cs" />
+    <Compile Include="ViewModels\XboxDevicePortalConnectionFactory.cs" />
     <Compile Include="Views\DeviceCollectionView.xaml.cs">
       <DependentUpon>DeviceCollectionView.xaml</DependentUpon>
     </Compile>
@@ -75,7 +79,7 @@
     </Compile>
     <Compile Include="Controls\SelectionListBox.cs" />
     <Compile Include="XboxDevicePortalConnection.cs" />
-    <Page Include="Views\BindablePassword.xaml">
+    <Page Include="Controls\BindablePassword.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -95,7 +99,7 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Views\BindablePassword.xaml.cs">
+    <Compile Include="Controls\BindablePassword.xaml.cs">
       <DependentUpon>BindablePassword.xaml</DependentUpon>
     </Compile>
     <Compile Include="ViewModels\DeviceSignInViewModel.cs" />
diff --git a/Samples/DeviceLab/Settings.StyleCop b/Samples/DeviceLab/Settings.StyleCop
index ce95989a..5356cc8a 100644
--- a/Samples/DeviceLab/Settings.StyleCop
+++ b/Samples/DeviceLab/Settings.StyleCop
@@ -50,5 +50,12 @@
       </Rules>
       <AnalyzerSettings />
     </Analyzer>
+    <Analyzer AnalyzerId="StyleCop.CSharp.NamingRules">
+      <AnalyzerSettings>
+        <CollectionProperty Name="Hungarian">
+          <Value>un</Value>
+        </CollectionProperty>
+      </AnalyzerSettings>
+    </Analyzer>
   </Analyzers>
 </StyleCopSettings>
\ No newline at end of file
diff --git a/Samples/DeviceLab/ViewModels/CommandSequence.cs b/Samples/DeviceLab/ViewModels/CommandSequence.cs
index 127f1178..5db22ea4 100644
--- a/Samples/DeviceLab/ViewModels/CommandSequence.cs
+++ b/Samples/DeviceLab/ViewModels/CommandSequence.cs
@@ -50,12 +50,22 @@ public CommandSequence(ObservableCommandQueue commandQueue = null)
         /// and then executing each command as it becomes ready
         /// </summary>
         private ObservableCommandQueue commandQueue;
+        
+        /// <summary>
+        /// The parameter passed to execute and subsequently shared with each command when it executes
+        /// </summary>
         private object sharedParameter;
         #endregion // Private Class Members
 
         //-------------------------------------------------------------------
         // Command Registration
         //-------------------------------------------------------------------
+        #region Command Registration
+        /// <summary>
+        /// Register a command with the CommandSequence
+        /// Commands are composed in the same order that they are registered
+        /// </summary>
+        /// <param name="cmd">Command to register with this CommandSequence</param>
         public void RegisterCommand(ICommand cmd)
         {
             if (cmd == null)
@@ -73,63 +83,86 @@ public void RegisterCommand(ICommand cmd)
                 CommandSequence seq = cmd as CommandSequence;
                 if (seq == null)
                 {
-                    AddCommand(cmd);
+                    this.AddCommand(cmd);
                 }
                 else
                 {
+                    // If the command is itself a CommandSequence then we crack it open
+                    // and add the individual commands within it. This enables composing
+                    // commands with other CommandSequences. Flattening is required in
+                    // the case when multiple command sequences share the same queue
                     foreach (ICommand subcmd in seq.registeredCommands)
                     {
-                        AddCommand(subcmd);
+                        this.AddCommand(subcmd);
                     }
                 }
             }
-            OnCanExecuteChanged();
+
+            this.OnCanExecuteChanged();
         }
 
+        /// <summary>
+        /// Internal helper to add a command to the list of commands.
+        /// </summary>
+        /// <param name="cmd">Command to add to this CommandSequence</param>
         private void AddCommand(ICommand cmd)
         {
-            if(this.registeredCommands.Count == 0)
+            if (this.registeredCommands.Count == 0)
             {
-                cmd.CanExecuteChanged += Forward_CanExecuteChanged;
+                cmd.CanExecuteChanged += this.Forward_CanExecuteChanged;
             }
+
             this.registeredCommands.Add(cmd);
         }
+        #endregion // Command Registration
 
         //-------------------------------------------------------------------
         // ICommand Implementation
         //-------------------------------------------------------------------
+        #region ICommand Implementation
+        #region CanExecuteChanged event
+        /// <summary>
+        /// Event signals when the ability to execute the CommandSequence has changed
+        /// </summary>
         public event EventHandler CanExecuteChanged;
 
+        /// <summary>
+        /// Invoke the CanExecuteChanged event handler
+        /// </summary>
         private void OnCanExecuteChanged()
         {
             this.CanExecuteChanged?.Invoke(this, new EventArgs());
         }
 
         /// <summary>
-        /// Forward on the CanExecuteChanged event from the first command in the list
+        /// Forward on the CanExecuteChanged event from the first command in the list.
+        /// See CanExecute for the conditions under which the CommandSequence can execute.
         /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
+        /// <param name="sender">Originator of the event</param>
+        /// <param name="e">The arguments associated with this event</param>
         private void Forward_CanExecuteChanged(object sender, EventArgs e)
         {
             this.CanExecuteChanged?.Invoke(sender, e);
         }
+        #endregion // CanExecuteChanged event
 
+        /// <summary>
+        /// Predicate indicates whether the CommandSequence is ready to execute
+        /// </summary>
+        /// <param name="parameter">Value passed to Execute/CanExecute for the commands in the sequence</param>
+        /// <returns>Indicates whether this CommandSequence is ready to execute</returns>
         public bool CanExecute(object parameter)
         {
-            if (this.registeredCommands.Count == 0)
-            {
-                return false;
-            }
-
-            if (this.commandQueue.Count > 0)
-            {
-                return false;
-            }
-
-            return this.registeredCommands[0].CanExecute(parameter);
+            return
+                this.registeredCommands.Count > 0                    // Must have at least one command to execute
+                && this.commandQueue.Count == 0                      // The queue must not be in use already
+                && this.registeredCommands[0].CanExecute(parameter); // First command must be ready to execute
         }
 
+        /// <summary>
+        /// Execute each command in the CommandSequence as they become ready
+        /// </summary>
+        /// <param name="parameter">The command parameter to be passed to all of the commands</param>
         public void Execute(object parameter)
         {
             lock (this.commandQueue)
@@ -148,20 +181,29 @@ public void Execute(object parameter)
                 }
             }
 
-            OnCanExecuteChanged();
-            ExecuteNext();
+            this.OnCanExecuteChanged();
+            this.ExecuteNext();
         }
 
+        /// <summary>
+        /// Event handler used determine when the command at the head of the queue is ready to execute
+        /// </summary>
+        /// <param name="sender">The originator of the event should be the command at the front of the queue</param>
+        /// <param name="e">The arguments associated with this event</param>
         private void CurrentCommand_CanExecuteChanged(object sender, EventArgs e)
         {
             ICommand cmd = sender as ICommand;
             if (cmd.CanExecute(this.sharedParameter))
             {
-                cmd.CanExecuteChanged -= CurrentCommand_CanExecuteChanged;
-                ExecuteNext();
+                cmd.CanExecuteChanged -= this.CurrentCommand_CanExecuteChanged;
+                this.ExecuteNext();
             }
         }
 
+        /// <summary>
+        /// Execute all the commands from the front of the queue that are already ready then hook up the
+        /// event to receive the signal when the next one is ready.
+        /// </summary>
         private void ExecuteNext()
         {
             lock (this.commandQueue)
@@ -174,105 +216,21 @@ private void ExecuteNext()
 
                 if (this.commandQueue.Count > 0)
                 {
-                    this.commandQueue.Peek().CanExecuteChanged += CurrentCommand_CanExecuteChanged;
+                    this.commandQueue.Peek().CanExecuteChanged += this.CurrentCommand_CanExecuteChanged;
                 }
             }
         }
 
-        private void CommandQueue_QueueChanged(object sender, EventArgs e)
-        {
-            OnCanExecuteChanged();
-        }
-    }
-
-    /// <summary>
-    /// A simple queue of commands that provides notifications whenever the contents changed.
-    /// </summary>
-    public class ObservableCommandQueue
-    {
         /// <summary>
-        /// Underlying Queue for the commands
+        /// The ObservableCommandQueue informs the CommandSequence when queue contents change so
+        /// that the CommandSequence can fire the CanExecuteChanged.
         /// </summary>
-        private Queue<ICommand> commands;
-
-        //-------------------------------------------------------------------
-        // Constructor
-        //-------------------------------------------------------------------
-        #region Constructor
-        /// <summary>
-        /// blah blah blah StyleCop will tell me what to put here
-        /// </summary>
-        public ObservableCommandQueue()
-        {
-            this.commands = new Queue<ICommand>();
-        }
-        #endregion
-
-        //-------------------------------------------------------------------
-        // Queue Operations
-        //-------------------------------------------------------------------
-        #region Queue Operations
-        /// <summary>
-        /// Gets the Count of elements contained in the queue
-        /// </summary>
-        public int Count
-        {
-            get
-            {
-                return this.commands.Count;
-            }
-        }
-
-        /// <summary>
-        /// Clears all elements from the queue
-        /// </summary>
-        public void Clear()
-        {
-            this.commands.Clear();
-            this.OnQueueChanged();
-        }
-
-        /// <summary>
-        /// Retrieves the element at the front of the queue without modifying the contents of the queue
-        /// </summary>
-        /// <returns>The element at the front of the queue</returns>
-        public ICommand Peek()
-        {
-            return this.commands.Peek();
-        }
-
-        /// <summary>
-        /// Inserts a new element at the back of the queue
-        /// </summary>
-        /// <param name="cmd">The new element to be inserted</param>
-        public void Enqueue(ICommand cmd)
-        {
-            this.commands.Enqueue(cmd);
-            OnQueueChanged();
-        }
-
-        /// <summary>
-        /// Removes the element at the front of the queue
-        /// </summary>
-        /// <returns>The element that was removed from the front of the queue</returns>
-        public ICommand Dequeue()
-        {
-            ICommand cmd = this.commands.Dequeue();
-            this.OnQueueChanged();
-            return cmd;
-        }
-        #endregion // Queue Operations
-
-        //-------------------------------------------------------------------
-        // QueueChanged Event
-        //-------------------------------------------------------------------
-        #region QueueChanged Event
-        public event EventHandler QueueChanged;
-
-        private void OnQueueChanged()
+        /// <param name="sender">ObservableCommandQueue that originated the event</param>
+        /// <param name="e">The arguments associated with this event</param>
+        private void CommandQueue_QueueChanged(object sender, EventArgs e)
         {
-            this.QueueChanged?.Invoke(this, new EventArgs());
+            this.OnCanExecuteChanged();
         }
-        #endregion // QueueChanged Event
+        #endregion // ICommand Implementation
     }
 }
diff --git a/Samples/DeviceLab/ViewModels/DevicePortalCommandModel.cs b/Samples/DeviceLab/ViewModels/DevicePortalCommandModel.cs
index 5193c366..89ac9c15 100644
--- a/Samples/DeviceLab/ViewModels/DevicePortalCommandModel.cs
+++ b/Samples/DeviceLab/ViewModels/DevicePortalCommandModel.cs
@@ -1,32 +1,38 @@
-using Microsoft.Tools.WindowsDevicePortal;
-using Prism.Commands;
-using Prism.Mvvm;
+//----------------------------------------------------------------------------------------------
+// <copyright file="DevicePortalCommandModel.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Input;
+using Microsoft.Tools.WindowsDevicePortal;
+using Prism.Mvvm;
 
 namespace DeviceLab
 {
+    /// <summary>
+    /// Base class for ViewModel classes that wrap a DevicePortal object.
+    /// Provides status for pending DevicePortal operations and an
+    /// ObservableCommandQueue to enable composing commands using
+    /// CommandSequences.
+    /// </summary>
     public class DevicePortalCommandModel : BindableBase
     {
-        //-------------------------------------------------------------------
-        //  Protected Members
-        //-------------------------------------------------------------------
-        #region Protected Members
-        protected IDiagnosticSink diagnostics;
-        protected DevicePortal portal;
-
-        #endregion // Protected Members
-
         //-------------------------------------------------------------------
         // Constructors
         //-------------------------------------------------------------------
         #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DevicePortalCommandModel" /> class.
+        /// </summary>
+        /// <param name="portal">DevicePortal object enscapsulated by this</param>
+        /// <param name="diags">Diagnostic sink for reporting</param>
         public DevicePortalCommandModel(DevicePortal portal, IDiagnosticSink diags)
         {
+            if (portal == null)
+            {
+                throw new ArgumentException("Must provide a valid DevicePortal object");
+            }
+
             this.portal = portal;
             this.diagnostics = diags;
             this.commandQueue = new ObservableCommandQueue();
@@ -38,44 +44,200 @@ public DevicePortalCommandModel(DevicePortal portal, IDiagnosticSink diags)
         //  Properties
         //-------------------------------------------------------------------
         #region Properties
+        #region The DevicePortal
+        /// <summary>
+        /// DevicePortal object encapsulated by this class
+        /// </summary>
+        private DevicePortal portal;
 
         /// <summary>
-        /// The Ready property indicates that there are no REST calls in flight via
-        /// the underlying DevicePortal object
+        /// Gets the DevicePortal object encapsulated by this class
         /// </summary>
+        protected DevicePortal Portal
+        {
+            get
+            {
+                return this.portal;
+            }
+        }
+        #endregion // The DevicePortal
+
         #region Ready
+        /// <summary>
+        /// The Ready property indicates that there are no RESTful calls in flight via
+        /// the underlying DevicePortal object
+        /// </summary>
         private bool ready;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the DevicePortal is ready
+        /// </summary>
         public bool Ready
         {
             get
             {
                 return this.ready;
             }
+
             protected set
             {
-                SetProperty(ref this.ready, value);
+                this.SetProperty(ref this.ready, value);
             }
         }
         #endregion // Ready
+
+        #region Address
+        /// <summary>
+        /// Gets the IP Address for the device
+        /// </summary>
+        public string Address
+        {
+            get
+            {
+                return this.portal == null ? "<unknown>" : this.portal.Address;
+            }
+        }
+        #endregion // Address
+
+        #region DeviceFamily
+        /// <summary>
+        /// Gets the device's DeviceFamily
+        /// </summary>
+        public string DeviceFamily
+        {
+            get
+            {
+                return this.portal == null ? "<unknown>" : this.portal.DeviceFamily;
+            }
+        }
+        #endregion // DeviceFamily
+
+        #region OperatingSystemVersion
+        /// <summary>
+        /// Gets the operating system version for the device
+        /// </summary>
+        public string OperatingSystemVersion
+        {
+            get
+            {
+                return this.portal == null ? "<unknown>" : this.portal.OperatingSystemVersion;
+            }
+        }
+        #endregion // OperatingSystemVersion
+
+        #region Platform
+        /// <summary>
+        /// Gets the platform for the device
+        /// </summary>
+        public string Platform
+        {
+            get
+            {
+                return this.portal == null ? "<unknown>" : this.portal.Platform.ToString();
+            }
+        }
+        #endregion // Platform
+
+        #region PlatformName
+        /// <summary>
+        /// Gets the platform name of the device
+        /// </summary>
+        public string PlatformName
+        {
+            get
+            {
+                return this.portal == null ? "<unknown>" : this.portal.PlatformName;
+            }
+        }
+        #endregion // PlatformName
         #endregion // Properties
 
         //-------------------------------------------------------------------
         // Command Sequences
         //-------------------------------------------------------------------
         #region Command Sequences
+        /// <summary>
+        /// CommandQueue shared by all command sequences created via a call to CreateCommandSequence.
+        /// CommandSequences will not be able to execute in the sense of CanExecute if there is already
+        /// another command sequence usign the shared queue
+        /// </summary>
         private ObservableCommandQueue commandQueue;
 
+        /// <summary>
+        /// Clears the shared command queue
+        /// </summary>
         protected void ClearCommandQueue()
         {
             this.commandQueue.Clear();
         }
 
+        /// <summary>
+        /// Creates a new CommandSequence using the shared command queue
+        /// </summary>
+        /// <returns>The new CommandSequence</returns>
         public CommandSequence CreateCommandSequence()
         {
             return new CommandSequence(this.commandQueue);
         }
-
         #endregion // Command Sequences
 
+        //-------------------------------------------------------------------
+        // Diagnostics
+        //-------------------------------------------------------------------
+        #region Diagnostics
+        /// <summary>
+        /// Destination for reporting diagnostic messages
+        /// </summary>
+        private IDiagnosticSink diagnostics;
+
+        /// <summary>
+        /// Gets protected access to the diagnostic sink
+        /// </summary>
+        protected IDiagnosticSink Diagnostics
+        {
+            get
+            {
+                return this.diagnostics;
+            }
+        }
+            
+        /// <summary>
+        /// Gets a short string, identifying the device, that is prepended to diagnostic output
+        /// </summary>
+        protected virtual string DiagnosticMoniker
+        {
+            get
+            {
+                return this.Address;
+            }
+        }
+
+        /// <summary>
+        /// Output diagnostic messages with the moniker already prepended to the output
+        /// </summary>
+        /// <param name="fmt">Format string</param>
+        /// <param name="args">Format arguments</param>
+        protected virtual void OutputDiagnosticString(string fmt, params object[] args)
+        {
+            this.diagnostics.OutputDiagnosticString("[{0}] ", this.DiagnosticMoniker);
+            this.diagnostics.OutputDiagnosticString(fmt, args);
+        }
+
+        /// <summary>
+        /// Report an exception to the diagnostic output and clear the command queue
+        /// </summary>
+        /// <param name="commandName">The command that generated the exception</param>
+        /// <param name="exn">The exception caught when attempting to execute the command</param>
+        protected virtual void ReportException(string commandName, Exception exn)
+        {
+            this.OutputDiagnosticString("Exception during {0} command:\n", commandName);
+            this.OutputDiagnosticString(exn.Message);
+            this.OutputDiagnosticString(exn.StackTrace);
+
+            // Clear the command queue to prevent executing any more commands
+            this.OutputDiagnosticString("Clearing any queued commands\n");
+            this.ClearCommandQueue();
+        }
+        #endregion // Diagnostics
     }
 }
diff --git a/Samples/DeviceLab/ViewModels/DevicePortalViewModel.cs b/Samples/DeviceLab/ViewModels/DevicePortalViewModel.cs
index 3ff33bcf..6ef94272 100644
--- a/Samples/DeviceLab/ViewModels/DevicePortalViewModel.cs
+++ b/Samples/DeviceLab/ViewModels/DevicePortalViewModel.cs
@@ -1,23 +1,31 @@
-using Microsoft.Tools.WindowsDevicePortal;
-using Prism.Commands;
-using Prism.Mvvm;
+//----------------------------------------------------------------------------------------------
+// <copyright file="DevicePortalViewModel.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
-using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
+using Microsoft.Tools.WindowsDevicePortal;
+using Prism.Commands;
 
 namespace DeviceLab
 {
+    /// <summary>
+    /// Viewmodel for a single connected device
+    /// </summary>
     public class DevicePortalViewModel : DevicePortalCommandModel
     {
         //-------------------------------------------------------------------
         //  Constructors
         //-------------------------------------------------------------------
         #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DevicePortalViewModel" /> class.
+        /// </summary>
+        /// <param name="portal">DevicePortal object enscapsulated by this</param>
+        /// <param name="diags">Diagnostic sink for reporting</param>
         public DevicePortalViewModel(DevicePortal portal, IDiagnosticSink diags)
             : base(portal, diags)
         {
@@ -30,17 +38,29 @@ public DevicePortalViewModel(DevicePortal portal, IDiagnosticSink diags)
         //-------------------------------------------------------------------
         #region Properties
         #region Diagnostic Moniker
-        private string diagnosticMoniker
+        /// <summary>
+        /// Gets the overriden DiagnosticMoniker for the device. The overriden
+        /// version will use the friendly name for the device or otherwise
+        /// default to the IP address.
+        /// </summary>
+        protected override string DiagnosticMoniker
         {
             get
             {
-                return !string.IsNullOrWhiteSpace(this.deviceName) ? this.deviceName : this.Address;
+                return !string.IsNullOrWhiteSpace(this.deviceName) ? this.deviceName : base.DiagnosticMoniker;
             }
         }
         #endregion // Diagnostic Moniker
 
         #region DeviceName
+        /// <summary>
+        /// The friendly name for the device
+        /// </summary>
         private string deviceName;
+
+        /// <summary>
+        /// Gets the freindly name for the device
+        /// </summary>
         public string DeviceName
         {
             get
@@ -50,13 +70,20 @@ public string DeviceName
 
             private set
             {
-                SetProperty(ref this.deviceName, value);
+                this.SetProperty(ref this.deviceName, value);
             }
         }
         #endregion //DeviceName
 
         #region DeviceNameEntry
+        /// <summary>
+        /// User input from the user to be used as a new device name
+        /// </summary>
         private string deviceNameEntry;
+
+        /// <summary>
+        /// Gets or sets a value representing input from the user to be used as a new device name
+        /// </summary>
         public string DeviceNameEntry
         {
             get
@@ -66,63 +93,20 @@ public string DeviceNameEntry
 
             set
             {
-                SetProperty(ref this.deviceNameEntry, value);
+                this.SetProperty(ref this.deviceNameEntry, value);
             }
         }
         #endregion // DeviceNameEntry
 
-        #region Address
-        public string Address
-        {
-            get
-            {
-                return this.portal == null ? "<unknown>" : this.portal.Address;
-            }
-        }
-        #endregion // Address
-
-        #region DeviceFamily
-        public string DeviceFamily
-        {
-            get
-            {
-                return this.portal == null ? "<unknown>" : this.portal.DeviceFamily;
-            }
-        }
-        #endregion // DeviceFamily
-
-        #region OperatingSystemVersion
-        public string OperatingSystemVersion
-        {
-            get
-            {
-                return this.portal == null ? "<unknown>" : this.portal.OperatingSystemVersion;
-            }
-        }
-        #endregion // OperatingSystemVersion
-
-        #region Platform
-        public string Platform
-        {
-            get
-            {
-                return this.portal == null ? "<unknown>" : this.portal.Platform.ToString();
-            }
-        }
-        #endregion // Platform
-
-        #region PlatformName
-        public string PlatformName
-        {
-            get
-            {
-                return this.portal == null ? "<unknown>" : this.portal.PlatformName;
-            }
-        }
-        #endregion // PlatformName
-
         #region CPULoad
+        /// <summary>
+        /// The CPU Load on the device
+        /// </summary>
         private int cpuLoad;
+
+        /// <summary>
+        ///  Gets a value representing the CPU load on the device
+        /// </summary>
         public string CPULoad
         {
             get
@@ -133,7 +117,14 @@ public string CPULoad
         #endregion // CPULoad
 
         #region ConnectionRetryAttempts
+        /// <summary>
+        /// The number of times to attempt to connect to the device
+        /// </summary>
         private int connectionRetryAttempts;
+
+        /// <summary>
+        /// Gets or sets the number of time to attempt to connect to the device
+        /// </summary>
         public int ConnectionRetryAttempts
         {
             get
@@ -143,7 +134,7 @@ public int ConnectionRetryAttempts
 
             set
             {
-                SetProperty(ref this.connectionRetryAttempts, value);
+                this.SetProperty(ref this.connectionRetryAttempts, value);
             }
         }
         #endregion // ConnectionRetryAttempts
@@ -153,27 +144,38 @@ public int ConnectionRetryAttempts
         //  Commands
         //-------------------------------------------------------------------
         #region Commands
-
         #region RenameCommand
+        /// <summary>
+        /// Command to rename the device
+        /// </summary>
         private CommandSequence renameCommand;
+
+        /// <summary>
+        /// Gets the command to rename the device
+        /// </summary>
         public ICommand RenameCommand
         {
             get
             {
-                if(this.renameCommand == null)
+                if (this.renameCommand == null)
                 {
-                    this.renameCommand = CreateCommandSequence();
-                    DelegateCommand renameDC = DelegateCommand.FromAsyncHandler(ExecuteRenameAsync, CanExecuteRename);
+                    this.renameCommand = this.CreateCommandSequence();
+                    DelegateCommand renameDC = DelegateCommand.FromAsyncHandler(this.ExecuteRenameAsync, this.CanExecuteRename);
                     renameDC.ObservesProperty(() => this.Ready);
                     renameDC.ObservesProperty(() => this.DeviceNameEntry);
                     this.renameCommand.RegisterCommand(renameDC);
                     this.renameCommand.RegisterCommand(this.RebootCommand);
                     this.renameCommand.RegisterCommand(this.RefreshDeviceNameCommand);
                 }
+
                 return this.renameCommand;
             }
         }
 
+        /// <summary>
+        /// Predicate for the rename command
+        /// </summary>
+        /// <returns>Result indicates whether the rename command can execute</returns>
         private bool CanExecuteRename()
         {
             //return
@@ -183,97 +185,135 @@ private bool CanExecuteRename()
                 !string.IsNullOrWhiteSpace(this.deviceNameEntry);
         }
 
+        /// <summary>
+        /// Performs the action for the rename command
+        /// </summary>
+        /// <returns>A task capturing the continuation of setting the device name</returns>
         private async Task ExecuteRenameAsync()
         {
-            this.diagnostics.OutputDiagnosticString("[{0}] ExecuteRenameAsync\n", this.diagnosticMoniker);
+            this.OutputDiagnosticString("ExecuteRenameAsync\n");
             this.Ready = false;
             try
             {
                 string newName = this.deviceNameEntry;
-                this.DeviceNameEntry = "";
-                this.diagnostics.OutputDiagnosticString("[{0}] Attempting to rename device to {1}\n", this.diagnosticMoniker, newName);
-                await this.portal.SetDeviceName(newName);
+                this.DeviceNameEntry = string.Empty;
+                this.OutputDiagnosticString("Attempting to rename device to {0}\n", newName);
+                await this.Portal.SetDeviceName(newName);
             }
             catch (Exception exn)
             {
-                ReportException("Rename", exn);
+                this.ReportException("Rename", exn);
             }
+
             this.Ready = true;
         }
         #endregion // RenameCommand
 
         #region RefreshDeviceName
+        /// <summary>
+        /// Retreive the friendly device name from the device
+        /// </summary>
         private CommandSequence refreshDeviceNameCommand;
+
+        /// <summary>
+        /// Gets the command for retrieving the device name
+        /// </summary>
         public ICommand RefreshDeviceNameCommand
         {
             get
             {
-                if(this.refreshDeviceNameCommand == null)
+                if (this.refreshDeviceNameCommand == null)
                 {
-                    DelegateCommand refreshDeviceNameDC = DelegateCommand.FromAsyncHandler(RefreshDeviceNameAsync, CanExecuteRefreshDeviceName);
+                    DelegateCommand refreshDeviceNameDC = DelegateCommand.FromAsyncHandler(this.RefreshDeviceNameAsync, this.CanExecuteRefreshDeviceName);
                     refreshDeviceNameDC.ObservesProperty(() => this.Ready);
-                    this.refreshDeviceNameCommand = CreateCommandSequence();
+                    this.refreshDeviceNameCommand = this.CreateCommandSequence();
                     this.refreshDeviceNameCommand.RegisterCommand(refreshDeviceNameDC);
                 }
+
                 return this.refreshDeviceNameCommand;
             }
         }
 
+        /// <summary>
+        /// Predicate indicates whether refresh device name command can execute
+        /// </summary>
+        /// <returns>Whether the command can execute</returns>
         private bool CanExecuteRefreshDeviceName()
         {
             return this.Ready;
         }
 
+        /// <summary>
+        /// Performs the action of the refresh device name command
+        /// </summary>
+        /// <returns>A task that captures the continuation of the refresh device name action</returns>
         private async Task RefreshDeviceNameAsync()
         {
-            this.diagnostics.OutputDiagnosticString("[{0}] RefreshDeviceNameAsync\n", this.diagnosticMoniker);
+            this.OutputDiagnosticString("RefreshDeviceNameAsync\n");
             this.Ready = false;
             try
             {
-                this.DeviceName = await this.portal.GetDeviceName();
+                this.DeviceName = await this.Portal.GetDeviceName();
             }
             catch (Exception exn)
             {
-                ReportException("RefreshDeviceName", exn);
+                this.ReportException("RefreshDeviceName", exn);
             }
+
             this.Ready = true;
         }
         #endregion // RefreshDeviceName
 
         #region Reboot Command
+        /// <summary>
+        /// Command to reboot the device
+        /// </summary>
         private CommandSequence rebootCommand;
+
+        /// <summary>
+        ///  Gets the command for rebooting the device
+        /// </summary>
         public ICommand RebootCommand
         {
             get
             {
-                if(this.rebootCommand == null)
+                if (this.rebootCommand == null)
                 {
-                    this.rebootCommand = CreateCommandSequence();
-                    DelegateCommand rebootDC = DelegateCommand.FromAsyncHandler(ExecuteRebootAsync, CanExecuteReboot);
+                    this.rebootCommand = this.CreateCommandSequence();
+                    DelegateCommand rebootDC = DelegateCommand.FromAsyncHandler(this.ExecuteRebootAsync, this.CanExecuteReboot);
                     rebootDC.ObservesProperty(() => this.Ready);
-                    this.rebootCommand.RegisterCommand(StopListeningForSystemPerfCommand);
+                    this.rebootCommand.RegisterCommand(this.StopListeningForSystemPerfCommand);
                     this.rebootCommand.RegisterCommand(rebootDC);
                     this.rebootCommand.RegisterCommand(this.ReestablishConnectionCommand);
                     this.rebootCommand.RegisterCommand(this.refreshDeviceNameCommand);
                     this.rebootCommand.RegisterCommand(this.StartListeningForSystemPerfCommand);
                 }
+
                 return this.rebootCommand;
             }
         }
 
+        /// <summary>
+        /// Predicate for determining whether the reboot command can execute
+        /// </summary>
+        /// <returns>Whether or not the reboot command can execute</returns>
         private bool CanExecuteReboot()
         {
             return this.Ready;
         }
 
+        /// <summary>
+        /// Performs the action of the reboot command
+        /// </summary>
+        /// <returns>A task that captures the continuation of the asynchronous reboot action</returns>
         private async Task ExecuteRebootAsync()
         {
-            this.diagnostics.OutputDiagnosticString("[{0}] ExecuteRebootAsync\n", this.diagnosticMoniker);
+            this.OutputDiagnosticString("ExecuteRebootAsync\n");
             this.Ready = false;
             try
             {
-                this.diagnostics.OutputDiagnosticString("[{0}] Attempting to reboot device.\n", this.diagnosticMoniker);
-                await this.portal.Reboot();
+                this.OutputDiagnosticString("Attempting to reboot device.\n");
+                await this.Portal.Reboot();
 
                 // Sometimes able to reestablish the connection prematurely before the console has a chance to shut down
                 // So adding a delay here before trying to reestablish the connection.
@@ -281,176 +321,235 @@ private async Task ExecuteRebootAsync()
             }
             catch (Exception exn)
             {
-                ReportException("Reboot", exn);
+                this.ReportException("Reboot", exn);
             }
+
             this.Ready = true;
         }
         #endregion // Reboot Command
 
         #region ReestablishConnectionCommand
+        /// <summary>
+        /// Command to reestablish the connection with the device
+        /// </summary>
         private CommandSequence reestablishConnectionCommand;
+
+        /// <summary>
+        /// Gets the command for reestablishing the connection with the device
+        /// </summary>
         public ICommand ReestablishConnectionCommand
         {
             get
             {
-                if(this.reestablishConnectionCommand == null)
+                if (this.reestablishConnectionCommand == null)
                 {
-                    this.reestablishConnectionCommand = CreateCommandSequence();
-                    DelegateCommand reestablishConnectionDC = DelegateCommand.FromAsyncHandler(ExecuteReestablishConnectionAsync, CanExecuteReestablishConnection);
+                    this.reestablishConnectionCommand = this.CreateCommandSequence();
+                    DelegateCommand reestablishConnectionDC = DelegateCommand.FromAsyncHandler(this.ExecuteReestablishConnectionAsync, this.CanExecuteReestablishConnection);
                     reestablishConnectionDC.ObservesProperty(() => this.Ready);
                     this.reestablishConnectionCommand.RegisterCommand(reestablishConnectionDC);
                 }
+
                 return this.reestablishConnectionCommand;
             }
         }
 
+        /// <summary>
+        /// Predicate for the reestablish connection command
+        /// </summary>
+        /// <returns>Indicates whether the reestablish connection command can execute.</returns>
         private bool CanExecuteReestablishConnection()
         {
             return this.Ready;
         }
 
+        /// <summary>
+        /// Performs the action of the reestablish connection command
+        /// </summary>
+        /// <returns>A task capturing the continuation of the asynchronous action to reestablish the connection</returns>
         private async Task ExecuteReestablishConnectionAsync()
         {
-            this.diagnostics.OutputDiagnosticString("[{0}] ExecuteReestablishConnectionAsync\n", this.diagnosticMoniker);
+            this.OutputDiagnosticString("ExecuteReestablishConnectionAsync\n");
             int numTries = 1;
 
             DeviceConnectionStatusEventHandler handler = (DevicePortal sender, DeviceConnectionStatusEventArgs args) =>
             {
-                this.diagnostics.OutputDiagnosticString("[{0}] Connection status update: Status: {1}, Phase: {2}\n", this.diagnosticMoniker, args.Status, args.Phase);
+                this.OutputDiagnosticString("Connection status update: Status: {0}, Phase: {1}\n", args.Status, args.Phase);
                 if (args.Status == DeviceConnectionStatus.Connected)
                 {
-                    this.diagnostics.OutputDiagnosticString("[{0}] Connection succeeded after {1} tries.\n", this.diagnosticMoniker, numTries);
+                    this.OutputDiagnosticString("Connection succeeded after {0} tries.\n", numTries);
                 }
                 else if (args.Status == DeviceConnectionStatus.Failed)
                 {
-                    this.diagnostics.OutputDiagnosticString("[{0}] Connection failed after {1} tries.\n", this.diagnosticMoniker, numTries);
+                    this.OutputDiagnosticString("Connection failed after {0} tries.\n", numTries);
                 }
             };
-            this.portal.ConnectionStatus += handler;
+            this.Portal.ConnectionStatus += handler;
 
             this.Ready = false;
             try
             {
                 do
                 {
-                    await this.portal.Connect();
+                    await this.Portal.Connect();
                     ++numTries;
-                } while (this.portal.ConnectionHttpStatusCode != HttpStatusCode.OK && numTries < this.ConnectionRetryAttempts);
+                }
+                while (this.Portal.ConnectionHttpStatusCode != HttpStatusCode.OK && numTries < this.ConnectionRetryAttempts);
             }
             catch (Exception exn)
             {
-                ReportException("ReestablishConnection", exn);
+                this.ReportException("ReestablishConnection", exn);
             }
-            this.portal.ConnectionStatus -= handler;
+
+            this.Portal.ConnectionStatus -= handler;
             this.Ready = true;
         }
         #endregion // ReestablishConnectionCommand
 
         #region StartListeningForSystemPerfCommand
+        /// <summary>
+        /// Command to start listing for asynchronous system performance updates
+        /// </summary>
         private CommandSequence startListeningForSystemPerfCommand;
+
+        /// <summary>
+        /// Gets the command to start listing for system performance updates
+        /// </summary>
         public ICommand StartListeningForSystemPerfCommand
         {
             get
             {
-                if(this.startListeningForSystemPerfCommand == null)
+                if (this.startListeningForSystemPerfCommand == null)
                 {
-                    this.startListeningForSystemPerfCommand = CreateCommandSequence();
-                    DelegateCommand startListeningForSystemPerfDC = DelegateCommand.FromAsyncHandler(ExecuteStartListeningForSystemPerfAsync, CanStartListeningForSystemPerf);
+                    this.startListeningForSystemPerfCommand = this.CreateCommandSequence();
+                    DelegateCommand startListeningForSystemPerfDC = DelegateCommand.FromAsyncHandler(this.ExecuteStartListeningForSystemPerfAsync, this.CanStartListeningForSystemPerf);
                     startListeningForSystemPerfDC.ObservesProperty(() => this.Ready);
                     this.startListeningForSystemPerfCommand.RegisterCommand(startListeningForSystemPerfDC);
                 }
-                return startListeningForSystemPerfCommand;
+
+                return this.startListeningForSystemPerfCommand;
             }
         }
 
+        /// <summary>
+        /// Predicate for the command to start listening for system performance updates
+        /// </summary>
+        /// <returns>Result indicates whether the command can execute</returns>
         private bool CanStartListeningForSystemPerf()
         {
             return this.Ready;
         }
 
+        /// <summary>
+        /// Performs the action of the command to start listening for system performance updates
+        /// </summary>
+        /// <returns>A task that captures the continuation of the action to start listening for system performance updates</returns>
         private async Task ExecuteStartListeningForSystemPerfAsync()
         {
-            this.diagnostics.OutputDiagnosticString("[{0}] ExecuteStartListeningForSystemPerfAsync\n", this.diagnosticMoniker);
+            this.OutputDiagnosticString("ExecuteStartListeningForSystemPerfAsync\n");
             this.Ready = false;
             try
             {
-                this.portal.SystemPerfMessageReceived += OnSystemPerfReceived;
-                await Task.Run(StartListeningHelper);
+                this.Portal.SystemPerfMessageReceived += this.OnSystemPerfReceived;
+                await Task.Run(this.StartListeningHelper);
             }
-            catch(Exception exn)
+            catch (Exception exn)
             {
-                ReportException("StartListeningForSystemPerf", exn);
+                this.ReportException("StartListeningForSystemPerf", exn);
             }
+
             this.Ready = true;
         }
 
+        /// <summary>
+        /// StartListeningForSystemPerf would deadlock when called from the main thread.
+        /// This helper exists so that the asynchronous operation can be run on the
+        /// thread pool and avoid the deadlock
+        /// </summary>
+        /// <returns>A task the captures the continuation of the start listening call</returns>
         private async Task StartListeningHelper()
         {
-            await this.portal.StartListeningForSystemPerf().ConfigureAwait(false);
+            await this.Portal.StartListeningForSystemPerf().ConfigureAwait(false);
         }
         #endregion // StartListeningForSystemPerfCommand
 
         #region StopListeningForSystemPerfCommand
+        /// <summary>
+        /// Command to stop listing to asynchronous system performance updates
+        /// </summary>
         private CommandSequence stopListeningForSystemPerfCommand;
+
+        /// <summary>
+        /// Gets the command to stop listening to asynchronous system performance updates
+        /// </summary>
         public ICommand StopListeningForSystemPerfCommand
         {
             get
             {
-                if(this.stopListeningForSystemPerfCommand == null)
+                if (this.stopListeningForSystemPerfCommand == null)
                 {
-                    this.stopListeningForSystemPerfCommand = CreateCommandSequence();
-                    DelegateCommand stopListeningForSystemPerfDC = DelegateCommand.FromAsyncHandler(ExecuteStopListeningForSystemPerfAsync, CanStopListeningForSystemPerf);
+                    this.stopListeningForSystemPerfCommand = this.CreateCommandSequence();
+                    DelegateCommand stopListeningForSystemPerfDC = DelegateCommand.FromAsyncHandler(this.ExecuteStopListeningForSystemPerfAsync, this.CanStopListeningForSystemPerf);
                     stopListeningForSystemPerfDC.ObservesProperty(() => this.Ready);
                     this.stopListeningForSystemPerfCommand.RegisterCommand(stopListeningForSystemPerfDC);
                 }
-                return stopListeningForSystemPerfCommand;
+
+                return this.stopListeningForSystemPerfCommand;
             }
         }
 
+        /// <summary>
+        /// Predicate for the stop listening for system performance command
+        /// </summary>
+        /// <returns>Result indicates whether the command can execute</returns>
         private bool CanStopListeningForSystemPerf()
         {
             return this.Ready;
         }
 
+        /// <summary>
+        /// Performs the action of the command to stop listening to system performance updates
+        /// </summary>
+        /// <returns>Task the captures the continuation of the asynchronous action</returns>
         private async Task ExecuteStopListeningForSystemPerfAsync()
         {
-            this.diagnostics.OutputDiagnosticString("[{0}] ExecuteStopListeningForSystemPerfAsync\n", this.diagnosticMoniker);
+            this.OutputDiagnosticString("ExecuteStopListeningForSystemPerfAsync\n");
             this.Ready = false;
             try
             {
-                this.portal.SystemPerfMessageReceived -= OnSystemPerfReceived;
-                await StopListeningHelper();
-                await StopListeningHelper();
+                this.Portal.SystemPerfMessageReceived -= this.OnSystemPerfReceived;
+                await this.StopListeningHelper();
+                await this.StopListeningHelper();
             }
-            catch(Exception exn)
+            catch (Exception exn)
             {
-                ReportException("StopListeningForSystemPerf", exn);
+                this.ReportException("StopListeningForSystemPerf", exn);
             }
+
             this.Ready = true;
         }
 
+        /// <summary>
+        /// StopListeningForSystemPerf would deadlock when called from the main thread.
+        /// This helper exists so that the asynchronous operation can be run on the
+        /// thread pool and avoid the deadlock
+        /// </summary>
+        /// <returns>Task the captures the continuation of the asynchronous action</returns>
         private async Task StopListeningHelper()
         {
-            await this.portal.StopListeningForSystemPerf();
+            await this.Portal.StopListeningForSystemPerf();
         }
         #endregion // StopListeningForSystemPerfCommand
         #endregion // Commands
 
+        /// <summary>
+        /// Event handler receives the system performance updates and sets the CPULoad property
+        /// </summary>
+        /// <param name="sender">The DevicePortal that originated the event</param>
+        /// <param name="args">The event data</param>
         private void OnSystemPerfReceived(DevicePortal sender, WebSocketMessageReceivedEventArgs<DevicePortal.SystemPerformanceInformation> args)
         {
             this.cpuLoad = args.Message.CpuLoad;
-            OnPropertyChanged("CPULoad");
-        }
-
-        private void ReportException(string commandName, Exception exn)
-        {
-            this.diagnostics.OutputDiagnosticString(
-                "[{0}] Exception during {1} command:\n[{0}] {2}\nStackTrace: \n[{0}] {3}\n",
-                this.diagnosticMoniker, commandName, exn.Message, exn.StackTrace);
-
-            // Clear the command queue to prevent executing any more commands
-            this.diagnostics.OutputDiagnosticString("[{0}] Clearing any queued commands\n", this.diagnosticMoniker);
-            ClearCommandQueue();
+            this.OnPropertyChanged("CPULoad");
         }
     }
 }
diff --git a/Samples/DeviceLab/ViewModels/DeviceSignInViewModel.cs b/Samples/DeviceLab/ViewModels/DeviceSignInViewModel.cs
index 047d383c..4bd96aa4 100644
--- a/Samples/DeviceLab/ViewModels/DeviceSignInViewModel.cs
+++ b/Samples/DeviceLab/ViewModels/DeviceSignInViewModel.cs
@@ -1,72 +1,29 @@
-using Microsoft.Tools.WindowsDevicePortal;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
+//----------------------------------------------------------------------------------------------
+// <copyright file="DeviceSignInViewModel.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+using System.Collections.ObjectModel;
 using System.Security;
-using System.Text;
-using System.Threading.Tasks;
+using System.Windows.Input;
+using Microsoft.Tools.WindowsDevicePortal;
 using Prism.Commands;
 using Prism.Mvvm;
-using System.Collections.ObjectModel;
-using System.Windows.Input;
 
 namespace DeviceLab
 {
-
-    public interface IDevicePortalConnectionFactory
-    {
-        IDevicePortalConnection CreateConnection(
-            string address,
-            string userName,
-            SecureString password);
-
-        string Name { get; }
-    }
-
-    class XboxDevicePortalConnectionFactory : IDevicePortalConnectionFactory
-    {
-        public string Name { get { return "Xbox One"; } }
-
-        public IDevicePortalConnection CreateConnection(
-            string address,
-            string userName,
-            SecureString password)
-        {
-            return new XboxDevicePortalConnection(address, userName, password);
-        }
-    }
-
-    class GenericDevicePortalConnectionFactory : IDevicePortalConnectionFactory
-    {
-        public string Name { get { return "Generic Device"; } }
-
-        public IDevicePortalConnection CreateConnection(string address, string userName, SecureString password)
-        {
-            return new DefaultDevicePortalConnection(address, userName, password);
-        }
-    }
-
-    public delegate void DeviceSignInEventHandler(DeviceSignInViewModel sender, DeviceSignInEventArgs args);
-
-    public class DeviceSignInEventArgs : System.EventArgs
-    {
-        internal DeviceSignInEventArgs(DevicePortal portal, IDevicePortalConnection conn)
-        {
-            this.Portal = portal;
-            this.Connection = conn;
-        }
-
-        public DevicePortal Portal { get; private set; }
-        public IDevicePortalConnection Connection { get; private set; }
-    }
-
+    /// <summary>
+    /// ViewModel for the device sign in flow
+    /// </summary>
     public class DeviceSignInViewModel : BindableBase
     {
         //-------------------------------------------------------------------
         //  Private Members
         //-------------------------------------------------------------------
         #region Private Members
+        /// <summary>
+        /// Destination for reporting diagnostic messages
+        /// </summary>
         private IDiagnosticSink diagnostics;
         #endregion // Private Members
 
@@ -75,16 +32,17 @@ public class DeviceSignInViewModel : BindableBase
         //-------------------------------------------------------------------
         #region Constructors
         /// <summary>
-        ///  Default constructor creates a null diagnostic sink
+        /// Initializes a new instance of the <see cref="DeviceSignInViewModel" /> class.
+        /// Default constructor creates a null diagnostic sink
         /// </summary>
         /// <remarks>Diagnostic output will be lost</remarks>
         public DeviceSignInViewModel()
         {
-            this.diagnostics = new NullDiagnosticSink();
-
+            this.diagnostics = new DiagnosticSinks.NullDiagnosticSink();
         }
 
         /// <summary>
+        /// Initializes a new instance of the <see cref="DeviceSignInViewModel" /> class.
         /// Use this constructor to specify a diagnostic sink for diagnostic output
         /// </summary>
         /// <param name="diags">Diagnostic sink that will receive all the diagnostic output</param>
@@ -99,34 +57,62 @@ public DeviceSignInViewModel(IDiagnosticSink diags)
         //-------------------------------------------------------------------
         #region Properties
         #region DeviceIP
+        /// <summary>
+        /// The IP address for the device with which we want to authentication
+        /// </summary>
         private string deviceIP;
+
+        /// <summary>
+        ///  Gets or sets the IP address for the device with which we want to authenticate
+        /// </summary>
         public string DeviceIP
         {
             get { return this.deviceIP; }
-            set { SetProperty(ref this.deviceIP, value); }
+            set { this.SetProperty(ref this.deviceIP, value); }
         }
         #endregion // DeviceIP
 
         #region UserName
+        /// <summary>
+        /// Username to use when authentication with the device
+        /// </summary>
         private string userName;
+
+        /// <summary>
+        /// Gets or sets the username to use when authenticating with the device
+        /// </summary>
         public string UserName
         {
             get { return this.userName; }
-            set { SetProperty(ref this.userName, value); }
+            set { this.SetProperty(ref this.userName, value); }
         }
         #endregion // UserName
 
         #region Password
+        /// <summary>
+        /// Password for authenticating with the device
+        /// </summary>
         private SecureString password;
+
+        /// <summary>
+        ///  Gets or sets the password for authenticating with the device
+        /// </summary>
         public SecureString Password
         {
             get { return this.password; }
-            set { SetProperty(ref this.password, value); }
+            set { this.SetProperty(ref this.password, value); }
         }
         #endregion // Password
 
         #region Connection Types
+        /// <summary>
+        /// Collection of IDevicePortalConnectionFactory objects for use when authenticating with different device types
+        /// </summary>
         private ObservableCollection<IDevicePortalConnectionFactory> connectionTypes;
+
+        /// <summary>
+        /// Gets the collection of IDevicePortalConnectionFactory objects used for connecting
+        /// </summary>
         public ObservableCollection<IDevicePortalConnectionFactory> ConnectionTypes
         {
             get
@@ -135,17 +121,25 @@ public ObservableCollection<IDevicePortalConnectionFactory> ConnectionTypes
                 {
                     this.connectionTypes = new ObservableCollection<IDevicePortalConnectionFactory>();
                 }
+
                 return this.connectionTypes;
             }
         }
         #endregion // Connection Types
 
         #region ConnectionTypeSelection
+        /// <summary>
+        /// Tracks the IDevicePortalConnectionFactory selected by the user
+        /// </summary>
         private IDevicePortalConnectionFactory connectionTypeSelection;
+
+        /// <summary>
+        /// Gets or sets the IDevicePortalConnectionFactory selected by the user
+        /// </summary>
         public IDevicePortalConnectionFactory ConnectionTypeSelection
         {
             get { return this.connectionTypeSelection; }
-            set { SetProperty(ref this.connectionTypeSelection, value); }
+            set { this.SetProperty(ref this.connectionTypeSelection, value); }
         }
         #endregion // ConnectionTypeSelection
         #endregion // Properties
@@ -156,30 +150,45 @@ public IDevicePortalConnectionFactory ConnectionTypeSelection
         #region Commands
 
         #region Connect Command
+        /// <summary>
+        /// Command to connect to the device
+        /// </summary>
         private DelegateCommand connectCommand;
+
+        /// <summary>
+        /// Gets the command for connecting with the device
+        /// </summary>
         public ICommand ConnectCommand
         {
             get
             {
-                if (connectCommand == null)
+                if (this.connectCommand == null)
                 {
-                    connectCommand = new DelegateCommand(ExecuteConnect, CanExecuteConnect);
-                    connectCommand.ObservesProperty(() => this.DeviceIP);
-                    connectCommand.ObservesProperty(() => this.UserName);
-                    connectCommand.ObservesProperty(() => this.Password);
-                    connectCommand.ObservesProperty(() => this.ConnectionTypeSelection);
+                    this.connectCommand = new DelegateCommand(this.ExecuteConnect, this.CanExecuteConnect);
+                    this.connectCommand.ObservesProperty(() => this.DeviceIP);
+                    this.connectCommand.ObservesProperty(() => this.UserName);
+                    this.connectCommand.ObservesProperty(() => this.Password);
+                    this.connectCommand.ObservesProperty(() => this.ConnectionTypeSelection);
                 }
-                return connectCommand;
+
+                return this.connectCommand;
             }
         }
 
+        /// <summary>
+        /// Performs the action of the ConnectCommand
+        /// </summary>
         private void ExecuteConnect()
         {
             IDevicePortalConnection conn = this.ConnectionTypeSelection.CreateConnection(this.DeviceIP, this.UserName, this.Password);
             DevicePortal portal = new DevicePortal(conn);
-            this.SignInAttempts?.Invoke(this, new DeviceSignInEventArgs(portal, conn));
+            this.SignInAttempted?.Invoke(this, new SignInAttemptEventArgs(portal, conn));
         }
         
+        /// <summary>
+        /// Predicate for the ConnectCommand
+        /// </summary>
+        /// <returns>Result indicates whether the ConnectCommand can execute</returns>
         private bool CanExecuteConnect()
         {
             return
@@ -193,6 +202,10 @@ private bool CanExecuteConnect()
         #endregion // Commands
 
         #region Public Methods
+        /// <summary>
+        /// Add an IDevicePortalConnnectionFactory to be presented to the user for selectoin
+        /// </summary>
+        /// <param name="factory">The factory to be added</param>
         public void AddDevicePortalConnectionFactory(IDevicePortalConnectionFactory factory)
         {
             this.ConnectionTypes.Add(factory);
@@ -200,8 +213,67 @@ public void AddDevicePortalConnectionFactory(IDevicePortalConnectionFactory fact
         #endregion // Public Methods
 
         #region Events
-        public event DeviceSignInEventHandler SignInAttempts;
+        /// <summary>
+        /// Delegate describes a method for handling SignInAttempt events
+        /// </summary>
+        /// <param name="sender">DeviceSignInViewModel that originated the event</param>
+        /// <param name="args">Event arguments</param>
+        public delegate void SignInAttemptEventHandler(DeviceSignInViewModel sender, SignInAttemptEventArgs args);
+
+        /// <summary>
+        /// The arguments for a DeviceSignInAttempt event
+        /// </summary>
+        public class SignInAttemptEventArgs : System.EventArgs
+        {
+            /// <summary>
+            /// Initializes a new instance of the <see cref="SignInAttemptEventArgs" /> class.
+            /// </summary>
+            /// <param name="portal">The DevicePortal associated with the sign in attempt</param>
+            /// <param name="conn">The IDevicePortalConnection instance associated with the sign in attempt</param>
+            internal SignInAttemptEventArgs(DevicePortal portal, IDevicePortalConnection conn)
+            {
+                this.Portal = portal;
+                this.Connection = conn;
+            }
+
+            /// <summary>
+            /// Gets the DevicePortal associated with the sign in attempt
+            /// </summary>
+            public DevicePortal Portal { get; private set; }
+
+            /// <summary>
+            ///  Gets the IDevicePortalConnection instance associated with the sign in attempt
+            /// </summary>
+            public IDevicePortalConnection Connection { get; private set; }
+        }
+
+        /// <summary>
+        /// Event fires whenever the user tries to connect to another device.
+        /// </summary>
+        public event SignInAttemptEventHandler SignInAttempted;
         #endregion // Events
+    }
 
+    /// <summary>
+    /// Interface describes a factory class for creating IDevicePortalConnection instances
+    /// </summary>
+    public interface IDevicePortalConnectionFactory
+    {
+        /// <summary>
+        /// Create an instance of IDevicePortalConnection
+        /// </summary>
+        /// <param name="address">IP address to use for connectin</param>
+        /// <param name="userName">User name to use for authenticating</param>
+        /// <param name="password">Password to use for authenticating</param>
+        /// <returns>The new IDevicePortalConnection instance</returns>
+        IDevicePortalConnection CreateConnection(
+            string address,
+            string userName,
+            SecureString password);
+
+        /// <summary>
+        /// Gets a friendly name for the IDevicePortalConnectionFactory that can be presented to the user
+        /// </summary>
+        string Name { get; }
     }
 }
diff --git a/Samples/DeviceLab/ViewModels/DiagnosticOutputViewModel.cs b/Samples/DeviceLab/ViewModels/DiagnosticOutputViewModel.cs
index baa41eea..ca86355a 100644
--- a/Samples/DeviceLab/ViewModels/DiagnosticOutputViewModel.cs
+++ b/Samples/DeviceLab/ViewModels/DiagnosticOutputViewModel.cs
@@ -1,105 +1,50 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+//----------------------------------------------------------------------------------------------
+// <copyright file="DiagnosticOutputViewModel.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+using Prism.Mvvm;
 
 namespace DeviceLab
 {
-    /// <summary>
-    /// Interface describes a destination for diagnostic output
-    /// </summary>
-    public interface IDiagnosticSink
-    {
-        void OutputDiagnosticString(string fmt, params object[] args);
-    }
-
-    /// <summary>
-    /// Discards all diagnostic output
-    /// </summary>
-    public class NullDiagnosticSink : IDiagnosticSink
-    {
-        public void OutputDiagnosticString(string fmt, params object[] args)
-        {
-        }
-    }
-
-    /// <summary>
-    /// Sends diagnostic output to the console
-    /// </summary>
-    public class ConsoleDiagnositcSink : IDiagnosticSink
-    {
-        public void OutputDiagnosticString(string fmt, params object[] args)
-        {
-            Console.Write(string.Format(fmt, args));
-        }
-    }
-
-    /// <summary>
-    /// Sends diagnostic output to the debug channel (i.e. OutputDebugString)
-    /// </summary>
-    public class DebugDiagnosticSink : IDiagnosticSink
-    {
-        public void OutputDiagnosticString(string fmt, params object[] args)
-        {
-            Debug.Write(string.Format(fmt, args));
-        }
-    }
-
-    /// <summary>
-    /// Combines several diagnostic sinks together
-    /// </summary>
-    public class AggregateDiagnosticSink : IDiagnosticSink
-    {
-        private IEnumerable<IDiagnosticSink> sinks;
-
-        public AggregateDiagnosticSink(params IDiagnosticSink[] args)
-        {
-            sinks = args;
-        }
-
-
-        public void OutputDiagnosticString(string fmt, params object[] args)
-        {
-            foreach (var diag in sinks)
-            {
-                diag.OutputDiagnosticString(fmt, args);
-            }
-        }
-    }
-
-
     /// <summary>
     /// View Model to provide diagnostic output to a view through the OutputStream string property
     /// </summary>
-    public class DiagnosticOutputViewModel : INotifyPropertyChanged, IDiagnosticSink
+    public class DiagnosticOutputViewModel : BindableBase, IDiagnosticSink
     {
         //-------------------------------------------------------------------
         //  Private Members
         //-------------------------------------------------------------------
         #region Private Members
-        private const int cMaxBufferSize = 65535;
+        /// <summary>
+        /// The maximum number of characters to store before discarding diagnostic output
+        /// </summary>
+        private const int MaxBufferSize = 65535;
         #endregion // Private Members
 
-
         //-------------------------------------------------------------------
         //  Properties
         //-------------------------------------------------------------------
         #region Properties
         #region OutputStream
-        private string mOutputStream;
+        /// <summary>
+        /// Stores the output that has already been written to the diagnostic sink
+        /// </summary>
+        private string outputStream;
+
+        /// <summary>
+        /// Gets a string that stors the output that has already been written to this diagnostic sink
+        /// </summary>
         public string OutputStream
         {
             get
             {
-                return mOutputStream;
+                return this.outputStream;
             }
 
             private set
             {
-                SetField(ref mOutputStream, value, "OutputStream");
+                this.SetProperty(ref this.outputStream, value);
             }
         }
         #endregion // OutputStream
@@ -117,8 +62,8 @@ private set
         /// <remarks>Automatically flushes the output</remarks>
         public void OutputDiagnosticString(string fmt, params object[] args)
         {
-            mOutputStream += string.Format(fmt, args);
-            FlushOutput();
+            this.outputStream += string.Format(fmt, args);
+            this.FlushOutput();
         }
         #endregion // IDiagnosticSink Implementation
 
@@ -131,33 +76,14 @@ public void OutputDiagnosticString(string fmt, params object[] args)
         /// </summary>
         private void FlushOutput()
         {
-            int len = mOutputStream.Length;
-            if (len > cMaxBufferSize)
+            int len = this.outputStream.Length;
+            if (len > MaxBufferSize)
             {
-                mOutputStream = mOutputStream.Substring(len - cMaxBufferSize);
+                this.outputStream = this.outputStream.Substring(len - MaxBufferSize);
             }
-            OnPropertyChanged("OutputStream");
-        }
-        #endregion // Private Methods
 
-        //-------------------------------------------------------------------
-        //  INotifyPropertyChanged Implementation
-        //-------------------------------------------------------------------
-        #region INotifyPropertyChanged implementation
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        protected virtual void OnPropertyChanged(string propertyName)
-        {
-            PropertyChangedEventHandler handler = PropertyChanged;
-            if (handler != null) handler(this, new PropertyChangedEventArgs(propertyName));
+            this.OnPropertyChanged("OutputStream");
         }
-        protected bool SetField<T>(ref T field, T value, string propertyName)
-        {
-            if (EqualityComparer<T>.Default.Equals(field, value)) return false;
-            field = value;
-            OnPropertyChanged(propertyName);
-            return true;
-        }
-        #endregion // INotifyPropertyChanged implementation
+        #endregion // Private Methods
     }
 }
diff --git a/Samples/DeviceLab/ViewModels/DiagnosticSinks.cs b/Samples/DeviceLab/ViewModels/DiagnosticSinks.cs
new file mode 100644
index 00000000..1c600a8d
--- /dev/null
+++ b/Samples/DeviceLab/ViewModels/DiagnosticSinks.cs
@@ -0,0 +1,110 @@
+//----------------------------------------------------------------------------------------------
+// <copyright file="DiagnosticSinks.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace DeviceLab
+{
+    /// <summary>
+    /// Several IDiagnosticSink implementations
+    /// </summary>
+    public static class DiagnosticSinks
+    {
+        /// <summary>
+        /// Discards all diagnostic output
+        /// </summary>
+        public class NullDiagnosticSink : IDiagnosticSink
+        {
+            /// <summary>
+            /// Writes formatted output to the sink
+            /// </summary>
+            /// <param name="fmt">Format string</param>
+            /// <param name="args">Format args</param>
+            public void OutputDiagnosticString(string fmt, params object[] args)
+            {
+            }
+        }
+
+        /// <summary>
+        /// Sends diagnostic output to the console
+        /// </summary>
+        public class ConsoleDiagnositcSink : IDiagnosticSink
+        {
+            /// <summary>
+            /// Writes formatted output to the sink
+            /// </summary>
+            /// <param name="fmt">Format string</param>
+            /// <param name="args">Format args</param>
+            public void OutputDiagnosticString(string fmt, params object[] args)
+            {
+                Console.Write(string.Format(fmt, args));
+            }
+        }
+
+        /// <summary>
+        /// Sends diagnostic output to the debug channel (i.e. OutputDebugString)
+        /// </summary>
+        public class DebugDiagnosticSink : IDiagnosticSink
+        {
+            /// <summary>
+            /// Writes formatted output to the sink
+            /// </summary>
+            /// <param name="fmt">Format string</param>
+            /// <param name="args">Format args</param>
+            public void OutputDiagnosticString(string fmt, params object[] args)
+            {
+                Debug.Write(string.Format(fmt, args));
+            }
+        }
+
+        /// <summary>
+        /// Combines several diagnostic sinks together
+        /// </summary>
+        public class AggregateDiagnosticSink : IDiagnosticSink
+        {
+            /// <summary>
+            /// The diagnostic sinks that are aggregated together
+            /// </summary>
+            private IEnumerable<IDiagnosticSink> sinks;
+
+            /// <summary>
+            /// Initializes a new instance of the <see cref="AggregateDiagnosticSink" /> class.
+            /// </summary>
+            /// <param name="args">Collection of diagnostic sinks to aggregate together</param>
+            public AggregateDiagnosticSink(params IDiagnosticSink[] args)
+            {
+                this.sinks = args;
+            }
+
+            /// <summary>
+            /// Writes formatted output to the sink
+            /// </summary>
+            /// <param name="fmt">Format string</param>
+            /// <param name="args">Format args</param>
+            public void OutputDiagnosticString(string fmt, params object[] args)
+            {
+                foreach (var diag in this.sinks)
+                {
+                    diag.OutputDiagnosticString(fmt, args);
+                }
+            }
+        }
+    }
+
+    /// <summary>
+    /// Interface describes a destination for diagnostic output
+    /// </summary>
+    public interface IDiagnosticSink
+    {
+        /// <summary>
+        /// Writes formatted output to the sink
+        /// </summary>
+        /// <param name="fmt">Format string</param>
+        /// <param name="args">Format args</param>
+        void OutputDiagnosticString(string fmt, params object[] args);
+    }
+}
diff --git a/Samples/DeviceLab/ViewModels/GenericDevicePortalConnectionFactory.cs b/Samples/DeviceLab/ViewModels/GenericDevicePortalConnectionFactory.cs
new file mode 100644
index 00000000..90ac610b
--- /dev/null
+++ b/Samples/DeviceLab/ViewModels/GenericDevicePortalConnectionFactory.cs
@@ -0,0 +1,36 @@
+//----------------------------------------------------------------------------------------------
+// <copyright file="GenericDevicePortalConnectionFactory.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+using System.Security;
+using Microsoft.Tools.WindowsDevicePortal;
+
+namespace DeviceLab
+{
+    /// <summary>
+    /// Fractory creates a generic IDevicePortalConnection instance
+    /// </summary>
+    public class GenericDevicePortalConnectionFactory : IDevicePortalConnectionFactory
+    {
+        /// <summary>
+        /// Gets a friendly name for the GenericDevicePortalConnectionFactory that can be presented to the user
+        /// </summary>
+        public string Name
+        {
+            get { return "Generic Device"; }
+        }
+
+        /// <summary>
+        /// Create an instance of GenericDevicePortalConnectionFactory
+        /// </summary>
+        /// <param name="address">IP address to use for connectin</param>
+        /// <param name="userName">User name to use for authenticating</param>
+        /// <param name="password">Password to use for authenticating</param>
+        /// <returns>The new IDevicePortalConnection instance</returns>
+        public IDevicePortalConnection CreateConnection(string address, string userName, SecureString password)
+        {
+            return new DefaultDevicePortalConnection(address, userName, password);
+        }
+    }
+}
diff --git a/Samples/DeviceLab/ViewModels/MainViewModel.cs b/Samples/DeviceLab/ViewModels/MainViewModel.cs
index 55e697ee..a652cce4 100644
--- a/Samples/DeviceLab/ViewModels/MainViewModel.cs
+++ b/Samples/DeviceLab/ViewModels/MainViewModel.cs
@@ -1,134 +1,181 @@
-using Prism.Commands;
-using Prism.Mvvm;
+//----------------------------------------------------------------------------------------------
+// <copyright file="MainViewModel.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.Windows.Input;
 using System.Collections.Specialized;
-using System.Collections;
 using System.ComponentModel;
-using System;
+using System.Windows.Input;
 using Microsoft.Tools.WindowsDevicePortal;
+using Prism.Commands;
+using Prism.Mvvm;
 
 namespace DeviceLab
 {
+    /// <summary>
+    /// View model for the main view.
+    /// </summary>
     public class MainViewModel : BindableBase
     {
         //-------------------------------------------------------------------
         //  Constructors
         //-------------------------------------------------------------------
         #region Constructors
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MainViewModel" /> class.
+        /// </summary>
         public MainViewModel()
         {
-            Diagnostics = new DiagnosticOutputViewModel();
+            this.Diagnostics = new DiagnosticOutputViewModel();
 
-            DebugDiagnosticSink debugDiags = new DebugDiagnosticSink();
-            AggregateDiagnosticSink aggDiags = new AggregateDiagnosticSink(Diagnostics, debugDiags);
+            DiagnosticSinks.DebugDiagnosticSink debugDiags = new DiagnosticSinks.DebugDiagnosticSink();
+            DiagnosticSinks.AggregateDiagnosticSink aggDiags = new DiagnosticSinks.AggregateDiagnosticSink(this.Diagnostics, debugDiags);
 
             this.SignIn = new DeviceSignInViewModel(aggDiags);
             this.SignIn.AddDevicePortalConnectionFactory(new XboxDevicePortalConnectionFactory());
             this.SignIn.AddDevicePortalConnectionFactory(new GenericDevicePortalConnectionFactory());
 
-            this.SignIn.SignInAttempts += OnSignInAttemptCompleted;
+            this.SignIn.SignInAttempted += this.OnSignInAttemptCompleted;
 
-            this.ConnectedDevices.CollectionChanged += OnConnectedDevicesChanged;
+            this.ConnectedDevices.CollectionChanged += this.OnConnectedDevicesChanged;
         }
         #endregion // Constructors
         
-        private void OnSignInAttemptCompleted(DeviceSignInViewModel sender, DeviceSignInEventArgs args)
+        /// <summary>
+        /// Handler for SignInAttempt events
+        /// </summary>
+        /// <param name="sender">DeviceSignInViewModel originating the event</param>
+        /// <param name="args">Arguments for the event</param>
+        private void OnSignInAttemptCompleted(DeviceSignInViewModel sender, DeviceSignInViewModel.SignInAttemptEventArgs args)
         {
             DevicePortal portal = args.Portal;
             // See if the device is already in the list
             foreach (DevicePortalViewModel dpvm in this.ConnectedDevices)
             {
-                if(dpvm.Address == portal.Address)
+                if (dpvm.Address == portal.Address)
                 {
                     this.Diagnostics.OutputDiagnosticString("[!!] The device with address {0} is already in the list\n", portal.Address);
                     return;
                 }
             }
 
-            this.ConnectedDevices.Add(new DevicePortalViewModel(args.Portal, Diagnostics));
+            this.ConnectedDevices.Add(new DevicePortalViewModel(args.Portal, this.Diagnostics));
         }
 
         //-------------------------------------------------------------------
         //  Properties
         //-------------------------------------------------------------------
         #region Properties
+        /// <summary>
+        /// Gets the diagnostic sink for this view model
+        /// </summary>
         public DiagnosticOutputViewModel Diagnostics { get; private set; }
+
+        /// <summary>
+        /// Gets the ViewModel for the sign-in portion of the user experience
+        /// </summary>
         public DeviceSignInViewModel SignIn { get; private set; }
 
         #region Connected Devices
+        /// <summary>
+        /// Collection of view models for devices that have been connected to
+        /// </summary>
         private ObservableCollection<DevicePortalViewModel> connectedDevices;
+
+        /// <summary>
+        /// Gets the collection of view models for the connected devices
+        /// </summary>
         public ObservableCollection<DevicePortalViewModel> ConnectedDevices
         {
             get
             {
-                if(this.connectedDevices == null)
+                if (this.connectedDevices == null)
                 {
                     this.connectedDevices = new ObservableCollection<DevicePortalViewModel>();
-                    OnPropertyChanged("ConnectedDevices");
+                    this.OnPropertyChanged("ConnectedDevices");
                 }
+
                 return this.connectedDevices;
             }
         }
         #endregion // Connected Devices
 
         #region SelectedDevices
+        /// <summary>
+        /// Subset of the collection of connected devices that have been selected by the user
+        /// </summary>
         private IList selectedDevices;
+
+        /// <summary>
+        /// Gets or sets the subset of connected devices that have been selected by the user.
+        /// </summary>
         public IList SelectedDevices
         {
             get
             {
-                if(selectedDevices == null)
+                if (this.selectedDevices == null)
                 {
-                    selectedDevices = new List<DevicePortalViewModel>();
+                    this.selectedDevices = new List<DevicePortalViewModel>();
                 }
-                return selectedDevices;
+
+                return this.selectedDevices;
             }
 
             set
             {
                 // This will be called when the contents of the list change without changing
                 // the actual list itself (i.e. same list, but different contents)
-                if(this.selectedDevices != value)
+                if (this.selectedDevices != value)
                 {
                     this.selectedDevices = value;
                 }
+
                 // We always want to fire the event to handle the case when contents change
-                OnPropertyChanged("SelectedDevices");
+                this.OnPropertyChanged("SelectedDevices");
             }
         }
         #endregion // SelectedDevices
 
         #region SomeDevicesReady
+        /// <summary>
+        /// Gets a value indicating whether some of the devices in the ConnectedDevices collection are ready
+        /// </summary>
         public bool SomeDevicesReady
         {
             get
             {
-                foreach(DevicePortalViewModel dpvm in ConnectedDevices)
+                foreach (DevicePortalViewModel dpvm in this.ConnectedDevices)
                 {
-                    if(dpvm.Ready)
+                    if (dpvm.Ready)
                     {
                         return true;
                     }
                 }
+
                 return false;
             }
         }
         #endregion // SomeDevicesReady
 
         #region AllDevicesReady
+        /// <summary>
+        /// Gets a value indicating whether all of the devices in the ConnectedDevices collection are ready
+        /// </summary>
         public bool AllDevicesReady
         {
             get
             {
-                foreach(DevicePortalViewModel dpvm in ConnectedDevices)
+                foreach (DevicePortalViewModel dpvm in this.ConnectedDevices)
                 {
-                    if(!dpvm.Ready)
+                    if (!dpvm.Ready)
                     {
                         return false;
                     }
                 }
+
                 return true;
             }
         }
@@ -140,60 +187,91 @@ public bool AllDevicesReady
         //-------------------------------------------------------------------
         #region Commands
         #region SelectAllDevicesCommand
+        /// <summary>
+        /// Command to select all connected devices
+        /// </summary>
         private DelegateCommand selectAllDevicesCommand;
+
+        /// <summary>
+        /// Gets the command to select all connected devices
+        /// </summary>
         public ICommand SelectAllDevicesCommand
         {
             get
             {
-                if(this.selectAllDevicesCommand == null)
+                if (this.selectAllDevicesCommand == null)
                 {
-                    this.selectAllDevicesCommand = new DelegateCommand(ExecuteSelectAllDevices, CanExecuteSelectAllDevices);
-                    this.selectAllDevicesCommand.ObservesProperty(() => SomeDevicesReady);
-                    this.selectAllDevicesCommand.ObservesProperty(() => SelectedDevices);
+                    this.selectAllDevicesCommand = new DelegateCommand(this.ExecuteSelectAllDevices, this.CanExecuteSelectAllDevices);
+                    this.selectAllDevicesCommand.ObservesProperty(() => this.SomeDevicesReady);
+                    this.selectAllDevicesCommand.ObservesProperty(() => this.SelectedDevices);
                 }
+
                 return this.selectAllDevicesCommand;
             }
         }
 
+        /// <summary>
+        /// Predicate for the SeletAllDevices command
+        /// </summary>
+        /// <returns>Result indicates whether the command can execute</returns>
         private bool CanExecuteSelectAllDevices()
         {
             return this.SomeDevicesReady && (this.SelectedDevices.Count < this.ConnectedDevices.Count);
         }
 
+        /// <summary>
+        /// Performs the action for the SelectAllDevices command
+        /// </summary>
         private void ExecuteSelectAllDevices()
         {
             List<DevicePortalViewModel> newSelection = new List<DevicePortalViewModel>();
-            foreach(DevicePortalViewModel dpvm in this.ConnectedDevices)
+            foreach (DevicePortalViewModel dpvm in this.ConnectedDevices)
             {
                 if (dpvm.Ready)
                 {
                     newSelection.Add(dpvm);
                 }
             }
+
             this.SelectedDevices = newSelection;
         }
         #endregion // SelectAllDevicesCommand
 
         #region UnSelectAllDevicesCommand
+        /// <summary>
+        /// Command to un-select all the devices
+        /// </summary>
         private DelegateCommand unSelectAllDevicesCommand;
+
+        /// <summary>
+        /// Gets the command to un-select all the devices
+        /// </summary>
         public ICommand UnSelectAllDevicesCommand
         {
             get
             {
-                if(this.unSelectAllDevicesCommand == null)
+                if (this.unSelectAllDevicesCommand == null)
                 {
-                    this.unSelectAllDevicesCommand = new DelegateCommand(ExecuteUnSelectAllDevices, CanExecuteUnSelectAllDevices);
-                    this.unSelectAllDevicesCommand.ObservesProperty(() => SelectedDevices);
+                    this.unSelectAllDevicesCommand = new DelegateCommand(this.ExecuteUnSelectAllDevices, this.CanExecuteUnSelectAllDevices);
+                    this.unSelectAllDevicesCommand.ObservesProperty(() => this.SelectedDevices);
                 }
+
                 return this.unSelectAllDevicesCommand;
             }
         }
 
+        /// <summary>
+        /// Predicate for the UnSelectAllDevices command
+        /// </summary>
+        /// <returns>Result indicates whether the command can excecute</returns>
         private bool CanExecuteUnSelectAllDevices()
         {
             return this.SelectedDevices.Count > 0;
         }
 
+        /// <summary>
+        /// Performs the action of the UnSelectAllDevices command
+        /// </summary>
         private void ExecuteUnSelectAllDevices()
         {
             this.SelectedDevices = new List<DevicePortalViewModel>();
@@ -201,39 +279,54 @@ private void ExecuteUnSelectAllDevices()
         #endregion // UnSelectAllDevicesCommand
 
         #region RebootSelectedDevicesCommand
+        /// <summary>
+        /// Command to reboot all the selected devices
+        /// </summary>
         private DelegateCommand rebootSelectedDevicesCommand;
+
+        /// <summary>
+        /// Gets the command to reboot all the selected devices
+        /// </summary>
         public ICommand RebootSelectedDevicesCommand
         {
             get
             {
-                if(this.rebootSelectedDevicesCommand == null)
+                if (this.rebootSelectedDevicesCommand == null)
                 {
-                    this.rebootSelectedDevicesCommand = new DelegateCommand(ExecuteRebootSelectedDevices, CanExecuteRebootSelectedDevices);
+                    this.rebootSelectedDevicesCommand = new DelegateCommand(this.ExecuteRebootSelectedDevices, this.CanExecuteRebootSelectedDevices);
                     this.rebootSelectedDevicesCommand.ObservesProperty(() => this.SelectedDevices);
                 }
-                return rebootSelectedDevicesCommand;
+
+                return this.rebootSelectedDevicesCommand;
             }
         }
 
+        /// <summary>
+        /// Predicate for the command to reboot all the devices
+        /// </summary>
+        /// <returns>Result indicates whether the command can execute.</returns>
         private bool CanExecuteRebootSelectedDevices()
         {
             return this.SelectedDevices.Count > 0;
         }
 
+        /// <summary>
+        /// Performs the action of the RebootSelectedDevices command
+        /// </summary>
         private void ExecuteRebootSelectedDevices()
         {
             // When devices become busy, they will be reomoved from the selected devices collection.
             // So, make a local copy of the devices we want to reboot:
             List<DevicePortalViewModel> rebootList = new List<DevicePortalViewModel>();
-            foreach(DevicePortalViewModel dpvm in this.SelectedDevices)
+            foreach (DevicePortalViewModel dpvm in this.SelectedDevices)
             {
-                if(dpvm.RebootCommand.CanExecute(this))
+                if (dpvm.RebootCommand.CanExecute(this))
                 {
                     rebootList.Add(dpvm);
                 }
             }
 
-            foreach(DevicePortalViewModel dpvm in rebootList)
+            foreach (DevicePortalViewModel dpvm in rebootList)
             {
                 dpvm.RebootCommand.Execute(this);
             }
@@ -241,25 +334,38 @@ private void ExecuteRebootSelectedDevices()
         #endregion // RebootSelectedDevicesCommand
 
         #region RemoveDeviceCommand
+        /// <summary>
+        /// Command to remove a device from the collection of connected devices
+        /// </summary>
+        private DelegateCommand<object> removeDeviceCommand;
         // NOTE: Ideally, the template parameter would be DevicePortalViewMOdel, rather than object.
         // Unfortunately, this would sporadically throw an invalid cast exception from within the
         // DelegateCommand<> constructor in the PRISM library. Apparently, the object passed to the
         // constructor cannot always be cast to something that would rightfully belong to the 
         // collection. 
-        private DelegateCommand<object> removeDeviceCommand;
+
+        /// <summary>
+        /// Gets the command that removes a device from the collection of connected devices
+        /// </summary>
         public ICommand RemoveDeviceCommand
         {
             get
             {
-                if(this.removeDeviceCommand == null)
+                if (this.removeDeviceCommand == null)
                 {
-                    this.removeDeviceCommand = new DelegateCommand<object>(ExecuteRemoveDeviceCommand, CanExecuteRemoveDeviceCommand);
-                    this.removeDeviceCommand.ObservesProperty(() => SomeDevicesReady);
+                    this.removeDeviceCommand = new DelegateCommand<object>(this.ExecuteRemoveDeviceCommand, this.CanExecuteRemoveDeviceCommand);
+                    this.removeDeviceCommand.ObservesProperty(() => this.SomeDevicesReady);
                 }
+
                 return this.removeDeviceCommand;
             }
         }
 
+        /// <summary>
+        /// Predicate for the RemoveDevice command
+        /// </summary>
+        /// <param name="arg">The device to be removed from the collection</param>
+        /// <returns>Result indicates whether the command can execute</returns>
         private bool CanExecuteRemoveDeviceCommand(object arg)
         {
             DevicePortalViewModel dpvm = arg as DevicePortalViewModel;
@@ -267,9 +373,14 @@ private bool CanExecuteRemoveDeviceCommand(object arg)
             {
                 return dpvm.Ready;
             }
+
             return false;
         }
 
+        /// <summary>
+        /// Peform the action for the RemoveDevice command
+        /// </summary>
+        /// <param name="obj">The device to be removed from the collection of connected devices</param>
         private void ExecuteRemoveDeviceCommand(object obj)
         {
             DevicePortalViewModel dpvm = obj as DevicePortalViewModel;
@@ -281,6 +392,11 @@ private void ExecuteRemoveDeviceCommand(object obj)
         #endregion // RemoveDeviceCommand
         #endregion // Commands
 
+        /// <summary>
+        /// Handle changes to the collection of connected devices
+        /// </summary>
+        /// <param name="sender">Object that originated the event</param>
+        /// <param name="e">Parameters for the event</param>
         private void OnConnectedDevicesChanged(object sender, NotifyCollectionChangedEventArgs e)
         {
             if (e.Action == NotifyCollectionChangedAction.Add)
@@ -289,25 +405,29 @@ private void OnConnectedDevicesChanged(object sender, NotifyCollectionChangedEve
                 {
                     foreach (DevicePortalViewModel dpvm in e.NewItems)
                     {
-                        OnDeviceAdded(dpvm);
+                        this.OnDeviceAdded(dpvm);
                     }
                 }
             }
             else if (e.Action == NotifyCollectionChangedAction.Remove)
             {
-                if(e.OldItems != null)
+                if (e.OldItems != null)
                 {
-                    foreach(DevicePortalViewModel dpvm in e.OldItems)
+                    foreach (DevicePortalViewModel dpvm in e.OldItems)
                     {
-                        OnDeviceRemoved(dpvm);
+                        this.OnDeviceRemoved(dpvm);
                     }
                 }
             }
         }
 
+        /// <summary>
+        /// Perform additional initialization on a device that has been newly added to the collection of connected devices
+        /// </summary>
+        /// <param name="dpvm">The device that has been added</param>
         private void OnDeviceAdded(DevicePortalViewModel dpvm)
         {
-            dpvm.PropertyChanged += DevicePropertyChanged;
+            dpvm.PropertyChanged += this.DevicePropertyChanged;
 
             CommandSequence cmdSeq = dpvm.CreateCommandSequence();
             cmdSeq.RegisterCommand(dpvm.ReestablishConnectionCommand);
@@ -316,36 +436,46 @@ private void OnDeviceAdded(DevicePortalViewModel dpvm)
             cmdSeq.Execute(null);
         }
 
+        /// <summary>
+        /// Tidy up a device that has just been removed from the collection of connected devices
+        /// </summary>
+        /// <param name="dpvm">The device just removed</param>
         private void OnDeviceRemoved(DevicePortalViewModel dpvm)
         {
-            dpvm.PropertyChanged -= DevicePropertyChanged;
-            if(dpvm.StopListeningForSystemPerfCommand.CanExecute(this))
+            dpvm.PropertyChanged -= this.DevicePropertyChanged;
+            if (dpvm.StopListeningForSystemPerfCommand.CanExecute(this))
             {
                 dpvm.StopListeningForSystemPerfCommand.Execute(this);
             }
         }
 
+        /// <summary>
+        /// Event handler to monitor property changes on each of the elements in the collection of connected devices
+        /// </summary>
+        /// <param name="sender">Device that originated the event</param>
+        /// <param name="e">The arguments for the event</param>
         private void DevicePropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if(e.PropertyName == "Ready")
+            if (e.PropertyName == "Ready")
             {
                 DevicePortalViewModel dpvmSender = sender as DevicePortalViewModel;
                 if (dpvmSender != null && !dpvmSender.Ready)
                 { 
                     // A device is no-longer ready, so remove it from the current selection
                     List<DevicePortalViewModel> updatedSelection = new List<DevicePortalViewModel>();
-                    foreach(DevicePortalViewModel dpvm in this.SelectedDevices)
+                    foreach (DevicePortalViewModel dpvm in this.SelectedDevices)
                     {
-                        if(dpvm.Ready)
+                        if (dpvm.Ready)
                         {
                             updatedSelection.Add(dpvm);
                         }
                     }
+
                     this.SelectedDevices = updatedSelection;
                 }
 
-                OnPropertyChanged("SomeDevicesReady");
-                OnPropertyChanged("AllDevicesReady");
+                this.OnPropertyChanged("SomeDevicesReady");
+                this.OnPropertyChanged("AllDevicesReady");
             }
         }
     }
diff --git a/Samples/DeviceLab/ViewModels/ObservableCommandQueue.cs b/Samples/DeviceLab/ViewModels/ObservableCommandQueue.cs
new file mode 100644
index 00000000..cad0cec6
--- /dev/null
+++ b/Samples/DeviceLab/ViewModels/ObservableCommandQueue.cs
@@ -0,0 +1,108 @@
+//----------------------------------------------------------------------------------------------
+// <copyright file="ObservableCommandQueue.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Windows.Input;
+
+namespace DeviceLab
+{
+    /// <summary>
+    /// A simple queue of commands that provides notifications whenever the contents changed.
+    /// </summary>
+    public class ObservableCommandQueue
+    {
+        /// <summary>
+        /// Underlying Queue for the commands
+        /// </summary>
+        private Queue<ICommand> commands;
+
+        //-------------------------------------------------------------------
+        // Constructor
+        //-------------------------------------------------------------------
+        #region Constructor
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ObservableCommandQueue" /> class.
+        /// </summary>
+        public ObservableCommandQueue()
+        {
+            this.commands = new Queue<ICommand>();
+        }
+        #endregion
+
+        //-------------------------------------------------------------------
+        // Queue Operations
+        //-------------------------------------------------------------------
+        #region Queue Operations
+        /// <summary>
+        /// Gets the Count of elements contained in the queue
+        /// </summary>
+        public int Count
+        {
+            get
+            {
+                return this.commands.Count;
+            }
+        }
+
+        /// <summary>
+        /// Clears all elements from the queue
+        /// </summary>
+        public void Clear()
+        {
+            this.commands.Clear();
+            this.OnQueueChanged();
+        }
+
+        /// <summary>
+        /// Retrieves the element at the front of the queue without modifying the contents of the queue
+        /// </summary>
+        /// <returns>The element at the front of the queue</returns>
+        public ICommand Peek()
+        {
+            return this.commands.Peek();
+        }
+
+        /// <summary>
+        /// Inserts a new element at the back of the queue
+        /// </summary>
+        /// <param name="cmd">The new element to be inserted</param>
+        public void Enqueue(ICommand cmd)
+        {
+            this.commands.Enqueue(cmd);
+            this.OnQueueChanged();
+        }
+
+        /// <summary>
+        /// Removes the element at the front of the queue
+        /// </summary>
+        /// <returns>The element that was removed from the front of the queue</returns>
+        public ICommand Dequeue()
+        {
+            ICommand cmd = this.commands.Dequeue();
+            this.OnQueueChanged();
+            return cmd;
+        }
+        #endregion // Queue Operations
+
+        //-------------------------------------------------------------------
+        // QueueChanged Event
+        //-------------------------------------------------------------------
+        #region QueueChanged Event
+        /// <summary>
+        /// Event for when there are changes to the queue's contents
+        /// </summary>
+        public event EventHandler QueueChanged;
+
+        /// <summary>
+        /// Invokes the QueueChanged event
+        /// </summary>
+        private void OnQueueChanged()
+        {
+            this.QueueChanged?.Invoke(this, new EventArgs());
+        }
+        #endregion // QueueChanged Event
+    }
+}
diff --git a/Samples/DeviceLab/ViewModels/XboxDevicePortalConnectionFactory.cs b/Samples/DeviceLab/ViewModels/XboxDevicePortalConnectionFactory.cs
new file mode 100644
index 00000000..52da03a8
--- /dev/null
+++ b/Samples/DeviceLab/ViewModels/XboxDevicePortalConnectionFactory.cs
@@ -0,0 +1,39 @@
+//----------------------------------------------------------------------------------------------
+// <copyright file="XboxDevicePortalConnectionFactory.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+using System.Security;
+using Microsoft.Tools.WindowsDevicePortal;
+
+namespace DeviceLab
+{
+    /// <summary>
+    /// Factory creates an IDevicePortalConnection instance that is specific to Xbox One devices
+    /// </summary>
+    public class XboxDevicePortalConnectionFactory : IDevicePortalConnectionFactory
+    {
+        /// <summary>
+        /// Gets a friendly name for the XboxDevicePortalConnectionFactory that can be presented to the user
+        /// </summary>
+        public string Name
+        {
+            get { return "Xbox One"; }
+        }
+
+        /// <summary>
+        /// Create an instance of XboxDevicePortalConnectionFactory
+        /// </summary>
+        /// <param name="address">IP address to use for connectin</param>
+        /// <param name="userName">User name to use for authenticating</param>
+        /// <param name="password">Password to use for authenticating</param>
+        /// <returns>The new IDevicePortalConnection instance</returns>
+        public IDevicePortalConnection CreateConnection(
+            string address,
+            string userName,
+            SecureString password)
+        {
+            return new XboxDevicePortalConnection(address, userName, password);
+        }
+    }
+}
diff --git a/Samples/DeviceLab/Views/BindablePassword.xaml.cs b/Samples/DeviceLab/Views/BindablePassword.xaml.cs
deleted file mode 100644
index 2cf6964e..00000000
--- a/Samples/DeviceLab/Views/BindablePassword.xaml.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System.Security;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace DeviceLab
-{
-    /// <summary>
-    /// Interaction logic for BindablePassword.xaml
-    /// </summary>
-    public partial class BindablePassword : UserControl
-    {
-        public SecureString Password
-        {
-            get
-            {
-                return (SecureString)GetValue(PasswordProperty);
-            }
-            set
-            {
-                SetValue(PasswordProperty, value);
-            }
-        }
-
-        public static readonly DependencyProperty PasswordProperty =
-        DependencyProperty.Register("Password", typeof(SecureString), typeof(BindablePassword),
-            new PropertyMetadata(default(SecureString)));
-
-        public BindablePassword()
-        {
-            InitializeComponent();
-        }
-
-        private void PasswordBox_PasswordChanged(object sender, RoutedEventArgs e)
-        {
-            Password = ((PasswordBox)sender).SecurePassword;
-        }
-    }
-}
diff --git a/Samples/DeviceLab/Views/DeviceCollectionView.xaml.cs b/Samples/DeviceLab/Views/DeviceCollectionView.xaml.cs
index 33ec7f38..1c25690e 100644
--- a/Samples/DeviceLab/Views/DeviceCollectionView.xaml.cs
+++ b/Samples/DeviceLab/Views/DeviceCollectionView.xaml.cs
@@ -1,17 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
+//----------------------------------------------------------------------------------------------
+// <copyright file="DeviceCollectionView.xaml.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace DeviceLab
 {
@@ -20,11 +13,19 @@ namespace DeviceLab
     /// </summary>
     public partial class DeviceCollectionView : UserControl
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DeviceCollectionView" /> class.
+        /// </summary>
         public DeviceCollectionView()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
 
+        /// <summary>
+        /// Eats any mouse clicks so that they won't be handled by the ListBox control
+        /// </summary>
+        /// <param name="sender">Object that originated the event</param>
+        /// <param name="e">Arguments for the event</param>
         private void EatMouseClicks(object sender, MouseButtonEventArgs e)
         {
             e.Handled = true;
diff --git a/Samples/DeviceLab/Views/DeviceSignInView.xaml.cs b/Samples/DeviceLab/Views/DeviceSignInView.xaml.cs
index 8e0cb238..1e07e1e1 100644
--- a/Samples/DeviceLab/Views/DeviceSignInView.xaml.cs
+++ b/Samples/DeviceLab/Views/DeviceSignInView.xaml.cs
@@ -1,4 +1,9 @@
-using System.Windows.Controls;
+//----------------------------------------------------------------------------------------------
+// <copyright file="DeviceSignInView.xaml.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+using System.Windows.Controls;
 
 namespace DeviceLab
 {
@@ -7,9 +12,12 @@ namespace DeviceLab
     /// </summary>
     public partial class DeviceSignInView : UserControl
     {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DeviceSignInView" /> class.
+        /// </summary>
         public DeviceSignInView()
         {
-            InitializeComponent();
+            this.InitializeComponent();
         }
     }
 }
diff --git a/Samples/DeviceLab/XboxDevicePortalConnection.cs b/Samples/DeviceLab/XboxDevicePortalConnection.cs
index 05499818..4bf07e89 100644
--- a/Samples/DeviceLab/XboxDevicePortalConnection.cs
+++ b/Samples/DeviceLab/XboxDevicePortalConnection.cs
@@ -1,4 +1,9 @@
-using System;
+//----------------------------------------------------------------------------------------------
+// <copyright file="XboxDevicePortalConnection.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+using System;
 using System.Net;
 using System.Security;
 using System.Security.Cryptography.X509Certificates;
@@ -7,6 +12,9 @@
 
 namespace Microsoft.Tools.WindowsDevicePortal
 {
+    /// <summary>
+    /// IDevicePortalConnection implementation for Xbox One devices
+    /// </summary>
     public class XboxDevicePortalConnection : IDevicePortalConnection
     {
         /// <summary>
@@ -123,6 +131,9 @@ public string QualifiedName
             set;
         }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether cert overrides should be allowed.
+        /// </summary>
         public bool AllowCertOverride
         {
             get

From 99007d85fd8a3f919da44ca4ffc1da3d91ae0d11 Mon Sep 17 00:00:00 2001
From: Greg Pettyjohn <grpettyj@microsoft.com>
Date: Mon, 12 Sep 2016 10:05:52 -0700
Subject: [PATCH 10/51] Committing before merging changes from upstream

---
 Samples/DeviceLab/DeviceLab.csproj            |   2 -
 .../ViewModels/DevicePortalCommandModel.cs    |  10 +-
 .../ViewModels/DevicePortalViewModel.cs       |  86 +++++---
 Samples/DeviceLab/ViewModels/MainViewModel.cs |   1 -
 .../XboxDevicePortalConnectionFactory.cs      |  39 ----
 .../DeviceLab/XboxDevicePortalConnection.cs   | 196 ------------------
 .../DefaultDevicePortalConnection.cs          |   3 +-
 7 files changed, 66 insertions(+), 271 deletions(-)
 delete mode 100644 Samples/DeviceLab/ViewModels/XboxDevicePortalConnectionFactory.cs
 delete mode 100644 Samples/DeviceLab/XboxDevicePortalConnection.cs

diff --git a/Samples/DeviceLab/DeviceLab.csproj b/Samples/DeviceLab/DeviceLab.csproj
index ffe46f14..0303255c 100644
--- a/Samples/DeviceLab/DeviceLab.csproj
+++ b/Samples/DeviceLab/DeviceLab.csproj
@@ -64,7 +64,6 @@
     <Compile Include="ViewModels\DiagnosticSinks.cs" />
     <Compile Include="ViewModels\GenericDevicePortalConnectionFactory.cs" />
     <Compile Include="ViewModels\ObservableCommandQueue.cs" />
-    <Compile Include="ViewModels\XboxDevicePortalConnectionFactory.cs" />
     <Compile Include="Views\DeviceCollectionView.xaml.cs">
       <DependentUpon>DeviceCollectionView.xaml</DependentUpon>
     </Compile>
@@ -78,7 +77,6 @@
       <DependentUpon>NumberEntryBox.xaml</DependentUpon>
     </Compile>
     <Compile Include="Controls\SelectionListBox.cs" />
-    <Compile Include="XboxDevicePortalConnection.cs" />
     <Page Include="Controls\BindablePassword.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/Samples/DeviceLab/ViewModels/DevicePortalCommandModel.cs b/Samples/DeviceLab/ViewModels/DevicePortalCommandModel.cs
index 89ac9c15..c4567cd8 100644
--- a/Samples/DeviceLab/ViewModels/DevicePortalCommandModel.cs
+++ b/Samples/DeviceLab/ViewModels/DevicePortalCommandModel.cs
@@ -11,9 +11,9 @@ namespace DeviceLab
 {
     /// <summary>
     /// Base class for ViewModel classes that wrap a DevicePortal object.
-    /// Provides status for pending DevicePortal operations and an
-    /// ObservableCommandQueue to enable composing commands using
-    /// CommandSequences.
+    /// Provides status for pending DevicePortal operations, diagnostic
+    /// output support, an ObservableCommandQueue to enable composing
+    /// commands using CommandSequences, etc.
     /// </summary>
     public class DevicePortalCommandModel : BindableBase
     {
@@ -231,8 +231,8 @@ protected virtual void OutputDiagnosticString(string fmt, params object[] args)
         protected virtual void ReportException(string commandName, Exception exn)
         {
             this.OutputDiagnosticString("Exception during {0} command:\n", commandName);
-            this.OutputDiagnosticString(exn.Message);
-            this.OutputDiagnosticString(exn.StackTrace);
+            this.OutputDiagnosticString(exn.Message + "\n");
+            this.OutputDiagnosticString(exn.StackTrace + "\n");
 
             // Clear the command queue to prevent executing any more commands
             this.OutputDiagnosticString("Clearing any queued commands\n");
diff --git a/Samples/DeviceLab/ViewModels/DevicePortalViewModel.cs b/Samples/DeviceLab/ViewModels/DevicePortalViewModel.cs
index 6ef94272..6165c8b2 100644
--- a/Samples/DeviceLab/ViewModels/DevicePortalViewModel.cs
+++ b/Samples/DeviceLab/ViewModels/DevicePortalViewModel.cs
@@ -9,6 +9,9 @@
 using System.Windows.Input;
 using Microsoft.Tools.WindowsDevicePortal;
 using Prism.Commands;
+using System.Security.Cryptography.X509Certificates;
+using System.Windows;
+using System.Net.Security;
 
 namespace DeviceLab
 {
@@ -29,7 +32,11 @@ public class DevicePortalViewModel : DevicePortalCommandModel
         public DevicePortalViewModel(DevicePortal portal, IDiagnosticSink diags)
             : base(portal, diags)
         {
-            this.ConnectionRetryAttempts = 5;
+            // Add additional handling for untrusted certs.
+            this.Portal.UnvalidatedCert += DoCertValidation;
+
+            // Default number of retry attempts to make when reestablishing the connection
+            this.ConnectionRetryAttempts = 3;
         }
         #endregion // Cosntructors
 
@@ -383,6 +390,7 @@ private async Task ExecuteReestablishConnectionAsync()
                     this.OutputDiagnosticString("Connection failed after {0} tries.\n", numTries);
                 }
             };
+
             this.Portal.ConnectionStatus += handler;
 
             this.Ready = false;
@@ -393,7 +401,12 @@ private async Task ExecuteReestablishConnectionAsync()
                     await this.Portal.Connect();
                     ++numTries;
                 }
-                while (this.Portal.ConnectionHttpStatusCode != HttpStatusCode.OK && numTries < this.ConnectionRetryAttempts);
+                while (this.Portal.ConnectionHttpStatusCode != HttpStatusCode.OK && numTries <= this.ConnectionRetryAttempts);
+
+                if(this.Portal.ConnectionHttpStatusCode !=HttpStatusCode.OK)
+                {
+                    throw new Exception(string.Format("Unable to connect after {0} tries.", numTries - 1));
+                }
             }
             catch (Exception exn)
             {
@@ -450,7 +463,7 @@ private async Task ExecuteStartListeningForSystemPerfAsync()
             try
             {
                 this.Portal.SystemPerfMessageReceived += this.OnSystemPerfReceived;
-                await Task.Run(this.StartListeningHelper);
+                await this.Portal.StartListeningForSystemPerf();
             }
             catch (Exception exn)
             {
@@ -459,17 +472,6 @@ private async Task ExecuteStartListeningForSystemPerfAsync()
 
             this.Ready = true;
         }
-
-        /// <summary>
-        /// StartListeningForSystemPerf would deadlock when called from the main thread.
-        /// This helper exists so that the asynchronous operation can be run on the
-        /// thread pool and avoid the deadlock
-        /// </summary>
-        /// <returns>A task the captures the continuation of the start listening call</returns>
-        private async Task StartListeningHelper()
-        {
-            await this.Portal.StartListeningForSystemPerf().ConfigureAwait(false);
-        }
         #endregion // StartListeningForSystemPerfCommand
 
         #region StopListeningForSystemPerfCommand
@@ -517,8 +519,7 @@ private async Task ExecuteStopListeningForSystemPerfAsync()
             try
             {
                 this.Portal.SystemPerfMessageReceived -= this.OnSystemPerfReceived;
-                await this.StopListeningHelper();
-                await this.StopListeningHelper();
+                await this.Portal.StopListeningForSystemPerf();
             }
             catch (Exception exn)
             {
@@ -527,17 +528,6 @@ private async Task ExecuteStopListeningForSystemPerfAsync()
 
             this.Ready = true;
         }
-
-        /// <summary>
-        /// StopListeningForSystemPerf would deadlock when called from the main thread.
-        /// This helper exists so that the asynchronous operation can be run on the
-        /// thread pool and avoid the deadlock
-        /// </summary>
-        /// <returns>Task the captures the continuation of the asynchronous action</returns>
-        private async Task StopListeningHelper()
-        {
-            await this.Portal.StopListeningForSystemPerf();
-        }
         #endregion // StopListeningForSystemPerfCommand
         #endregion // Commands
 
@@ -551,5 +541,47 @@ private void OnSystemPerfReceived(DevicePortal sender, WebSocketMessageReceivedE
             this.cpuLoad = args.Message.CpuLoad;
             this.OnPropertyChanged("CPULoad");
         }
+
+        /// <summary>
+        /// An SSL thumbprint that we'll accept.
+        /// </summary>
+        private string thumbprint;
+
+        /// <summary>
+        /// Validate the server certificate
+        /// </summary>
+        /// <param name="sender">The sender object</param>
+        /// <param name="certificate">The server's certificate</param>
+        /// <param name="chain">The cert chain</param>
+        /// <param name="sslPolicyErrors">Policy Errors</param>
+        /// <returns>whether the cert passes validation</returns>
+        private bool DoCertValidation(DevicePortal sender, X509Certificate certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
+        {
+            X509Certificate2 cert = new X509Certificate2(certificate);
+
+            // If we have previously said to accept this cert, don't prompt again for this session.
+            if (!string.IsNullOrEmpty(this.thumbprint) && this.thumbprint.Equals(cert.Thumbprint, StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            // We could alternatively ask the user if they wanted to always trust
+            // this device and we could persist the thumbprint in some way (registry, database, filesystem, etc).
+            MessageBoxResult result = MessageBox.Show(string.Format(
+                                "Do you want to accept the following certificate?\n\nThumbprint:\n  {0}\nIssuer:\n  {1}",
+                                cert.Thumbprint,
+                                cert.Issuer),
+                            "Untrusted Certificate Detected",
+                            MessageBoxButton.YesNo,
+                            MessageBoxImage.Question,
+                            MessageBoxResult.No);
+
+            if (result == MessageBoxResult.Yes)
+            {
+                thumbprint = cert.Thumbprint;
+                return true;
+            }
+            return false;
+        }
     }
 }
diff --git a/Samples/DeviceLab/ViewModels/MainViewModel.cs b/Samples/DeviceLab/ViewModels/MainViewModel.cs
index a652cce4..d8db7350 100644
--- a/Samples/DeviceLab/ViewModels/MainViewModel.cs
+++ b/Samples/DeviceLab/ViewModels/MainViewModel.cs
@@ -35,7 +35,6 @@ public MainViewModel()
             DiagnosticSinks.AggregateDiagnosticSink aggDiags = new DiagnosticSinks.AggregateDiagnosticSink(this.Diagnostics, debugDiags);
 
             this.SignIn = new DeviceSignInViewModel(aggDiags);
-            this.SignIn.AddDevicePortalConnectionFactory(new XboxDevicePortalConnectionFactory());
             this.SignIn.AddDevicePortalConnectionFactory(new GenericDevicePortalConnectionFactory());
 
             this.SignIn.SignInAttempted += this.OnSignInAttemptCompleted;
diff --git a/Samples/DeviceLab/ViewModels/XboxDevicePortalConnectionFactory.cs b/Samples/DeviceLab/ViewModels/XboxDevicePortalConnectionFactory.cs
deleted file mode 100644
index 52da03a8..00000000
--- a/Samples/DeviceLab/ViewModels/XboxDevicePortalConnectionFactory.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-//----------------------------------------------------------------------------------------------
-// <copyright file="XboxDevicePortalConnectionFactory.cs" company="Microsoft Corporation">
-//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
-// </copyright>
-//----------------------------------------------------------------------------------------------
-using System.Security;
-using Microsoft.Tools.WindowsDevicePortal;
-
-namespace DeviceLab
-{
-    /// <summary>
-    /// Factory creates an IDevicePortalConnection instance that is specific to Xbox One devices
-    /// </summary>
-    public class XboxDevicePortalConnectionFactory : IDevicePortalConnectionFactory
-    {
-        /// <summary>
-        /// Gets a friendly name for the XboxDevicePortalConnectionFactory that can be presented to the user
-        /// </summary>
-        public string Name
-        {
-            get { return "Xbox One"; }
-        }
-
-        /// <summary>
-        /// Create an instance of XboxDevicePortalConnectionFactory
-        /// </summary>
-        /// <param name="address">IP address to use for connectin</param>
-        /// <param name="userName">User name to use for authenticating</param>
-        /// <param name="password">Password to use for authenticating</param>
-        /// <returns>The new IDevicePortalConnection instance</returns>
-        public IDevicePortalConnection CreateConnection(
-            string address,
-            string userName,
-            SecureString password)
-        {
-            return new XboxDevicePortalConnection(address, userName, password);
-        }
-    }
-}
diff --git a/Samples/DeviceLab/XboxDevicePortalConnection.cs b/Samples/DeviceLab/XboxDevicePortalConnection.cs
deleted file mode 100644
index 4bf07e89..00000000
--- a/Samples/DeviceLab/XboxDevicePortalConnection.cs
+++ /dev/null
@@ -1,196 +0,0 @@
-//----------------------------------------------------------------------------------------------
-// <copyright file="XboxDevicePortalConnection.cs" company="Microsoft Corporation">
-//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
-// </copyright>
-//----------------------------------------------------------------------------------------------
-using System;
-using System.Net;
-using System.Security;
-using System.Security.Cryptography.X509Certificates;
-using System.Text.RegularExpressions;
-using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
-
-namespace Microsoft.Tools.WindowsDevicePortal
-{
-    /// <summary>
-    /// IDevicePortalConnection implementation for Xbox One devices
-    /// </summary>
-    public class XboxDevicePortalConnection : IDevicePortalConnection
-    {
-        /// <summary>
-        /// Device Certificate
-        /// </summary>
-        private X509Certificate2 deviceCertificate = null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="XboxDevicePortalConnection"/> class.
-        /// </summary>
-        /// <param name="address">device identifier</param>
-        /// <param name="userName">WDP username</param>
-        /// <param name="password">WDP password</param>
-        public XboxDevicePortalConnection(
-            string address,
-            string userName,
-            string password)
-        {
-            this.Connection = new Uri(string.Format("https://{0}:11443", address));
-            this.Credentials = new NetworkCredential(userName, password);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="XboxDevicePortalConnection"/> class, using a SecureString to secure the password.
-        /// </summary>
-        /// <param name="address">device identifier</param>
-        /// <param name="userName">WDP username</param>
-        /// <param name="password">WDP password</param>
-        public XboxDevicePortalConnection(
-            string address,
-            string userName,
-            SecureString password)
-        {
-            this.Connection = new Uri(string.Format("https://{0}:11443", address));
-            this.Credentials = new NetworkCredential(userName, password);
-        }
-
-        /// <summary>
-        /// Gets Connection property
-        /// </summary>
-        public Uri Connection
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets Web Socket Connection property
-        /// </summary>
-        public Uri WebSocketConnection
-        {
-            get
-            {
-                if (this.Connection == null)
-                {
-                    return null;
-                }
-
-                string absoluteUri = this.Connection.AbsoluteUri;
-
-                if (absoluteUri.StartsWith("https", StringComparison.OrdinalIgnoreCase))
-                {
-                    return new Uri(Regex.Replace(absoluteUri, "https", "wss", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant));
-                }
-                else
-                {
-                    return new Uri(Regex.Replace(absoluteUri, "http", "ws", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant));
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets Credentials property
-        /// </summary>
-        public NetworkCredential Credentials
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets or sets device family
-        /// </summary>
-        public string Family
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the device name
-        /// </summary>
-        public string Name
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets device OS Info
-        /// </summary>
-        public OperatingSystemInformation OsInfo
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the device's qualified name
-        /// </summary>
-        public string QualifiedName
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether cert overrides should be allowed.
-        /// </summary>
-        public bool AllowCertOverride
-        {
-            get
-            {
-                throw new NotImplementedException();
-            }
-
-            set
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        /// <summary>
-        /// Returns certificate data
-        /// </summary>
-        /// <returns>certificate data</returns>
-        public byte[] GetDeviceCertificateData()
-        {
-            return this.deviceCertificate.GetRawCertData();
-        }
-
-        /// <summary>
-        /// Validates and sets the device certificate.
-        /// </summary>
-        /// <param name="certificate">The device's root certificate.</param>
-        public void SetDeviceCertificate(X509Certificate2 certificate)
-        {
-            if (!certificate.IssuerName.Name.Contains(DevicePortalCertificateIssuer))
-            {
-                throw new DevicePortalException(
-                    (HttpStatusCode)0,
-                    "Invalid certificate issuer",
-                    null,
-                    "Failed to download device certificate");
-            }
-
-            this.deviceCertificate = certificate;
-        }
-
-        /// <summary>
-        /// Xbox will never update the connection.
-        /// </summary>
-        /// <param name="requiresHttps">https required</param>
-        public void UpdateConnection(bool requiresHttps)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <summary>
-        ///  Xbox will never update the connection.
-        /// </summary>
-        /// <param name="ipConfig">IP info</param>
-        /// <param name="requiresHttps">https required</param>
-        public void UpdateConnection(IpConfiguration ipConfig, bool requiresHttps)
-        {
-            //throw new NotImplementedException();
-        }
-    }
-}
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs
index a924db0b..81102083 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs
@@ -7,6 +7,7 @@
 using System;
 using System.Net;
 using System.Net.Security;
+//using System.Security;
 using System.Security.Cryptography.X509Certificates;
 using System.Text.RegularExpressions;
 using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
@@ -53,7 +54,7 @@ public DefaultDevicePortalConnection(
         public DefaultDevicePortalConnection(
             string address,
             string userName,
-            SecureString password)
+            System.Security.SecureString password)
         {
             this.Connection = new Uri(string.Format("https://{0}:11443", address));
             this.Credentials = new NetworkCredential(userName, password);

From ab8eed0813d08bde79c2f9c8c0a432a047391362 Mon Sep 17 00:00:00 2001
From: Greg Pettyjohn <grpettyj@microsoft.com>
Date: Wed, 21 Sep 2016 09:12:46 -0700
Subject: [PATCH 11/51] Integrated the new DeviceSignIn view. Fixed the timing
 issue in the reestablish connection retry loop. Made rename more robust.
 Stronger check for duplicates using the cannonical IP address

---
 .../DeviceCollectionView.xaml                 |   9 +-
 .../DeviceCollectionView.xaml.cs              |   0
 .../DeviceLab/Controls/DeviceSignInView.xaml  |  87 ++++
 .../DeviceSignInView.xaml.cs                  |   0
 Samples/DeviceLab/DeviceLab.csproj            |   9 +-
 Samples/DeviceLab/MainWindow.xaml             |   2 +-
 .../ViewModels/DevicePortalCommandModel.cs    |  45 +-
 .../ViewModels/DevicePortalViewModel.cs       | 316 +++++++++++++-
 .../ViewModels/DeviceSignInViewModel.cs       | 393 ++++++++++++------
 .../GenericDevicePortalConnectionFactory.cs   |  36 --
 Samples/DeviceLab/ViewModels/MainViewModel.cs |  19 +-
 Samples/DeviceLab/Views/DeviceSignInView.xaml |  69 ---
 .../DefaultDevicePortalConnection.cs          |  14 +-
 13 files changed, 714 insertions(+), 285 deletions(-)
 rename Samples/DeviceLab/{Views => Controls}/DeviceCollectionView.xaml (97%)
 rename Samples/DeviceLab/{Views => Controls}/DeviceCollectionView.xaml.cs (100%)
 create mode 100644 Samples/DeviceLab/Controls/DeviceSignInView.xaml
 rename Samples/DeviceLab/{Views => Controls}/DeviceSignInView.xaml.cs (100%)
 delete mode 100644 Samples/DeviceLab/ViewModels/GenericDevicePortalConnectionFactory.cs
 delete mode 100644 Samples/DeviceLab/Views/DeviceSignInView.xaml

diff --git a/Samples/DeviceLab/Views/DeviceCollectionView.xaml b/Samples/DeviceLab/Controls/DeviceCollectionView.xaml
similarity index 97%
rename from Samples/DeviceLab/Views/DeviceCollectionView.xaml
rename to Samples/DeviceLab/Controls/DeviceCollectionView.xaml
index 734cea42..d9780279 100644
--- a/Samples/DeviceLab/Views/DeviceCollectionView.xaml
+++ b/Samples/DeviceLab/Controls/DeviceCollectionView.xaml
@@ -96,8 +96,8 @@
                                         </CheckBox>
                                         <TextBlock Margin="0,0,4,0" Text="Device Name:" />
                                         <TextBlock Text="{Binding DeviceName}"/>
-                                        <TextBlock Margin="50,0,4,0" Text="Device Address:" />
-                                        <TextBlock Text="{Binding Address}"/>
+                                        <TextBlock Margin="50,0,4,0" Text="Cannonical Device Address:" />
+                                        <TextBlock Text="{Binding CannonicalIpAddress}"/>
                                         <Button
                                             DockPanel.Dock="Right"
                                             Height="16" Width="16"
@@ -139,9 +139,10 @@
                         </StackPanel>
                         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Height="20" Margin="0,5,0,0">
                             <Button Content="Reboot" Width="60" Command="{Binding RebootCommand}" />
-                            <Button Content="Reestablish Connection" Width="140" Margin="2,0,0,0" Command="{Binding ReestablishConnectionCommand}" />
+                            <Button Content="Refresh Connection" Width="140" Margin="2,0,0,0" Command="{Binding RefreshConnectionCommand}" />
                             <TextBlock Text="Retry Attempts:" Width="86" Margin="15,0,-5,0" />
-                            <local:NumberEntryBox Value="{Binding ConnectionRetryAttempts}" />
+                            <local:NumberEntryBox Value="{Binding ConnectionRetryAttempts, Mode=TwoWay}" />
+                            <Button Content="Dump IP Config" Width="100" Margin="4,0,0,0" Command="{Binding DumpIpConfigCommand}" />
                         </StackPanel>
                     </StackPanel>
                 </TabItem>
diff --git a/Samples/DeviceLab/Views/DeviceCollectionView.xaml.cs b/Samples/DeviceLab/Controls/DeviceCollectionView.xaml.cs
similarity index 100%
rename from Samples/DeviceLab/Views/DeviceCollectionView.xaml.cs
rename to Samples/DeviceLab/Controls/DeviceCollectionView.xaml.cs
diff --git a/Samples/DeviceLab/Controls/DeviceSignInView.xaml b/Samples/DeviceLab/Controls/DeviceSignInView.xaml
new file mode 100644
index 00000000..d78a8419
--- /dev/null
+++ b/Samples/DeviceLab/Controls/DeviceSignInView.xaml
@@ -0,0 +1,87 @@
+<UserControl x:Class="DeviceLab.DeviceSignInView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:DeviceLab"
+             xmlns:System="clr-namespace:System;assembly=mscorlib"
+             mc:Ignorable="d"
+             d:DesignHeight="140" d:DesignWidth="450">
+    <UserControl.Resources>
+        <!-- ObjectDataProvider allows using a standard enum as an items source -->
+        <ObjectDataProvider
+            x:Key="dataFromEnum" MethodName="GetValues" ObjectType="{x:Type System:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="local:DeviceFamilySelections" />
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+        <local:BooleanToVisibilityConverter
+            x:Key="BoolToVisible"
+            True="Visible"
+            False="Hidden" />
+        <local:BooleanToHttpsConverter x:Key="BoolToProtocol" />
+        <Style x:Key="FieldNameStyle" TargetType="{x:Type TextBlock}">
+            <Setter Property="Padding" Value="0,0,4,0" />
+            <Setter Property="TextWrapping" Value="NoWrap"/>
+            <Setter Property="TextTrimming" Value="None"/>
+        </Style>
+        <Style x:Key="FieldStyle" TargetType="{x:Type StackPanel}">
+            <Setter Property="Orientation" Value="Horizontal" />
+            <Setter Property="HorizontalAlignment" Value="Right" />
+            <Setter Property="Margin" Value="0,1,0,4" />
+        </Style>
+    </UserControl.Resources>
+    <StackPanel  HorizontalAlignment="Center" VerticalAlignment="Bottom" Background="White">
+        <!-- Address Field -->
+        <StackPanel Style="{DynamicResource FieldStyle}">
+            <TextBlock Text="Hostname/Address:" Style="{DynamicResource FieldNameStyle}" />
+            <Grid Width="30" HorizontalAlignment="Right">
+                <TextBlock Text="{Binding ProtocolIsHttps, Converter={StaticResource BoolToProtocol}}" HorizontalAlignment="Right"/>
+            </Grid>
+            <TextBlock Text="://" Margin="0,0,2,0" />
+            <TextBox Width="200" Text="{Binding Address, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding AddressEntryEnabled}" />
+            <TextBlock Text=":" />
+            <TextBox Width="50" Text="{Binding Port, UpdateSourceTrigger=PropertyChanged}" IsEnabled="{Binding IsPortEntryEnabled}"/>
+        </StackPanel>
+        <Grid Background="White">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="240"/>
+                <ColumnDefinition Width="240"/>
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <!-- Device Family Selection -->
+            <StackPanel Grid.Row="0" Grid.Column="0" Style="{DynamicResource FieldStyle}">
+                <TextBlock Text="Device Family:" Style="{DynamicResource FieldNameStyle}" />
+                <ComboBox
+                Width="150"
+                ItemsSource="{Binding Source={StaticResource dataFromEnum}}"
+                SelectedItem="{Binding DeviceFamily}" />
+            </StackPanel>
+            <!-- Protocol Selection -->
+            <StackPanel Grid.Row="0" Grid.Column="1" Style="{DynamicResource FieldStyle}">
+                <TextBlock Text="Protocol:" Style="{DynamicResource FieldNameStyle}" />
+                <RadioButton IsEnabled="{Binding ProtocolSelectionEnabled}" Content="HTTPS" IsChecked="{Binding ProtocolIsHttps}"/>
+                <RadioButton IsEnabled="{Binding ProtocolSelectionEnabled}" Content="HTTP"/>
+                <CheckBox Content="USB" Margin="8,0,0,0" Visibility="{Binding Path=UsbAvailable, Converter={StaticResource BoolToVisible}}" IsChecked="{Binding UsbSelected}"/>
+            </StackPanel>
+            <!-- User Name Entry -->
+            <StackPanel Grid.Row="1" Grid.Column="0" Style="{DynamicResource FieldStyle}">
+                <TextBlock Text="User Name:" Style="{DynamicResource FieldNameStyle}" />
+                <TextBox Width="150" Text="{Binding UserName, UpdateSourceTrigger=PropertyChanged}"/>
+            </StackPanel>
+            <StackPanel Grid.Row="1" Grid.Column="1" Style="{DynamicResource FieldStyle}">
+            <!-- Password Entry -->
+                <TextBlock Text="Password:" Style="{DynamicResource FieldNameStyle}" />
+                <local:BindablePassword 
+                    Width="150" 
+                    Password="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" 
+                    IsEnabled="{Binding Ready}" />
+            </StackPanel>
+            <Button Grid.Row="2" Grid.Column="1"  Width="150" Content="Connect" Command="{Binding ConnectCommand}" HorizontalAlignment="Right"/>
+        </Grid>
+    </StackPanel>
+</UserControl>
diff --git a/Samples/DeviceLab/Views/DeviceSignInView.xaml.cs b/Samples/DeviceLab/Controls/DeviceSignInView.xaml.cs
similarity index 100%
rename from Samples/DeviceLab/Views/DeviceSignInView.xaml.cs
rename to Samples/DeviceLab/Controls/DeviceSignInView.xaml.cs
diff --git a/Samples/DeviceLab/DeviceLab.csproj b/Samples/DeviceLab/DeviceLab.csproj
index 0303255c..7b9fadfc 100644
--- a/Samples/DeviceLab/DeviceLab.csproj
+++ b/Samples/DeviceLab/DeviceLab.csproj
@@ -62,14 +62,13 @@
     <Compile Include="Controls\AutoScrollTextBox.cs" />
     <Compile Include="ViewModels\CommandSequence.cs" />
     <Compile Include="ViewModels\DiagnosticSinks.cs" />
-    <Compile Include="ViewModels\GenericDevicePortalConnectionFactory.cs" />
     <Compile Include="ViewModels\ObservableCommandQueue.cs" />
-    <Compile Include="Views\DeviceCollectionView.xaml.cs">
+    <Compile Include="Controls\DeviceCollectionView.xaml.cs">
       <DependentUpon>DeviceCollectionView.xaml</DependentUpon>
     </Compile>
     <Compile Include="ViewModels\DevicePortalCommandModel.cs" />
     <Compile Include="ViewModels\DevicePortalViewModel.cs" />
-    <Compile Include="Views\DeviceSignInView.xaml.cs">
+    <Compile Include="Controls\DeviceSignInView.xaml.cs">
       <DependentUpon>DeviceSignInView.xaml</DependentUpon>
     </Compile>
     <Compile Include="ViewModels\MainViewModel.cs" />
@@ -81,11 +80,11 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\DeviceCollectionView.xaml">
+    <Page Include="Controls\DeviceCollectionView.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Views\DeviceSignInView.xaml">
+    <Page Include="Controls\DeviceSignInView.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
diff --git a/Samples/DeviceLab/MainWindow.xaml b/Samples/DeviceLab/MainWindow.xaml
index 8ae0bdda..8dfc99bc 100644
--- a/Samples/DeviceLab/MainWindow.xaml
+++ b/Samples/DeviceLab/MainWindow.xaml
@@ -25,7 +25,7 @@
                 <ColumnDefinition Width="*" MinWidth="10"/>
             </Grid.ColumnDefinitions>
 
-            <local:DeviceSignInView Grid.Column="1" DataContext="{Binding SignIn}" />
+            <local:DeviceSignInView Grid.Column="1" DataContext="{Binding SignIn}" Margin="0,0,0,5"/>
 
             <Rectangle Grid.Column="2" Fill="Gray" Width="2" Margin="0,2,0,2"/>
 
diff --git a/Samples/DeviceLab/ViewModels/DevicePortalCommandModel.cs b/Samples/DeviceLab/ViewModels/DevicePortalCommandModel.cs
index c4567cd8..f66466e4 100644
--- a/Samples/DeviceLab/ViewModels/DevicePortalCommandModel.cs
+++ b/Samples/DeviceLab/ViewModels/DevicePortalCommandModel.cs
@@ -26,14 +26,16 @@ public class DevicePortalCommandModel : BindableBase
         /// </summary>
         /// <param name="portal">DevicePortal object enscapsulated by this</param>
         /// <param name="diags">Diagnostic sink for reporting</param>
-        public DevicePortalCommandModel(DevicePortal portal, IDiagnosticSink diags)
+        public DevicePortalCommandModel(IDevicePortalConnection connection, IDiagnosticSink diags)
         {
-            if (portal == null)
+            if (connection == null)
             {
-                throw new ArgumentException("Must provide a valid DevicePortal object");
+                throw new ArgumentException("Must provide a valid IDevicePortalConnection object");
             }
 
-            this.portal = portal;
+            this.Connection = connection;
+            this.Portal = new DevicePortal(connection);
+
             this.diagnostics = diags;
             this.commandQueue = new ObservableCommandQueue();
             this.Ready = true;
@@ -41,27 +43,24 @@ public DevicePortalCommandModel(DevicePortal portal, IDiagnosticSink diags)
         #endregion // Constructors
 
         //-------------------------------------------------------------------
-        //  Properties
+        // Class Members
         //-------------------------------------------------------------------
-        #region Properties
-        #region The DevicePortal
+        #region Class Members
         /// <summary>
-        /// DevicePortal object encapsulated by this class
+        ///  The DevicePortal object encapsulated by this class
         /// </summary>
-        private DevicePortal portal;
+        public DevicePortal Portal { get; protected set; }
 
         /// <summary>
-        /// Gets the DevicePortal object encapsulated by this class
+        /// The IDevicePortalConnection object encapsulated by this class
         /// </summary>
-        protected DevicePortal Portal
-        {
-            get
-            {
-                return this.portal;
-            }
-        }
-        #endregion // The DevicePortal
+        public IDevicePortalConnection Connection { get; protected set; }
+        #endregion // Class Members
 
+        //-------------------------------------------------------------------
+        //  Properties
+        //-------------------------------------------------------------------
+        #region Properties
         #region Ready
         /// <summary>
         /// The Ready property indicates that there are no RESTful calls in flight via
@@ -94,7 +93,7 @@ public string Address
         {
             get
             {
-                return this.portal == null ? "<unknown>" : this.portal.Address;
+                return this.Portal == null ? "<unknown>" : this.Portal.Address;
             }
         }
         #endregion // Address
@@ -107,7 +106,7 @@ public string DeviceFamily
         {
             get
             {
-                return this.portal == null ? "<unknown>" : this.portal.DeviceFamily;
+                return this.Portal == null ? "<unknown>" : this.Portal.DeviceFamily;
             }
         }
         #endregion // DeviceFamily
@@ -120,7 +119,7 @@ public string OperatingSystemVersion
         {
             get
             {
-                return this.portal == null ? "<unknown>" : this.portal.OperatingSystemVersion;
+                return this.Portal == null ? "<unknown>" : this.Portal.OperatingSystemVersion;
             }
         }
         #endregion // OperatingSystemVersion
@@ -133,7 +132,7 @@ public string Platform
         {
             get
             {
-                return this.portal == null ? "<unknown>" : this.portal.Platform.ToString();
+                return this.Portal == null ? "<unknown>" : this.Portal.Platform.ToString();
             }
         }
         #endregion // Platform
@@ -146,7 +145,7 @@ public string PlatformName
         {
             get
             {
-                return this.portal == null ? "<unknown>" : this.portal.PlatformName;
+                return this.Portal == null ? "<unknown>" : this.Portal.PlatformName;
             }
         }
         #endregion // PlatformName
diff --git a/Samples/DeviceLab/ViewModels/DevicePortalViewModel.cs b/Samples/DeviceLab/ViewModels/DevicePortalViewModel.cs
index 6165c8b2..7b2a83df 100644
--- a/Samples/DeviceLab/ViewModels/DevicePortalViewModel.cs
+++ b/Samples/DeviceLab/ViewModels/DevicePortalViewModel.cs
@@ -12,6 +12,7 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Windows;
 using System.Net.Security;
+using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
 
 namespace DeviceLab
 {
@@ -20,6 +21,8 @@ namespace DeviceLab
     /// </summary>
     public class DevicePortalViewModel : DevicePortalCommandModel
     {
+        MainViewModel mainViewModel;
+
         //-------------------------------------------------------------------
         //  Constructors
         //-------------------------------------------------------------------
@@ -29,9 +32,11 @@ public class DevicePortalViewModel : DevicePortalCommandModel
         /// </summary>
         /// <param name="portal">DevicePortal object enscapsulated by this</param>
         /// <param name="diags">Diagnostic sink for reporting</param>
-        public DevicePortalViewModel(DevicePortal portal, IDiagnosticSink diags)
-            : base(portal, diags)
+        public DevicePortalViewModel(MainViewModel mainViewModel, IDevicePortalConnection connection, IDiagnosticSink diags)
+            : base(connection, diags)
         {
+            this.mainViewModel = mainViewModel;
+
             // Add additional handling for untrusted certs.
             this.Portal.UnvalidatedCert += DoCertValidation;
 
@@ -54,7 +59,11 @@ protected override string DiagnosticMoniker
         {
             get
             {
-                return !string.IsNullOrWhiteSpace(this.deviceName) ? this.deviceName : base.DiagnosticMoniker;
+                if(string.IsNullOrWhiteSpace(this.deviceName))
+                {
+                    return !string.IsNullOrWhiteSpace(this.CannonicalIpAddress) ? this.CannonicalIpAddress : base.DiagnosticMoniker;
+                }
+                return this.deviceName;
             }
         }
         #endregion // Diagnostic Moniker
@@ -82,6 +91,22 @@ private set
         }
         #endregion //DeviceName
 
+        #region CannonicalIpAddress
+        private string cannonicalIpAddress;
+        public string CannonicalIpAddress
+        {
+            get
+            {
+                return cannonicalIpAddress;
+            }
+
+            private set
+            {
+                this.SetProperty(ref this.cannonicalIpAddress, value);
+            }
+        }
+        #endregion // CannonicalIpAddress
+
         #region DeviceNameEntry
         /// <summary>
         /// User input from the user to be used as a new device name
@@ -151,6 +176,183 @@ public int ConnectionRetryAttempts
         //  Commands
         //-------------------------------------------------------------------
         #region Commands
+        #region GetCannonicalIpAddress
+        private CommandSequence getCannonicalIpAddressCommand;
+        public ICommand GetCannonicalIpAddressCommand
+        {
+            get
+            {
+                if(this.getCannonicalIpAddressCommand == null)
+                {
+                    this.getCannonicalIpAddressCommand = this.CreateCommandSequence();
+                    DelegateCommand getCannonicalIpAddressDC = DelegateCommand.FromAsyncHandler(this.ExecuteGetCannonicalIpAddressAsync, this.CanExecuteGetCannonicalIpAddress);
+                    getCannonicalIpAddressDC.ObservesProperty(() => this.Ready);
+                    this.getCannonicalIpAddressCommand.RegisterCommand(getCannonicalIpAddressDC);
+                }
+                return this.getCannonicalIpAddressCommand;
+            }
+        }
+
+        private bool CanExecuteGetCannonicalIpAddress()
+        {
+            return this.Ready;
+        }
+
+        private async Task ExecuteGetCannonicalIpAddressAsync()
+        {
+            this.OutputDiagnosticString("ExecuteGetCannonicalIpAddress\n");
+            this.Ready = false;
+            try
+            {
+                IpConfiguration config = await this.Portal.GetIpConfig();
+                this.CannonicalIpAddressFromIpConfig(config);
+                this.CheckForDuplicateDevices();
+            }
+            catch (Exception exn)
+            {
+                this.ReportException("GetCannonicalIpAddress", exn);
+            }
+            this.Ready = true;
+        }
+
+        private void CheckForDuplicateDevices()
+        {
+            foreach(DevicePortalViewModel dpvm in this.mainViewModel.ConnectedDevices)
+            {
+                if (dpvm == this)
+                    continue;
+
+                if(this.cannonicalIpAddress == dpvm.cannonicalIpAddress)
+                {
+                    MessageBox.Show(string.Format("You already have a connection for this device address: {0}", this.cannonicalIpAddress),
+                            "Duplicate",
+                            MessageBoxButton.OK,
+                            MessageBoxImage.Exclamation);
+                    this.ClearCommandQueue();
+                    this.mainViewModel.RemoveDeviceCommand.Execute(this);
+                }
+            }
+        }
+
+        private void CannonicalIpAddressFromIpConfig(IpConfiguration config)
+        {
+            string firstNonZeroIpAddress = "";
+            string connectionIp = this.StripPort(this.Connection.Connection.Authority);
+            bool ipMatchesConnection = false;
+            foreach(NetworkAdapterInfo naio in config.Adapters)
+            {
+                foreach(IpAddressInfo iai in naio.IpAddresses)
+                {
+                    string addr = iai.Address;
+                    if (string.IsNullOrWhiteSpace(addr))
+                        continue;
+                    if (addr == "0.0.0.0")
+                        continue;
+                    firstNonZeroIpAddress = addr;
+                    if(addr == connectionIp)
+                    {
+                        ipMatchesConnection = true;
+                        break;
+                    }
+                }
+                
+                if(ipMatchesConnection)
+                {
+                    this.CannonicalIpAddress = connectionIp;
+                }
+                else
+                {
+                    this.CannonicalIpAddress = firstNonZeroIpAddress;
+                }
+            }
+        }
+
+        private string StripPort(string authority)
+        {
+            return authority.Split(':')[0];
+        }
+        #endregion // GetCannonicalIpAddress
+
+        #region DumpIpConfigCommand
+        private CommandSequence dumpIpConfigCommand;
+        public ICommand DumpIpConfigCommand
+        {
+            get
+            {
+                if(this.dumpIpConfigCommand == null)
+                {
+                    this.dumpIpConfigCommand = this.CreateCommandSequence();
+                    DelegateCommand dumpIpConfigDC = DelegateCommand.FromAsyncHandler(this.ExecuteDumpIpConfigAsync, this.CanExecuteDumpIpConfig);
+                    dumpIpConfigDC.ObservesProperty(() => this.Ready);
+                    this.dumpIpConfigCommand.RegisterCommand(dumpIpConfigDC);
+                }
+                return this.dumpIpConfigCommand;
+            }
+        }
+
+        private bool CanExecuteDumpIpConfig()
+        {
+            return this.Ready;
+        }
+
+        private async Task ExecuteDumpIpConfigAsync()
+        {
+            this.OutputDiagnosticString("ExecuteDumpIpConfigAsync\n");
+            this.Ready = false;
+            try
+            {
+                IpConfiguration config = await this.Portal.GetIpConfig();
+                this.OutputIpConfiguration(config);
+            }
+            catch (Exception exn)
+            {
+                this.ReportException("DumpIPConfig", exn);
+            }
+            this.Ready = true;
+        }
+
+        private void OutputIpConfiguration(IpConfiguration config)
+        {
+            // For now, just dump out the adapters to the debug output to see what I got
+            this.OutputDiagnosticString("Dumping network adapter information:\n");
+
+            foreach (NetworkAdapterInfo nai in config.Adapters)
+            {
+                this.OutputDiagnosticString("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n");
+                this.OutputDiagnosticString("    Description: {0}\n", nai.Description);
+                this.OutputDiagnosticString("    Mac Address: {0}\n", nai.MacAddress);
+                this.OutputDiagnosticString("    Index: {0}\n", nai.Index);
+                this.OutputDiagnosticString("    Id: {0}\n", nai.Id);
+                this.OutputDiagnosticString("    Adapter Type: {0}\n", nai.AdapterType);
+                this.OutputDiagnosticString("    DHCP:\n");
+                this.OutputDHCPInfo(nai.Dhcp);
+                this.OutputDiagnosticString("    Gateways:\n");
+                foreach (IpAddressInfo iai in nai.Gateways)
+                {
+                    this.OutputIpAddressInfo(iai);
+                }
+                this.OutputDiagnosticString("    IP Addresses:\n");
+                foreach (IpAddressInfo iai in nai.IpAddresses)
+                {
+                    this.OutputIpAddressInfo(iai);
+                }
+            }
+        }
+
+        private void OutputDHCPInfo(Dhcp dhcp)
+        {
+            this.OutputIpAddressInfo(dhcp.Address);
+            this.OutputDiagnosticString("        Lease Obtained {0}\n", dhcp.LeaseObtained.ToLocalTime().ToString());
+            this.OutputDiagnosticString("        Lease Expires {0}\n", dhcp.LeaseExpires.ToLocalTime().ToString());
+        }
+
+        private void OutputIpAddressInfo(IpAddressInfo ipAddr)
+        {
+            this.OutputDiagnosticString("        Address: {0}\n", ipAddr.Address);
+            this.OutputDiagnosticString("        Subnet Mask: {0}\n", ipAddr.SubnetMask);            
+        }
+        #endregion // DumpIpConfigCommand
+
         #region RenameCommand
         /// <summary>
         /// Command to rename the device
@@ -170,23 +372,70 @@ public ICommand RenameCommand
                     DelegateCommand renameDC = DelegateCommand.FromAsyncHandler(this.ExecuteRenameAsync, this.CanExecuteRename);
                     renameDC.ObservesProperty(() => this.Ready);
                     renameDC.ObservesProperty(() => this.DeviceNameEntry);
+                    
+
+                    DelegateCommand resetConnectionAndPortalDC = new DelegateCommand(this.ExecuteResetConnectionAndPortal, this.CanExecuteResetConnectionAndPortal);
+                    resetConnectionAndPortalDC.ObservesProperty(() => this.Ready);
+
                     this.renameCommand.RegisterCommand(renameDC);
+                    this.renameCommand.RegisterCommand(resetConnectionAndPortalDC);
+                    this.renameCommand.RegisterCommand(this.ReestablishConnectionCommand);
                     this.renameCommand.RegisterCommand(this.RebootCommand);
-                    this.renameCommand.RegisterCommand(this.RefreshDeviceNameCommand);
                 }
 
                 return this.renameCommand;
             }
         }
 
+        private bool CanExecuteResetConnectionAndPortal()
+        {
+            return this.Ready;
+        }
+
+        private void ExecuteResetConnectionAndPortal()
+        {
+            this.OutputDiagnosticString("ExecuteResetConnectionAndPortalAsync\n");
+            this.Ready = false;
+            try
+            {
+                NetworkCredential cred = this.Connection.Credentials;
+                string scheme = this.Connection.Connection.Scheme;
+                string address = this.CannonicalIpAddress;
+                string port = this.Connection.Connection.Port.ToString();
+                string schemeAddressPort = string.Format(@"{0}://{1}:{2}", scheme, address, port);
+                string username = this.StripAutoPrefix(cred.UserName);
+
+                this.Portal.UnvalidatedCert -= DoCertValidation;
+
+                this.Connection = new DefaultDevicePortalConnection(schemeAddressPort, username, cred.SecurePassword);
+                this.Portal = new DevicePortal(this.Connection);
+
+                // Add additional handling for untrusted certs.
+                this.Portal.UnvalidatedCert += DoCertValidation;
+            }
+            catch (Exception exn)
+            {
+                this.ReportException("ResetConnectionAndPortal", exn);
+            }
+
+            this.Ready = true;
+        }
+
+        private string StripAutoPrefix(string userName)
+        {
+            if(userName.Length > 5)
+            {
+                return userName.Substring(5);
+            }
+            return userName;
+        }
+
         /// <summary>
         /// Predicate for the rename command
         /// </summary>
         /// <returns>Result indicates whether the rename command can execute</returns>
         private bool CanExecuteRename()
         {
-            //return
-            //    this.Ready;
             return
                 this.Ready &&
                 !string.IsNullOrWhiteSpace(this.deviceNameEntry);
@@ -214,6 +463,7 @@ private async Task ExecuteRenameAsync()
 
             this.Ready = true;
         }
+        
         #endregion // RenameCommand
 
         #region RefreshDeviceName
@@ -261,6 +511,7 @@ private async Task RefreshDeviceNameAsync()
             try
             {
                 this.DeviceName = await this.Portal.GetDeviceName();
+                this.OutputDiagnosticString("Done refreshing device name\n");
             }
             catch (Exception exn)
             {
@@ -292,7 +543,8 @@ public ICommand RebootCommand
                     this.rebootCommand.RegisterCommand(this.StopListeningForSystemPerfCommand);
                     this.rebootCommand.RegisterCommand(rebootDC);
                     this.rebootCommand.RegisterCommand(this.ReestablishConnectionCommand);
-                    this.rebootCommand.RegisterCommand(this.refreshDeviceNameCommand);
+                    this.rebootCommand.RegisterCommand(this.RefreshDeviceNameCommand);
+                    this.renameCommand.RegisterCommand(this.GetCannonicalIpAddressCommand);
                     this.rebootCommand.RegisterCommand(this.StartListeningForSystemPerfCommand);
                 }
 
@@ -335,6 +587,26 @@ private async Task ExecuteRebootAsync()
         }
         #endregion // Reboot Command
 
+        #region RefreshConnectionCommand
+        private CommandSequence refreshConnectionCommand;
+        public ICommand RefreshConnectionCommand
+        {
+            get
+            {
+                if(this.refreshConnectionCommand == null)
+                {
+                    this.refreshConnectionCommand = this.CreateCommandSequence();
+                    this.refreshConnectionCommand.RegisterCommand(this.StopListeningForSystemPerfCommand);
+                    this.refreshConnectionCommand.RegisterCommand(this.ReestablishConnectionCommand);
+                    this.refreshConnectionCommand.RegisterCommand(this.RefreshDeviceNameCommand);
+                    this.refreshConnectionCommand.RegisterCommand(this.GetCannonicalIpAddressCommand);
+                    this.refreshConnectionCommand.RegisterCommand(this.StartListeningForSystemPerfCommand);
+                }
+                return this.refreshConnectionCommand;
+            }
+        }
+        #endregion // RefreshConnectionCommand
+
         #region ReestablishConnectionCommand
         /// <summary>
         /// Command to reestablish the connection with the device
@@ -387,7 +659,10 @@ private async Task ExecuteReestablishConnectionAsync()
                 }
                 else if (args.Status == DeviceConnectionStatus.Failed)
                 {
+                    
                     this.OutputDiagnosticString("Connection failed after {0} tries.\n", numTries);
+                    this.OutputDiagnosticString("HTTP Status: {0}\n", this.Portal.ConnectionHttpStatusCode);
+                    this.OutputDiagnosticString("Failure description: {0}\n", args.Message);
                 }
             };
 
@@ -396,17 +671,40 @@ private async Task ExecuteReestablishConnectionAsync()
             this.Ready = false;
             try
             {
+
                 do
                 {
                     await this.Portal.Connect();
+
+                    if(this.Portal.ConnectionHttpStatusCode == HttpStatusCode.Unauthorized)
+                    {
+                        MessageBox.Show("Connection Unauthorized. Please double check your authentication credentials",
+                            "Unauthorized",
+                            MessageBoxButton.OK,
+                            MessageBoxImage.Exclamation);
+                        this.ClearCommandQueue();
+                        this.mainViewModel.RemoveDeviceCommand.Execute(this);
+                        break;
+                    }
+                    else if(this.Portal.ConnectionHttpStatusCode != HttpStatusCode.OK && numTries <= this.ConnectionRetryAttempts)
+                    {
+                        await Task.Delay(1000 * 5);
+                    }
+                    
                     ++numTries;
                 }
                 while (this.Portal.ConnectionHttpStatusCode != HttpStatusCode.OK && numTries <= this.ConnectionRetryAttempts);
 
-                if(this.Portal.ConnectionHttpStatusCode !=HttpStatusCode.OK)
+                if (this.Portal.ConnectionHttpStatusCode != HttpStatusCode.OK)
                 {
                     throw new Exception(string.Format("Unable to connect after {0} tries.", numTries - 1));
                 }
+
+                OnPropertyChanged("Address");
+                OnPropertyChanged("DeviceFamily");
+                OnPropertyChanged("OperatingSystemVersion");
+                OnPropertyChanged("Platform");
+                OnPropertyChanged("PlatformName");
             }
             catch (Exception exn)
             {
@@ -578,7 +876,7 @@ private bool DoCertValidation(DevicePortal sender, X509Certificate certificate,
 
             if (result == MessageBoxResult.Yes)
             {
-                thumbprint = cert.Thumbprint;
+                this.thumbprint = cert.Thumbprint;
                 return true;
             }
             return false;
diff --git a/Samples/DeviceLab/ViewModels/DeviceSignInViewModel.cs b/Samples/DeviceLab/ViewModels/DeviceSignInViewModel.cs
index 4bd96aa4..43d3254f 100644
--- a/Samples/DeviceLab/ViewModels/DeviceSignInViewModel.cs
+++ b/Samples/DeviceLab/ViewModels/DeviceSignInViewModel.cs
@@ -3,15 +3,84 @@
 //     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
 // </copyright>
 //----------------------------------------------------------------------------------------------
-using System.Collections.ObjectModel;
+using Prism.Mvvm;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows;
+
 using System.Security;
-using System.Windows.Input;
 using Microsoft.Tools.WindowsDevicePortal;
 using Prism.Commands;
 using Prism.Mvvm;
+using System.Windows.Input;
 
 namespace DeviceLab
 {
+    //-------------------------------------------------------------------
+    //  Value Converters
+    //-------------------------------------------------------------------
+    #region Value Converters
+    /// <summary>
+    ///     Template allows for easy creation of a value converter for bools
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <remarks>
+    ///     See BooleanToVisibilityConverter and BooleanToBrushConverter (below) and usage in Generic.xaml
+    /// </remarks>
+    public class BooleanConverter<T> : IValueConverter
+    {
+        public BooleanConverter(T trueValue, T falseValue)
+        {
+            True = trueValue;
+            False = falseValue;
+        }
+
+        public T True { get; set; }
+        public T False { get; set; }
+
+        public virtual object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value is bool && ((bool)value) ? True : False;
+        }
+
+        public virtual object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value is T && EqualityComparer<T>.Default.Equals((T)value, True);
+        }
+    }
+
+    /// <summary>
+    /// Converts a boolean to a Visibility value
+    /// </summary>
+    public sealed class BooleanToVisibilityConverter : BooleanConverter<Visibility>
+    {
+        public BooleanToVisibilityConverter() :
+            base(Visibility.Visible, Visibility.Hidden)
+        { }
+    }
+
+    public sealed class BooleanToHttpsConverter : BooleanConverter<string>
+    {
+        public BooleanToHttpsConverter() :
+            base("https", "http")
+        { }
+    }
+    #endregion // Value Converters
+
+    public enum DeviceFamilySelections
+    {
+        XboxOne,
+        HoloLens,
+        Phone,
+        IoT,
+        Desktop
+    }
+
     /// <summary>
     /// ViewModel for the device sign in flow
     /// </summary>
@@ -21,10 +90,6 @@ public class DeviceSignInViewModel : BindableBase
         //  Private Members
         //-------------------------------------------------------------------
         #region Private Members
-        /// <summary>
-        /// Destination for reporting diagnostic messages
-        /// </summary>
-        private IDiagnosticSink diagnostics;
         #endregion // Private Members
 
         //-------------------------------------------------------------------
@@ -33,22 +98,11 @@ public class DeviceSignInViewModel : BindableBase
         #region Constructors
         /// <summary>
         /// Initializes a new instance of the <see cref="DeviceSignInViewModel" /> class.
-        /// Default constructor creates a null diagnostic sink
         /// </summary>
-        /// <remarks>Diagnostic output will be lost</remarks>
         public DeviceSignInViewModel()
         {
-            this.diagnostics = new DiagnosticSinks.NullDiagnosticSink();
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DeviceSignInViewModel" /> class.
-        /// Use this constructor to specify a diagnostic sink for diagnostic output
-        /// </summary>
-        /// <param name="diags">Diagnostic sink that will receive all the diagnostic output</param>
-        public DeviceSignInViewModel(IDiagnosticSink diags)
-        {
-            this.diagnostics = diags;
+            this.DeviceFamily = DeviceFamilySelections.XboxOne;
+            this.ProtocolIsHttps = true;
         }
         #endregion // Constructors
 
@@ -56,21 +110,193 @@ public DeviceSignInViewModel(IDiagnosticSink diags)
         //  Properties
         //-------------------------------------------------------------------
         #region Properties
-        #region DeviceIP
-        /// <summary>
-        /// The IP address for the device with which we want to authentication
-        /// </summary>
-        private string deviceIP;
 
-        /// <summary>
-        ///  Gets or sets the IP address for the device with which we want to authenticate
-        /// </summary>
-        public string DeviceIP
+        #region DeviceFamily
+        private DeviceFamilySelections deviceFamily;
+        public DeviceFamilySelections DeviceFamily
         {
-            get { return this.deviceIP; }
-            set { this.SetProperty(ref this.deviceIP, value); }
+            get
+            {
+                return this.deviceFamily;
+            }
+
+            set
+            {
+                this.SetProperty(ref this.deviceFamily, value);
+                OnPropertyChanged("UsbAvailable");
+                OnPropertyChanged("UsbSelected");
+                OnPropertyChanged("ProtocolSelectionEnabled");
+                OnPropertyChanged("Port");
+                OnPropertyChanged("IsPortEntryEnabled");
+                OnPropertyChanged("AddressEntryEnabled");
+                OnPropertyChanged("Address");
+                if (this.DeviceFamily == DeviceFamilySelections.XboxOne)
+                {
+                    this.ProtocolIsHttps = true;
+                }
+            }
         }
-        #endregion // DeviceIP
+        #endregion // DeviceFamily
+
+        #region ProtocolIsHttps
+        private bool protocolIsHttps;
+        public bool ProtocolIsHttps
+        {
+            get
+            {
+                return this.protocolIsHttps;
+            }
+
+            set
+            {
+                this.SetProperty(ref this.protocolIsHttps, value);
+                OnPropertyChanged("Port");
+                OnPropertyChanged("IsPortEntryEnabled");
+                OnPropertyChanged("Address");
+            }
+        }
+        #endregion // ProtocolIsHttps
+
+        #region ProtocolSelectionEnabled
+        public bool ProtocolSelectionEnabled
+        {
+            get
+            {
+                return this.DeviceFamily != DeviceFamilySelections.XboxOne;
+            }
+        }
+        #endregion // ProtocolSelectionEnabled
+
+        #region UsbAvailable
+        public bool UsbAvailable
+        {
+            get
+            {
+                return this.DeviceFamily == DeviceFamilySelections.HoloLens
+                    || this.DeviceFamily == DeviceFamilySelections.Phone;
+            }
+        }
+        #endregion // UsbAvailable
+
+        #region UsbSelected
+        private bool usbSelected;
+        public bool UsbSelected
+        {
+            get
+            {
+                return this.UsbAvailable && this.usbSelected;
+            }
+
+            set
+            {
+                this.SetProperty(ref this.usbSelected, value);
+                OnPropertyChanged("Port");
+                OnPropertyChanged("IsPortEntryEnabled");
+                OnPropertyChanged("Address");
+                OnPropertyChanged("AddressEntryEnabled");
+            }
+        }
+        #endregion // UsbSelected
+
+        #region IsPortEntryEnabled
+        public bool IsPortEntryEnabled
+        {
+            get
+            {
+                switch (this.DeviceFamily)
+                {
+                    case DeviceFamilySelections.HoloLens:
+                    case DeviceFamilySelections.Phone:
+                    case DeviceFamilySelections.XboxOne:
+                        return false;
+
+                    case DeviceFamilySelections.IoT:
+                        return this.ProtocolIsHttps;
+
+                    case DeviceFamilySelections.Desktop:
+                    default:
+                        return true;
+                }
+            }
+        }
+        #endregion // IsPortEntryEnabled
+
+        #region Port
+        private string portUserEntry;
+        public string Port
+        {
+            get
+            {
+                string portForFamily = GetPortForDeviceFamily();
+                if (string.IsNullOrEmpty(portForFamily))
+                {
+                    return portUserEntry;
+                }
+                else
+                {
+                    return portForFamily;
+                }
+            }
+            set
+            {
+                SetProperty(ref portUserEntry, value);
+            }
+        }
+        #endregion // Port
+
+        #region GetPortForDeviceFamily
+        private string GetPortForDeviceFamily()
+        {
+            switch (this.DeviceFamily)
+            {
+                case DeviceFamilySelections.HoloLens:
+                case DeviceFamilySelections.Phone:
+                    {
+                        if (this.UsbSelected)
+                            return "10080";
+                        return this.ProtocolIsHttps ? "443" : "80";
+                    }
+                case DeviceFamilySelections.IoT:
+                    return this.ProtocolIsHttps ? "" : "8080";
+                case DeviceFamilySelections.XboxOne:
+                    return "11443";
+                case DeviceFamilySelections.Desktop:
+                    return "";
+                default:
+                    return "";
+            }
+        }
+        #endregion // GetPortForDeviceFamily
+
+        #region Address
+        private string addressUserEntry;
+        public string Address
+        {
+            get
+            {
+                if (this.UsbAvailable && this.UsbSelected)
+                {
+                    return "localhost";
+                }
+                return addressUserEntry;
+            }
+
+            set
+            {
+                SetProperty(ref this.addressUserEntry, value);
+            }
+        }
+        #endregion // Address
+
+        #region AddressEntryEnabled
+        public bool AddressEntryEnabled
+        {
+            get
+            {
+                return !this.UsbAvailable || !this.UsbSelected;
+            }
+        }
+        #endregion // AddressEntryEnabled
 
         #region UserName
         /// <summary>
@@ -104,44 +330,7 @@ public SecureString Password
         }
         #endregion // Password
 
-        #region Connection Types
-        /// <summary>
-        /// Collection of IDevicePortalConnectionFactory objects for use when authenticating with different device types
-        /// </summary>
-        private ObservableCollection<IDevicePortalConnectionFactory> connectionTypes;
-
-        /// <summary>
-        /// Gets the collection of IDevicePortalConnectionFactory objects used for connecting
-        /// </summary>
-        public ObservableCollection<IDevicePortalConnectionFactory> ConnectionTypes
-        {
-            get
-            {
-                if (this.connectionTypes == null)
-                {
-                    this.connectionTypes = new ObservableCollection<IDevicePortalConnectionFactory>();
-                }
-
-                return this.connectionTypes;
-            }
-        }
-        #endregion // Connection Types
-
-        #region ConnectionTypeSelection
-        /// <summary>
-        /// Tracks the IDevicePortalConnectionFactory selected by the user
-        /// </summary>
-        private IDevicePortalConnectionFactory connectionTypeSelection;
-
-        /// <summary>
-        /// Gets or sets the IDevicePortalConnectionFactory selected by the user
-        /// </summary>
-        public IDevicePortalConnectionFactory ConnectionTypeSelection
-        {
-            get { return this.connectionTypeSelection; }
-            set { this.SetProperty(ref this.connectionTypeSelection, value); }
-        }
-        #endregion // ConnectionTypeSelection
+        
         #endregion // Properties
 
         //-------------------------------------------------------------------
@@ -165,10 +354,10 @@ public ICommand ConnectCommand
                 if (this.connectCommand == null)
                 {
                     this.connectCommand = new DelegateCommand(this.ExecuteConnect, this.CanExecuteConnect);
-                    this.connectCommand.ObservesProperty(() => this.DeviceIP);
+                    this.connectCommand.ObservesProperty(() => this.Address);
+                    this.connectCommand.ObservesProperty(() => this.Port);
                     this.connectCommand.ObservesProperty(() => this.UserName);
                     this.connectCommand.ObservesProperty(() => this.Password);
-                    this.connectCommand.ObservesProperty(() => this.ConnectionTypeSelection);
                 }
 
                 return this.connectCommand;
@@ -180,9 +369,14 @@ public ICommand ConnectCommand
         /// </summary>
         private void ExecuteConnect()
         {
-            IDevicePortalConnection conn = this.ConnectionTypeSelection.CreateConnection(this.DeviceIP, this.UserName, this.Password);
-            DevicePortal portal = new DevicePortal(conn);
-            this.SignInAttempted?.Invoke(this, new SignInAttemptEventArgs(portal, conn));
+            string protocolAddressPort = string.Format(
+                @"{0}://{1}:{2}",
+                this.ProtocolIsHttps ? @"https" : @"http",
+                this.Address,
+                this.Port );
+
+            IDevicePortalConnection conn = new DefaultDevicePortalConnection(protocolAddressPort, this.UserName, this.Password);
+            this.SignInAttempted?.Invoke(this, new SignInAttemptEventArgs(conn));
         }
         
         /// <summary>
@@ -191,27 +385,17 @@ private void ExecuteConnect()
         /// <returns>Result indicates whether the ConnectCommand can execute</returns>
         private bool CanExecuteConnect()
         {
+            
             return
-                !string.IsNullOrWhiteSpace(this.DeviceIP) &&
+                !string.IsNullOrWhiteSpace(this.Address) &&
+                !string.IsNullOrWhiteSpace(this.Port) &&
                 !string.IsNullOrWhiteSpace(this.UserName) &&
                 this.Password != null &&
-                this.Password.Length > 0 &&
-                this.ConnectionTypeSelection != null;
+                this.Password.Length > 0;
         }
         #endregion // Connect Command
         #endregion // Commands
 
-        #region Public Methods
-        /// <summary>
-        /// Add an IDevicePortalConnnectionFactory to be presented to the user for selectoin
-        /// </summary>
-        /// <param name="factory">The factory to be added</param>
-        public void AddDevicePortalConnectionFactory(IDevicePortalConnectionFactory factory)
-        {
-            this.ConnectionTypes.Add(factory);
-        }
-        #endregion // Public Methods
-
         #region Events
         /// <summary>
         /// Delegate describes a method for handling SignInAttempt events
@@ -230,17 +414,11 @@ public class SignInAttemptEventArgs : System.EventArgs
             /// </summary>
             /// <param name="portal">The DevicePortal associated with the sign in attempt</param>
             /// <param name="conn">The IDevicePortalConnection instance associated with the sign in attempt</param>
-            internal SignInAttemptEventArgs(DevicePortal portal, IDevicePortalConnection conn)
+            internal SignInAttemptEventArgs(IDevicePortalConnection conn)
             {
-                this.Portal = portal;
                 this.Connection = conn;
             }
-
-            /// <summary>
-            /// Gets the DevicePortal associated with the sign in attempt
-            /// </summary>
-            public DevicePortal Portal { get; private set; }
-
+                        
             /// <summary>
             ///  Gets the IDevicePortalConnection instance associated with the sign in attempt
             /// </summary>
@@ -253,27 +431,4 @@ internal SignInAttemptEventArgs(DevicePortal portal, IDevicePortalConnection con
         public event SignInAttemptEventHandler SignInAttempted;
         #endregion // Events
     }
-
-    /// <summary>
-    /// Interface describes a factory class for creating IDevicePortalConnection instances
-    /// </summary>
-    public interface IDevicePortalConnectionFactory
-    {
-        /// <summary>
-        /// Create an instance of IDevicePortalConnection
-        /// </summary>
-        /// <param name="address">IP address to use for connectin</param>
-        /// <param name="userName">User name to use for authenticating</param>
-        /// <param name="password">Password to use for authenticating</param>
-        /// <returns>The new IDevicePortalConnection instance</returns>
-        IDevicePortalConnection CreateConnection(
-            string address,
-            string userName,
-            SecureString password);
-
-        /// <summary>
-        /// Gets a friendly name for the IDevicePortalConnectionFactory that can be presented to the user
-        /// </summary>
-        string Name { get; }
-    }
 }
diff --git a/Samples/DeviceLab/ViewModels/GenericDevicePortalConnectionFactory.cs b/Samples/DeviceLab/ViewModels/GenericDevicePortalConnectionFactory.cs
deleted file mode 100644
index 90ac610b..00000000
--- a/Samples/DeviceLab/ViewModels/GenericDevicePortalConnectionFactory.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-//----------------------------------------------------------------------------------------------
-// <copyright file="GenericDevicePortalConnectionFactory.cs" company="Microsoft Corporation">
-//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
-// </copyright>
-//----------------------------------------------------------------------------------------------
-using System.Security;
-using Microsoft.Tools.WindowsDevicePortal;
-
-namespace DeviceLab
-{
-    /// <summary>
-    /// Fractory creates a generic IDevicePortalConnection instance
-    /// </summary>
-    public class GenericDevicePortalConnectionFactory : IDevicePortalConnectionFactory
-    {
-        /// <summary>
-        /// Gets a friendly name for the GenericDevicePortalConnectionFactory that can be presented to the user
-        /// </summary>
-        public string Name
-        {
-            get { return "Generic Device"; }
-        }
-
-        /// <summary>
-        /// Create an instance of GenericDevicePortalConnectionFactory
-        /// </summary>
-        /// <param name="address">IP address to use for connectin</param>
-        /// <param name="userName">User name to use for authenticating</param>
-        /// <param name="password">Password to use for authenticating</param>
-        /// <returns>The new IDevicePortalConnection instance</returns>
-        public IDevicePortalConnection CreateConnection(string address, string userName, SecureString password)
-        {
-            return new DefaultDevicePortalConnection(address, userName, password);
-        }
-    }
-}
diff --git a/Samples/DeviceLab/ViewModels/MainViewModel.cs b/Samples/DeviceLab/ViewModels/MainViewModel.cs
index d8db7350..2ef0d86f 100644
--- a/Samples/DeviceLab/ViewModels/MainViewModel.cs
+++ b/Samples/DeviceLab/ViewModels/MainViewModel.cs
@@ -34,8 +34,7 @@ public MainViewModel()
             DiagnosticSinks.DebugDiagnosticSink debugDiags = new DiagnosticSinks.DebugDiagnosticSink();
             DiagnosticSinks.AggregateDiagnosticSink aggDiags = new DiagnosticSinks.AggregateDiagnosticSink(this.Diagnostics, debugDiags);
 
-            this.SignIn = new DeviceSignInViewModel(aggDiags);
-            this.SignIn.AddDevicePortalConnectionFactory(new GenericDevicePortalConnectionFactory());
+            this.SignIn = new DeviceSignInViewModel();
 
             this.SignIn.SignInAttempted += this.OnSignInAttemptCompleted;
 
@@ -50,18 +49,7 @@ public MainViewModel()
         /// <param name="args">Arguments for the event</param>
         private void OnSignInAttemptCompleted(DeviceSignInViewModel sender, DeviceSignInViewModel.SignInAttemptEventArgs args)
         {
-            DevicePortal portal = args.Portal;
-            // See if the device is already in the list
-            foreach (DevicePortalViewModel dpvm in this.ConnectedDevices)
-            {
-                if (dpvm.Address == portal.Address)
-                {
-                    this.Diagnostics.OutputDiagnosticString("[!!] The device with address {0} is already in the list\n", portal.Address);
-                    return;
-                }
-            }
-
-            this.ConnectedDevices.Add(new DevicePortalViewModel(args.Portal, this.Diagnostics));
+            this.ConnectedDevices.Add(new DevicePortalViewModel(this, args.Connection, this.Diagnostics));
         }
 
         //-------------------------------------------------------------------
@@ -337,7 +325,7 @@ private void ExecuteRebootSelectedDevices()
         /// Command to remove a device from the collection of connected devices
         /// </summary>
         private DelegateCommand<object> removeDeviceCommand;
-        // NOTE: Ideally, the template parameter would be DevicePortalViewMOdel, rather than object.
+        // NOTE: Ideally, the template parameter would be DevicePortalViewModel, rather than object.
         // Unfortunately, this would sporadically throw an invalid cast exception from within the
         // DelegateCommand<> constructor in the PRISM library. Apparently, the object passed to the
         // constructor cannot always be cast to something that would rightfully belong to the 
@@ -431,6 +419,7 @@ private void OnDeviceAdded(DevicePortalViewModel dpvm)
             CommandSequence cmdSeq = dpvm.CreateCommandSequence();
             cmdSeq.RegisterCommand(dpvm.ReestablishConnectionCommand);
             cmdSeq.RegisterCommand(dpvm.RefreshDeviceNameCommand);
+            cmdSeq.RegisterCommand(dpvm.GetCannonicalIpAddressCommand);
             cmdSeq.RegisterCommand(dpvm.StartListeningForSystemPerfCommand);
             cmdSeq.Execute(null);
         }
diff --git a/Samples/DeviceLab/Views/DeviceSignInView.xaml b/Samples/DeviceLab/Views/DeviceSignInView.xaml
deleted file mode 100644
index 2cb870e4..00000000
--- a/Samples/DeviceLab/Views/DeviceSignInView.xaml
+++ /dev/null
@@ -1,69 +0,0 @@
-<UserControl x:Class="DeviceLab.DeviceSignInView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:DeviceLab"
-             mc:Ignorable="d" >
-    <UserControl.Resources>
-        <Style x:Key="fieldNameStyle" TargetType="{x:Type TextBlock}">
-            <Setter Property="Margin" Value="0,0,5,0" />
-            <Setter Property="VerticalAlignment" Value="Top" />
-            <Setter Property="HorizontalAlignment" Value="Right" />
-        </Style>
-        <Style x:Key="entryBoxStyle" TargetType="{x:Type TextBox}">
-            <Setter Property="HorizontalAlignment" Value="Left" />
-            <Setter Property="Height" Value="23" />
-            <Setter Property="TextWrapping" Value="Wrap" />
-            <Setter Property="VerticalAlignment" Value="Top" />
-            <Setter Property="Width" Value="285" />
-        </Style>
-        <Style x:Key="rowStyle" TargetType="{x:Type StackPanel}">
-            <Setter Property="Orientation" Value="Horizontal" />
-            <Setter Property="HorizontalAlignment" Value="Right" />
-            <Setter Property="Margin" Value="0,2,0,0" />
-        </Style>
-    </UserControl.Resources>
-    <StackPanel>
-        <StackPanel Style="{StaticResource rowStyle}">
-            <TextBlock Text="Address" Style="{StaticResource fieldNameStyle}" />
-            <TextBox
-                Style="{StaticResource entryBoxStyle}"
-                Text="{Binding DeviceIP, UpdateSourceTrigger=PropertyChanged}"
-                IsEnabled="{Binding Ready}" />
-        </StackPanel>
-        <StackPanel Style="{StaticResource rowStyle}">
-            <TextBlock Text="UserName" Style="{StaticResource fieldNameStyle}" />
-            <TextBox
-                Style="{StaticResource entryBoxStyle}"
-                Text="{Binding UserName, UpdateSourceTrigger=PropertyChanged}"
-                IsEnabled="{Binding Ready}" />
-        </StackPanel>
-        <StackPanel Style="{StaticResource rowStyle}">
-            <TextBlock Text="Password" Style="{StaticResource fieldNameStyle}" />
-            <local:BindablePassword
-                HorizontalAlignment="Right" VerticalAlignment="Top" Width="285" Height="21"
-                Password="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                IsEnabled="{Binding Ready}" />
-        </StackPanel>
-        <StackPanel Style="{StaticResource rowStyle}">
-            <TextBlock Text="Connection Type" Style="{StaticResource fieldNameStyle}" />
-            <ComboBox
-                HorizontalAlignment="Left" VerticalAlignment="Top" Width="207"
-                Margin="0,0,2,0"
-                ItemsSource="{Binding ConnectionTypes}"
-                SelectedItem="{Binding ConnectionTypeSelection}">
-                <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding Name}" />
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </ComboBox>
-            <Button
-                Content="Connect" HorizontalAlignment="Left" VerticalAlignment="Top" Width="76"
-                
-                Command="{Binding ConnectCommand}"
-                IsEnabled="{Binding Ready}" />
-        </StackPanel>
-    </StackPanel>
-</UserControl>
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs
index 80d7fd10..1a54382f 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs
@@ -6,8 +6,6 @@
 
 using System;
 using System.Net;
-using System.Net.Security;
-//using System.Security;
 using System.Security.Cryptography.X509Certificates;
 using System.Text.RegularExpressions;
 using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
@@ -57,8 +55,16 @@ public DefaultDevicePortalConnection(
             string userName,
             System.Security.SecureString password)
         {
-            this.Connection = new Uri(string.Format("https://{0}:11443", address));
-            this.Credentials = new NetworkCredential(userName, password);
+            this.Connection = new Uri(address);
+
+
+            if (!string.IsNullOrEmpty(userName) &&
+                password != null &&
+                password.Length > 0)
+            {
+                // append auto- to the credentials to bypass CSRF token requirement on non-Get requests.
+                this.Credentials = new NetworkCredential(string.Format("auto-{0}", userName), password);
+            }
         }
 
         /// <summary>

From a49bab94ca2f6daa94b2c8eb6e033f6e3ad45519 Mon Sep 17 00:00:00 2001
From: Greg Pettyjohn <grpettyj@microsoft.com>
Date: Fri, 23 Sep 2016 09:58:03 -0700
Subject: [PATCH 12/51] Renamed DeviceLab to SampleDeviceCollection

---
 .../App.config                                |  0
 .../App.xaml                                  |  4 +-
 .../App.xaml.cs                               |  2 +-
 .../Controls/AutoScrollTextBox.cs             |  2 +-
 .../Controls/BindablePassword.xaml            |  2 +-
 .../Controls/BindablePassword.xaml.cs         |  2 +-
 .../Controls/DeviceCollectionView.xaml        |  4 +-
 .../Controls/DeviceCollectionView.xaml.cs     |  2 +-
 .../Controls/DeviceSignInView.xaml            |  4 +-
 .../Controls/DeviceSignInView.xaml.cs         |  2 +-
 .../Controls/NumberEntryBox.xaml              |  4 +-
 .../Controls/NumberEntryBox.xaml.cs           |  2 +-
 .../Controls/SelectionListBox.cs              |  2 +-
 .../MainWindow.xaml                           |  6 +--
 .../MainWindow.xaml.cs                        |  2 +-
 .../Properties/AssemblyInfo.cs                |  4 +-
 .../Properties/Resources.Designer.cs          | 44 ++++++++-----------
 .../Properties/Resources.resx                 |  0
 .../Properties/Settings.Designer.cs           | 22 ++++------
 .../Properties/Settings.settings              |  0
 .../SampleDeviceCollection.csproj}            |  4 +-
 .../SampleDeviceCollection.sln}               |  2 +-
 .../Settings.StyleCop                         |  0
 .../Themes/CustomStyles.xaml                  |  2 +-
 .../Themes/Generic.xaml                       |  2 +-
 .../ViewModels/CommandSequence.cs             |  2 +-
 .../ViewModels/DevicePortalCommandModel.cs    |  2 +-
 .../ViewModels/DevicePortalViewModel.cs       |  2 +-
 .../ViewModels/DeviceSignInViewModel.cs       |  2 +-
 .../ViewModels/DiagnosticOutputViewModel.cs   |  2 +-
 .../ViewModels/DiagnosticSinks.cs             |  2 +-
 .../ViewModels/MainViewModel.cs               |  2 +-
 .../ViewModels/ObservableCommandQueue.cs      |  2 +-
 .../packages.config                           |  0
 34 files changed, 62 insertions(+), 74 deletions(-)
 rename Samples/{DeviceLab => SampleDeviceCollection}/App.config (100%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/App.xaml (73%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/App.xaml.cs (94%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Controls/AutoScrollTextBox.cs (97%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Controls/BindablePassword.xaml (88%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Controls/BindablePassword.xaml.cs (98%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Controls/DeviceCollectionView.xaml (99%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Controls/DeviceCollectionView.xaml.cs (97%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Controls/DeviceSignInView.xaml (97%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Controls/DeviceSignInView.xaml.cs (96%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Controls/NumberEntryBox.xaml (90%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Controls/NumberEntryBox.xaml.cs (99%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Controls/SelectionListBox.cs (99%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/MainWindow.xaml (92%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/MainWindow.xaml.cs (95%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Properties/AssemblyInfo.cs (96%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Properties/Resources.Designer.cs (83%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Properties/Resources.resx (100%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Properties/Settings.Designer.cs (82%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Properties/Settings.settings (100%)
 rename Samples/{DeviceLab/DeviceLab.csproj => SampleDeviceCollection/SampleDeviceCollection.csproj} (98%)
 rename Samples/{DeviceLab/DeviceLab.sln => SampleDeviceCollection/SampleDeviceCollection.sln} (91%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Settings.StyleCop (100%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Themes/CustomStyles.xaml (97%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/Themes/Generic.xaml (84%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/ViewModels/CommandSequence.cs (99%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/ViewModels/DevicePortalCommandModel.cs (99%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/ViewModels/DevicePortalViewModel.cs (99%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/ViewModels/DeviceSignInViewModel.cs (99%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/ViewModels/DiagnosticOutputViewModel.cs (99%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/ViewModels/DiagnosticSinks.cs (99%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/ViewModels/MainViewModel.cs (99%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/ViewModels/ObservableCommandQueue.cs (99%)
 rename Samples/{DeviceLab => SampleDeviceCollection}/packages.config (100%)

diff --git a/Samples/DeviceLab/App.config b/Samples/SampleDeviceCollection/App.config
similarity index 100%
rename from Samples/DeviceLab/App.config
rename to Samples/SampleDeviceCollection/App.config
diff --git a/Samples/DeviceLab/App.xaml b/Samples/SampleDeviceCollection/App.xaml
similarity index 73%
rename from Samples/DeviceLab/App.xaml
rename to Samples/SampleDeviceCollection/App.xaml
index aa1b6c03..072cc6c8 100644
--- a/Samples/DeviceLab/App.xaml
+++ b/Samples/SampleDeviceCollection/App.xaml
@@ -1,7 +1,7 @@
-<Application x:Class="DeviceLab.App"
+<Application x:Class="SampleDeviceCollection.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:DeviceLab"
+             xmlns:local="clr-namespace:SampleDeviceCollection"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary Source="Themes\CustomStyles.xaml" />
diff --git a/Samples/DeviceLab/App.xaml.cs b/Samples/SampleDeviceCollection/App.xaml.cs
similarity index 94%
rename from Samples/DeviceLab/App.xaml.cs
rename to Samples/SampleDeviceCollection/App.xaml.cs
index bf0bfb95..f0e468ac 100644
--- a/Samples/DeviceLab/App.xaml.cs
+++ b/Samples/SampleDeviceCollection/App.xaml.cs
@@ -5,7 +5,7 @@
 //----------------------------------------------------------------------------------------------
 using System.Windows;
 
-namespace DeviceLab
+namespace SampleDeviceCollection
 {
     /// <summary>
     /// Interaction logic for App.xaml
diff --git a/Samples/DeviceLab/Controls/AutoScrollTextBox.cs b/Samples/SampleDeviceCollection/Controls/AutoScrollTextBox.cs
similarity index 97%
rename from Samples/DeviceLab/Controls/AutoScrollTextBox.cs
rename to Samples/SampleDeviceCollection/Controls/AutoScrollTextBox.cs
index 7ebfff23..0372169a 100644
--- a/Samples/DeviceLab/Controls/AutoScrollTextBox.cs
+++ b/Samples/SampleDeviceCollection/Controls/AutoScrollTextBox.cs
@@ -6,7 +6,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace DeviceLab
+namespace SampleDeviceCollection
 {
     /// <summary>
     /// A TextBox derrivative that automatically scrolls to end whenever new text is added.
diff --git a/Samples/DeviceLab/Controls/BindablePassword.xaml b/Samples/SampleDeviceCollection/Controls/BindablePassword.xaml
similarity index 88%
rename from Samples/DeviceLab/Controls/BindablePassword.xaml
rename to Samples/SampleDeviceCollection/Controls/BindablePassword.xaml
index a31e1b81..88277aff 100644
--- a/Samples/DeviceLab/Controls/BindablePassword.xaml
+++ b/Samples/SampleDeviceCollection/Controls/BindablePassword.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="DeviceLab.BindablePassword"
+<UserControl x:Class="SampleDeviceCollection.BindablePassword"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
diff --git a/Samples/DeviceLab/Controls/BindablePassword.xaml.cs b/Samples/SampleDeviceCollection/Controls/BindablePassword.xaml.cs
similarity index 98%
rename from Samples/DeviceLab/Controls/BindablePassword.xaml.cs
rename to Samples/SampleDeviceCollection/Controls/BindablePassword.xaml.cs
index d3c3eb2b..06e4dfef 100644
--- a/Samples/DeviceLab/Controls/BindablePassword.xaml.cs
+++ b/Samples/SampleDeviceCollection/Controls/BindablePassword.xaml.cs
@@ -7,7 +7,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace DeviceLab
+namespace SampleDeviceCollection
 {
     /// <summary>
     /// Interaction logic for BindablePassword.xaml
diff --git a/Samples/DeviceLab/Controls/DeviceCollectionView.xaml b/Samples/SampleDeviceCollection/Controls/DeviceCollectionView.xaml
similarity index 99%
rename from Samples/DeviceLab/Controls/DeviceCollectionView.xaml
rename to Samples/SampleDeviceCollection/Controls/DeviceCollectionView.xaml
index d9780279..b92df97d 100644
--- a/Samples/DeviceLab/Controls/DeviceCollectionView.xaml
+++ b/Samples/SampleDeviceCollection/Controls/DeviceCollectionView.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="DeviceLab.DeviceCollectionView"
+<UserControl x:Class="SampleDeviceCollection.DeviceCollectionView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:DeviceLab"
+             xmlns:local="clr-namespace:SampleDeviceCollection"
              mc:Ignorable="d" 
              d:DesignHeight="228.52" d:DesignWidth="517">
     <UserControl.Resources>
diff --git a/Samples/DeviceLab/Controls/DeviceCollectionView.xaml.cs b/Samples/SampleDeviceCollection/Controls/DeviceCollectionView.xaml.cs
similarity index 97%
rename from Samples/DeviceLab/Controls/DeviceCollectionView.xaml.cs
rename to Samples/SampleDeviceCollection/Controls/DeviceCollectionView.xaml.cs
index 1c25690e..078773b5 100644
--- a/Samples/DeviceLab/Controls/DeviceCollectionView.xaml.cs
+++ b/Samples/SampleDeviceCollection/Controls/DeviceCollectionView.xaml.cs
@@ -6,7 +6,7 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 
-namespace DeviceLab
+namespace SampleDeviceCollection
 {
     /// <summary>
     /// Interaction logic for DeviceCollectionView.xaml
diff --git a/Samples/DeviceLab/Controls/DeviceSignInView.xaml b/Samples/SampleDeviceCollection/Controls/DeviceSignInView.xaml
similarity index 97%
rename from Samples/DeviceLab/Controls/DeviceSignInView.xaml
rename to Samples/SampleDeviceCollection/Controls/DeviceSignInView.xaml
index d78a8419..d97ec80a 100644
--- a/Samples/DeviceLab/Controls/DeviceSignInView.xaml
+++ b/Samples/SampleDeviceCollection/Controls/DeviceSignInView.xaml
@@ -1,9 +1,9 @@
-<UserControl x:Class="DeviceLab.DeviceSignInView"
+<UserControl x:Class="SampleDeviceCollection.DeviceSignInView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:DeviceLab"
+             xmlns:local="clr-namespace:SampleDeviceCollection"
              xmlns:System="clr-namespace:System;assembly=mscorlib"
              mc:Ignorable="d"
              d:DesignHeight="140" d:DesignWidth="450">
diff --git a/Samples/DeviceLab/Controls/DeviceSignInView.xaml.cs b/Samples/SampleDeviceCollection/Controls/DeviceSignInView.xaml.cs
similarity index 96%
rename from Samples/DeviceLab/Controls/DeviceSignInView.xaml.cs
rename to Samples/SampleDeviceCollection/Controls/DeviceSignInView.xaml.cs
index 1e07e1e1..7c2a00ca 100644
--- a/Samples/DeviceLab/Controls/DeviceSignInView.xaml.cs
+++ b/Samples/SampleDeviceCollection/Controls/DeviceSignInView.xaml.cs
@@ -5,7 +5,7 @@
 //----------------------------------------------------------------------------------------------
 using System.Windows.Controls;
 
-namespace DeviceLab
+namespace SampleDeviceCollection
 {
     /// <summary>
     /// Interaction logic for DeviceSignInView.xaml
diff --git a/Samples/DeviceLab/Controls/NumberEntryBox.xaml b/Samples/SampleDeviceCollection/Controls/NumberEntryBox.xaml
similarity index 90%
rename from Samples/DeviceLab/Controls/NumberEntryBox.xaml
rename to Samples/SampleDeviceCollection/Controls/NumberEntryBox.xaml
index e717ebfe..2ce03c31 100644
--- a/Samples/DeviceLab/Controls/NumberEntryBox.xaml
+++ b/Samples/SampleDeviceCollection/Controls/NumberEntryBox.xaml
@@ -1,11 +1,11 @@
 <UserControl
-    x:Class="DeviceLab.NumberEntryBox"
+    x:Class="SampleDeviceCollection.NumberEntryBox"
     x:Name="root"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-    xmlns:local="clr-namespace:DeviceLab"
+    xmlns:local="clr-namespace:SampleDeviceCollection"
     mc:Ignorable="d" 
     d:DesignHeight="18" d:DesignWidth="55">
     <Grid Background="White" DataContext="{Binding ElementName=root}">
diff --git a/Samples/DeviceLab/Controls/NumberEntryBox.xaml.cs b/Samples/SampleDeviceCollection/Controls/NumberEntryBox.xaml.cs
similarity index 99%
rename from Samples/DeviceLab/Controls/NumberEntryBox.xaml.cs
rename to Samples/SampleDeviceCollection/Controls/NumberEntryBox.xaml.cs
index 9bce6971..aa43ffae 100644
--- a/Samples/DeviceLab/Controls/NumberEntryBox.xaml.cs
+++ b/Samples/SampleDeviceCollection/Controls/NumberEntryBox.xaml.cs
@@ -9,7 +9,7 @@
 using System.Windows.Input;
 using Prism.Commands;
 
-namespace DeviceLab
+namespace SampleDeviceCollection
 {
     /// <summary>
     /// Interaction logic for NumberEntryBox.xaml
diff --git a/Samples/DeviceLab/Controls/SelectionListBox.cs b/Samples/SampleDeviceCollection/Controls/SelectionListBox.cs
similarity index 99%
rename from Samples/DeviceLab/Controls/SelectionListBox.cs
rename to Samples/SampleDeviceCollection/Controls/SelectionListBox.cs
index ad65cfdc..08fa4e21 100644
--- a/Samples/DeviceLab/Controls/SelectionListBox.cs
+++ b/Samples/SampleDeviceCollection/Controls/SelectionListBox.cs
@@ -7,7 +7,7 @@
 using System.Windows;
 using System.Windows.Controls;
 
-namespace DeviceLab
+namespace SampleDeviceCollection
 {
     /// <summary>
     /// Custom ListBox that exposes a SelectionList Dependency property to enable two-way binding.
diff --git a/Samples/DeviceLab/MainWindow.xaml b/Samples/SampleDeviceCollection/MainWindow.xaml
similarity index 92%
rename from Samples/DeviceLab/MainWindow.xaml
rename to Samples/SampleDeviceCollection/MainWindow.xaml
index 8dfc99bc..5f1cb3c6 100644
--- a/Samples/DeviceLab/MainWindow.xaml
+++ b/Samples/SampleDeviceCollection/MainWindow.xaml
@@ -1,11 +1,11 @@
-<Window x:Class="DeviceLab.MainWindow"
+<Window x:Class="SampleDeviceCollection.MainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:DeviceLab"
+        xmlns:local="clr-namespace:SampleDeviceCollection"
         mc:Ignorable="d"
-        Title="Device Lab" Height="600" Width="700">
+        Title="Device Collection Sample" Height="600" Width="700">
     <Window.DataContext>
         <local:MainViewModel />
     </Window.DataContext>
diff --git a/Samples/DeviceLab/MainWindow.xaml.cs b/Samples/SampleDeviceCollection/MainWindow.xaml.cs
similarity index 95%
rename from Samples/DeviceLab/MainWindow.xaml.cs
rename to Samples/SampleDeviceCollection/MainWindow.xaml.cs
index a357767d..c049e37f 100644
--- a/Samples/DeviceLab/MainWindow.xaml.cs
+++ b/Samples/SampleDeviceCollection/MainWindow.xaml.cs
@@ -5,7 +5,7 @@
 //----------------------------------------------------------------------------------------------
 using System.Windows;
 
-namespace DeviceLab
+namespace SampleDeviceCollection
 {
     /// <summary>
     /// Interaction logic for MainWindow.xaml
diff --git a/Samples/DeviceLab/Properties/AssemblyInfo.cs b/Samples/SampleDeviceCollection/Properties/AssemblyInfo.cs
similarity index 96%
rename from Samples/DeviceLab/Properties/AssemblyInfo.cs
rename to Samples/SampleDeviceCollection/Properties/AssemblyInfo.cs
index d0049244..4ff94abf 100644
--- a/Samples/DeviceLab/Properties/AssemblyInfo.cs
+++ b/Samples/SampleDeviceCollection/Properties/AssemblyInfo.cs
@@ -10,11 +10,11 @@
 // 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("DeviceLab")]
+[assembly: AssemblyTitle("SampleDeviceCollection")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("DeviceLab")]
+[assembly: AssemblyProduct("SampleDeviceCollection")]
 [assembly: AssemblyCopyright("Copyright ©  2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
diff --git a/Samples/DeviceLab/Properties/Resources.Designer.cs b/Samples/SampleDeviceCollection/Properties/Resources.Designer.cs
similarity index 83%
rename from Samples/DeviceLab/Properties/Resources.Designer.cs
rename to Samples/SampleDeviceCollection/Properties/Resources.Designer.cs
index f083c487..e3e69d2f 100644
--- a/Samples/DeviceLab/Properties/Resources.Designer.cs
+++ b/Samples/SampleDeviceCollection/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace DeviceLab.Properties
-{
-
-
+namespace SampleDeviceCollection.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -22,48 +22,40 @@ namespace DeviceLab.Properties
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DeviceLab.Properties.Resources", typeof(Resources).Assembly);
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("SampleDeviceCollection.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
diff --git a/Samples/DeviceLab/Properties/Resources.resx b/Samples/SampleDeviceCollection/Properties/Resources.resx
similarity index 100%
rename from Samples/DeviceLab/Properties/Resources.resx
rename to Samples/SampleDeviceCollection/Properties/Resources.resx
diff --git a/Samples/DeviceLab/Properties/Settings.Designer.cs b/Samples/SampleDeviceCollection/Properties/Settings.Designer.cs
similarity index 82%
rename from Samples/DeviceLab/Properties/Settings.Designer.cs
rename to Samples/SampleDeviceCollection/Properties/Settings.Designer.cs
index 0d6835be..4869e044 100644
--- a/Samples/DeviceLab/Properties/Settings.Designer.cs
+++ b/Samples/SampleDeviceCollection/Properties/Settings.Designer.cs
@@ -8,21 +8,17 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace DeviceLab.Properties
-{
-
-
+namespace SampleDeviceCollection.Properties {
+    
+    
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
-    {
-
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.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
-            {
+        
+        public static Settings Default {
+            get {
                 return defaultInstance;
             }
         }
diff --git a/Samples/DeviceLab/Properties/Settings.settings b/Samples/SampleDeviceCollection/Properties/Settings.settings
similarity index 100%
rename from Samples/DeviceLab/Properties/Settings.settings
rename to Samples/SampleDeviceCollection/Properties/Settings.settings
diff --git a/Samples/DeviceLab/DeviceLab.csproj b/Samples/SampleDeviceCollection/SampleDeviceCollection.csproj
similarity index 98%
rename from Samples/DeviceLab/DeviceLab.csproj
rename to Samples/SampleDeviceCollection/SampleDeviceCollection.csproj
index 7b9fadfc..6d15f6a6 100644
--- a/Samples/DeviceLab/DeviceLab.csproj
+++ b/Samples/SampleDeviceCollection/SampleDeviceCollection.csproj
@@ -7,8 +7,8 @@
     <ProjectGuid>{C0C9CBEF-E460-431B-90DD-4B1EFEBB9445}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DeviceLab</RootNamespace>
-    <AssemblyName>DeviceLab</AssemblyName>
+    <RootNamespace>SampleDeviceCollection</RootNamespace>
+    <AssemblyName>SampleDeviceCollection</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
diff --git a/Samples/DeviceLab/DeviceLab.sln b/Samples/SampleDeviceCollection/SampleDeviceCollection.sln
similarity index 91%
rename from Samples/DeviceLab/DeviceLab.sln
rename to Samples/SampleDeviceCollection/SampleDeviceCollection.sln
index 0e1b1c70..8ab2951c 100644
--- a/Samples/DeviceLab/DeviceLab.sln
+++ b/Samples/SampleDeviceCollection/SampleDeviceCollection.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeviceLab", "DeviceLab.csproj", "{C0C9CBEF-E460-431B-90DD-4B1EFEBB9445}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleDeviceCollection", "SampleDeviceCollection.csproj", "{C0C9CBEF-E460-431B-90DD-4B1EFEBB9445}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsDevicePortalWrapper", "..\..\WindowsDevicePortalWrapper\WindowsDevicePortalWrapper\WindowsDevicePortalWrapper.csproj", "{6A9E862E-5CDA-4A8A-BBC0-56E9EA921E39}"
 EndProject
diff --git a/Samples/DeviceLab/Settings.StyleCop b/Samples/SampleDeviceCollection/Settings.StyleCop
similarity index 100%
rename from Samples/DeviceLab/Settings.StyleCop
rename to Samples/SampleDeviceCollection/Settings.StyleCop
diff --git a/Samples/DeviceLab/Themes/CustomStyles.xaml b/Samples/SampleDeviceCollection/Themes/CustomStyles.xaml
similarity index 97%
rename from Samples/DeviceLab/Themes/CustomStyles.xaml
rename to Samples/SampleDeviceCollection/Themes/CustomStyles.xaml
index 3e2ddd5a..0cb24049 100644
--- a/Samples/DeviceLab/Themes/CustomStyles.xaml
+++ b/Samples/SampleDeviceCollection/Themes/CustomStyles.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:DeviceLab.Themes">
+                    xmlns:local="clr-namespace:SampleDeviceCollection.Themes">
 
     <!-- GridSplitter Control Styling -->
     <Style TargetType="{x:Type Ellipse}" x:Key="splitterDot">
diff --git a/Samples/DeviceLab/Themes/Generic.xaml b/Samples/SampleDeviceCollection/Themes/Generic.xaml
similarity index 84%
rename from Samples/DeviceLab/Themes/Generic.xaml
rename to Samples/SampleDeviceCollection/Themes/Generic.xaml
index ad0d898c..e621fb66 100644
--- a/Samples/DeviceLab/Themes/Generic.xaml
+++ b/Samples/SampleDeviceCollection/Themes/Generic.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:DeviceLab">
+                    xmlns:local="clr-namespace:SampleDeviceCollection">
     <Style TargetType="{x:Type local:SelectionListBox}" BasedOn="{StaticResource {x:Type ListBox}}" />
     <Style TargetType="{x:Type local:AutoScrollTextBox}" BasedOn="{StaticResource {x:Type TextBox}}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Samples/DeviceLab/ViewModels/CommandSequence.cs b/Samples/SampleDeviceCollection/ViewModels/CommandSequence.cs
similarity index 99%
rename from Samples/DeviceLab/ViewModels/CommandSequence.cs
rename to Samples/SampleDeviceCollection/ViewModels/CommandSequence.cs
index 5db22ea4..b196e4cb 100644
--- a/Samples/DeviceLab/ViewModels/CommandSequence.cs
+++ b/Samples/SampleDeviceCollection/ViewModels/CommandSequence.cs
@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Windows.Input;
 
-namespace DeviceLab
+namespace SampleDeviceCollection
 {
     /// <summary>
     /// Composes several ICommand implementations to run in sequence with each command executing
diff --git a/Samples/DeviceLab/ViewModels/DevicePortalCommandModel.cs b/Samples/SampleDeviceCollection/ViewModels/DevicePortalCommandModel.cs
similarity index 99%
rename from Samples/DeviceLab/ViewModels/DevicePortalCommandModel.cs
rename to Samples/SampleDeviceCollection/ViewModels/DevicePortalCommandModel.cs
index f66466e4..4f38c0a8 100644
--- a/Samples/DeviceLab/ViewModels/DevicePortalCommandModel.cs
+++ b/Samples/SampleDeviceCollection/ViewModels/DevicePortalCommandModel.cs
@@ -7,7 +7,7 @@
 using Microsoft.Tools.WindowsDevicePortal;
 using Prism.Mvvm;
 
-namespace DeviceLab
+namespace SampleDeviceCollection
 {
     /// <summary>
     /// Base class for ViewModel classes that wrap a DevicePortal object.
diff --git a/Samples/DeviceLab/ViewModels/DevicePortalViewModel.cs b/Samples/SampleDeviceCollection/ViewModels/DevicePortalViewModel.cs
similarity index 99%
rename from Samples/DeviceLab/ViewModels/DevicePortalViewModel.cs
rename to Samples/SampleDeviceCollection/ViewModels/DevicePortalViewModel.cs
index 7b2a83df..1feb61d3 100644
--- a/Samples/DeviceLab/ViewModels/DevicePortalViewModel.cs
+++ b/Samples/SampleDeviceCollection/ViewModels/DevicePortalViewModel.cs
@@ -14,7 +14,7 @@
 using System.Net.Security;
 using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
 
-namespace DeviceLab
+namespace SampleDeviceCollection
 {
     /// <summary>
     /// Viewmodel for a single connected device
diff --git a/Samples/DeviceLab/ViewModels/DeviceSignInViewModel.cs b/Samples/SampleDeviceCollection/ViewModels/DeviceSignInViewModel.cs
similarity index 99%
rename from Samples/DeviceLab/ViewModels/DeviceSignInViewModel.cs
rename to Samples/SampleDeviceCollection/ViewModels/DeviceSignInViewModel.cs
index 43d3254f..4afaab01 100644
--- a/Samples/DeviceLab/ViewModels/DeviceSignInViewModel.cs
+++ b/Samples/SampleDeviceCollection/ViewModels/DeviceSignInViewModel.cs
@@ -19,7 +19,7 @@
 using Prism.Mvvm;
 using System.Windows.Input;
 
-namespace DeviceLab
+namespace SampleDeviceCollection
 {
     //-------------------------------------------------------------------
     //  Value Converters
diff --git a/Samples/DeviceLab/ViewModels/DiagnosticOutputViewModel.cs b/Samples/SampleDeviceCollection/ViewModels/DiagnosticOutputViewModel.cs
similarity index 99%
rename from Samples/DeviceLab/ViewModels/DiagnosticOutputViewModel.cs
rename to Samples/SampleDeviceCollection/ViewModels/DiagnosticOutputViewModel.cs
index ca86355a..dd50184e 100644
--- a/Samples/DeviceLab/ViewModels/DiagnosticOutputViewModel.cs
+++ b/Samples/SampleDeviceCollection/ViewModels/DiagnosticOutputViewModel.cs
@@ -5,7 +5,7 @@
 //----------------------------------------------------------------------------------------------
 using Prism.Mvvm;
 
-namespace DeviceLab
+namespace SampleDeviceCollection
 {
     /// <summary>
     /// View Model to provide diagnostic output to a view through the OutputStream string property
diff --git a/Samples/DeviceLab/ViewModels/DiagnosticSinks.cs b/Samples/SampleDeviceCollection/ViewModels/DiagnosticSinks.cs
similarity index 99%
rename from Samples/DeviceLab/ViewModels/DiagnosticSinks.cs
rename to Samples/SampleDeviceCollection/ViewModels/DiagnosticSinks.cs
index 1c600a8d..fb7ce80b 100644
--- a/Samples/DeviceLab/ViewModels/DiagnosticSinks.cs
+++ b/Samples/SampleDeviceCollection/ViewModels/DiagnosticSinks.cs
@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace DeviceLab
+namespace SampleDeviceCollection
 {
     /// <summary>
     /// Several IDiagnosticSink implementations
diff --git a/Samples/DeviceLab/ViewModels/MainViewModel.cs b/Samples/SampleDeviceCollection/ViewModels/MainViewModel.cs
similarity index 99%
rename from Samples/DeviceLab/ViewModels/MainViewModel.cs
rename to Samples/SampleDeviceCollection/ViewModels/MainViewModel.cs
index 2ef0d86f..05778aed 100644
--- a/Samples/DeviceLab/ViewModels/MainViewModel.cs
+++ b/Samples/SampleDeviceCollection/ViewModels/MainViewModel.cs
@@ -13,7 +13,7 @@
 using Prism.Commands;
 using Prism.Mvvm;
 
-namespace DeviceLab
+namespace SampleDeviceCollection
 {
     /// <summary>
     /// View model for the main view.
diff --git a/Samples/DeviceLab/ViewModels/ObservableCommandQueue.cs b/Samples/SampleDeviceCollection/ViewModels/ObservableCommandQueue.cs
similarity index 99%
rename from Samples/DeviceLab/ViewModels/ObservableCommandQueue.cs
rename to Samples/SampleDeviceCollection/ViewModels/ObservableCommandQueue.cs
index cad0cec6..20f54f8a 100644
--- a/Samples/DeviceLab/ViewModels/ObservableCommandQueue.cs
+++ b/Samples/SampleDeviceCollection/ViewModels/ObservableCommandQueue.cs
@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Windows.Input;
 
-namespace DeviceLab
+namespace SampleDeviceCollection
 {
     /// <summary>
     /// A simple queue of commands that provides notifications whenever the contents changed.
diff --git a/Samples/DeviceLab/packages.config b/Samples/SampleDeviceCollection/packages.config
similarity index 100%
rename from Samples/DeviceLab/packages.config
rename to Samples/SampleDeviceCollection/packages.config

From 377b3c2c995a49aa62bf73de7f6e5fe08732e6f0 Mon Sep 17 00:00:00 2001
From: Greg Pettyjohn <grpettyj@microsoft.com>
Date: Wed, 28 Sep 2016 11:55:26 -0700
Subject: [PATCH 13/51] Added finishing touches to the code. Getting it ready
 for a pull request

---
 .../BooleanConverter.cs                       | 105 +++++++
 .../Controls/DeviceCollectionView.xaml        |   2 +-
 .../SampleDeviceCollection.csproj             |   1 +
 .../SampleDeviceCollection/Settings.StyleCop  |   5 +
 .../ViewModels/DevicePortalCommandModel.cs    |  10 +-
 .../ViewModels/DevicePortalViewModel.cs       | 281 ++++++------------
 .../ViewModels/DeviceSignInViewModel.cs       | 234 +++++++++------
 .../ViewModels/MainViewModel.cs               |  75 ++++-
 .../DefaultDevicePortalConnection.cs          |  12 +-
 9 files changed, 424 insertions(+), 301 deletions(-)
 create mode 100644 Samples/SampleDeviceCollection/BooleanConverter.cs

diff --git a/Samples/SampleDeviceCollection/BooleanConverter.cs b/Samples/SampleDeviceCollection/BooleanConverter.cs
new file mode 100644
index 00000000..57665166
--- /dev/null
+++ b/Samples/SampleDeviceCollection/BooleanConverter.cs
@@ -0,0 +1,105 @@
+//----------------------------------------------------------------------------------------------
+// <copyright file="BooleanConverter.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace SampleDeviceCollection
+{
+    //-------------------------------------------------------------------
+    //  Boolean Converter
+    //-------------------------------------------------------------------
+    #region Boolean Converter
+    /// <summary>
+    ///     Template allows for easy creation of a value converter for bools
+    /// </summary>
+    /// <typeparam name="T">Type to convert back and forth to boolean</typeparam>
+    /// <remarks>
+    ///     See BooleanToVisibilityConverter and BooleanToBrushConverter (below) and usage in Generic.xaml
+    /// </remarks>
+    public class BooleanConverter<T> : IValueConverter
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BooleanConverter{T}" /> class.
+        /// </summary>
+        /// <param name="trueValue">The value of type T that represents true</param>
+        /// <param name="falseValue">The value of type T that represents false</param>
+        public BooleanConverter(T trueValue, T falseValue)
+        {
+            this.True = trueValue;
+            this.False = falseValue;
+        }
+
+        /// <summary>
+        /// Gets or sets the value that represents true
+        /// </summary>
+        public T True { get; set; }
+
+        /// <summary>
+        /// Gets or sets the value that represetns false
+        /// </summary>
+        public T False { get; set; }
+
+        /// <summary>
+        /// Convert an object of type T to boolean
+        /// </summary>
+        /// <param name="value">Object of type T to convert</param>
+        /// <param name="targetType">The parameter is not used.</param>
+        /// <param name="parameter">The parameter is not used.</param>
+        /// <param name="culture">The parameter is not used.</param>
+        /// <returns>Object of boolean value</returns>
+        public virtual object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value is bool && ((bool)value) ? this.True : this.False;
+        }
+
+        /// <summary>
+        /// Convert a boolean value to an object of type T
+        /// </summary>
+        /// <param name="value">The boolean value to convert</param>
+        /// <param name="targetType">The parameter is not used.</param>
+        /// <param name="parameter">The parameter is not used.</param>
+        /// <param name="culture">The parameter is not used.</param>
+        /// <returns>Object of type T</returns>
+        public virtual object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value is T && EqualityComparer<T>.Default.Equals((T)value, this.True);
+        }
+    }
+
+    /// <summary>
+    /// Converter between a boolean and visibility value
+    /// </summary>
+    [type: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:FileMayOnlyContainASingleClass", Justification = "Small classes are all instances of the same generic and are better organized in a single file.")]
+    public sealed class BooleanToVisibilityConverter : BooleanConverter<Visibility>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BooleanToVisibilityConverter" /> class.
+        /// </summary>
+        public BooleanToVisibilityConverter() :
+            base(Visibility.Visible, Visibility.Hidden)
+        {
+        }
+    }
+
+    /// <summary>
+    /// Converter between a boolean and either "http" or "https"
+    /// </summary>
+    [type: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1402:FileMayOnlyContainASingleClass", Justification = "Small classes are all instances of the same generic and are better organized in a single file.")]
+    public sealed class BooleanToHttpsConverter : BooleanConverter<string>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BooleanToHttpsConverter" /> class.
+        /// </summary>
+        public BooleanToHttpsConverter() :
+            base("https", "http")
+        {
+        }
+    }
+    #endregion // Boolean Converter
+}
diff --git a/Samples/SampleDeviceCollection/Controls/DeviceCollectionView.xaml b/Samples/SampleDeviceCollection/Controls/DeviceCollectionView.xaml
index b92df97d..f1784eba 100644
--- a/Samples/SampleDeviceCollection/Controls/DeviceCollectionView.xaml
+++ b/Samples/SampleDeviceCollection/Controls/DeviceCollectionView.xaml
@@ -97,7 +97,7 @@
                                         <TextBlock Margin="0,0,4,0" Text="Device Name:" />
                                         <TextBlock Text="{Binding DeviceName}"/>
                                         <TextBlock Margin="50,0,4,0" Text="Cannonical Device Address:" />
-                                        <TextBlock Text="{Binding CannonicalIpAddress}"/>
+                                        <TextBlock Text="{Binding Address}"/>
                                         <Button
                                             DockPanel.Dock="Right"
                                             Height="16" Width="16"
diff --git a/Samples/SampleDeviceCollection/SampleDeviceCollection.csproj b/Samples/SampleDeviceCollection/SampleDeviceCollection.csproj
index 6d15f6a6..50b51a15 100644
--- a/Samples/SampleDeviceCollection/SampleDeviceCollection.csproj
+++ b/Samples/SampleDeviceCollection/SampleDeviceCollection.csproj
@@ -60,6 +60,7 @@
       <SubType>Designer</SubType>
     </ApplicationDefinition>
     <Compile Include="Controls\AutoScrollTextBox.cs" />
+    <Compile Include="BooleanConverter.cs" />
     <Compile Include="ViewModels\CommandSequence.cs" />
     <Compile Include="ViewModels\DiagnosticSinks.cs" />
     <Compile Include="ViewModels\ObservableCommandQueue.cs" />
diff --git a/Samples/SampleDeviceCollection/Settings.StyleCop b/Samples/SampleDeviceCollection/Settings.StyleCop
index 5356cc8a..c7a638bf 100644
--- a/Samples/SampleDeviceCollection/Settings.StyleCop
+++ b/Samples/SampleDeviceCollection/Settings.StyleCop
@@ -7,6 +7,11 @@
             <BooleanProperty Name="Enabled">False</BooleanProperty>
           </RuleSettings>
         </Rule>
+        <Rule Name="EnumerationItemsMustBeDocumented">
+          <RuleSettings>
+            <BooleanProperty Name="Enabled">False</BooleanProperty>
+          </RuleSettings>
+        </Rule>
       </Rules>
       <AnalyzerSettings />
     </Analyzer>
diff --git a/Samples/SampleDeviceCollection/ViewModels/DevicePortalCommandModel.cs b/Samples/SampleDeviceCollection/ViewModels/DevicePortalCommandModel.cs
index 4f38c0a8..f8a2f1c2 100644
--- a/Samples/SampleDeviceCollection/ViewModels/DevicePortalCommandModel.cs
+++ b/Samples/SampleDeviceCollection/ViewModels/DevicePortalCommandModel.cs
@@ -24,7 +24,7 @@ public class DevicePortalCommandModel : BindableBase
         /// <summary>
         /// Initializes a new instance of the <see cref="DevicePortalCommandModel" /> class.
         /// </summary>
-        /// <param name="portal">DevicePortal object enscapsulated by this</param>
+        /// <param name="connection">IDevicePortalConnection object used for connecting</param>
         /// <param name="diags">Diagnostic sink for reporting</param>
         public DevicePortalCommandModel(IDevicePortalConnection connection, IDiagnosticSink diags)
         {
@@ -47,12 +47,12 @@ public DevicePortalCommandModel(IDevicePortalConnection connection, IDiagnosticS
         //-------------------------------------------------------------------
         #region Class Members
         /// <summary>
-        ///  The DevicePortal object encapsulated by this class
+        ///  Gets or sets the DevicePortal object encapsulated by this class
         /// </summary>
         public DevicePortal Portal { get; protected set; }
 
         /// <summary>
-        /// The IDevicePortalConnection object encapsulated by this class
+        /// Gets or sets the IDevicePortalConnection object encapsulated by this class
         /// </summary>
         public IDevicePortalConnection Connection { get; protected set; }
         #endregion // Class Members
@@ -93,7 +93,7 @@ public string Address
         {
             get
             {
-                return this.Portal == null ? "<unknown>" : this.Portal.Address;
+                return this.Portal == null ? "<unknown>" : this.Portal.Address.Split(':')[0];
             }
         }
         #endregion // Address
@@ -165,7 +165,7 @@ public string PlatformName
         /// <summary>
         /// Clears the shared command queue
         /// </summary>
-        protected void ClearCommandQueue()
+        public void ClearCommandQueue()
         {
             this.commandQueue.Clear();
         }
diff --git a/Samples/SampleDeviceCollection/ViewModels/DevicePortalViewModel.cs b/Samples/SampleDeviceCollection/ViewModels/DevicePortalViewModel.cs
index 1feb61d3..f2cc9f54 100644
--- a/Samples/SampleDeviceCollection/ViewModels/DevicePortalViewModel.cs
+++ b/Samples/SampleDeviceCollection/ViewModels/DevicePortalViewModel.cs
@@ -5,13 +5,13 @@
 //----------------------------------------------------------------------------------------------
 using System;
 using System.Net;
+using System.Net.Security;
+using System.Security.Cryptography.X509Certificates;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Input;
 using Microsoft.Tools.WindowsDevicePortal;
 using Prism.Commands;
-using System.Security.Cryptography.X509Certificates;
-using System.Windows;
-using System.Net.Security;
 using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
 
 namespace SampleDeviceCollection
@@ -21,8 +21,6 @@ namespace SampleDeviceCollection
     /// </summary>
     public class DevicePortalViewModel : DevicePortalCommandModel
     {
-        MainViewModel mainViewModel;
-
         //-------------------------------------------------------------------
         //  Constructors
         //-------------------------------------------------------------------
@@ -30,15 +28,15 @@ public class DevicePortalViewModel : DevicePortalCommandModel
         /// <summary>
         /// Initializes a new instance of the <see cref="DevicePortalViewModel" /> class.
         /// </summary>
-        /// <param name="portal">DevicePortal object enscapsulated by this</param>
+        /// <param name="connection">IDevicePortalConnection used for connecting</param>
         /// <param name="diags">Diagnostic sink for reporting</param>
-        public DevicePortalViewModel(MainViewModel mainViewModel, IDevicePortalConnection connection, IDiagnosticSink diags)
+        public DevicePortalViewModel(IDevicePortalConnection connection, IDiagnosticSink diags)
             : base(connection, diags)
         {
-            this.mainViewModel = mainViewModel;
+            this.connectionStatus = DeviceConnectionStatus.None;
 
             // Add additional handling for untrusted certs.
-            this.Portal.UnvalidatedCert += DoCertValidation;
+            this.Portal.UnvalidatedCert += this.DoCertValidation;
 
             // Default number of retry attempts to make when reestablishing the connection
             this.ConnectionRetryAttempts = 3;
@@ -59,11 +57,7 @@ protected override string DiagnosticMoniker
         {
             get
             {
-                if(string.IsNullOrWhiteSpace(this.deviceName))
-                {
-                    return !string.IsNullOrWhiteSpace(this.CannonicalIpAddress) ? this.CannonicalIpAddress : base.DiagnosticMoniker;
-                }
-                return this.deviceName;
+                return !string.IsNullOrWhiteSpace(this.DeviceName) ? this.DeviceName : base.DiagnosticMoniker;
             }
         }
         #endregion // Diagnostic Moniker
@@ -91,22 +85,6 @@ private set
         }
         #endregion //DeviceName
 
-        #region CannonicalIpAddress
-        private string cannonicalIpAddress;
-        public string CannonicalIpAddress
-        {
-            get
-            {
-                return cannonicalIpAddress;
-            }
-
-            private set
-            {
-                this.SetProperty(ref this.cannonicalIpAddress, value);
-            }
-        }
-        #endregion // CannonicalIpAddress
-
         #region DeviceNameEntry
         /// <summary>
         /// User input from the user to be used as a new device name
@@ -170,131 +148,75 @@ public int ConnectionRetryAttempts
             }
         }
         #endregion // ConnectionRetryAttempts
-        #endregion // Properties
 
-        //-------------------------------------------------------------------
-        //  Commands
-        //-------------------------------------------------------------------
-        #region Commands
-        #region GetCannonicalIpAddress
-        private CommandSequence getCannonicalIpAddressCommand;
-        public ICommand GetCannonicalIpAddressCommand
-        {
-            get
-            {
-                if(this.getCannonicalIpAddressCommand == null)
-                {
-                    this.getCannonicalIpAddressCommand = this.CreateCommandSequence();
-                    DelegateCommand getCannonicalIpAddressDC = DelegateCommand.FromAsyncHandler(this.ExecuteGetCannonicalIpAddressAsync, this.CanExecuteGetCannonicalIpAddress);
-                    getCannonicalIpAddressDC.ObservesProperty(() => this.Ready);
-                    this.getCannonicalIpAddressCommand.RegisterCommand(getCannonicalIpAddressDC);
-                }
-                return this.getCannonicalIpAddressCommand;
-            }
-        }
-
-        private bool CanExecuteGetCannonicalIpAddress()
-        {
-            return this.Ready;
-        }
-
-        private async Task ExecuteGetCannonicalIpAddressAsync()
-        {
-            this.OutputDiagnosticString("ExecuteGetCannonicalIpAddress\n");
-            this.Ready = false;
-            try
-            {
-                IpConfiguration config = await this.Portal.GetIpConfig();
-                this.CannonicalIpAddressFromIpConfig(config);
-                this.CheckForDuplicateDevices();
-            }
-            catch (Exception exn)
-            {
-                this.ReportException("GetCannonicalIpAddress", exn);
-            }
-            this.Ready = true;
-        }
+        #region ConnectionStatus
+        /// <summary>
+        /// Status of the connection associated with this DevicePortalViewModel
+        /// </summary>
+        private DeviceConnectionStatus connectionStatus;
 
-        private void CheckForDuplicateDevices()
+        /// <summary>
+        /// Gets the status of the connection associated with this DevicePortalViewModel
+        /// </summary>
+        public DeviceConnectionStatus ConnectionStatus
         {
-            foreach(DevicePortalViewModel dpvm in this.mainViewModel.ConnectedDevices)
+            get
             {
-                if (dpvm == this)
-                    continue;
-
-                if(this.cannonicalIpAddress == dpvm.cannonicalIpAddress)
-                {
-                    MessageBox.Show(string.Format("You already have a connection for this device address: {0}", this.cannonicalIpAddress),
-                            "Duplicate",
-                            MessageBoxButton.OK,
-                            MessageBoxImage.Exclamation);
-                    this.ClearCommandQueue();
-                    this.mainViewModel.RemoveDeviceCommand.Execute(this);
-                }
+                return this.connectionStatus;
             }
-        }
 
-        private void CannonicalIpAddressFromIpConfig(IpConfiguration config)
-        {
-            string firstNonZeroIpAddress = "";
-            string connectionIp = this.StripPort(this.Connection.Connection.Authority);
-            bool ipMatchesConnection = false;
-            foreach(NetworkAdapterInfo naio in config.Adapters)
+            private set
             {
-                foreach(IpAddressInfo iai in naio.IpAddresses)
-                {
-                    string addr = iai.Address;
-                    if (string.IsNullOrWhiteSpace(addr))
-                        continue;
-                    if (addr == "0.0.0.0")
-                        continue;
-                    firstNonZeroIpAddress = addr;
-                    if(addr == connectionIp)
-                    {
-                        ipMatchesConnection = true;
-                        break;
-                    }
-                }
-                
-                if(ipMatchesConnection)
-                {
-                    this.CannonicalIpAddress = connectionIp;
-                }
-                else
-                {
-                    this.CannonicalIpAddress = firstNonZeroIpAddress;
-                }
+                this.SetProperty(ref this.connectionStatus, value);
             }
         }
+            
+        #endregion // ConnectionStatus
+        #endregion // Properties
 
-        private string StripPort(string authority)
-        {
-            return authority.Split(':')[0];
-        }
-        #endregion // GetCannonicalIpAddress
+        //-------------------------------------------------------------------
+        //  Commands
+        //-------------------------------------------------------------------
+        #region Commands
 
         #region DumpIpConfigCommand
+        /// <summary>
+        /// Command to dump the IP configuration for the remote device
+        /// </summary>
         private CommandSequence dumpIpConfigCommand;
+
+        /// <summary>
+        /// Gets the command to dump the IP configuration for the remote device
+        /// </summary>
         public ICommand DumpIpConfigCommand
         {
             get
             {
-                if(this.dumpIpConfigCommand == null)
-                {
+                if (this.dumpIpConfigCommand == null)
+                { 
                     this.dumpIpConfigCommand = this.CreateCommandSequence();
                     DelegateCommand dumpIpConfigDC = DelegateCommand.FromAsyncHandler(this.ExecuteDumpIpConfigAsync, this.CanExecuteDumpIpConfig);
                     dumpIpConfigDC.ObservesProperty(() => this.Ready);
                     this.dumpIpConfigCommand.RegisterCommand(dumpIpConfigDC);
                 }
+
                 return this.dumpIpConfigCommand;
             }
         }
 
+        /// <summary>
+        /// Predicate for the DumpIpConfigCommand
+        /// </summary>
+        /// <returns>Result indicates whether the command can execute</returns>
         private bool CanExecuteDumpIpConfig()
         {
             return this.Ready;
         }
 
+        /// <summary>
+        /// Performs the action for the DumpIPConfigCommand
+        /// </summary>
+        /// <returns>A task capturing the continuation of dumping the IP config</returns>
         private async Task ExecuteDumpIpConfigAsync()
         {
             this.OutputDiagnosticString("ExecuteDumpIpConfigAsync\n");
@@ -308,9 +230,14 @@ private async Task ExecuteDumpIpConfigAsync()
             {
                 this.ReportException("DumpIPConfig", exn);
             }
+
             this.Ready = true;
         }
 
+        /// <summary>
+        /// Writes an IP configuration to the diagnostic output
+        /// </summary>
+        /// <param name="config">The IP configuration to write out</param>
         private void OutputIpConfiguration(IpConfiguration config)
         {
             // For now, just dump out the adapters to the debug output to see what I got
@@ -331,6 +258,7 @@ private void OutputIpConfiguration(IpConfiguration config)
                 {
                     this.OutputIpAddressInfo(iai);
                 }
+
                 this.OutputDiagnosticString("    IP Addresses:\n");
                 foreach (IpAddressInfo iai in nai.IpAddresses)
                 {
@@ -339,6 +267,10 @@ private void OutputIpConfiguration(IpConfiguration config)
             }
         }
 
+        /// <summary>
+        /// Writes DHCP configuration data to the diagnostic output
+        /// </summary>
+        /// <param name="dhcp">The DHCP configuration data to write</param>
         private void OutputDHCPInfo(Dhcp dhcp)
         {
             this.OutputIpAddressInfo(dhcp.Address);
@@ -346,6 +278,10 @@ private void OutputDHCPInfo(Dhcp dhcp)
             this.OutputDiagnosticString("        Lease Expires {0}\n", dhcp.LeaseExpires.ToLocalTime().ToString());
         }
 
+        /// <summary>
+        /// Writes IP address information to the diagnostic output
+        /// </summary>
+        /// <param name="ipAddr">The IP address information to write</param>
         private void OutputIpAddressInfo(IpAddressInfo ipAddr)
         {
             this.OutputDiagnosticString("        Address: {0}\n", ipAddr.Address);
@@ -372,13 +308,8 @@ public ICommand RenameCommand
                     DelegateCommand renameDC = DelegateCommand.FromAsyncHandler(this.ExecuteRenameAsync, this.CanExecuteRename);
                     renameDC.ObservesProperty(() => this.Ready);
                     renameDC.ObservesProperty(() => this.DeviceNameEntry);
-                    
-
-                    DelegateCommand resetConnectionAndPortalDC = new DelegateCommand(this.ExecuteResetConnectionAndPortal, this.CanExecuteResetConnectionAndPortal);
-                    resetConnectionAndPortalDC.ObservesProperty(() => this.Ready);
 
                     this.renameCommand.RegisterCommand(renameDC);
-                    this.renameCommand.RegisterCommand(resetConnectionAndPortalDC);
                     this.renameCommand.RegisterCommand(this.ReestablishConnectionCommand);
                     this.renameCommand.RegisterCommand(this.RebootCommand);
                 }
@@ -386,50 +317,7 @@ public ICommand RenameCommand
                 return this.renameCommand;
             }
         }
-
-        private bool CanExecuteResetConnectionAndPortal()
-        {
-            return this.Ready;
-        }
-
-        private void ExecuteResetConnectionAndPortal()
-        {
-            this.OutputDiagnosticString("ExecuteResetConnectionAndPortalAsync\n");
-            this.Ready = false;
-            try
-            {
-                NetworkCredential cred = this.Connection.Credentials;
-                string scheme = this.Connection.Connection.Scheme;
-                string address = this.CannonicalIpAddress;
-                string port = this.Connection.Connection.Port.ToString();
-                string schemeAddressPort = string.Format(@"{0}://{1}:{2}", scheme, address, port);
-                string username = this.StripAutoPrefix(cred.UserName);
-
-                this.Portal.UnvalidatedCert -= DoCertValidation;
-
-                this.Connection = new DefaultDevicePortalConnection(schemeAddressPort, username, cred.SecurePassword);
-                this.Portal = new DevicePortal(this.Connection);
-
-                // Add additional handling for untrusted certs.
-                this.Portal.UnvalidatedCert += DoCertValidation;
-            }
-            catch (Exception exn)
-            {
-                this.ReportException("ResetConnectionAndPortal", exn);
-            }
-
-            this.Ready = true;
-        }
-
-        private string StripAutoPrefix(string userName)
-        {
-            if(userName.Length > 5)
-            {
-                return userName.Substring(5);
-            }
-            return userName;
-        }
-
+        
         /// <summary>
         /// Predicate for the rename command
         /// </summary>
@@ -544,7 +432,6 @@ public ICommand RebootCommand
                     this.rebootCommand.RegisterCommand(rebootDC);
                     this.rebootCommand.RegisterCommand(this.ReestablishConnectionCommand);
                     this.rebootCommand.RegisterCommand(this.RefreshDeviceNameCommand);
-                    this.renameCommand.RegisterCommand(this.GetCannonicalIpAddressCommand);
                     this.rebootCommand.RegisterCommand(this.StartListeningForSystemPerfCommand);
                 }
 
@@ -588,20 +475,27 @@ private async Task ExecuteRebootAsync()
         #endregion // Reboot Command
 
         #region RefreshConnectionCommand
+        /// <summary>
+        /// Command to refresh the connection with the remote device
+        /// </summary>
         private CommandSequence refreshConnectionCommand;
+
+        /// <summary>
+        /// Gets the command that refreshes the connection with the remote device
+        /// </summary>
         public ICommand RefreshConnectionCommand
         {
             get
             {
-                if(this.refreshConnectionCommand == null)
+                if (this.refreshConnectionCommand == null)
                 {
                     this.refreshConnectionCommand = this.CreateCommandSequence();
                     this.refreshConnectionCommand.RegisterCommand(this.StopListeningForSystemPerfCommand);
                     this.refreshConnectionCommand.RegisterCommand(this.ReestablishConnectionCommand);
                     this.refreshConnectionCommand.RegisterCommand(this.RefreshDeviceNameCommand);
-                    this.refreshConnectionCommand.RegisterCommand(this.GetCannonicalIpAddressCommand);
                     this.refreshConnectionCommand.RegisterCommand(this.StartListeningForSystemPerfCommand);
                 }
+
                 return this.refreshConnectionCommand;
             }
         }
@@ -650,20 +544,24 @@ private async Task ExecuteReestablishConnectionAsync()
             this.OutputDiagnosticString("ExecuteReestablishConnectionAsync\n");
             int numTries = 1;
 
+            DeviceConnectionStatus finalConnectionStatus = DeviceConnectionStatus.None;
+
             DeviceConnectionStatusEventHandler handler = (DevicePortal sender, DeviceConnectionStatusEventArgs args) =>
             {
                 this.OutputDiagnosticString("Connection status update: Status: {0}, Phase: {1}\n", args.Status, args.Phase);
                 if (args.Status == DeviceConnectionStatus.Connected)
                 {
                     this.OutputDiagnosticString("Connection succeeded after {0} tries.\n", numTries);
+                    this.ConnectionStatus = DeviceConnectionStatus.Connected;
                 }
                 else if (args.Status == DeviceConnectionStatus.Failed)
                 {
-                    
                     this.OutputDiagnosticString("Connection failed after {0} tries.\n", numTries);
                     this.OutputDiagnosticString("HTTP Status: {0}\n", this.Portal.ConnectionHttpStatusCode);
                     this.OutputDiagnosticString("Failure description: {0}\n", args.Message);
                 }
+
+                finalConnectionStatus = args.Status;
             };
 
             this.Portal.ConnectionStatus += handler;
@@ -671,22 +569,16 @@ private async Task ExecuteReestablishConnectionAsync()
             this.Ready = false;
             try
             {
-
                 do
                 {
                     await this.Portal.Connect();
 
-                    if(this.Portal.ConnectionHttpStatusCode == HttpStatusCode.Unauthorized)
+                    if (this.Portal.ConnectionHttpStatusCode == HttpStatusCode.Unauthorized)
                     {
-                        MessageBox.Show("Connection Unauthorized. Please double check your authentication credentials",
-                            "Unauthorized",
-                            MessageBoxButton.OK,
-                            MessageBoxImage.Exclamation);
-                        this.ClearCommandQueue();
-                        this.mainViewModel.RemoveDeviceCommand.Execute(this);
+                        // Don't try to reconnect when there is an authentication failure
                         break;
                     }
-                    else if(this.Portal.ConnectionHttpStatusCode != HttpStatusCode.OK && numTries <= this.ConnectionRetryAttempts)
+                    else if (this.Portal.ConnectionHttpStatusCode != HttpStatusCode.OK && numTries <= this.ConnectionRetryAttempts)
                     {
                         await Task.Delay(1000 * 5);
                     }
@@ -700,19 +592,20 @@ private async Task ExecuteReestablishConnectionAsync()
                     throw new Exception(string.Format("Unable to connect after {0} tries.", numTries - 1));
                 }
 
-                OnPropertyChanged("Address");
-                OnPropertyChanged("DeviceFamily");
-                OnPropertyChanged("OperatingSystemVersion");
-                OnPropertyChanged("Platform");
-                OnPropertyChanged("PlatformName");
+                this.OnPropertyChanged("Address");
+                this.OnPropertyChanged("DeviceFamily");
+                this.OnPropertyChanged("OperatingSystemVersion");
+                this.OnPropertyChanged("Platform");
+                this.OnPropertyChanged("PlatformName");
             }
             catch (Exception exn)
             {
                 this.ReportException("ReestablishConnection", exn);
             }
-
+            
             this.Portal.ConnectionStatus -= handler;
             this.Ready = true;
+            this.ConnectionStatus = finalConnectionStatus;
         }
         #endregion // ReestablishConnectionCommand
 
@@ -865,7 +758,8 @@ private bool DoCertValidation(DevicePortal sender, X509Certificate certificate,
 
             // We could alternatively ask the user if they wanted to always trust
             // this device and we could persist the thumbprint in some way (registry, database, filesystem, etc).
-            MessageBoxResult result = MessageBox.Show(string.Format(
+            MessageBoxResult result = MessageBox.Show(
+                string.Format(
                                 "Do you want to accept the following certificate?\n\nThumbprint:\n  {0}\nIssuer:\n  {1}",
                                 cert.Thumbprint,
                                 cert.Issuer),
@@ -879,6 +773,7 @@ private bool DoCertValidation(DevicePortal sender, X509Certificate certificate,
                 this.thumbprint = cert.Thumbprint;
                 return true;
             }
+
             return false;
         }
     }
diff --git a/Samples/SampleDeviceCollection/ViewModels/DeviceSignInViewModel.cs b/Samples/SampleDeviceCollection/ViewModels/DeviceSignInViewModel.cs
index 4afaab01..23baa57b 100644
--- a/Samples/SampleDeviceCollection/ViewModels/DeviceSignInViewModel.cs
+++ b/Samples/SampleDeviceCollection/ViewModels/DeviceSignInViewModel.cs
@@ -3,82 +3,28 @@
 //     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
 // </copyright>
 //----------------------------------------------------------------------------------------------
-using Prism.Mvvm;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Globalization;
-using System.Windows.Data;
-using System.Windows;
 
+using System;
 using System.Security;
+using System.Windows.Input;
 using Microsoft.Tools.WindowsDevicePortal;
 using Prism.Commands;
 using Prism.Mvvm;
-using System.Windows.Input;
 
 namespace SampleDeviceCollection
 {
-    //-------------------------------------------------------------------
-    //  Value Converters
-    //-------------------------------------------------------------------
-    #region Value Converters
     /// <summary>
-    ///     Template allows for easy creation of a value converter for bools
+    /// Enumerates the device families that may be selected by the user
     /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <remarks>
-    ///     See BooleanToVisibilityConverter and BooleanToBrushConverter (below) and usage in Generic.xaml
-    /// </remarks>
-    public class BooleanConverter<T> : IValueConverter
-    {
-        public BooleanConverter(T trueValue, T falseValue)
-        {
-            True = trueValue;
-            False = falseValue;
-        }
-
-        public T True { get; set; }
-        public T False { get; set; }
-
-        public virtual object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value is bool && ((bool)value) ? True : False;
-        }
-
-        public virtual object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            return value is T && EqualityComparer<T>.Default.Equals((T)value, True);
-        }
-    }
-
-    /// <summary>
-    /// Converts a boolean to a Visibility value
-    /// </summary>
-    public sealed class BooleanToVisibilityConverter : BooleanConverter<Visibility>
-    {
-        public BooleanToVisibilityConverter() :
-            base(Visibility.Visible, Visibility.Hidden)
-        { }
-    }
-
-    public sealed class BooleanToHttpsConverter : BooleanConverter<string>
-    {
-        public BooleanToHttpsConverter() :
-            base("https", "http")
-        { }
-    }
-    #endregion // Value Converters
-
     public enum DeviceFamilySelections
     {
         XboxOne,
         HoloLens,
-        Phone,
+        // TODO: Phone is not yet supported
+        // Phone,
         IoT,
-        Desktop
+        Desktop,
+        Other
     }
 
     /// <summary>
@@ -110,9 +56,15 @@ public DeviceSignInViewModel()
         //  Properties
         //-------------------------------------------------------------------
         #region Properties
-
         #region DeviceFamily
+        /// <summary>
+        /// The device family selected by the user
+        /// </summary>
         private DeviceFamilySelections deviceFamily;
+
+        /// <summary>
+        /// Gets or sets the device family selected by the user
+        /// </summary>
         public DeviceFamilySelections DeviceFamily
         {
             get
@@ -123,13 +75,26 @@ public DeviceFamilySelections DeviceFamily
             set
             {
                 this.SetProperty(ref this.deviceFamily, value);
-                OnPropertyChanged("UsbAvailable");
-                OnPropertyChanged("UsbSelected");
-                OnPropertyChanged("ProtocolSelectionEnabled");
-                OnPropertyChanged("Port");
-                OnPropertyChanged("IsPortEntryEnabled");
-                OnPropertyChanged("AddressEntryEnabled");
-                OnPropertyChanged("Address");
+
+                // Prepopulate some "best guess" values for Desktop
+                if (this.DeviceFamily == DeviceFamilySelections.Desktop)
+                {
+                    this.PrepopulateDesktopPort();
+                }
+
+                // All bets are off for "Other" so clear everything and leave it up to the user
+                if (this.DeviceFamily == DeviceFamilySelections.Other)
+                {
+                    this.portUserEntry = string.Empty;
+                }
+                
+                this.OnPropertyChanged("UsbAvailable");
+                this.OnPropertyChanged("UsbSelected");
+                this.OnPropertyChanged("ProtocolSelectionEnabled");
+                this.OnPropertyChanged("Port");
+                this.OnPropertyChanged("IsPortEntryEnabled");
+                this.OnPropertyChanged("AddressEntryEnabled");
+                this.OnPropertyChanged("Address");
                 if (this.DeviceFamily == DeviceFamilySelections.XboxOne)
                 {
                     this.ProtocolIsHttps = true;
@@ -139,7 +104,14 @@ public DeviceFamilySelections DeviceFamily
         #endregion // DeviceFamily
 
         #region ProtocolIsHttps
+        /// <summary>
+        /// Bidning for a radio selection to disambiguate the URL protocol scheme for the user. Protocol can be either http or https.
+        /// </summary>
         private bool protocolIsHttps;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the URL protocol scheme is https or http
+        /// </summary>
         public bool ProtocolIsHttps
         {
             get
@@ -150,14 +122,22 @@ public bool ProtocolIsHttps
             set
             {
                 this.SetProperty(ref this.protocolIsHttps, value);
-                OnPropertyChanged("Port");
-                OnPropertyChanged("IsPortEntryEnabled");
-                OnPropertyChanged("Address");
+                if (this.DeviceFamily == DeviceFamilySelections.Desktop)
+                {
+                    this.PrepopulateDesktopPort();
+                }
+
+                this.OnPropertyChanged("Port");
+                this.OnPropertyChanged("IsPortEntryEnabled");
+                this.OnPropertyChanged("Address");
             }
         }
         #endregion // ProtocolIsHttps
-
+                
         #region ProtocolSelectionEnabled
+        /// <summary>
+        /// Gets a value indicating whether the user may select the URL protocol scheme
+        /// </summary>
         public bool ProtocolSelectionEnabled
         {
             get
@@ -168,18 +148,29 @@ public bool ProtocolSelectionEnabled
         #endregion // ProtocolSelectionEnabled
 
         #region UsbAvailable
+        /// <summary>
+        /// Gets a value indicating whether USB selection is available
+        /// </summary>
         public bool UsbAvailable
         {
             get
             {
-                return this.DeviceFamily == DeviceFamilySelections.HoloLens
-                    || this.DeviceFamily == DeviceFamilySelections.Phone;
+                return this.DeviceFamily == DeviceFamilySelections.HoloLens;
+                    // TODO: Phone is not yet supported
+                    // || this.DeviceFamily == DeviceFamilySelections.Phone
             }
         }
         #endregion // UsbAvailable
 
         #region UsbSelected
+        /// <summary>
+        /// Binding property for a checkbox that indictates whether the user is attemptint to connect over USB
+        /// </summary>
         private bool usbSelected;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the user is attempting to connect over USB
+        /// </summary>
         public bool UsbSelected
         {
             get
@@ -190,15 +181,18 @@ public bool UsbSelected
             set
             {
                 this.SetProperty(ref this.usbSelected, value);
-                OnPropertyChanged("Port");
-                OnPropertyChanged("IsPortEntryEnabled");
-                OnPropertyChanged("Address");
-                OnPropertyChanged("AddressEntryEnabled");
+                this.OnPropertyChanged("Port");
+                this.OnPropertyChanged("IsPortEntryEnabled");
+                this.OnPropertyChanged("Address");
+                this.OnPropertyChanged("AddressEntryEnabled");
             }
         }
         #endregion // UsbSelected
 
         #region IsPortEntryEnabled
+        /// <summary>
+        /// Gets a value indicating whether the user may enter the port value
+        /// </summary>
         public bool IsPortEntryEnabled
         {
             get
@@ -206,14 +200,15 @@ public bool IsPortEntryEnabled
                 switch (this.DeviceFamily)
                 {
                     case DeviceFamilySelections.HoloLens:
-                    case DeviceFamilySelections.Phone:
+                    // TODO: Phone is not yet supported
+                    // case DeviceFamilySelections.Phone:
                     case DeviceFamilySelections.XboxOne:
                         return false;
 
                     case DeviceFamilySelections.IoT:
                         return this.ProtocolIsHttps;
 
-                    case DeviceFamilySelections.Desktop:
+                    case DeviceFamilySelections.Other:
                     default:
                         return true;
                 }
@@ -222,54 +217,76 @@ public bool IsPortEntryEnabled
         #endregion // IsPortEntryEnabled
 
         #region Port
+        /// <summary>
+        /// Binding property for a field where the user may enter a port value
+        /// </summary>
         private string portUserEntry;
+
+        /// <summary>
+        /// Gets or sets the port value to use when connecting to the device.
+        /// </summary>
         public string Port
         {
             get
             {
-                string portForFamily = GetPortForDeviceFamily();
+                string portForFamily = this.GetPortForDeviceFamily();
                 if (string.IsNullOrEmpty(portForFamily))
                 {
-                    return portUserEntry;
+                    return this.portUserEntry;
                 }
                 else
                 {
                     return portForFamily;
                 }
             }
+
             set
             {
-                SetProperty(ref portUserEntry, value);
+                this.SetProperty(ref this.portUserEntry, value);
             }
         }
         #endregion // Port
 
         #region GetPortForDeviceFamily
+        /// <summary>
+        /// Gets the port number to use based on the device family, protocol, and USB selections
+        /// </summary>
+        /// <returns>the port number as a string</returns>
         private string GetPortForDeviceFamily()
         {
             switch (this.DeviceFamily)
             {
                 case DeviceFamilySelections.HoloLens:
-                case DeviceFamilySelections.Phone:
+                //case DeviceFamilySelections.Phone:
                     {
                         if (this.UsbSelected)
+                        {
                             return "10080";
+                        }
+
                         return this.ProtocolIsHttps ? "443" : "80";
                     }
+
                 case DeviceFamilySelections.IoT:
-                    return this.ProtocolIsHttps ? "" : "8080";
+                    return this.ProtocolIsHttps ? string.Empty : "8080";
                 case DeviceFamilySelections.XboxOne:
                     return "11443";
-                case DeviceFamilySelections.Desktop:
-                    return "";
+                case DeviceFamilySelections.Other:
                 default:
-                    return "";
+                    return string.Empty;
             }
         }
         #endregion // GetPortForDeviceFamily
 
         #region Address
+        /// <summary>
+        /// Binding property for a field where the user enters the device address
+        /// </summary>
         private string addressUserEntry;
+
+        /// <summary>
+        /// Gets or sets a value containing the device address
+        /// </summary>
         public string Address
         {
             get
@@ -278,17 +295,22 @@ public string Address
                 {
                     return "localhost";
                 }
-                return addressUserEntry;
+
+                return this.addressUserEntry;
             }
 
             set
             {
-                SetProperty(ref this.addressUserEntry, value);
+                this.SetProperty(ref this.addressUserEntry, value);
             }
         }
         #endregion // Address
 
         #region AddressEntryEnabled
+        /// <summary>
+        /// Gets a value indicating whether the user may enter an address for the device.
+        /// (In case it is a USB connection then the address is always localhost.)
+        /// </summary>
         public bool AddressEntryEnabled
         {
             get
@@ -330,7 +352,29 @@ public SecureString Password
         }
         #endregion // Password
 
-        
+        /// <summary>
+        /// Prepopulate the port entry with a best guess value whenever the user selects Desktop
+        /// or when Desktop is already selected and the user changes the protocol
+        /// </summary>
+        private void PrepopulateDesktopPort()
+        {
+            if(this.ProtocolIsHttps)
+            {
+                // Some logic to prevent clobbering the user's entry
+                if(string.IsNullOrWhiteSpace(this.portUserEntry) || this.portUserEntry == "50080")
+                {
+                    this.portUserEntry = "50443";
+                }
+            }
+            else
+            {
+                // Some logic to prevent clobbering the user's entry
+                if (string.IsNullOrWhiteSpace(this.portUserEntry) || this.portUserEntry == "50443")
+                {
+                    this.portUserEntry = "50080";
+                }
+            }
+        }
         #endregion // Properties
 
         //-------------------------------------------------------------------
@@ -373,7 +417,7 @@ private void ExecuteConnect()
                 @"{0}://{1}:{2}",
                 this.ProtocolIsHttps ? @"https" : @"http",
                 this.Address,
-                this.Port );
+                this.Port);
 
             IDevicePortalConnection conn = new DefaultDevicePortalConnection(protocolAddressPort, this.UserName, this.Password);
             this.SignInAttempted?.Invoke(this, new SignInAttemptEventArgs(conn));
@@ -385,7 +429,6 @@ private void ExecuteConnect()
         /// <returns>Result indicates whether the ConnectCommand can execute</returns>
         private bool CanExecuteConnect()
         {
-            
             return
                 !string.IsNullOrWhiteSpace(this.Address) &&
                 !string.IsNullOrWhiteSpace(this.Port) &&
@@ -395,7 +438,7 @@ private bool CanExecuteConnect()
         }
         #endregion // Connect Command
         #endregion // Commands
-
+        
         #region Events
         /// <summary>
         /// Delegate describes a method for handling SignInAttempt events
@@ -412,7 +455,6 @@ public class SignInAttemptEventArgs : System.EventArgs
             /// <summary>
             /// Initializes a new instance of the <see cref="SignInAttemptEventArgs" /> class.
             /// </summary>
-            /// <param name="portal">The DevicePortal associated with the sign in attempt</param>
             /// <param name="conn">The IDevicePortalConnection instance associated with the sign in attempt</param>
             internal SignInAttemptEventArgs(IDevicePortalConnection conn)
             {
diff --git a/Samples/SampleDeviceCollection/ViewModels/MainViewModel.cs b/Samples/SampleDeviceCollection/ViewModels/MainViewModel.cs
index 05778aed..6b0a36b7 100644
--- a/Samples/SampleDeviceCollection/ViewModels/MainViewModel.cs
+++ b/Samples/SampleDeviceCollection/ViewModels/MainViewModel.cs
@@ -3,11 +3,14 @@
 //     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
 // </copyright>
 //----------------------------------------------------------------------------------------------
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 using System.ComponentModel;
+using System.Net;
+using System.Windows;
 using System.Windows.Input;
 using Microsoft.Tools.WindowsDevicePortal;
 using Prism.Commands;
@@ -49,7 +52,7 @@ public MainViewModel()
         /// <param name="args">Arguments for the event</param>
         private void OnSignInAttemptCompleted(DeviceSignInViewModel sender, DeviceSignInViewModel.SignInAttemptEventArgs args)
         {
-            this.ConnectedDevices.Add(new DevicePortalViewModel(this, args.Connection, this.Diagnostics));
+            this.ConnectedDevices.Add(new DevicePortalViewModel(args.Connection, this.Diagnostics));
         }
 
         //-------------------------------------------------------------------
@@ -373,7 +376,7 @@ private void ExecuteRemoveDeviceCommand(object obj)
             DevicePortalViewModel dpvm = obj as DevicePortalViewModel;
             if (dpvm != null)
             {
-                this.ConnectedDevices.Remove(dpvm);
+                this.RemoveDevice(dpvm);
             }
         }
         #endregion // RemoveDeviceCommand
@@ -419,7 +422,6 @@ private void OnDeviceAdded(DevicePortalViewModel dpvm)
             CommandSequence cmdSeq = dpvm.CreateCommandSequence();
             cmdSeq.RegisterCommand(dpvm.ReestablishConnectionCommand);
             cmdSeq.RegisterCommand(dpvm.RefreshDeviceNameCommand);
-            cmdSeq.RegisterCommand(dpvm.GetCannonicalIpAddressCommand);
             cmdSeq.RegisterCommand(dpvm.StartListeningForSystemPerfCommand);
             cmdSeq.Execute(null);
         }
@@ -437,6 +439,16 @@ private void OnDeviceRemoved(DevicePortalViewModel dpvm)
             }
         }
 
+        /// <summary>
+        /// Removes a device from the collection and clears any pending commands
+        /// </summary>
+        /// <param name="removeMe">The device to remove</param>
+        private void RemoveDevice(DevicePortalViewModel removeMe)
+        {
+            removeMe.ClearCommandQueue();
+            this.ConnectedDevices.Remove(removeMe);
+        }
+
         /// <summary>
         /// Event handler to monitor property changes on each of the elements in the collection of connected devices
         /// </summary>
@@ -448,7 +460,7 @@ private void DevicePropertyChanged(object sender, PropertyChangedEventArgs e)
             {
                 DevicePortalViewModel dpvmSender = sender as DevicePortalViewModel;
                 if (dpvmSender != null && !dpvmSender.Ready)
-                { 
+                {
                     // A device is no-longer ready, so remove it from the current selection
                     List<DevicePortalViewModel> updatedSelection = new List<DevicePortalViewModel>();
                     foreach (DevicePortalViewModel dpvm in this.SelectedDevices)
@@ -465,6 +477,61 @@ private void DevicePropertyChanged(object sender, PropertyChangedEventArgs e)
                 this.OnPropertyChanged("SomeDevicesReady");
                 this.OnPropertyChanged("AllDevicesReady");
             }
+
+            if (e.PropertyName == "ConnectionStatus")
+            {
+                DevicePortalViewModel dpvmSender = sender as DevicePortalViewModel;
+                if (dpvmSender.ConnectionStatus == DeviceConnectionStatus.Failed)
+                {
+                    // Check for authentication failure and warn the user about bad credentials
+                    if (dpvmSender.Portal.ConnectionHttpStatusCode == HttpStatusCode.Unauthorized)
+                    {
+                        MessageBox.Show(
+                            "Connection Unauthorized. Please double check your authentication credentials",
+                            "Unauthorized",
+                            MessageBoxButton.OK,
+                            MessageBoxImage.Exclamation);
+                        this.RemoveDevice(dpvmSender);
+                    }
+                }
+            }
+
+            if (e.PropertyName == "Address")
+            {
+                DevicePortalViewModel dpvmSender = sender as DevicePortalViewModel;
+                if (this.DeviceIsDuplicate(dpvmSender))
+                {
+                    MessageBox.Show(
+                        string.Format("You already have a connection for this device address: {0}", dpvmSender.Address),
+                        "Duplicate",
+                        MessageBoxButton.OK,
+                        MessageBoxImage.Exclamation);
+                    this.RemoveDevice(dpvmSender);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Determine whether the provided DevicePortalViewModel is already represented in the collection
+        /// </summary>
+        /// <param name="dpvmToCheck">The DevicePortalViewModel for which you want to check for duplicates</param>
+        /// <returns>True if the device is already represented in the collection</returns>
+        private bool DeviceIsDuplicate(DevicePortalViewModel dpvmToCheck)
+        {
+            foreach (DevicePortalViewModel dpvm in this.ConnectedDevices)
+            {
+                if (dpvmToCheck == dpvm)
+                {
+                    continue;
+                }
+
+                if (dpvmToCheck.Address == dpvm.Address)
+                {
+                    return true;
+                }
+            }
+
+            return false;
         }
     }
 }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs
index 0231ddef..88278fd0 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs
@@ -173,11 +173,19 @@ public void UpdateConnection(
                     // We take the first, non-169.x.x.x address we find that is not 0.0.0.0.
                     if ((addressInfo.Address != "0.0.0.0") && !addressInfo.Address.StartsWith("169."))
                     {
+                        string port = "";
+                        string[] addressParts = this.Connection.Authority.Split(':');
+                        if (addressParts.Length == 2)
+                        {
+                            port = string.Format(":{0}", addressParts[1]);
+                        }
+
                         newConnection = new Uri(
                             string.Format(
-                                "{0}://{1}", 
+                                "{0}://{1}{2}",
                                 requiresHttps ? "https" : "http",
-                                this.Connection.Authority));
+                                addressInfo.Address,
+                                port));
                         break;
                     }
                 }

From cfa914481d1aef81ae8a40c2d177e331cd0947b9 Mon Sep 17 00:00:00 2001
From: Hirsch Singhal <hps.scout@gmail.com>
Date: Tue, 11 Oct 2016 09:20:37 -0700
Subject: [PATCH 14/51] Breaking Change: Updating async methods to follow C#
 async naming conventions (#188)

And updating version number.
---
 .../MainPage.xaml.cs                          | 14 +--
 Samples/SampleWdpClient/MainWindow.xaml.cs    | 12 +--
 .../XboxWdpDriver/Operations/AppOperation.cs  |  8 +-
 .../Operations/ConfigOperation.cs             |  6 +-
 .../Operations/FiddlerOperation.cs            |  6 +-
 .../XboxWdpDriver/Operations/FileOperation.cs | 12 +--
 .../Operations/InstallOperation.cs            | 12 +--
 .../Operations/ListProcessesOperation.cs      |  6 +-
 .../Operations/SandboxOperation.cs            |  6 +-
 .../Operations/ScreenshotOperation.cs         |  2 +-
 .../Operations/SystemPerfOperation.cs         |  6 +-
 .../XboxWdpDriver/Operations/UserOperation.cs |  4 +-
 Samples/XboxWdpDriver/Program.cs              |  6 +-
 .../MockDataGenerator/Program.cs              | 10 +-
 .../Core/AppFileExplorerTests.cs              | 14 +--
 .../Core/OsInformationTests.cs                |  2 +-
 .../Core/PerformanceDataTests.cs              | 18 ++--
 .../HoloLens/HoloLensHelpers.cs               |  4 +-
 .../HoloLens/HoloLens_rs1_release.cs          | 18 ++--
 .../IoT/IoT_rs1_release.cs                    | 94 +++++++++----------
 .../XboxOne/XboxHelpers.cs                    |  2 +-
 .../XboxOne/XboxOne_rs1_xbox_rel_1608.cs      | 52 +++++-----
 .../UnitTestProject/TestHelpers.cs            |  2 +-
 .../WDPMockImplementations/AppDeployment.cs   |  2 +-
 .../WDPMockImplementations/RestDelete.cs      |  4 +-
 .../WDPMockImplementations/RestGet.cs         |  4 +-
 .../WDPMockImplementations/RestPost.cs        |  4 +-
 .../WDPMockImplementations/RestPut.cs         |  2 +-
 .../WDPMockImplementations/WebSocket.cs       |  4 +-
 .../Core/AppDeployment.cs                     | 18 ++--
 .../Core/AppFileExplorer.cs                   | 24 ++---
 .../Core/DeviceManager.cs                     |  4 +-
 .../Core/Dns-Sd.cs                            | 16 ++--
 .../Core/Networking.cs                        |  4 +-
 .../Core/OsInformation.cs                     | 16 ++--
 .../Core/PerformanceData.cs                   | 24 ++---
 .../Core/Power.cs                             | 12 +--
 .../Core/RemoteControl.cs                     |  8 +-
 .../Core/TaskManager.cs                       | 10 +-
 .../Core/WiFiManagement.cs                    | 12 +--
 .../DevicePortal.cs                           | 28 +++---
 .../HoloLens/HolographicOs.cs                 | 16 ++--
 .../HoloLens/HolographicPerception.cs         |  8 +-
 .../HoloLens/HolographicThermal.cs            |  4 +-
 .../HoloLens/MixedRealityCapture.cs           | 34 +++----
 .../HoloLens/PerceptionSimulationPlayback.cs  | 16 ++--
 .../HoloLens/PerceptionSimulationRecording.cs | 12 +--
 .../HttpRest/RestDelete.cs                    |  8 +-
 .../HttpRest/RestGet.cs                       |  4 +-
 .../HttpRest/RestPost.cs                      | 12 +--
 .../HttpRest/RestPut.cs                       |  8 +-
 .../HttpRest/WebSocket.cs                     |  9 +-
 .../IoT/ApplicationManager.cs                 | 24 ++---
 .../IoT/AudioDevices.cs                       | 12 +--
 .../IoT/BluetoothConnectivity.cs              | 40 ++++----
 .../IoT/DeviceInfo.cs                         | 52 +++++-----
 .../IoT/IcsManager.cs                         | 12 +--
 .../IoT/IoTOnboarding.cs                      | 16 ++--
 .../IoT/Limpet.cs                             | 28 +++---
 .../IoT/ProcessManagement.cs                  |  8 +-
 .../IoT/RemoteSettings.cs                     | 12 +--
 .../IoT/WindowsUpdate.cs                      |  8 +-
 .../Xbox/FiddlerSetup.cs                      | 10 +-
 .../Xbox/SmbShare.cs                          |  4 +-
 .../Xbox/UserManagement.cs                    |  8 +-
 .../Xbox/XboxAppDeployment.cs                 | 10 +-
 .../Xbox/XboxLiveSandbox.cs                   |  8 +-
 .../Xbox/XboxMediaCapture.cs                  |  4 +-
 .../Xbox/XboxSettings.cs                      | 12 +--
 .../CertificateHandling.cs                    |  2 +-
 .../Core/AppDeployment.cs                     |  2 +-
 .../HttpRest/RestDelete.cs                    |  4 +-
 .../HttpRest/RestGet.cs                       |  4 +-
 .../HttpRest/RestPost.cs                      |  4 +-
 .../HttpRest/RestPut.cs                       |  4 +-
 .../HttpRest/WebSocket.cs                     |  4 +-
 .../Properties/AssemblyInfo.cs                |  4 +-
 ...evicePortalWrapper.UniversalWindows.csproj |  4 +-
 .../CertificateHandling.cs                    |  4 +-
 .../Core/AppDeployment.cs                     |  2 +-
 .../HttpRest/RestDelete.cs                    |  4 +-
 .../HttpRest/RestGet.cs                       |  4 +-
 .../HttpRest/RestPost.cs                      |  4 +-
 .../HttpRest/RestPut.cs                       |  4 +-
 .../HttpRest/WebSocket.cs                     | 12 +--
 .../Properties/AssemblyInfo.cs                |  4 +-
 86 files changed, 490 insertions(+), 491 deletions(-)

diff --git a/Samples/SampleWdpClient.UniversalWindows/MainPage.xaml.cs b/Samples/SampleWdpClient.UniversalWindows/MainPage.xaml.cs
index dfbd7364..fca8e65a 100644
--- a/Samples/SampleWdpClient.UniversalWindows/MainPage.xaml.cs
+++ b/Samples/SampleWdpClient.UniversalWindows/MainPage.xaml.cs
@@ -113,9 +113,9 @@ private void ConnectToDevice_Click(object sender, RoutedEventArgs e)
                         // remainder of this session.
                         if (allowUntrusted)
                         {
-                            this.certificate = await portal.GetRootDeviceCertificate(true);
+                            this.certificate = await portal.GetRootDeviceCertificateAsync(true);
                         }
-                        await portal.Connect(manualCertificate: this.certificate);
+                        await portal.ConnectAsync(manualCertificate: this.certificate);
                     }
                     catch (Exception exception)
                     {
@@ -195,7 +195,7 @@ private void GetIPConfig_Click(object sender, RoutedEventArgs e)
 
                     try
                     {
-                        IpConfiguration ipconfig = await portal.GetIpConfig();
+                        IpConfiguration ipconfig = await portal.GetIpConfigAsync();
 
                         foreach (NetworkAdapterInfo adapterInfo in ipconfig.Adapters)
                         {
@@ -251,7 +251,7 @@ private void GetWifiInfo_Click(object sender, RoutedEventArgs e)
 
                     try
                     {
-                        WifiInterfaces wifiInterfaces = await portal.GetWifiInterfaces();
+                        WifiInterfaces wifiInterfaces = await portal.GetWifiInterfacesAsync();
                         sb.AppendLine("WiFi Interfaces:");
                         foreach (WifiInterface wifiInterface in wifiInterfaces.Interfaces)
                         {
@@ -260,7 +260,7 @@ private void GetWifiInfo_Click(object sender, RoutedEventArgs e)
                             sb.Append("  GUID: ");
                             sb.AppendLine(wifiInterface.Guid.ToString());
 
-                            WifiNetworks wifiNetworks = await portal.GetWifiNetworks(wifiInterface.Guid);
+                            WifiNetworks wifiNetworks = await portal.GetWifiNetworksAsync(wifiInterface.Guid);
                             sb.AppendLine("  Networks:");
                             foreach (WifiNetworkInfo network in wifiNetworks.AvailableNetworks)
                             {
@@ -394,7 +394,7 @@ private void RebootDevice_Click(object sender, RoutedEventArgs e)
 
                     try
                     {
-                        await portal.Reboot();
+                        await portal.RebootAsync();
                     }
                     catch (Exception ex)
                     {
@@ -438,7 +438,7 @@ private void ShutdownDevice_Click(object sender, RoutedEventArgs e)
 
                     try
                     {
-                        await portal.Shutdown();
+                        await portal.ShutdownAsync();
                     }
                     catch (Exception ex)
                     {
diff --git a/Samples/SampleWdpClient/MainWindow.xaml.cs b/Samples/SampleWdpClient/MainWindow.xaml.cs
index 7c5c8ed0..3bb0ca3c 100644
--- a/Samples/SampleWdpClient/MainWindow.xaml.cs
+++ b/Samples/SampleWdpClient/MainWindow.xaml.cs
@@ -115,7 +115,7 @@ private void ConnectToDevice_Click(object sender, RoutedEventArgs e)
                             }
                         };
                     
-                        await portal.Connect();
+                        await portal.ConnectAsync();
 
                         this.MarshalUpdateCommandOutput(sb.ToString());
                 });
@@ -190,7 +190,7 @@ private void GetIPConfig_Click(object sender, RoutedEventArgs e)
 
                     try
                     {
-                        IpConfiguration ipconfig = await portal.GetIpConfig();
+                        IpConfiguration ipconfig = await portal.GetIpConfigAsync();
 
                         foreach (NetworkAdapterInfo adapterInfo in ipconfig.Adapters)
                         {
@@ -247,7 +247,7 @@ private void GetWifiInfo_Click(object sender, RoutedEventArgs e)
 
                     try
                     {
-                        WifiInterfaces wifiInterfaces = await portal.GetWifiInterfaces();
+                        WifiInterfaces wifiInterfaces = await portal.GetWifiInterfacesAsync();
                         sb.AppendLine("WiFi Interfaces:");
                         foreach (WifiInterface wifiInterface in wifiInterfaces.Interfaces)
                         {
@@ -256,7 +256,7 @@ private void GetWifiInfo_Click(object sender, RoutedEventArgs e)
                             sb.Append("  GUID: ");
                             sb.AppendLine(wifiInterface.Guid.ToString());
 
-                            WifiNetworks wifiNetworks = await portal.GetWifiNetworks(wifiInterface.Guid);
+                            WifiNetworks wifiNetworks = await portal.GetWifiNetworksAsync(wifiInterface.Guid);
                             sb.AppendLine("  Networks:");
                             foreach (WifiNetworkInfo network in wifiNetworks.AvailableNetworks)
                             {
@@ -387,7 +387,7 @@ private void RebootDevice_Click(object sender, RoutedEventArgs e)
 
                     try
                     {
-                        await this.portal.Reboot();
+                        await this.portal.RebootAsync();
                     }
                     catch(Exception ex)
                     {
@@ -432,7 +432,7 @@ private void ShutdownDevice_Click(object sender, RoutedEventArgs e)
 
                     try
                     {
-                        await this.portal.Shutdown();
+                        await this.portal.ShutdownAsync();
                     }
                     catch(Exception ex)
                     {
diff --git a/Samples/XboxWdpDriver/Operations/AppOperation.cs b/Samples/XboxWdpDriver/Operations/AppOperation.cs
index 73c31e70..4b9a6067 100644
--- a/Samples/XboxWdpDriver/Operations/AppOperation.cs
+++ b/Samples/XboxWdpDriver/Operations/AppOperation.cs
@@ -65,7 +65,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
             {
                 if (operationType.Equals("list"))
                 {
-                    Task<AppPackages> packagesTask = portal.GetInstalledAppPackages();
+                    Task<AppPackages> packagesTask = portal.GetInstalledAppPackagesAsync();
 
                     packagesTask.Wait();
                     Console.WriteLine(packagesTask.Result);
@@ -101,21 +101,21 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
                             return;
                         }
 
-                        Task launchTask = portal.LaunchApplication(aumid, packageFullName);
+                        Task launchTask = portal.LaunchApplicationAsync(aumid, packageFullName);
                         launchTask.Wait();
 
                         Console.WriteLine("Application launched.");
                     }
                     else if (operationType.Equals("terminate"))
                     {
-                        Task terminateTask = portal.TerminateApplication(packageFullName);
+                        Task terminateTask = portal.TerminateApplicationAsync(packageFullName);
                         terminateTask.Wait();
 
                         Console.WriteLine("Application terminated.");
                     }
                     else if (operationType.Equals("uninstall"))
                     {
-                        Task uninstallTask = portal.UninstallApplication(packageFullName);
+                        Task uninstallTask = portal.UninstallApplicationAsync(packageFullName);
                         uninstallTask.Wait();
 
                         Console.WriteLine("Application uninstalled.");
diff --git a/Samples/XboxWdpDriver/Operations/ConfigOperation.cs b/Samples/XboxWdpDriver/Operations/ConfigOperation.cs
index cf3739b9..a1d32034 100644
--- a/Samples/XboxWdpDriver/Operations/ConfigOperation.cs
+++ b/Samples/XboxWdpDriver/Operations/ConfigOperation.cs
@@ -46,7 +46,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
             // Determine if this is for all settings or a single setting.
             if (string.IsNullOrWhiteSpace(desiredSetting))
             {
-                Task<XboxSettingList> getSettingsTask = portal.GetXboxSettings();
+                Task<XboxSettingList> getSettingsTask = portal.GetXboxSettingsAsync();
                 getSettingsTask.Wait();
 
                 Console.WriteLine(getSettingsTask.Result);
@@ -55,7 +55,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
             {
                 if (string.IsNullOrWhiteSpace(desiredValue))
                 {
-                    Task<XboxSetting> getSettingTask = portal.GetXboxSetting(desiredSetting);
+                    Task<XboxSetting> getSettingTask = portal.GetXboxSettingAsync(desiredSetting);
                     getSettingTask.Wait();
 
                     Console.WriteLine(getSettingTask.Result);
@@ -66,7 +66,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
                     setting.Name = desiredSetting;
                     setting.Value = desiredValue;
 
-                    Task<XboxSetting> setSettingTask = portal.UpdateXboxSetting(setting);
+                    Task<XboxSetting> setSettingTask = portal.UpdateXboxSettingAsync(setting);
                     setSettingTask.Wait();
 
                     Console.WriteLine(setSettingTask.Result);
diff --git a/Samples/XboxWdpDriver/Operations/FiddlerOperation.cs b/Samples/XboxWdpDriver/Operations/FiddlerOperation.cs
index 6a8d0474..ef226f48 100644
--- a/Samples/XboxWdpDriver/Operations/FiddlerOperation.cs
+++ b/Samples/XboxWdpDriver/Operations/FiddlerOperation.cs
@@ -65,13 +65,13 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
                         return;
                     }
 
-                    Task fiddlerEnableTask = portal.EnableFiddlerTracing(proxyAddress, proxyPort, parameters.GetParameterValue("certpath"));
+                    Task fiddlerEnableTask = portal.EnableFiddlerTracingAsync(proxyAddress, proxyPort, parameters.GetParameterValue("certpath"));
                     fiddlerEnableTask.Wait();
                     Console.WriteLine("Fiddler enabled.");
                 }
                 else if (string.Equals(state, "off", StringComparison.OrdinalIgnoreCase))
                 {
-                    Task fiddlerDisableTask = portal.DisableFiddlerTracing();
+                    Task fiddlerDisableTask = portal.DisableFiddlerTracingAsync();
                     fiddlerDisableTask.Wait();
                     Console.WriteLine("Fiddler disabled.");
                 }
@@ -85,7 +85,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
 
                 if (parameters.HasFlag("reboot"))
                 {
-                    Task rebootTask = portal.Reboot();
+                    Task rebootTask = portal.RebootAsync();
                     rebootTask.Wait();
                     Console.WriteLine("Console rebooting...");
                 }
diff --git a/Samples/XboxWdpDriver/Operations/FileOperation.cs b/Samples/XboxWdpDriver/Operations/FileOperation.cs
index 8b0363ef..34c5c585 100644
--- a/Samples/XboxWdpDriver/Operations/FileOperation.cs
+++ b/Samples/XboxWdpDriver/Operations/FileOperation.cs
@@ -67,7 +67,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
             {
                 if (operationType.Equals("knownfolders"))
                 {
-                    Task<KnownFolders> getKnownFoldersTask = portal.GetKnownFolders();
+                    Task<KnownFolders> getKnownFoldersTask = portal.GetKnownFoldersAsync();
 
                     getKnownFoldersTask.Wait();
                     Console.WriteLine(getKnownFoldersTask.Result);
@@ -84,7 +84,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
 
                     if (operationType.Equals("dir"))
                     {
-                        Task<FolderContents> getDirectoryContents = portal.GetFolderContents(knownFolderId, subPath, packageFullName);
+                        Task<FolderContents> getDirectoryContents = portal.GetFolderContentsAsync(knownFolderId, subPath, packageFullName);
 
                         getDirectoryContents.Wait();
                         Console.WriteLine(getDirectoryContents.Result);
@@ -101,7 +101,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
                             return;
                         }
 
-                        Task uploadFileTask = portal.UploadFile(knownFolderId, filepath, subPath, packageFullName);
+                        Task uploadFileTask = portal.UploadFileAsync(knownFolderId, filepath, subPath, packageFullName);
 
                         uploadFileTask.Wait();
                         Console.WriteLine(string.Format("{0} uploaded.", filepath));
@@ -132,7 +132,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
 
                             destination += "/" + filename;
 
-                            Task<Stream> getFile = portal.GetFile(knownFolderId, filename, subPath, packageFullName);
+                            Task<Stream> getFile = portal.GetFileAsync(knownFolderId, filename, subPath, packageFullName);
 
                             getFile.Wait();
 
@@ -155,14 +155,14 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
                                 return;
                             }
 
-                            Task renameFileTask = portal.RenameFile(knownFolderId, filename, newfilename, subPath, packageFullName);
+                            Task renameFileTask = portal.RenameFileAsync(knownFolderId, filename, newfilename, subPath, packageFullName);
 
                             renameFileTask.Wait();
                             Console.WriteLine(string.Format("Renamed {0} to {1}.", filename, newfilename));
                         }
                         else if (operationType.Equals("delete"))
                         {
-                            Task deleteFileTask = portal.DeleteFile(knownFolderId, filename, subPath, packageFullName);
+                            Task deleteFileTask = portal.DeleteFileAsync(knownFolderId, filename, subPath, packageFullName);
 
                             deleteFileTask.Wait();
                             Console.WriteLine(string.Format("Deleted {0}.", filename));
diff --git a/Samples/XboxWdpDriver/Operations/InstallOperation.cs b/Samples/XboxWdpDriver/Operations/InstallOperation.cs
index 3d399a72..74ddc562 100644
--- a/Samples/XboxWdpDriver/Operations/InstallOperation.cs
+++ b/Samples/XboxWdpDriver/Operations/InstallOperation.cs
@@ -104,7 +104,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
                 if (!string.IsNullOrEmpty(appxFile))
                 {
                     operation.mreAppInstall.Reset();
-                    Task installTask = portal.InstallApplication(null, appxFile, dependencies, certificate);
+                    Task installTask = portal.InstallApplicationAsync(null, appxFile, dependencies, certificate);
                     operation.mreAppInstall.WaitOne();
 
                     if (operation.installResults.Status == ApplicationInstallStatus.Completed)
@@ -122,7 +122,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
                     foreach (string dependency in dependencies)
                     {
                         operation.mreAppInstall.Reset();
-                        Task installTask = portal.InstallApplication(null, dependency, new List<string>());
+                        Task installTask = portal.InstallApplicationAsync(null, dependency, new List<string>());
                         operation.mreAppInstall.WaitOne();
 
                         if (operation.installResults.Status != ApplicationInstallStatus.Completed)
@@ -171,7 +171,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
                         {
                             if (e.HResult == ErrorLogonFailureHresult)
                             {
-                                Task<SmbInfo> smbTask = portal.GetSmbShareInfo();
+                                Task<SmbInfo> smbTask = portal.GetSmbShareInfoAsync();
                                 smbTask.Wait();
 
                                 // Set the username/password for accessing the share.
@@ -205,14 +205,14 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
                         return;
                     }
 
-                    Task registerTask = portal.RegisterApplication(destinationFolderName);
+                    Task registerTask = portal.RegisterApplicationAsync(destinationFolderName);
                     registerTask.Wait();
 
                     Console.WriteLine("Install complete.");
                 }
                 else if (!string.IsNullOrEmpty(registerPath))
                 {
-                    Task registerTask = portal.RegisterApplication(registerPath);
+                    Task registerTask = portal.RegisterApplicationAsync(registerPath);
                     registerTask.Wait();
 
                     Console.WriteLine("Registration complete.");
@@ -275,7 +275,7 @@ protected virtual void Dispose(bool disposing)
         /// <param name="relativeDestination">The relative destination directory.</param>
         private void UploadDirectoryOverHttp(string folderPath, string relativeDestination)
         {
-            Task uploadTask = this.portal.UploadPackageFolder(folderPath, relativeDestination);
+            Task uploadTask = this.portal.UploadPackageFolderAsync(folderPath, relativeDestination);
             uploadTask.Wait();
 
             foreach (string subDir in Directory.GetDirectories(folderPath))
diff --git a/Samples/XboxWdpDriver/Operations/ListProcessesOperation.cs b/Samples/XboxWdpDriver/Operations/ListProcessesOperation.cs
index f673d33c..a6688a62 100644
--- a/Samples/XboxWdpDriver/Operations/ListProcessesOperation.cs
+++ b/Samples/XboxWdpDriver/Operations/ListProcessesOperation.cs
@@ -41,19 +41,19 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
 
                 portal.RunningProcessesMessageReceived += runningProcessesReceivedHandler;
 
-                Task startListeningForProcessesTask = portal.StartListeningForRunningProcesses();
+                Task startListeningForProcessesTask = portal.StartListeningForRunningProcessesAsync();
                 startListeningForProcessesTask.Wait();
 
                 runningProcessesReceived.WaitOne();
 
-                Task stopListeningForProcessesTask = portal.StopListeningForRunningProcesses();
+                Task stopListeningForProcessesTask = portal.StopListeningForRunningProcessesAsync();
                 stopListeningForProcessesTask.Wait();
 
                 portal.RunningProcessesMessageReceived -= runningProcessesReceivedHandler;
             }
             else
             {
-                Task<DevicePortal.RunningProcesses> getRunningProcessesTask = portal.GetRunningProcesses();
+                Task<DevicePortal.RunningProcesses> getRunningProcessesTask = portal.GetRunningProcessesAsync();
                 runningProcesses = getRunningProcessesTask.Result;
             }
 
diff --git a/Samples/XboxWdpDriver/Operations/SandboxOperation.cs b/Samples/XboxWdpDriver/Operations/SandboxOperation.cs
index 4c39a463..6f9daef7 100644
--- a/Samples/XboxWdpDriver/Operations/SandboxOperation.cs
+++ b/Samples/XboxWdpDriver/Operations/SandboxOperation.cs
@@ -42,21 +42,21 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
 
             if (string.IsNullOrEmpty(desiredValue))
             {
-                Task<Sandbox> getSandboxTask = portal.GetXboxLiveSandbox();
+                Task<Sandbox> getSandboxTask = portal.GetXboxLiveSandboxAsync();
                 getSandboxTask.Wait();
 
                 Console.WriteLine(getSandboxTask.Result);
             }
             else
             {
-                Task<Sandbox> setSandboxTask = portal.SetXboxLiveSandbox(desiredValue);
+                Task<Sandbox> setSandboxTask = portal.SetXboxLiveSandboxAsync(desiredValue);
                 setSandboxTask.Wait();
 
                 Console.WriteLine("{0} -> {1}", setSandboxTask.Result, desiredValue);
 
                 if (parameters.HasFlag("reboot"))
                 {
-                    Task rebootTask = portal.Reboot();
+                    Task rebootTask = portal.RebootAsync();
                     rebootTask.Wait();
                     Console.WriteLine("Console rebooting...");
                 }
diff --git a/Samples/XboxWdpDriver/Operations/ScreenshotOperation.cs b/Samples/XboxWdpDriver/Operations/ScreenshotOperation.cs
index 026ba8f4..afe929f7 100644
--- a/Samples/XboxWdpDriver/Operations/ScreenshotOperation.cs
+++ b/Samples/XboxWdpDriver/Operations/ScreenshotOperation.cs
@@ -53,7 +53,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
             }
             else
             {
-                Task<Stream> screenshotTask = portal.TakeXboxScreenshot();
+                Task<Stream> screenshotTask = portal.TakeXboxScreenshotAsync();
                 screenshotTask.Wait();
 
                 using (var fileStream = new FileStream(filepath, FileMode.Create))
diff --git a/Samples/XboxWdpDriver/Operations/SystemPerfOperation.cs b/Samples/XboxWdpDriver/Operations/SystemPerfOperation.cs
index d983e5a4..3a620dcf 100644
--- a/Samples/XboxWdpDriver/Operations/SystemPerfOperation.cs
+++ b/Samples/XboxWdpDriver/Operations/SystemPerfOperation.cs
@@ -41,19 +41,19 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
 
                 portal.SystemPerfMessageReceived += systemPerfReceivedHandler;
 
-                Task startListeningForSystemPerfTask = portal.StartListeningForSystemPerf();
+                Task startListeningForSystemPerfTask = portal.StartListeningForSystemPerfAsync();
                 startListeningForSystemPerfTask.Wait();
 
                 systemPerfReceived.WaitOne();
 
-                Task stopListeningForSystemPerfTask = portal.StopListeningForRunningProcesses();
+                Task stopListeningForSystemPerfTask = portal.StopListeningForRunningProcessesAsync();
                 stopListeningForSystemPerfTask.Wait();
 
                 portal.SystemPerfMessageReceived -= systemPerfReceivedHandler;
             }
             else
             {
-                Task<SystemPerformanceInformation> getRunningProcessesTask = portal.GetSystemPerf();
+                Task<SystemPerformanceInformation> getRunningProcessesTask = portal.GetSystemPerfAsync();
                 systemPerformanceInformation = getRunningProcessesTask.Result;
             }
 
diff --git a/Samples/XboxWdpDriver/Operations/UserOperation.cs b/Samples/XboxWdpDriver/Operations/UserOperation.cs
index c52c5051..bd6b3f9d 100644
--- a/Samples/XboxWdpDriver/Operations/UserOperation.cs
+++ b/Samples/XboxWdpDriver/Operations/UserOperation.cs
@@ -60,7 +60,7 @@ public static void HandleOperation(DevicePortal portal, ParameterHelper paramete
 
             if (operationType.Equals("list"))
             {
-                Task<UserList> getUsers = portal.GetXboxLiveUsers();
+                Task<UserList> getUsers = portal.GetXboxLiveUsersAsync();
 
                 getUsers.Wait();
                 Console.WriteLine(getUsers.Result);
@@ -162,7 +162,7 @@ private static void UpdateXboxLiveUsers(DevicePortal portal, UserList userList)
         {
             try
             {
-                Task updateUsers = portal.UpdateXboxLiveUsers(userList);
+                Task updateUsers = portal.UpdateXboxLiveUsersAsync(userList);
                 updateUsers.Wait();
             }
             catch (AggregateException e)
diff --git a/Samples/XboxWdpDriver/Program.cs b/Samples/XboxWdpDriver/Program.cs
index 41083dc9..d438187d 100644
--- a/Samples/XboxWdpDriver/Program.cs
+++ b/Samples/XboxWdpDriver/Program.cs
@@ -259,7 +259,7 @@ public static void Main(string[] args)
                     }
                 }
 
-                Task connectTask = portal.Connect(updateConnection: false, manualCertificate: cert);
+                Task connectTask = portal.ConnectAsync(updateConnection: false, manualCertificate: cert);
                 connectTask.Wait();
 
                 if (portal.ConnectionHttpStatusCode != HttpStatusCode.OK)
@@ -332,7 +332,7 @@ public static void Main(string[] args)
                             Console.WriteLine("OS version: " + portal.OperatingSystemVersion);
                             Console.WriteLine("Platform: " + portal.PlatformName + " (" + portal.Platform.ToString() + ")");
 
-                            Task<string> getNameTask = portal.GetDeviceName();
+                            Task<string> getNameTask = portal.GetDeviceNameAsync();
                             getNameTask.Wait();
                             Console.WriteLine("Device name: " + getNameTask.Result);
                             break;
@@ -349,7 +349,7 @@ public static void Main(string[] args)
                             break;
 
                         case OperationType.RebootOperation:
-                            Task rebootTask = portal.Reboot();
+                            Task rebootTask = portal.RebootAsync();
                             rebootTask.Wait();
                             Console.WriteLine("Rebooting device.");
                             break;
diff --git a/WindowsDevicePortalWrapper/MockDataGenerator/Program.cs b/WindowsDevicePortalWrapper/MockDataGenerator/Program.cs
index 222c781f..fdf35088 100644
--- a/WindowsDevicePortalWrapper/MockDataGenerator/Program.cs
+++ b/WindowsDevicePortalWrapper/MockDataGenerator/Program.cs
@@ -103,7 +103,7 @@ public static void Main(string[] args)
             IDevicePortalConnection connection = new DefaultDevicePortalConnection(parameters.GetParameterValue(ParameterHelper.FullAddress), parameters.GetParameterValue(ParameterHelper.WdpUser), parameters.GetParameterValue(ParameterHelper.WdpPassword));
             DevicePortal portal = new DevicePortal(connection);
 
-            Task connectTask = portal.Connect(updateConnection: false);
+            Task connectTask = portal.ConnectAsync(updateConnection: false);
             connectTask.Wait();
 
             if (portal.ConnectionHttpStatusCode != HttpStatusCode.OK)
@@ -170,7 +170,7 @@ public static void Main(string[] args)
                             dataStream.Position = 0;
                             string contentType = string.Format("multipart/form-data; boundary={0}", boundaryString);
 
-                            Task saveResponseTask = portal.SaveEndpointResponseToFile(endpoint, directory, httpMethod, dataStream, contentType);
+                            Task saveResponseTask = portal.SaveEndpointResponseToFileAsync(endpoint, directory, httpMethod, dataStream, contentType);
                             saveResponseTask.Wait();
                         }
                     }
@@ -178,13 +178,13 @@ public static void Main(string[] args)
                     {
                         Stream fileStream = new FileStream(requestBodyFile, FileMode.Open);
 
-                        Task saveResponseTask = portal.SaveEndpointResponseToFile(endpoint, directory, httpMethod, fileStream, "application/json");
+                        Task saveResponseTask = portal.SaveEndpointResponseToFileAsync(endpoint, directory, httpMethod, fileStream, "application/json");
                         saveResponseTask.Wait();
                     }
                 }
                 else
                 {
-                    Task saveResponseTask = portal.SaveEndpointResponseToFile(endpoint, directory, httpMethod);
+                    Task saveResponseTask = portal.SaveEndpointResponseToFileAsync(endpoint, directory, httpMethod);
                     saveResponseTask.Wait();
                 }
             }
@@ -197,7 +197,7 @@ public static void Main(string[] args)
 
                     try
                     {
-                        Task saveResponseTask = portal.SaveEndpointResponseToFile(finalEndpoint, directory, httpMethod);
+                        Task saveResponseTask = portal.SaveEndpointResponseToFileAsync(finalEndpoint, directory, httpMethod);
                         saveResponseTask.Wait();
                     }
                     catch (Exception e)
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/Core/AppFileExplorerTests.cs b/WindowsDevicePortalWrapper/UnitTestProject/Core/AppFileExplorerTests.cs
index 311966e3..3cfe687d 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/Core/AppFileExplorerTests.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/Core/AppFileExplorerTests.cs
@@ -38,7 +38,7 @@ public void AppFileExplorerGetKnownFolderTest()
 
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.KnownFoldersApi, response, HttpMethods.Get);
 
-            Task<KnownFolders> getKnownFoldersTask = TestHelpers.Portal.GetKnownFolders();
+            Task<KnownFolders> getKnownFoldersTask = TestHelpers.Portal.GetKnownFoldersAsync();
             getKnownFoldersTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getKnownFoldersTask.Status);
@@ -71,7 +71,7 @@ public void AppFileExplorerGetFolderContentsTest()
 
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.GetFilesApi, response, HttpMethods.Get);
 
-            Task<FolderContents> getFolderContentsTask = TestHelpers.Portal.GetFolderContents("KnownFolderOne");
+            Task<FolderContents> getFolderContentsTask = TestHelpers.Portal.GetFolderContentsAsync("KnownFolderOne");
             getFolderContentsTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getFolderContentsTask.Status);
@@ -119,7 +119,7 @@ public void AppFileExplorerDownloadFileTest()
 
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.GetFileApi, response, HttpMethods.Get);
 
-            Task<Stream> getFileTask = TestHelpers.Portal.GetFile("knownfolder", "FileToDownload.txt", "SubFolder\\SubFolder2");
+            Task<Stream> getFileTask = TestHelpers.Portal.GetFileAsync("knownfolder", "FileToDownload.txt", "SubFolder\\SubFolder2");
             getFileTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getFileTask.Status);
@@ -137,7 +137,7 @@ public void AppFileExplorerUploadFileTest()
 
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.GetFileApi, response, HttpMethods.Post);
 
-            Task uploadFileTask = TestHelpers.Portal.UploadFile("knownfolder", "MockData\\Defaults\\api_os_devicefamily_Default.dat", "SubFolder\\SubFolder2");
+            Task uploadFileTask = TestHelpers.Portal.UploadFileAsync("knownfolder", "MockData\\Defaults\\api_os_devicefamily_Default.dat", "SubFolder\\SubFolder2");
             uploadFileTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, uploadFileTask.Status);
@@ -156,7 +156,7 @@ public void AppFileExplorerUploadFileTest_Failure()
 
             try
             {
-                Task uploadFileTask = TestHelpers.Portal.UploadFile("knownfolder", "NonExistentFilePath\\NonExistentFile.txt", "SubFolder\\SubFolder2");
+                Task uploadFileTask = TestHelpers.Portal.UploadFileAsync("knownfolder", "NonExistentFilePath\\NonExistentFile.txt", "SubFolder\\SubFolder2");
                 uploadFileTask.Wait();
 
                 Assert.Fail("Should not have succeeded if uploading a file which doesn't exist.");
@@ -177,7 +177,7 @@ public void AppFileExplorerDeleteFileTest()
 
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.GetFileApi, response, HttpMethods.Delete);
 
-            Task deleteFileTask = TestHelpers.Portal.DeleteFile("knownfolder", "FileToDelete.txt", "SubFolder\\SubFolder2");
+            Task deleteFileTask = TestHelpers.Portal.DeleteFileAsync("knownfolder", "FileToDelete.txt", "SubFolder\\SubFolder2");
             deleteFileTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, deleteFileTask.Status);
@@ -193,7 +193,7 @@ public void AppFileExplorerRenameFileTest()
 
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.RenameFileApi, response, HttpMethods.Post);
 
-            Task renameFileTask = TestHelpers.Portal.RenameFile("knownfolder", "FileToRename.txt", "NewFileName.txt", "SubFolder\\SubFolder2");
+            Task renameFileTask = TestHelpers.Portal.RenameFileAsync("knownfolder", "FileToRename.txt", "NewFileName.txt", "SubFolder\\SubFolder2");
             renameFileTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, renameFileTask.Status);
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/Core/OsInformationTests.cs b/WindowsDevicePortalWrapper/UnitTestProject/Core/OsInformationTests.cs
index 163bce66..a26c2d62 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/Core/OsInformationTests.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/Core/OsInformationTests.cs
@@ -25,7 +25,7 @@ public void OsInformationTest()
         {
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.MachineNameApi, HttpMethods.Get);
 
-            Task<string> getNameTask = TestHelpers.Portal.GetDeviceName();
+            Task<string> getNameTask = TestHelpers.Portal.GetDeviceNameAsync();
             getNameTask.Wait();
 
             Assert.IsNotNull(TestHelpers.Portal.OperatingSystemVersion);
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/Core/PerformanceDataTests.cs b/WindowsDevicePortalWrapper/UnitTestProject/Core/PerformanceDataTests.cs
index b8e587ea..5101c52a 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/Core/PerformanceDataTests.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/Core/PerformanceDataTests.cs
@@ -26,12 +26,12 @@ public void GetRunningProcessesTest()
         {
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.RunningProcessApi, HttpMethods.Get);
 
-            Task<RunningProcesses> getRunningProcessesTask = TestHelpers.Portal.GetRunningProcesses();
+            Task<RunningProcesses> getRunningProcessesTask = TestHelpers.Portal.GetRunningProcessesAsync();
             getRunningProcessesTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getRunningProcessesTask.Status);
 
-            ValidateRunningProcesses(getRunningProcessesTask.Result);
+            ValidateRunningProcessesAsync(getRunningProcessesTask.Result);
         }
 
         /// <summary>
@@ -57,19 +57,19 @@ public void GetRunningProcessesWebSocketTest()
 
             TestHelpers.Portal.RunningProcessesMessageReceived += runningProcessesReceivedHandler;
 
-            Task startListeningForProcessesTask = TestHelpers.Portal.StartListeningForRunningProcesses();
+            Task startListeningForProcessesTask = TestHelpers.Portal.StartListeningForRunningProcessesAsync();
             startListeningForProcessesTask.Wait();
             Assert.AreEqual(TaskStatus.RanToCompletion, startListeningForProcessesTask.Status);
 
             runningProcessesReceived.WaitOne();
 
-            Task stopListeningForProcessesTask = TestHelpers.Portal.StopListeningForRunningProcesses();
+            Task stopListeningForProcessesTask = TestHelpers.Portal.StopListeningForRunningProcessesAsync();
             stopListeningForProcessesTask.Wait();
             Assert.AreEqual(TaskStatus.RanToCompletion, stopListeningForProcessesTask.Status);
 
             TestHelpers.Portal.RunningProcessesMessageReceived -= runningProcessesReceivedHandler;
 
-            ValidateRunningProcesses(runningProcesses);
+            ValidateRunningProcessesAsync(runningProcesses);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public void GetSystemPerfTest()
         {
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.SystemPerfApi, HttpMethods.Get);
 
-            Task<SystemPerformanceInformation> getSystemPerfTask = TestHelpers.Portal.GetSystemPerf();
+            Task<SystemPerformanceInformation> getSystemPerfTask = TestHelpers.Portal.GetSystemPerfAsync();
             getSystemPerfTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getSystemPerfTask.Status);
@@ -111,13 +111,13 @@ public void GetSystemPerfWebSocketTest()
 
             TestHelpers.Portal.SystemPerfMessageReceived += systemPerfReceivedHandler;
 
-            Task startListeningForSystemPerfTask = TestHelpers.Portal.StartListeningForSystemPerf();
+            Task startListeningForSystemPerfTask = TestHelpers.Portal.StartListeningForSystemPerfAsync();
             startListeningForSystemPerfTask.Wait();
             Assert.AreEqual(TaskStatus.RanToCompletion, startListeningForSystemPerfTask.Status);
 
             systemPerfReceived.WaitOne();
 
-            Task stopListeningForSystemPerf = TestHelpers.Portal.StopListeningForSystemPerf();
+            Task stopListeningForSystemPerf = TestHelpers.Portal.StopListeningForSystemPerfAsync();
             stopListeningForSystemPerf.Wait();
             Assert.AreEqual(TaskStatus.RanToCompletion, stopListeningForSystemPerf.Status);
 
@@ -130,7 +130,7 @@ public void GetSystemPerfWebSocketTest()
         /// Validate the <see cref="RunningProcesses" /> returned from the tests.
         /// </summary>
         /// <param name="runningProcesses">The <see cref="RunningProcesses" /> to validate.</param>
-        private static void ValidateRunningProcesses(RunningProcesses runningProcesses)
+        private static void ValidateRunningProcessesAsync(RunningProcesses runningProcesses)
         {
             List<DeviceProcessInfo> processes = new List<DeviceProcessInfo>(runningProcesses.Processes);
 
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/HoloLens/HoloLensHelpers.cs b/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/HoloLens/HoloLensHelpers.cs
index 2be144ce..41e980fc 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/HoloLens/HoloLensHelpers.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/HoloLens/HoloLensHelpers.cs
@@ -19,7 +19,7 @@ public static class HoloLensHelpers
         /// Validate the <see cref="SystemPerformanceInformation" /> returned from the HoloLens tests.
         /// </summary>
         /// <param name="systemPerfInfo">The <see cref="SystemPerformanceInformation" /> to validate.</param>
-        internal static void ValidateSystemPerf(SystemPerformanceInformation systemPerfInfo)
+        internal static void ValidateSystemPerfAsync(SystemPerformanceInformation systemPerfInfo)
         {
             // Check some known things about this response.
             Assert.AreEqual(275897, systemPerfInfo.AvailablePages);
@@ -66,7 +66,7 @@ internal static void VerifyOsInformation(
                 friendlyOperatingSystemVersion, 
                 HttpMethods.Get);
 
-            Task<string> getNameTask = TestHelpers.Portal.GetDeviceName();
+            Task<string> getNameTask = TestHelpers.Portal.GetDeviceNameAsync();
             getNameTask.Wait();
 
             Assert.AreEqual(operatingSystemVersion, TestHelpers.Portal.OperatingSystemVersion);
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/HoloLens/HoloLens_rs1_release.cs b/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/HoloLens/HoloLens_rs1_release.cs
index e973265f..010448bf 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/HoloLens/HoloLens_rs1_release.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/HoloLens/HoloLens_rs1_release.cs
@@ -62,7 +62,7 @@ public void GetBatteryState_HoloLens_1607()
                 this.FriendlyOperatingSystemVersion, 
                 HttpMethods.Get);
 
-            Task<BatteryState> getTask  = TestHelpers.Portal.GetBatteryState();
+            Task<BatteryState> getTask  = TestHelpers.Portal.GetBatteryStateAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -88,7 +88,7 @@ public void GetDeviceName_HoloLens_1607()
                 this.FriendlyOperatingSystemVersion, 
                 HttpMethods.Get);
 
-            Task<string> getTask  = TestHelpers.Portal.GetDeviceName();
+            Task<string> getTask  = TestHelpers.Portal.GetDeviceNameAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -109,7 +109,7 @@ public void GetIpConfig_HoloLens_1607()
                 this.FriendlyOperatingSystemVersion, 
                 HttpMethods.Get);
 
-            Task<IpConfiguration> getTask  = TestHelpers.Portal.GetIpConfig();
+            Task<IpConfiguration> getTask  = TestHelpers.Portal.GetIpConfigAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -141,7 +141,7 @@ public void GetIpd_HoloLens_1607()
                 this.FriendlyOperatingSystemVersion, 
                 HttpMethods.Get);
 
-            Task<float> getTask  = TestHelpers.Portal.GetInterPupilaryDistance();
+            Task<float> getTask  = TestHelpers.Portal.GetInterPupilaryDistanceAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -162,7 +162,7 @@ public void GetMrcFileList_HoloLens_1607()
                 this.FriendlyOperatingSystemVersion, 
                 HttpMethods.Get);
 
-            Task<MrcFileList> getTask  = TestHelpers.Portal.GetMrcFileList();
+            Task<MrcFileList> getTask  = TestHelpers.Portal.GetMrcFileListAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -187,7 +187,7 @@ public void GetMrcStatus_HoloLens_1607()
                 this.FriendlyOperatingSystemVersion, 
                 HttpMethods.Get);
 
-            Task<MrcStatus> getTask  = TestHelpers.Portal.GetMrcStatus();
+            Task<MrcStatus> getTask  = TestHelpers.Portal.GetMrcStatusAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -209,7 +209,7 @@ public void GetPowerState_HoloLens_1607()
                 this.FriendlyOperatingSystemVersion, 
                 HttpMethods.Get);
 
-            Task<PowerState> getTask  = TestHelpers.Portal.GetPowerState();
+            Task<PowerState> getTask  = TestHelpers.Portal.GetPowerStateAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -232,12 +232,12 @@ public void GetSystemPerf_HoloLens_1607()
                 this.FriendlyOperatingSystemVersion, 
                 HttpMethods.Get);
 
-            Task<SystemPerformanceInformation> getSystemPerfTask = TestHelpers.Portal.GetSystemPerf();
+            Task<SystemPerformanceInformation> getSystemPerfTask = TestHelpers.Portal.GetSystemPerfAsync();
             getSystemPerfTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getSystemPerfTask.Status);
 
-            HoloLensHelpers.ValidateSystemPerf(getSystemPerfTask.Result);
+            HoloLensHelpers.ValidateSystemPerfAsync(getSystemPerfTask.Result);
         }
 
         /// <summary>
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/IoT/IoT_rs1_release.cs b/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/IoT/IoT_rs1_release.cs
index 908486bb..a225de96 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/IoT/IoT_rs1_release.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/IoT/IoT_rs1_release.cs
@@ -63,7 +63,7 @@ public void GetBatteryState_IoT()
                 this.FriendlyOperatingSystemVersion, 
                 HttpMethods.Get);
 
-            Task<BatteryState> getTask  = TestHelpers.Portal.GetBatteryState();
+            Task<BatteryState> getTask  = TestHelpers.Portal.GetBatteryStateAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -89,7 +89,7 @@ public void GetDeviceName_IoT()
                 this.FriendlyOperatingSystemVersion, 
                 HttpMethods.Get);
 
-            Task<string> getTask  = TestHelpers.Portal.GetDeviceName();
+            Task<string> getTask  = TestHelpers.Portal.GetDeviceNameAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -110,7 +110,7 @@ public void GetIpConfig_IoT()
                 this.FriendlyOperatingSystemVersion, 
                 HttpMethods.Get);
 
-            Task<IpConfiguration> getTask  = TestHelpers.Portal.GetIpConfig();
+            Task<IpConfiguration> getTask  = TestHelpers.Portal.GetIpConfigAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -138,7 +138,7 @@ public void GetControllerDriverInfo_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<ControllerDriverInfo> getTask = TestHelpers.Portal.GetControllerDriverInfo();
+            Task<ControllerDriverInfo> getTask = TestHelpers.Portal.GetControllerDriverInfoAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -161,7 +161,7 @@ public void GetCurrentDateTimeInfo_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<DateTimeInfo> getTask = TestHelpers.Portal.GetDateTimeInfo();
+            Task<DateTimeInfo> getTask = TestHelpers.Portal.GetDateTimeInfoAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -183,7 +183,7 @@ public void GetTimezoneInfo_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<TimezoneInfo> getTask = TestHelpers.Portal.GetTimezoneInfo();
+            Task<TimezoneInfo> getTask = TestHelpers.Portal.GetTimezoneInfoAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -206,7 +206,7 @@ public void GetDisplayResolutionInfo_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<DisplayResolutionInfo> getTask = TestHelpers.Portal.GetDisplayResolutionInfo();
+            Task<DisplayResolutionInfo> getTask = TestHelpers.Portal.GetDisplayResolutionInfoAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -228,7 +228,7 @@ public void GetDisplayOrientationInfo_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<DisplayOrientationInfo> getTask = TestHelpers.Portal.GetDisplayOrientationInfo();
+            Task<DisplayOrientationInfo> getTask = TestHelpers.Portal.GetDisplayOrientationInfoAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -250,7 +250,7 @@ public void GetDeviceInfo_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<IoTOSInfo> getTask = TestHelpers.Portal.GetIoTOSInfo();
+            Task<IoTOSInfo> getTask = TestHelpers.Portal.GetIoTOSInfoAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -274,7 +274,7 @@ public void GetStatusInfo_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<StatusInfo> getTask = TestHelpers.Portal.GetStatusInfo();
+            Task<StatusInfo> getTask = TestHelpers.Portal.GetStatusInfoAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -298,7 +298,7 @@ public void GetUpdateInstallTime_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<UpdateInstallTimeInfo> getTask = TestHelpers.Portal.GetUpdateInstallTime();
+            Task<UpdateInstallTimeInfo> getTask = TestHelpers.Portal.GetUpdateInstallTimeAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -321,7 +321,7 @@ public void GetRemoteSettingsStatus_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<RemoteSettingsStatusInfo> getTask = TestHelpers.Portal.GetRemoteSettingsStatusInfo();
+            Task<RemoteSettingsStatusInfo> getTask = TestHelpers.Portal.GetRemoteSettingsStatusInfoAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -344,7 +344,7 @@ public void GetSoftAPSettings_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<SoftAPSettingsInfo> getTask = TestHelpers.Portal.GetSoftAPSettingsInfo();
+            Task<SoftAPSettingsInfo> getTask = TestHelpers.Portal.GetSoftAPSettingsInfoAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -367,7 +367,7 @@ public void GetAllJoynSettings_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<AllJoynSettingsInfo> getTask = TestHelpers.Portal.GetAllJoynSettingsInfo();
+            Task<AllJoynSettingsInfo> getTask = TestHelpers.Portal.GetAllJoynSettingsInfoAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -389,7 +389,7 @@ public void SetDeviceNameTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.DeviceNameApi, response, HttpMethods.Post);
 
-            Task setIoTDeviceName = TestHelpers.Portal.SetIoTDeviceName(deviceName);
+            Task setIoTDeviceName = TestHelpers.Portal.SetIoTDeviceNameAsync(deviceName);
             setIoTDeviceName.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, setIoTDeviceName.Status);
@@ -409,7 +409,7 @@ public void SetSoftApSettingsTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.SoftAPSettingsApi, response, HttpMethods.Post);
 
-            Task setSoftApSettings = TestHelpers.Portal.SetSoftApSettings(SoftApEnabled, SoftApSsid, SoftApPassword);
+            Task setSoftApSettings = TestHelpers.Portal.SetSoftApSettingsAsync(SoftApEnabled, SoftApSsid, SoftApPassword);
             setSoftApSettings.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, setSoftApSettings.Status);
@@ -429,7 +429,7 @@ public void SetAllJoynSettingsTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.AllJoynSettingsApi, response, HttpMethods.Post);
 
-            Task setAllJoynSettings = TestHelpers.Portal.SetAllJoynSettings(allJoynStatus, allJoynDescription, allJoynManufacturer, allJoynModelNumber);
+            Task setAllJoynSettings = TestHelpers.Portal.SetAllJoynSettingsAsync(allJoynStatus, allJoynDescription, allJoynManufacturer, allJoynModelNumber);
             setAllJoynSettings.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, setAllJoynSettings.Status);
@@ -451,7 +451,7 @@ public void SetNewPasswordTest_IoT()
 
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.ResetPasswordApi, response, HttpMethods.Post);
 
-            Task<ErrorInformation> setIoTNewPassword = TestHelpers.Portal.SetNewPassword(oldPassword, newPassword);
+            Task<ErrorInformation> setIoTNewPassword = TestHelpers.Portal.SetNewPasswordAsync(oldPassword, newPassword);
             setIoTNewPassword.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, setIoTNewPassword.Status);
@@ -470,7 +470,7 @@ public void SetNewRemoteDebuggingPinTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.NewRemoteDebuggingPinApi, response, HttpMethods.Post);
 
-            Task setIoTNewRemoteDebuggingPin = TestHelpers.Portal.SetNewRemoteDebuggingPin(newPin);
+            Task setIoTNewRemoteDebuggingPin = TestHelpers.Portal.SetNewRemoteDebuggingPinAsync(newPin);
             setIoTNewRemoteDebuggingPin.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, setIoTNewRemoteDebuggingPin.Status);
@@ -490,7 +490,7 @@ public void SetControllersDriversTest_IoT()
 
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.ControllerDriverApi, response, HttpMethods.Post);
 
-            Task<ControllerDriverInfo> setIoTControllersDrivers = TestHelpers.Portal.SetControllersDrivers(newDriver);
+            Task<ControllerDriverInfo> setIoTControllersDrivers = TestHelpers.Portal.SetControllersDriversAsync(newDriver);
             setIoTControllersDrivers.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, setIoTControllersDrivers.Status);
@@ -508,7 +508,7 @@ public void SetTimeZoneTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.SetTimeZoneApi, response, HttpMethods.Post);
 
-            Task setIoTTimeZone = TestHelpers.Portal.SetTimeZone(index);
+            Task setIoTTimeZone = TestHelpers.Portal.SetTimeZoneAsync(index);
             setIoTTimeZone.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, setIoTTimeZone.Status);
@@ -525,7 +525,7 @@ public void SetDisplayResolutionTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.DisplayResolutionApi, response, HttpMethods.Post);
 
-            Task setDisplayResolution = TestHelpers.Portal.SetDisplayResolution(displayResolution);
+            Task setDisplayResolution = TestHelpers.Portal.SetDisplayResolutionAsync(displayResolution);
             setDisplayResolution.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, setDisplayResolution.Status);
@@ -542,7 +542,7 @@ public void SetDisplayOrientationTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.DisplayOrientationApi, response, HttpMethods.Post);
 
-            Task setIoTDisplayOrientation = TestHelpers.Portal.SetDisplayOrientation(displayOrientation);
+            Task setIoTDisplayOrientation = TestHelpers.Portal.SetDisplayOrientationAsync(displayOrientation);
             setIoTDisplayOrientation.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, setIoTDisplayOrientation.Status);
@@ -560,7 +560,7 @@ public void GetAppsListInfo_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<AppsListInfo> getTask = TestHelpers.Portal.GetAppsListInfo();
+            Task<AppsListInfo> getTask = TestHelpers.Portal.GetAppsListInfoAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -582,7 +582,7 @@ public void GetHeadlessAppsListInfo_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<HeadlessAppsListInfo> getTask = TestHelpers.Portal.GetHeadlessAppsListInfo();
+            Task<HeadlessAppsListInfo> getTask = TestHelpers.Portal.GetHeadlessAppsListInfoAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -603,7 +603,7 @@ public void UpdateStartupAppTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.AppsListApi, response, HttpMethods.Post);
 
-            Task setIoTStartupApp = TestHelpers.Portal.UpdateStartupApp(startupApp);
+            Task setIoTStartupApp = TestHelpers.Portal.UpdateStartupAppAsync(startupApp);
             setIoTStartupApp.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, setIoTStartupApp.Status);
@@ -620,7 +620,7 @@ public void UpdateHeadlessStartupAppTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.HeadlessStartupAppApi, response, HttpMethods.Post);
 
-            Task setIoTHeadlessStartupApp = TestHelpers.Portal.UpdateHeadlessStartupApp(startupApp);
+            Task setIoTHeadlessStartupApp = TestHelpers.Portal.UpdateHeadlessStartupAppAsync(startupApp);
             setIoTHeadlessStartupApp.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, setIoTHeadlessStartupApp.Status);
@@ -637,7 +637,7 @@ public void RemoveHeadlessStartupAppTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.HeadlessStartupAppApi, response, HttpMethods.Delete);
 
-            Task removeIoTHeadlessStartupApp = TestHelpers.Portal.RemoveHeadlessStartupApp(startupApp);
+            Task removeIoTHeadlessStartupApp = TestHelpers.Portal.RemoveHeadlessStartupAppAsync(startupApp);
             removeIoTHeadlessStartupApp.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, removeIoTHeadlessStartupApp.Status);
@@ -654,7 +654,7 @@ public void ActivatePackageTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.ActivatePackageApi, response, HttpMethods.Post);
 
-            Task activatePackage = TestHelpers.Portal.ActivatePackage(appId);
+            Task activatePackage = TestHelpers.Portal.ActivatePackageAsync(appId);
             activatePackage.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, activatePackage.Status);
@@ -672,7 +672,7 @@ public void GetAudioDeviceListInfo_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<AudioDeviceListInfo> getTask = TestHelpers.Portal.GetAudioDeviceListInfo();
+            Task<AudioDeviceListInfo> getTask = TestHelpers.Portal.GetAudioDeviceListInfoAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -693,7 +693,7 @@ public void SetRenderVolumeTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.SetRenderVolumeApi, response, HttpMethods.Post);
 
-            Task RenderVolume = TestHelpers.Portal.SetRenderVolume(renderVolume);
+            Task RenderVolume = TestHelpers.Portal.SetRenderVolumeAsync(renderVolume);
             RenderVolume.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, RenderVolume.Status);
@@ -710,7 +710,7 @@ public void SetCaptureVolumeTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.SetCaptureVolumeApi, response, HttpMethods.Post);
 
-            Task CaptureVolume = TestHelpers.Portal.SetCaptureVolume(captureVolume);
+            Task CaptureVolume = TestHelpers.Portal.SetCaptureVolumeAsync(captureVolume);
             CaptureVolume.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, CaptureVolume.Status);
@@ -728,7 +728,7 @@ public void IcSharingStartTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.IcSharingApi, response, HttpMethods.Post);
 
-            Task IcsStart = TestHelpers.Portal.IcSharingStart(privateInterfaceIndex, publicInterfaceIndex);
+            Task IcsStart = TestHelpers.Portal.IcSharingStartAsync(privateInterfaceIndex, publicInterfaceIndex);
             IcsStart.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, IcsStart.Status);
@@ -746,7 +746,7 @@ public void IcSharingStopTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.IcSharingApi, response, HttpMethods.Delete);
 
-            Task IcsStop = TestHelpers.Portal.IcSharingStop(privateInterfaceIndex, publicInterfaceIndex);
+            Task IcsStop = TestHelpers.Portal.IcSharingStopAsync(privateInterfaceIndex, publicInterfaceIndex);
             IcsStop.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, IcsStop.Status);
@@ -764,7 +764,7 @@ public void GetIcsInterfacesInfo_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<IscInterfacesInfo> getTask = TestHelpers.Portal.GetIcsInterfacesInfo();
+            Task<IscInterfacesInfo> getTask = TestHelpers.Portal.GetIcsInterfacesInfoAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -786,7 +786,7 @@ public void SetRunCommandTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.RunCommandApi, response, HttpMethods.Post);
 
-            Task runCommand = TestHelpers.Portal.RunCommand(command, runAsDefaultAccount);
+            Task runCommand = TestHelpers.Portal.RunCommandAsync(command, runAsDefaultAccount);
             runCommand.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, runCommand.Status);
@@ -807,7 +807,7 @@ public void SetRunCommandWithoutOutputTest_IoT()
 
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.RunCommandWithoutOutputApi, response, HttpMethods.Post);
 
-            Task<RunCommandOutputInfo> runCommandWithoutOutput = TestHelpers.Portal.RunCommandWithoutOutput(command, runAsDefaultAccount, timeout);
+            Task<RunCommandOutputInfo> runCommandWithoutOutput = TestHelpers.Portal.RunCommandWithoutOutputAsync(command, runAsDefaultAccount, timeout);
             runCommandWithoutOutput.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, runCommandWithoutOutput.Status);
@@ -825,7 +825,7 @@ public void GetRemoteSettingsStatusInfo_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<RemoteSettingsStatusInfo> getTask = TestHelpers.Portal.GetRemoteSettingsStatusInfo();
+            Task<RemoteSettingsStatusInfo> getTask = TestHelpers.Portal.GetRemoteSettingsStatusInfoAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -848,7 +848,7 @@ public void RemoteSettingsEnableTest_IoT()
 
              TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.RemoteSettingsEnableApi, response, HttpMethods.Post);
 
-            Task<RemoteSettingsStatusInfo> remoteSettingsEnable = TestHelpers.Portal.RemoteSettingsEnable();
+            Task<RemoteSettingsStatusInfo> remoteSettingsEnable = TestHelpers.Portal.RemoteSettingsEnableAsync();
             remoteSettingsEnable.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, remoteSettingsEnable.Status);
@@ -867,7 +867,7 @@ public void RemoteSettingsDisableTest_IoT()
 
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.RemoteSettingsDisableApi, response, HttpMethods.Post);
 
-            Task<RemoteSettingsStatusInfo> remoteSettingsDisable = TestHelpers.Portal.RemoteSettingsDisable();
+            Task<RemoteSettingsStatusInfo> remoteSettingsDisable = TestHelpers.Portal.RemoteSettingsDisableAsync();
             remoteSettingsDisable.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, remoteSettingsDisable.Status);
@@ -885,7 +885,7 @@ public void GetTpmSettingsInfo_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<TpmSettingsInfo> getTask = TestHelpers.Portal.GetTpmSettingsInfo();
+            Task<TpmSettingsInfo> getTask = TestHelpers.Portal.GetTpmSettingsInfoAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -907,7 +907,7 @@ public void GetTpmAcpiTablesInfo_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<TpmAcpiTablesInfo> getTask = TestHelpers.Portal.GetTpmAcpiTablesInfo();
+            Task<TpmAcpiTablesInfo> getTask = TestHelpers.Portal.GetTpmAcpiTablesInfoAsync();
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -931,7 +931,7 @@ public void GetTpmLogicalDeviceSettingsInfo_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<TpmLogicalDeviceSettingsInfo> getTask = TestHelpers.Portal.GetTpmLogicalDeviceSettingsInfo(logicalDeviceId);
+            Task<TpmLogicalDeviceSettingsInfo> getTask = TestHelpers.Portal.GetTpmLogicalDeviceSettingsInfoAsync(logicalDeviceId);
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
@@ -952,7 +952,7 @@ public void SetTpmAcpiTablesTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.TpmAcpiTablesApi, response, HttpMethods.Post);
 
-            Task tpmAcpiTables = TestHelpers.Portal.SetTpmAcpiTablesInfo(acpiTableIndex);
+            Task tpmAcpiTables = TestHelpers.Portal.SetTpmAcpiTablesInfoAsync(acpiTableIndex);
             tpmAcpiTables.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, tpmAcpiTables.Status);
@@ -971,7 +971,7 @@ public void SetTpmLogicalDeviceSettingsTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(string.Format("{0}/{1}", DevicePortal.TpmSettingsApi, logicalDeviceId), response, HttpMethods.Post);
 
-            Task tpmLogicalDeviceSettings = TestHelpers.Portal.SetTpmLogicalDeviceSettingsInfo(logicalDeviceId, azureUri, azureKey);
+            Task tpmLogicalDeviceSettings = TestHelpers.Portal.SetTpmLogicalDeviceSettingsInfoAsync(logicalDeviceId, azureUri, azureKey);
             tpmLogicalDeviceSettings.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, tpmLogicalDeviceSettings.Status);
@@ -988,7 +988,7 @@ public void ResetTpmLogicalDeviceSettingsTest_IoT()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(string.Format("{0}/{1}", DevicePortal.TpmSettingsApi, logicalDeviceId), response, HttpMethods.Delete);
 
-            Task tpmLogicalDeviceSettings = TestHelpers.Portal.ResetTpmLogicalDeviceSettingsInfo(logicalDeviceId);
+            Task tpmLogicalDeviceSettings = TestHelpers.Portal.ResetTpmLogicalDeviceSettingsInfoAsync(logicalDeviceId);
             tpmLogicalDeviceSettings.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, tpmLogicalDeviceSettings.Status);
@@ -1009,7 +1009,7 @@ public void GetTpmAzureTokenInfo_IoT()
                 this.FriendlyOperatingSystemVersion,
                 HttpMethods.Get);
 
-            Task<TpmAzureTokenInfo> getTask = TestHelpers.Portal.GetTpmAzureTokenInfo(logicalDeviceId, validity);
+            Task<TpmAzureTokenInfo> getTask = TestHelpers.Portal.GetTpmAzureTokenInfoAsync(logicalDeviceId, validity);
             getTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getTask.Status);
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/XboxOne/XboxHelpers.cs b/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/XboxOne/XboxHelpers.cs
index ec806722..44fb4654 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/XboxOne/XboxHelpers.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/XboxOne/XboxHelpers.cs
@@ -24,7 +24,7 @@ public static void VerifyOsInformation(string friendlyOperatingSystemVersion, st
         {
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.MachineNameApi, DevicePortalPlatforms.XboxOne, friendlyOperatingSystemVersion, HttpMethods.Get);
 
-            Task<string> getNameTask = TestHelpers.Portal.GetDeviceName();
+            Task<string> getNameTask = TestHelpers.Portal.GetDeviceNameAsync();
             getNameTask.Wait();
 
             Assert.AreEqual(operatingSystemVersion, TestHelpers.Portal.OperatingSystemVersion);
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/XboxOne/XboxOne_rs1_xbox_rel_1608.cs b/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/XboxOne/XboxOne_rs1_xbox_rel_1608.cs
index 2537325a..bfb97c82 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/XboxOne/XboxOne_rs1_xbox_rel_1608.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/XboxOne/XboxOne_rs1_xbox_rel_1608.cs
@@ -65,7 +65,7 @@ public void GetXboxLiveUserListTest_XboxOne_1608()
         {
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.XboxLiveUserApi, this.PlatformType, this.FriendlyOperatingSystemVersion, HttpMethods.Get);
 
-            Task<UserList> getUserTask = TestHelpers.Portal.GetXboxLiveUsers();
+            Task<UserList> getUserTask = TestHelpers.Portal.GetXboxLiveUsersAsync();
             getUserTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getUserTask.Status);
@@ -102,7 +102,7 @@ public void GetXboxSettingsTest_XboxOne_1608()
         {
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.XboxSettingsApi, this.PlatformType, this.FriendlyOperatingSystemVersion, HttpMethods.Get);
 
-            Task<XboxSettingList> getSettingsTask = TestHelpers.Portal.GetXboxSettings();
+            Task<XboxSettingList> getSettingsTask = TestHelpers.Portal.GetXboxSettingsAsync();
             getSettingsTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getSettingsTask.Status);
@@ -137,7 +137,7 @@ public void AppFileExplorerGetKnownFolderTest_XboxOne_1608()
         {
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.KnownFoldersApi, this.PlatformType, this.FriendlyOperatingSystemVersion, HttpMethods.Get);
 
-            Task<KnownFolders> getKnownFoldersTask = TestHelpers.Portal.GetKnownFolders();
+            Task<KnownFolders> getKnownFoldersTask = TestHelpers.Portal.GetKnownFoldersAsync();
             getKnownFoldersTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getKnownFoldersTask.Status);
@@ -159,7 +159,7 @@ public void AppFileExplorerGetFolderContentsTest_XboxOne_1608()
         {
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.GetFilesApi, this.PlatformType, this.FriendlyOperatingSystemVersion, HttpMethods.Get);
 
-            Task<FolderContents> getFolderContentsTask = TestHelpers.Portal.GetFolderContents("DevelopmentFiles");
+            Task<FolderContents> getFolderContentsTask = TestHelpers.Portal.GetFolderContentsAsync("DevelopmentFiles");
             getFolderContentsTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getFolderContentsTask.Status);
@@ -262,12 +262,12 @@ public void GetRunningProcessesTest_XboxOne_1608()
         {
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.RunningProcessApi, this.PlatformType, this.FriendlyOperatingSystemVersion, HttpMethods.Get);
 
-            Task<RunningProcesses> getRunningProcessesTask = TestHelpers.Portal.GetRunningProcesses();
+            Task<RunningProcesses> getRunningProcessesTask = TestHelpers.Portal.GetRunningProcessesAsync();
             getRunningProcessesTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getRunningProcessesTask.Status);
 
-            ValidateRunningProcesses(getRunningProcessesTask.Result);
+            ValidateRunningProcessesAsync(getRunningProcessesTask.Result);
         }
 
         /// <summary>
@@ -294,19 +294,19 @@ public void GetRunningProcessesWebSocketTest_XboxOne_1608()
 
             TestHelpers.Portal.RunningProcessesMessageReceived += runningProcessesReceivedHandler;
 
-            Task startListeningForProcessesTask = TestHelpers.Portal.StartListeningForRunningProcesses();
+            Task startListeningForProcessesTask = TestHelpers.Portal.StartListeningForRunningProcessesAsync();
             startListeningForProcessesTask.Wait();
             Assert.AreEqual(TaskStatus.RanToCompletion, startListeningForProcessesTask.Status);
 
             runningProcessesReceived.WaitOne();
 
-            Task stopListeningForProcessesTask = TestHelpers.Portal.StopListeningForRunningProcesses();
+            Task stopListeningForProcessesTask = TestHelpers.Portal.StopListeningForRunningProcessesAsync();
             stopListeningForProcessesTask.Wait();
             Assert.AreEqual(TaskStatus.RanToCompletion, stopListeningForProcessesTask.Status);
 
             TestHelpers.Portal.RunningProcessesMessageReceived -= runningProcessesReceivedHandler;
 
-            ValidateRunningProcesses(runningProcesses);
+            ValidateRunningProcessesAsync(runningProcesses);
         }
 
         /// <summary>
@@ -319,7 +319,7 @@ public void GetSystemPerfTest_XboxOne_1608()
         {
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.SystemPerfApi, this.PlatformType, this.FriendlyOperatingSystemVersion, HttpMethods.Get);
 
-            Task<SystemPerformanceInformation> getSystemPerfTask = TestHelpers.Portal.GetSystemPerf();
+            Task<SystemPerformanceInformation> getSystemPerfTask = TestHelpers.Portal.GetSystemPerfAsync();
             getSystemPerfTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getSystemPerfTask.Status);
@@ -351,13 +351,13 @@ public void GetSystemPerfWebSocketTest_XboxOne_1608()
 
             TestHelpers.Portal.SystemPerfMessageReceived += systemPerfReceivedHandler;
 
-            Task startListeningForSystemPerfTask = TestHelpers.Portal.StartListeningForSystemPerf();
+            Task startListeningForSystemPerfTask = TestHelpers.Portal.StartListeningForSystemPerfAsync();
             startListeningForSystemPerfTask.Wait();
             Assert.AreEqual(TaskStatus.RanToCompletion, startListeningForSystemPerfTask.Status);
 
             systemPerfReceived.WaitOne();
 
-            Task stopListeningForSystemPerf = TestHelpers.Portal.StopListeningForSystemPerf();
+            Task stopListeningForSystemPerf = TestHelpers.Portal.StopListeningForSystemPerfAsync();
             stopListeningForSystemPerf.Wait();
             Assert.AreEqual(TaskStatus.RanToCompletion, stopListeningForSystemPerf.Status);
 
@@ -375,7 +375,7 @@ public void XboxAppRegisterTest()
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.RegisterPackageApi, HttpMethods.Post);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.InstallStateApi, HttpMethods.Post);
 
-            Task registerTask = TestHelpers.Portal.RegisterApplication("SomeLooseFolder");
+            Task registerTask = TestHelpers.Portal.RegisterApplicationAsync("SomeLooseFolder");
             registerTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, registerTask.Status);
@@ -389,7 +389,7 @@ public void XboxAppUploadFolderTest()
         {
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.UploadPackageFolderApi, HttpMethods.Post);
 
-            Task uploadTask = TestHelpers.Portal.UploadPackageFolder("MockData\\XboxOne", "DestinationLooseFolder");
+            Task uploadTask = TestHelpers.Portal.UploadPackageFolderAsync("MockData\\XboxOne", "DestinationLooseFolder");
             uploadTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, uploadTask.Status);
@@ -405,7 +405,7 @@ public void GetXboxLiveUserListTest()
         {
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.XboxLiveUserApi, HttpMethods.Get);
 
-            Task<UserList> getUserTask = TestHelpers.Portal.GetXboxLiveUsers();
+            Task<UserList> getUserTask = TestHelpers.Portal.GetXboxLiveUsersAsync();
             getUserTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getUserTask.Status);
@@ -447,7 +447,7 @@ public void UpdateXboxLiveUsersTest()
             user.SignedIn = true;
             users.Add(user);
 
-            Task updateUsersTask = TestHelpers.Portal.UpdateXboxLiveUsers(users);
+            Task updateUsersTask = TestHelpers.Portal.UpdateXboxLiveUsersAsync(users);
             updateUsersTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, updateUsersTask.Status);
@@ -477,7 +477,7 @@ public void AddSponsoredUserTest_Failure()
 
             try
             {
-                Task updateUsersTask = TestHelpers.Portal.UpdateXboxLiveUsers(users);
+                Task updateUsersTask = TestHelpers.Portal.UpdateXboxLiveUsersAsync(users);
                 updateUsersTask.Wait();
 
                 Assert.Fail("Expected an exception due to mock responder returning failure HRESULT.");
@@ -505,7 +505,7 @@ public void GetXboxSettingsTest()
         {
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.XboxSettingsApi, HttpMethods.Get);
 
-            Task<XboxSettingList> getSettingsTask = TestHelpers.Portal.GetXboxSettings();
+            Task<XboxSettingList> getSettingsTask = TestHelpers.Portal.GetXboxSettingsAsync();
             getSettingsTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getSettingsTask.Status);
@@ -541,7 +541,7 @@ public void GetSingleXboxSettingTest()
             string settingName = "TVResolution";
             TestHelpers.MockHttpResponder.AddMockResponse(Path.Combine(DevicePortal.XboxSettingsApi, settingName), HttpMethods.Get);
 
-            Task<XboxSetting> getSettingTask = TestHelpers.Portal.GetXboxSetting(settingName);
+            Task<XboxSetting> getSettingTask = TestHelpers.Portal.GetXboxSettingAsync(settingName);
             getSettingTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getSettingTask.Status);
@@ -569,7 +569,7 @@ public void UpdateXboxSettingsTest()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.NoContent);
             TestHelpers.MockHttpResponder.AddMockResponse(Path.Combine(DevicePortal.XboxSettingsApi, setting.Name), HttpMethods.Put);
 
-            Task<XboxSetting> updateSettingsTask = TestHelpers.Portal.UpdateXboxSetting(setting);
+            Task<XboxSetting> updateSettingsTask = TestHelpers.Portal.UpdateXboxSettingAsync(setting);
             updateSettingsTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, updateSettingsTask.Status);
@@ -595,7 +595,7 @@ public void XboxScreenshotTest()
 
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.GetXboxScreenshotApi, response, HttpMethods.Get);
 
-            Task<Stream> screenshotTask = TestHelpers.Portal.TakeXboxScreenshot();
+            Task<Stream> screenshotTask = TestHelpers.Portal.TakeXboxScreenshotAsync();
             screenshotTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, screenshotTask.Status);
@@ -610,7 +610,7 @@ public void EnableFiddlerTest()
             HttpResponseMessage response = new HttpResponseMessage(HttpStatusCode.OK);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.FiddlerSetupApi, response, HttpMethods.Post);
 
-            Task fiddlerEnableTask = TestHelpers.Portal.EnableFiddlerTracing("localhost", "8888");
+            Task fiddlerEnableTask = TestHelpers.Portal.EnableFiddlerTracingAsync("localhost", "8888");
             fiddlerEnableTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, fiddlerEnableTask.Status);
@@ -618,7 +618,7 @@ public void EnableFiddlerTest()
             response = new HttpResponseMessage(HttpStatusCode.OK);
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.FiddlerSetupApi, response, HttpMethods.Delete);
 
-            Task fiddlerDisableTask = TestHelpers.Portal.DisableFiddlerTracing();
+            Task fiddlerDisableTask = TestHelpers.Portal.DisableFiddlerTracingAsync();
             fiddlerDisableTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, fiddlerDisableTask.Status);
@@ -634,7 +634,7 @@ public void GetXboxLiveSandboxTest()
 
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.XboxLiveSandboxApi, this.PlatformType, this.FriendlyOperatingSystemVersion, HttpMethods.Get);
 
-            Task<Sandbox> getSandboxTask = TestHelpers.Portal.GetXboxLiveSandbox();
+            Task<Sandbox> getSandboxTask = TestHelpers.Portal.GetXboxLiveSandboxAsync();
             getSandboxTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, getSandboxTask.Status);
@@ -655,7 +655,7 @@ public void SetXboxLiveSandboxTest()
 
             TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.XboxLiveSandboxApi, response, HttpMethods.Put);
 
-            Task<Sandbox> setSandboxTask = TestHelpers.Portal.SetXboxLiveSandbox(sandboxValue);
+            Task<Sandbox> setSandboxTask = TestHelpers.Portal.SetXboxLiveSandboxAsync(sandboxValue);
             setSandboxTask.Wait();
 
             Assert.AreEqual(TaskStatus.RanToCompletion, setSandboxTask.Status);
@@ -667,7 +667,7 @@ public void SetXboxLiveSandboxTest()
         /// Validate the <see cref="RunningProcesses" /> returned from the tests.
         /// </summary>
         /// <param name="runningProcesses">The <see cref="RunningProcesses" /> to validate.</param>
-        private static void ValidateRunningProcesses(RunningProcesses runningProcesses)
+        private static void ValidateRunningProcessesAsync(RunningProcesses runningProcesses)
         {
             List<DeviceProcessInfo> processes = new List<DeviceProcessInfo>(runningProcesses.Processes);
 
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/TestHelpers.cs b/WindowsDevicePortalWrapper/UnitTestProject/TestHelpers.cs
index d9a6cb85..e049d179 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/TestHelpers.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/TestHelpers.cs
@@ -47,7 +47,7 @@ public static void EstablishMockConnection(DevicePortalPlatforms platform, strin
           
             TestHelpers.Portal = new DevicePortal(new MockDevicePortalConnection());
 
-            Task connectTask = TestHelpers.Portal.Connect(updateConnection: false);
+            Task connectTask = TestHelpers.Portal.ConnectAsync(updateConnection: false);
             connectTask.Wait();
 
             Assert.AreEqual(HttpStatusCode.OK, TestHelpers.Portal.ConnectionHttpStatusCode);
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/AppDeployment.cs b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/AppDeployment.cs
index 7383a745..50b44dfc 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/AppDeployment.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/AppDeployment.cs
@@ -21,7 +21,7 @@ public partial class DevicePortal
         /// API for getting installation status.
         /// </summary>
         /// <returns>The status</returns>
-        public async Task<ApplicationInstallStatus> GetInstallStatus()
+        public async Task<ApplicationInstallStatus> GetInstallStatusAsync()
         {
             ApplicationInstallStatus status = ApplicationInstallStatus.Completed;
 
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestDelete.cs b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestDelete.cs
index 3b03cf70..773180df 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestDelete.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestDelete.cs
@@ -13,7 +13,7 @@
 namespace Microsoft.Tools.WindowsDevicePortal
 {
     /// <content>
-    /// MOCK implementation of HTTP Delete
+    /// MOCK implementation of HTTP DeleteAsync
     /// </content>
     public partial class DevicePortal
     {
@@ -22,7 +22,7 @@ public partial class DevicePortal
         /// </summary>
         /// <param name="uri">The uri to which the delete request will be issued.</param>
         /// <returns>Task tracking HTTP completion</returns>
-        private async Task<Stream> Delete(Uri uri)
+        private async Task<Stream> DeleteAsync(Uri uri)
         {
             MemoryStream dataStream = null;
 
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestGet.cs b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestGet.cs
index c2f13c0c..bca5ee88 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestGet.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestGet.cs
@@ -13,7 +13,7 @@
 namespace Microsoft.Tools.WindowsDevicePortal
 {
     /// <content>
-    /// MOCK implementation of HTTP Get
+    /// MOCK implementation of HTTP GetAsync
     /// </content>
     public partial class DevicePortal
     {
@@ -22,7 +22,7 @@ public partial class DevicePortal
         /// </summary>
         /// <param name="uri">The uri to which the get request will be issued.</param>
         /// <returns>Response data as a stream.</returns>
-        private async Task<Stream> Get(
+        private async Task<Stream> GetAsync(
             Uri uri)
         {
             MemoryStream dataStream = null;
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestPost.cs b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestPost.cs
index 887123f0..6fa1755e 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestPost.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestPost.cs
@@ -13,7 +13,7 @@
 namespace Microsoft.Tools.WindowsDevicePortal
 {
     /// <content>
-    /// MOCK implementation of HTTP Post
+    /// MOCK implementation of HTTP PostAsync
     /// </content>
     public partial class DevicePortal
     {
@@ -24,7 +24,7 @@ public partial class DevicePortal
         /// <param name="requestStream">Optional stream containing data for the request body.</param>
         /// <param name="requestStreamContentType">The type of that request body data.</param>
         /// <returns>Task tracking the completion of the POST request</returns>
-        private async Task<Stream> Post(
+        private async Task<Stream> PostAsync(
             Uri uri,
             Stream requestStream = null,
             string requestStreamContentType = null)
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestPut.cs b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestPut.cs
index 12abe99e..d0f89aab 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestPut.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestPut.cs
@@ -23,7 +23,7 @@ public partial class DevicePortal
         /// <param name="uri">The uri to which the put request will be issued.</param>
         /// <param name="body">The HTTP content comprising the body of the request.</param>
         /// <returns>Task tracking the PUT completion.</returns>
-        private async Task<Stream> Put(
+        private async Task<Stream> PutAsync(
             Uri uri,
             HttpContent body = null)
         {
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/WebSocket.cs b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/WebSocket.cs
index 00dedef7..8a499e7c 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/WebSocket.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/WebSocket.cs
@@ -55,7 +55,7 @@ public WebSocket(IDevicePortalConnection connection, Func<object, X509Certificat
         /// </summary>
         /// <returns>The task of closing the websocket connection.</returns>
 #pragma warning disable 1998
-        private async Task StopListeningForMessagesInternal()
+        private async Task StopListeningForMessagesInternalAsync()
         {
             if (this.IsListeningForMessages)
             {
@@ -77,7 +77,7 @@ private async Task StopListeningForMessagesInternal()
         /// </summary>
         /// <param name="endpoint">The uri that the weboscket should connect to</param>
         /// <returns>The task of listening for messages from the websocket.</returns>
-        private async Task StartListeningForMessagesInternal(Uri endpoint)
+        private async Task StartListeningForMessagesInternalAsync(Uri endpoint)
         {
             this.keepListeningForMessages = true;
 
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppDeployment.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppDeployment.cs
index dc96351e..062dc6a1 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppDeployment.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppDeployment.cs
@@ -53,9 +53,9 @@ public partial class DevicePortal
         /// Gets the collection of applications installed on the device.
         /// </summary>
         /// <returns>AppPackages object containing the list of installed application packages.</returns>
-        public async Task<AppPackages> GetInstalledAppPackages()
+        public async Task<AppPackages> GetInstalledAppPackagesAsync()
         {
-            return await this.Get<AppPackages>(InstalledPackagesApi);
+            return await this.GetAsync<AppPackages>(InstalledPackagesApi);
         }
 
         /// <summary>
@@ -71,7 +71,7 @@ public async Task<AppPackages> GetInstalledAppPackages()
         /// <remarks>InstallApplication sends ApplicationInstallStatus events to indicate the current progress in the installation process.
         /// Some applications may opt to not register for the AppInstallStatus event and await on InstallApplication.</remarks>
         /// <returns>Task for tracking completion of install initialization.</returns>
-        public async Task InstallApplication(
+        public async Task InstallApplicationAsync(
             string appName,
             string packageFileName, 
             List<string> dependencyFileNames,
@@ -100,12 +100,12 @@ public async Task InstallApplication(
                         ApplicationInstallStatus.InProgress,
                         ApplicationInstallPhase.UninstallingPreviousVersion,
                         installPhaseDescription);
-                    AppPackages installedApps = await this.GetInstalledAppPackages();
+                    AppPackages installedApps = await this.GetInstalledAppPackagesAsync();
                     foreach (PackageInfo package in installedApps.Packages)
                     {
                         if (package.Name == appName)
                         {
-                            await this.UninstallApplication(package.FullName);
+                            await this.UninstallApplicationAsync(package.FullName);
                             break;
                         }
                     }
@@ -170,7 +170,7 @@ public async Task InstallApplication(
                     string contentType = string.Format("multipart/form-data; boundary={0}", boundaryString);
 
                     // Make the HTTP request.
-                    await this.Post(uri, dataStream, contentType);
+                    await this.PostAsync(uri, dataStream, contentType);
                 }
 
                 // Poll the status until complete.
@@ -185,7 +185,7 @@ public async Task InstallApplication(
 
                     await Task.Delay(TimeSpan.FromMilliseconds(stateCheckIntervalMs));
 
-                    status = await this.GetInstallStatus();
+                    status = await this.GetInstallStatusAsync();
                 }
                 while (status == ApplicationInstallStatus.InProgress);
 
@@ -221,9 +221,9 @@ public async Task InstallApplication(
         /// </summary>
         /// <param name="packageName">The name of the application package to uninstall.</param>
         /// <returns>Task tracking the uninstall operation.</returns>
-        public async Task UninstallApplication(string packageName)
+        public async Task UninstallApplicationAsync(string packageName)
         {
-            await this.Delete(
+            await this.DeleteAsync(
                 PackageManagerApi,
                 //// NOTE: When uninstalling an app package, the package name is not Hex64 encoded.
                 string.Format("package={0}", packageName));
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppFileExplorer.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppFileExplorer.cs
index 0b155fc9..cc93f29e 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppFileExplorer.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppFileExplorer.cs
@@ -41,9 +41,9 @@ public partial class DevicePortal
         /// Gets a list of Known Folders on the device. 
         /// </summary>
         /// <returns>List of known folders available on this device.</returns>
-        public async Task<KnownFolders> GetKnownFolders()
+        public async Task<KnownFolders> GetKnownFoldersAsync()
         {
-            return await this.Get<KnownFolders>(KnownFoldersApi);
+            return await this.GetAsync<KnownFolders>(KnownFoldersApi);
         }
 
         /// <summary>
@@ -53,14 +53,14 @@ public async Task<KnownFolders> GetKnownFolders()
         /// <param name="subPath">An optional subpath to the folder.</param>
         /// <param name="packageFullName">The package full name if using LocalAppData.</param>
         /// <returns>Contents of the requested folder.</returns>
-        public async Task<FolderContents> GetFolderContents(
+        public async Task<FolderContents> GetFolderContentsAsync(
             string knownFolderId, 
             string subPath = null, 
             string packageFullName = null)
         {
             Dictionary<string, string> payload = this.BuildCommonFilePayload(knownFolderId, subPath, packageFullName);
 
-            return await this.Get<FolderContents>(GetFilesApi, Utilities.BuildQueryString(payload));
+            return await this.GetAsync<FolderContents>(GetFilesApi, Utilities.BuildQueryString(payload));
         }
 
         /// <summary>
@@ -71,7 +71,7 @@ public async Task<FolderContents> GetFolderContents(
         /// <param name="subPath">An optional subpath to the folder.</param>
         /// <param name="packageFullName">The package full name if using LocalAppData.</param>
         /// <returns>Stream to the downloaded file.</returns>
-        public async Task<Stream> GetFile(
+        public async Task<Stream> GetFileAsync(
             string knownFolderId,
             string filename,
             string subPath = null,
@@ -86,7 +86,7 @@ public async Task<Stream> GetFile(
                 GetFileApi,
                 Utilities.BuildQueryString(payload));
 
-            return await this.Get(uri);
+            return await this.GetAsync(uri);
         }
 
         /// <summary>
@@ -97,7 +97,7 @@ public async Task<Stream> GetFile(
         /// <param name="subPath">An optional subpath to the folder.</param>
         /// <param name="packageFullName">The package full name if using LocalAppData.</param>
         /// <returns>Task tracking completion of the upload request.</returns>
-        public async Task UploadFile(
+        public async Task UploadFileAsync(
             string knownFolderId,
             string filepath,
             string subPath = null,
@@ -108,7 +108,7 @@ public async Task UploadFile(
             List<string> files = new List<string>();
             files.Add(filepath);
 
-            await this.Post(GetFileApi, files, Utilities.BuildQueryString(payload));
+            await this.PostAsync(GetFileApi, files, Utilities.BuildQueryString(payload));
         }
 
         /// <summary>
@@ -119,7 +119,7 @@ public async Task UploadFile(
         /// <param name="subPath">An optional subpath to the folder.</param>
         /// <param name="packageFullName">The package full name if using LocalAppData.</param>
         /// <returns>Task tracking completion of the delete request.</returns>
-        public async Task DeleteFile(
+        public async Task DeleteFileAsync(
             string knownFolderId,
             string filename,
             string subPath = null,
@@ -129,7 +129,7 @@ public async Task DeleteFile(
 
             payload.Add("filename", filename);
 
-            await this.Delete(GetFileApi, Utilities.BuildQueryString(payload));
+            await this.DeleteAsync(GetFileApi, Utilities.BuildQueryString(payload));
         }
 
         /// <summary>
@@ -141,7 +141,7 @@ public async Task DeleteFile(
         /// <param name="subPath">An optional subpath to the folder.</param>
         /// <param name="packageFullName">The package full name if using LocalAppData.</param>
         /// <returns>Task tracking completion of the rename request.</returns>
-        public async Task RenameFile(
+        public async Task RenameFileAsync(
             string knownFolderId,
             string filename,
             string newFilename,
@@ -153,7 +153,7 @@ public async Task RenameFile(
             payload.Add("filename", filename);
             payload.Add("newfilename", newFilename);
 
-            await this.Post(RenameFileApi, Utilities.BuildQueryString(payload));
+            await this.PostAsync(RenameFileApi, Utilities.BuildQueryString(payload));
         }
 
         /// <summary>
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DeviceManager.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DeviceManager.cs
index ef710637..d420b83a 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DeviceManager.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DeviceManager.cs
@@ -24,9 +24,9 @@ public partial class DevicePortal
         /// Get a listing of installed devices
         /// </summary>
         /// <returns>List of installed devices</returns>
-        public async Task<List<Device>> GetDeviceList()
+        public async Task<List<Device>> GetDeviceListAsync()
         {
-            DeviceList deviceList = await this.Get<DeviceList>(InstalledDevicesApi);
+            DeviceList deviceList = await this.GetAsync<DeviceList>(InstalledDevicesApi);
             return deviceList.Devices;
         }
 
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Dns-Sd.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Dns-Sd.cs
index 9ed30723..82d4bb13 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Dns-Sd.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Dns-Sd.cs
@@ -30,9 +30,9 @@ public partial class DevicePortal
         /// Gets a list of DNS-SD tags being broadcast by this device. 
         /// </summary>
         /// <returns>Array of strings, each one an individual tag.</returns>
-        public async Task<List<string>> GetServiceTags()
+        public async Task<List<string>> GetServiceTagsAsync()
         {
-            ServiceTags tags = await this.Get<ServiceTags>(TagsApi);
+            ServiceTags tags = await this.GetAsync<ServiceTags>(TagsApi);
             return tags.Tags;
         }
 
@@ -41,9 +41,9 @@ public async Task<List<string>> GetServiceTags()
         /// </summary>
         /// <param name="tagValue">The tag to assign to the device.</param>
         /// <returns>Task tracking adding the tag.</returns>
-        public async Task AddServiceTag(string tagValue)
+        public async Task AddServiceTagAsync(string tagValue)
         {
-            await this.Post(
+            await this.PostAsync(
                 TagApi,
                 string.Format("tagValue={0}", tagValue));
         }
@@ -52,9 +52,9 @@ await this.Post(
         /// Delete all tags from the device's DNS-SD broadcast. 
         /// </summary>
         /// <returns>Task tracking deletion of all tags.</returns>
-        public async Task DeleteAllTags()
+        public async Task DeleteAllTagsAsync()
         {
-            await this.Delete(TagsApi);
+            await this.DeleteAsync(TagsApi);
         }
 
         /// <summary>
@@ -62,9 +62,9 @@ public async Task DeleteAllTags()
         /// </summary>
         /// <param name="tagValue">The tag to delete from the device broadcast.</param>
         /// <returns>Task tracking deletion of the tag.</returns>
-        public async Task DeleteTag(string tagValue)
+        public async Task DeleteTagAsync(string tagValue)
         {
-            await this.Delete(
+            await this.DeleteAsync(
                 TagApi,
                 string.Format("tagValue={0}", tagValue));
         }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Networking.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Networking.cs
index 0e48820a..9b34e544 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Networking.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Networking.cs
@@ -25,9 +25,9 @@ public partial class DevicePortal
         /// Gets the IP configuration data of the device.
         /// </summary>
         /// <returns>object containing details of the device's network configuration.</returns>
-        public async Task<IpConfiguration> GetIpConfig()
+        public async Task<IpConfiguration> GetIpConfigAsync()
         {
-            return await this.Get<IpConfiguration>(IpConfigApi);
+            return await this.GetAsync<IpConfiguration>(IpConfigApi);
         }
 
         #region Data contract
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/OsInformation.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/OsInformation.cs
index 0391410d..0530bf9e 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/OsInformation.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/OsInformation.cs
@@ -91,9 +91,9 @@ public enum DevicePortalPlatforms
         /// Gets the family name (ex: Windows.Holographic) of the device.
         /// </summary>
         /// <returns>String containing the device's family.</returns>
-        public async Task<string> GetDeviceFamily()
+        public async Task<string> GetDeviceFamilyAsync()
         {
-            DeviceOsFamily deviceFamily = await this.Get<DeviceOsFamily>(DeviceFamilyApi);
+            DeviceOsFamily deviceFamily = await this.GetAsync<DeviceOsFamily>(DeviceFamilyApi);
             return deviceFamily.Family;
         }
 
@@ -101,9 +101,9 @@ public async Task<string> GetDeviceFamily()
         /// Gets the name of the device.
         /// </summary>
         /// <returns>String containing the device's name.</returns>
-        public async Task<string> GetDeviceName()
+        public async Task<string> GetDeviceNameAsync()
         {
-            DeviceName deviceName = await this.Get<DeviceName>(MachineNameApi);
+            DeviceName deviceName = await this.GetAsync<DeviceName>(MachineNameApi);
             return deviceName.Name;
         }
 
@@ -111,9 +111,9 @@ public async Task<string> GetDeviceName()
         /// Gets information about the device's operating system.
         /// </summary>
         /// <returns>OperatingSystemInformation object containing details of the installed operating system.</returns>
-        public async Task<OperatingSystemInformation> GetOperatingSystemInformation()
+        public async Task<OperatingSystemInformation> GetOperatingSystemInformationAsync()
         {
-            return await this.Get<OperatingSystemInformation>(OsInfoApi);
+            return await this.GetAsync<OperatingSystemInformation>(OsInfoApi);
         }
 
         /// <summary>
@@ -122,9 +122,9 @@ public async Task<OperatingSystemInformation> GetOperatingSystemInformation()
         /// <param name="name">The name to assign to the device.</param>
         /// <remarks>The new name does not take effect until the device has been restarted.</remarks>
         /// <returns>Task tracking setting the device name completion.</returns>
-        public async Task SetDeviceName(string name)
+        public async Task SetDeviceNameAsync(string name)
         {
-            await this.Post(
+            await this.PostAsync(
                 MachineNameApi,
                 string.Format("name={0}", Utilities.Hex64Encode(name)));
         }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/PerformanceData.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/PerformanceData.cs
index 99ad2fe4..1b2f835a 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/PerformanceData.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/PerformanceData.cs
@@ -50,16 +50,16 @@ public partial class DevicePortal
         /// Gets the collection of processes running on the device.
         /// </summary>
         /// <returns>RunningProcesses object containing the list of running processes.</returns>
-        public async Task<RunningProcesses> GetRunningProcesses()
+        public async Task<RunningProcesses> GetRunningProcessesAsync()
         {
-            return await this.Get<RunningProcesses>(RunningProcessApi);
+            return await this.GetAsync<RunningProcesses>(RunningProcessApi);
         }
 
         /// <summary>
         /// Starts listening for the running processes on the device with them being returned via the RunningProcessesMessageReceived event handler.
         /// </summary>
         /// <returns>Task for connecting to the websocket but not for listening to it.</returns>
-        public async Task StartListeningForRunningProcesses()
+        public async Task StartListeningForRunningProcessesAsync()
         {
             if (this.deviceProcessesWebSocket == null)
             {
@@ -79,37 +79,37 @@ public async Task StartListeningForRunningProcesses()
                 }
             }
 
-            await this.deviceProcessesWebSocket.StartListeningForMessages(RunningProcessApi);
+            await this.deviceProcessesWebSocket.StartListeningForMessagesAsync(RunningProcessApi);
         }
 
         /// <summary>
         /// Stop listening for the running processes on the device.
         /// </summary>
         /// <returns>Task for stop listening for processes and disconnecting from the websocket .</returns>
-        public async Task StopListeningForRunningProcesses()
+        public async Task StopListeningForRunningProcessesAsync()
         {
             if (this.deviceProcessesWebSocket == null || !this.deviceProcessesWebSocket.IsListeningForMessages)
             {
                 return;
             }
 
-            await this.deviceProcessesWebSocket.StopListeningForMessages();
+            await this.deviceProcessesWebSocket.StopListeningForMessagesAsync();
         }
 
         /// <summary>
         /// Gets system performance information for the device.
         /// </summary>
         /// <returns>SystemPerformanceInformation object containing information such as memory usage.</returns>
-        public async Task<SystemPerformanceInformation> GetSystemPerf()
+        public async Task<SystemPerformanceInformation> GetSystemPerfAsync()
         {
-            return await this.Get<SystemPerformanceInformation>(SystemPerfApi);
+            return await this.GetAsync<SystemPerformanceInformation>(SystemPerfApi);
         }
 
         /// <summary>
         /// Starts listening for the system performance information for the device with it being returned via the SystemPerfMessageReceived event handler.
         /// </summary>
         /// <returns>Task for connecting to the websocket but not for listening to it.</returns>
-        public async Task StartListeningForSystemPerf()
+        public async Task StartListeningForSystemPerfAsync()
         {
             if (this.systemPerfWebSocket == null)
             {
@@ -129,21 +129,21 @@ public async Task StartListeningForSystemPerf()
                 }
             }
 
-            await this.systemPerfWebSocket.StartListeningForMessages(SystemPerfApi);
+            await this.systemPerfWebSocket.StartListeningForMessagesAsync(SystemPerfApi);
         }
 
         /// <summary>
         /// Stop listening for the system performance information for the device.
         /// </summary>
         /// <returns>Task for stop listening for system perf and disconnecting from the websocket .</returns>
-        public async Task StopListeningForSystemPerf()
+        public async Task StopListeningForSystemPerfAsync()
         {
             if (this.systemPerfWebSocket == null || !this.systemPerfWebSocket.IsListeningForMessages)
             {
                 return;
             }
 
-            await this.systemPerfWebSocket.StopListeningForMessages();
+            await this.systemPerfWebSocket.StopListeningForMessagesAsync();
         }
 
         /// <summary>
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Power.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Power.cs
index 8cc16c31..d504adb3 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Power.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Power.cs
@@ -54,9 +54,9 @@ public partial class DevicePortal
         /// Returns the current active power scheme.
         /// </summary>
         /// <returns>The power scheme identifier.</returns>
-        public async Task<Guid> GetActivePowerScheme()
+        public async Task<Guid> GetActivePowerSchemeAsync()
         {
-            ActivePowerScheme activeScheme = await this.Get<ActivePowerScheme>(ActivePowerSchemeApi);
+            ActivePowerScheme activeScheme = await this.GetAsync<ActivePowerScheme>(ActivePowerSchemeApi);
             return activeScheme.Id;
         }
 
@@ -64,18 +64,18 @@ public async Task<Guid> GetActivePowerScheme()
         /// Returns the current state of the device's battery.
         /// </summary>
         /// <returns>BatteryState object containing details such as the current battery level.</returns>
-        public async Task<BatteryState> GetBatteryState()
+        public async Task<BatteryState> GetBatteryStateAsync()
         {
-            return await this.Get<BatteryState>(BatteryStateApi);
+            return await this.GetAsync<BatteryState>(BatteryStateApi);
         }
 
         /// <summary>
         /// Gets the device's current power state.
         /// </summary>
         /// <returns>PowerState object containing details such as whether or not the device is in low power mode.</returns>
-        public async Task<PowerState> GetPowerState()
+        public async Task<PowerState> GetPowerStateAsync()
         {
-            return await this.Get<PowerState>(PowerStateApi);
+            return await this.GetAsync<PowerState>(PowerStateApi);
         }
 
         #region Data contract
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/RemoteControl.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/RemoteControl.cs
index 290a0f1a..9ba49c2c 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/RemoteControl.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/RemoteControl.cs
@@ -29,9 +29,9 @@ public partial class DevicePortal
         /// <returns>
         /// Task tracking reboot completion.
         /// </returns>
-        public async Task Reboot()
+        public async Task RebootAsync()
         {
-            await this.Post(RebootApi);
+            await this.PostAsync(RebootApi);
         }
 
         /// <summary>
@@ -40,9 +40,9 @@ public async Task Reboot()
         /// <returns>
         /// Task tracking shutdown completion.
         /// </returns>
-        public async Task Shutdown()
+        public async Task ShutdownAsync()
         {
-            await this.Post(ShutdownApi);
+            await this.PostAsync(ShutdownApi);
         }
     }
 }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/TaskManager.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/TaskManager.cs
index 37fd1f4f..1344de63 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/TaskManager.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/TaskManager.cs
@@ -24,7 +24,7 @@ public partial class DevicePortal
         /// <param name="appid">Application ID</param>
         /// <param name="packageName">The name of the application package.</param>
         /// <returns>Process identifier for the application instance.</returns>
-        public async Task<int> LaunchApplication(
+        public async Task<int> LaunchApplicationAsync(
             string appid,
             string packageName)
         {
@@ -33,11 +33,11 @@ public async Task<int> LaunchApplication(
                 Utilities.Hex64Encode(appid), 
                 Utilities.Hex64Encode(packageName));
 
-            await this.Post(
+            await this.PostAsync(
                 TaskManagerApi, 
                 payload);
 
-            RunningProcesses runningApps = await this.GetRunningProcesses();
+            RunningProcesses runningApps = await this.GetRunningProcessesAsync();
 
             int processId = 0;
             foreach (DeviceProcessInfo process in runningApps.Processes)    
@@ -59,9 +59,9 @@ await this.Post(
         /// <returns>
         /// Task for tracking termination completion
         /// </returns>
-        public async Task TerminateApplication(string packageName)
+        public async Task TerminateApplicationAsync(string packageName)
         {
-            await this.Delete(
+            await this.DeleteAsync(
                 TaskManagerApi,
                 string.Format("package={0}", Utilities.Hex64Encode(packageName)));
         }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/WiFiManagement.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/WiFiManagement.cs
index 44985bfe..ed1063c7 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/WiFiManagement.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/WiFiManagement.cs
@@ -38,7 +38,7 @@ public partial class DevicePortal
         /// <param name="ssid">SSID of the network.</param>
         /// <param name="networkKey">Network key.</param>
         /// <returns>Task tracking connection status.</returns>
-        public async Task ConnectToWifiNetwork(
+        public async Task ConnectToWifiNetworkAsync(
             Guid networkAdapter,
             string ssid,
             string networkKey)
@@ -49,7 +49,7 @@ public async Task ConnectToWifiNetwork(
                 Utilities.Hex64Encode(ssid),
                 Utilities.Hex64Encode(networkKey));
 
-            await this.Post(
+            await this.PostAsync(
                 WifiNetworkApi,
                 payload);
         }
@@ -58,9 +58,9 @@ await this.Post(
         /// Gets WiFi interfaces.
         /// </summary>
         /// <returns>List of WiFi interfaces.</returns>
-        public async Task<WifiInterfaces> GetWifiInterfaces()
+        public async Task<WifiInterfaces> GetWifiInterfacesAsync()
         {
-            return await this.Get<WifiInterfaces>(WifiInterfacesApi);
+            return await this.GetAsync<WifiInterfaces>(WifiInterfacesApi);
         }
 
         /// <summary>
@@ -68,9 +68,9 @@ public async Task<WifiInterfaces> GetWifiInterfaces()
         /// </summary>
         /// <param name="interfaceGuid">Interface to get networks from.</param>
         /// <returns>List of available networks.</returns>
-        public async Task<WifiNetworks> GetWifiNetworks(Guid interfaceGuid)
+        public async Task<WifiNetworks> GetWifiNetworksAsync(Guid interfaceGuid)
         {
-            return await this.Get<WifiNetworks>(
+            return await this.GetAsync<WifiNetworks>(
                 WifiNetworksApi,
                 string.Format("interface={0}", interfaceGuid.ToString()));
         }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs
index 5a0b9375..e58eae5f 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs
@@ -186,7 +186,7 @@ public string PlatformName
         /// Some applications may opt to not register for the ConnectionStatus event and await on Connect.</remarks>
         /// <returns>Task for tracking the connect.</returns>
         [method: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.ReadabilityRules", "SA1118:ParameterMustNotSpanMultipleLines", Justification = "manualCertificate param doesn't really span multiple lines, it just has a different type for UWP and .NET implementations.")]
-        public async Task Connect(
+        public async Task ConnectAsync(
             string ssid = null,
             string ssidKey = null,
             bool updateConnection = true,
@@ -216,8 +216,8 @@ public async Task Connect(
                     DeviceConnectionStatus.Connecting,
                     DeviceConnectionPhase.RequestingOperatingSystemInformation,
                     connectionPhaseDescription);
-                this.deviceConnection.Family = await this.GetDeviceFamily();
-                this.deviceConnection.OsInfo = await this.GetOperatingSystemInformation();
+                this.deviceConnection.Family = await this.GetDeviceFamilyAsync();
+                this.deviceConnection.OsInfo = await this.GetOperatingSystemInformationAsync();
 
                 // Default to using whatever was specified in the connection.
                 bool requiresHttps = this.IsUsingHttps();
@@ -231,7 +231,7 @@ public async Task Connect(
                         DeviceConnectionStatus.Connecting,
                         DeviceConnectionPhase.DeterminingConnectionRequirements,
                         connectionPhaseDescription);
-                    requiresHttps = await this.GetIsHttpsRequired();
+                    requiresHttps = await this.GetIsHttpsRequiredAsync();
                 }
 
                 // Connect the device to the specified network.
@@ -242,10 +242,10 @@ public async Task Connect(
                         DeviceConnectionStatus.Connecting,
                         DeviceConnectionPhase.ConnectingToTargetNetwork,
                         connectionPhaseDescription);
-                    WifiInterfaces wifiInterfaces = await this.GetWifiInterfaces();
+                    WifiInterfaces wifiInterfaces = await this.GetWifiInterfacesAsync();
 
                     // TODO - consider what to do if there is more than one wifi interface on a device
-                    await this.ConnectToWifiNetwork(wifiInterfaces.Interfaces[0].Guid, ssid, ssidKey);
+                    await this.ConnectToWifiNetworkAsync(wifiInterfaces.Interfaces[0].Guid, ssid, ssidKey);
                 }
 
                 // Get the device's IP configuration and update the connection as appropriate.
@@ -268,7 +268,7 @@ public async Task Connect(
                     }
 
                     this.deviceConnection.UpdateConnection(
-                        await this.GetIpConfig(), 
+                        await this.GetIpConfigAsync(), 
                         requiresHttps,
                         preservePort);
                 }
@@ -318,7 +318,7 @@ await this.GetIpConfig(),
         /// <param name="requestBody">An optional stream to use for the request body content.</param>
         /// <param name="requestBodyContentType">The content type of the request stream.</param>
         /// <returns>Task waiting for HTTP call to return and file copy to complete.</returns>
-        public async Task SaveEndpointResponseToFile(
+        public async Task SaveEndpointResponseToFileAsync(
             string endpoint,
             string directory,
             HttpMethods httpMethod,
@@ -372,12 +372,12 @@ public async Task SaveEndpointResponseToFile(
 
                 websocket.WebSocketStreamReceived += streamReceivedHandler;
 
-                Task startListeningForStreamTask = websocket.StartListeningForMessages(endpoint);
+                Task startListeningForStreamTask = websocket.StartListeningForMessagesAsync(endpoint);
                 startListeningForStreamTask.Wait();
 
                 streamReceived.WaitOne();
 
-                Task stopListeningForStreamTask = websocket.StopListeningForMessages();
+                Task stopListeningForStreamTask = websocket.StopListeningForMessagesAsync();
                 stopListeningForStreamTask.Wait();
 
                 websocket.WebSocketStreamReceived -= streamReceivedHandler;
@@ -410,7 +410,7 @@ public async Task SaveEndpointResponseToFile(
 #endif // WINDOWS_UWP
                 }
 
-                using (Stream dataStream = await this.Put(uri, streamContent))
+                using (Stream dataStream = await this.PutAsync(uri, streamContent))
                 {
                     using (var fileStream = File.Create(filepath))
                     {
@@ -421,7 +421,7 @@ public async Task SaveEndpointResponseToFile(
             }
             else if (HttpMethods.Post == httpMethod)
             {
-                using (Stream dataStream = await this.Post(uri, requestBody, requestBodyContentType))
+                using (Stream dataStream = await this.PostAsync(uri, requestBody, requestBodyContentType))
                 {
                     using (var fileStream = File.Create(filepath))
                     {
@@ -432,7 +432,7 @@ public async Task SaveEndpointResponseToFile(
             }
             else if (HttpMethods.Delete == httpMethod)
             {
-                using (Stream dataStream = await this.Delete(uri))
+                using (Stream dataStream = await this.DeleteAsync(uri))
                 {
                     using (var fileStream = File.Create(filepath))
                     {
@@ -443,7 +443,7 @@ public async Task SaveEndpointResponseToFile(
             }
             else if (HttpMethods.Get == httpMethod)
             {
-                using (Stream dataStream = await this.Get(uri))
+                using (Stream dataStream = await this.GetAsync(uri))
                 {
                     using (var fileStream = File.Create(filepath))
                     {
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs
index 2233e903..6f6c4e73 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs
@@ -34,14 +34,14 @@ public partial class DevicePortal
         /// </summary>
         /// <returns>Interpupilary distance, in millimeters.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task<float> GetInterPupilaryDistance()
+        public async Task<float> GetInterPupilaryDistanceAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
                 throw new NotSupportedException("This method is only supported on HoloLens.");
             }
 
-            InterPupilaryDistance ipd = await this.Get<InterPupilaryDistance>(HolographicIpdApi);
+            InterPupilaryDistance ipd = await this.GetAsync<InterPupilaryDistance>(HolographicIpdApi);
             return ipd.Ipd;
         }
 
@@ -51,14 +51,14 @@ public async Task<float> GetInterPupilaryDistance()
         /// <param name="httpsRequired">Desired value for HTTPS communication</param>
         /// <returns>True if WiFi based communication requires a secure connection, false otherwise.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task SetIsHttpsRequired(bool httpsRequired)
+        public async Task SetIsHttpsRequiredAsync(bool httpsRequired)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
                 throw new NotSupportedException("This method is only supported on HoloLens.");
             }
 
-            await this.Post(
+            await this.PostAsync(
                 HolographicWebManagementHttpSettingsApi,
                 string.Format("required={0}", httpsRequired));
 
@@ -71,7 +71,7 @@ await this.Post(
         /// <param name="ipd">Interpupilary distance, in millimeters.</param>
         /// <returns>Task for tracking the POST call</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task SetInterPupilaryDistance(float ipd)
+        public async Task SetInterPupilaryDistanceAsync(float ipd)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
@@ -80,7 +80,7 @@ public async Task SetInterPupilaryDistance(float ipd)
 
             string payload = string.Format("ipd={0}", (int)(ipd * 1000.0f));
 
-            await this.Post(
+            await this.PostAsync(
                 HolographicIpdApi,
                 payload);
         }
@@ -90,14 +90,14 @@ await this.Post(
         /// </summary>
         /// <returns>True if WiFi based communication requires a secure connection, false otherwise.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task<bool> GetIsHttpsRequired()
+        public async Task<bool> GetIsHttpsRequiredAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
                 throw new NotSupportedException("This method is only supported on HoloLens.");
             }
 
-            WebManagementHttpSettings httpSettings = await this.Get<WebManagementHttpSettings>(HolographicWebManagementHttpSettingsApi);
+            WebManagementHttpSettings httpSettings = await this.GetAsync<WebManagementHttpSettings>(HolographicWebManagementHttpSettingsApi);
             return httpSettings.IsHttpsRequired;
         }
 
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
index 5661cfd9..f7d7ebe3 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
@@ -61,14 +61,14 @@ public enum SimulationControlMode
         /// </summary>
         /// <returns>The simulation control mode.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task<SimulationControlMode> GetPerceptionSimulationControlMode()
+        public async Task<SimulationControlMode> GetPerceptionSimulationControlModeAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
                 throw new NotSupportedException("This method is only supported on HoloLens.");
             }
 
-            PerceptionSimulationControlMode controlMode = await this.Get<PerceptionSimulationControlMode>(HolographicSimulationModeApi);
+            PerceptionSimulationControlMode controlMode = await this.GetAsync<PerceptionSimulationControlMode>(HolographicSimulationModeApi);
             return controlMode.Mode;
         }
 
@@ -78,7 +78,7 @@ public async Task<SimulationControlMode> GetPerceptionSimulationControlMode()
         /// <param name="mode">The simulation control mode.</param>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task SetPerceptionSimulationControlMode(SimulationControlMode mode)
+        public async Task SetPerceptionSimulationControlModeAsync(SimulationControlMode mode)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
@@ -88,7 +88,7 @@ public async Task SetPerceptionSimulationControlMode(SimulationControlMode mode)
             string payload = string.Format(
                 "mode={0}",
                 (int)mode);
-            await this.Post(HolographicSimulationModeApi, payload);
+            await this.PostAsync(HolographicSimulationModeApi, payload);
         }
 
         #region Data contract
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicThermal.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicThermal.cs
index 2bd09afa..92732853 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicThermal.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicThermal.cs
@@ -51,14 +51,14 @@ public partial class DevicePortal
         /// </summary>
         /// <returns>ThermalStages enum value.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task<ThermalStages> GetThermalStage()
+        public async Task<ThermalStages> GetThermalStageAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
                 throw new NotSupportedException("This method is only supported on HoloLens.");
             }
 
-            ThermalStage thermalStage = await this.Get<ThermalStage>(ThermalStageApi);
+            ThermalStage thermalStage = await this.GetAsync<ThermalStage>(ThermalStageApi);
             return thermalStage.Stage;
         }
 
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
index 2c0434af..d0ab6ce9 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
@@ -83,14 +83,14 @@ public partial class DevicePortal
         /// <param name="fileName">The name of the file to be deleted.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task DeleteMrcFile(string fileName)
+        public async Task DeleteMrcFileAsync(string fileName)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
                 throw new NotSupportedException("This method is only supported on HoloLens.");
             }
 
-            await this.Delete(
+            await this.DeleteAsync(
                 MrcFileApi,
                 string.Format("filename={0}", Utilities.Hex64Encode(fileName)));
         }
@@ -186,7 +186,7 @@ public Uri GetMediumResolutionMrcLiveStreamUri(
         /// <param name="isThumbnailRequest">Specifies whether or not we are requesting a thumbnail image.</param>
         /// <returns>Byte array containing the file data.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task<byte[]> GetMrcFileData(
+        public async Task<byte[]> GetMrcFileDataAsync(
             string fileName,
             bool isThumbnailRequest = false)
         {
@@ -199,7 +199,7 @@ public async Task<byte[]> GetMrcFileData(
 
             string apiPath = isThumbnailRequest ? MrcThumbnailApi : MrcFileApi;
 
-            using (MemoryStream data = await this.Get<MemoryStream>(
+            using (MemoryStream data = await this.GetAsync<MemoryStream>(
                 apiPath,
                 string.Format("filename={0}", Utilities.Hex64Encode(fileName))))
             {
@@ -215,20 +215,20 @@ public async Task<byte[]> GetMrcFileData(
         /// </summary>
         /// <returns>List of the capture files</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task<MrcFileList> GetMrcFileList()
+        public async Task<MrcFileList> GetMrcFileListAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
                 throw new NotSupportedException("This method is only supported on HoloLens.");
             }
 
-            MrcFileList mrcFileList = await this.Get<MrcFileList>(MrcFileListApi);
+            MrcFileList mrcFileList = await this.GetAsync<MrcFileList>(MrcFileListApi);
 
             foreach (MrcFileInformation mfi in mrcFileList.Files)
             {
                 try 
                 {
-                    mfi.Thumbnail = await this.GetMrcThumbnailData(mfi.FileName);
+                    mfi.Thumbnail = await this.GetMrcThumbnailDataAsync(mfi.FileName);
                 }
                 catch
                 {
@@ -273,14 +273,14 @@ public Uri GetMrcLiveStreamUri(
         /// </summary>
         /// <returns>Status of the capture</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task<MrcStatus> GetMrcStatus()
+        public async Task<MrcStatus> GetMrcStatusAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
                 throw new NotSupportedException("This method is only supported on HoloLens.");
             }
 
-            return await this.Get<MrcStatus>(MrcStatusApi);
+            return await this.GetAsync<MrcStatus>(MrcStatusApi);
         }
 
         /// <summary>
@@ -289,10 +289,10 @@ public async Task<MrcStatus> GetMrcStatus()
         /// <param name="fileName">Name of the capture file</param>
         /// <returns>Byte array containing the thumbnail image data</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task<byte[]> GetMrcThumbnailData(string fileName)
+        public async Task<byte[]> GetMrcThumbnailDataAsync(string fileName)
         {
             // GetMrcFileData checks for the appropriate platform. We do not need to duplicate the check here.
-            return await this.GetMrcFileData(fileName, true);
+            return await this.GetMrcFileDataAsync(fileName, true);
         }
 
         // TODO: SetMrcSettings()
@@ -306,7 +306,7 @@ public async Task<byte[]> GetMrcThumbnailData(string fileName)
         /// <param name="includeAudio">Specifies whether or not to include audio data</param>
         /// <returns>Task tracking completion of the REST call.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task StartMrcRecording(
+        public async Task StartMrcRecordingAsync(
             bool includeHolograms = true,
             bool includeColorCamera = true,
             bool includeMicrophone = true,
@@ -324,7 +324,7 @@ public async Task StartMrcRecording(
                 includeMicrophone,
                 includeAudio).ToLower();
 
-            await this.Post(
+            await this.PostAsync(
                 MrcStartRecordingApi,
                 payload);
         }
@@ -334,14 +334,14 @@ await this.Post(
         /// </summary>
         /// <returns>Task tracking completion of the REST call.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task StopMrcRecording()
+        public async Task StopMrcRecordingAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
                 throw new NotSupportedException("This method is only supported on HoloLens.");
             }
 
-            await this.Post(MrcStopRecordingApi);
+            await this.PostAsync(MrcStopRecordingApi);
         }
 
         /// <summary>
@@ -351,7 +351,7 @@ public async Task StopMrcRecording()
         /// <param name="includeColorCamera">Specifies whether or not to include the color camera</param>
         /// <returns>Task tracking completion of the REST call.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task TakeMrcPhoto(
+        public async Task TakeMrcPhotoAsync(
             bool includeHolograms = true,
             bool includeColorCamera = true)
         {
@@ -360,7 +360,7 @@ public async Task TakeMrcPhoto(
                 throw new NotSupportedException("This method is only supported on HoloLens.");
             }
 
-            await this.Post(
+            await this.PostAsync(
                 MrcPhotoApi,
                 string.Format("holo={0}&pv={1}", includeHolograms, includeColorCamera).ToLower());
         }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationPlayback.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationPlayback.cs
index f2ac0723..87d4fc38 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationPlayback.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationPlayback.cs
@@ -99,7 +99,7 @@ public enum HolographicSimulationPlaybackStates
         /// <param name="name">The name of the recording to delete (ex: testsession.xef).</param>
         /// <returns>Task tracking completion of the REST call.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task DeleteHolographicSimulationRecording(string name)
+        public async Task DeleteHolographicSimulationRecordingAsync(string name)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
@@ -110,7 +110,7 @@ public async Task DeleteHolographicSimulationRecording(string name)
                 "recording={0}",
                 name);
 
-            await this.Delete(HolographicSimulationPlaybackFileApi, payload);
+            await this.DeleteAsync(HolographicSimulationPlaybackFileApi, payload);
         }
 
         /// <summary>
@@ -119,7 +119,7 @@ public async Task DeleteHolographicSimulationRecording(string name)
         /// <param name="name">The name of the recording (ex: testsession.xef).</param>
         /// <returns>HolographicSimulationPlaybackStates enum value describing the state of the recording.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task<HolographicSimulationPlaybackStates> GetHolographicSimulationPlaybackState(string name)
+        public async Task<HolographicSimulationPlaybackStates> GetHolographicSimulationPlaybackStateAsync(string name)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
@@ -137,7 +137,7 @@ public async Task<HolographicSimulationPlaybackStates> GetHolographicSimulationP
                 HolographicSimulationPlaybackStateApi,
                 payload);
 
-            using (Stream dataStream = await this.Get(uri))
+            using (Stream dataStream = await this.GetAsync(uri))
             {
                 if ((dataStream != null) &&
                     (dataStream.Length != 0))
@@ -169,7 +169,7 @@ public async Task<HolographicSimulationPlaybackStates> GetHolographicSimulationP
         /// <param name="name">The name of the recording to load (ex: testsession.xef).</param>
         /// <returns>Task tracking completion of the REST call.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task LoadHolographicSimulationRecording(string name)
+        public async Task LoadHolographicSimulationRecordingAsync(string name)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
@@ -180,7 +180,7 @@ public async Task LoadHolographicSimulationRecording(string name)
                 "recording={0}",
                 name);
 
-            await this.Post(HolographicSimulationPlaybackSessionFileApi, payload);
+            await this.PostAsync(HolographicSimulationPlaybackSessionFileApi, payload);
         }
 
         /// <summary>
@@ -189,7 +189,7 @@ public async Task LoadHolographicSimulationRecording(string name)
         /// <param name="name">The name of the recording to unload (ex: testsession.xef).</param>
         /// <returns>Task tracking completion of the REST call.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task UnloadHolographicSimulationRecording(string name)
+        public async Task UnloadHolographicSimulationRecordingAsync(string name)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
@@ -200,7 +200,7 @@ public async Task UnloadHolographicSimulationRecording(string name)
                 "recording={0}",
                 name);
 
-            await this.Delete(HolographicSimulationPlaybackSessionFileApi, payload);
+            await this.DeleteAsync(HolographicSimulationPlaybackSessionFileApi, payload);
         }
 
         #region Data contract
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationRecording.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationRecording.cs
index aed2f011..7f9e9ccc 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationRecording.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationRecording.cs
@@ -37,14 +37,14 @@ public partial class DevicePortal
         /// </summary>
         /// <returns>True if recording, false otherwise.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task<bool> GetHolographicSimulationRecordingStatus()
+        public async Task<bool> GetHolographicSimulationRecordingStatusAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
                 throw new NotSupportedException("This method is only supported on HoloLens.");
             }
 
-            HolographicSimulationRecordingStatus status = await this.Get<HolographicSimulationRecordingStatus>(HolographicSimulationRecordingStatusApi);
+            HolographicSimulationRecordingStatus status = await this.GetAsync<HolographicSimulationRecordingStatus>(HolographicSimulationRecordingStatusApi);
             return status.IsRecording;
         }
 
@@ -58,7 +58,7 @@ public async Task<bool> GetHolographicSimulationRecordingStatus()
         /// <param name="recordEnvironment">Should environment data be recorded? The default value is true.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task StartHolographicSimulationRecording(
+        public async Task StartHolographicSimulationRecordingAsync(
             string name,
             bool recordHead = true,
             bool recordHands = true,
@@ -77,7 +77,7 @@ public async Task StartHolographicSimulationRecording(
                 recordSpatialMapping ? 1 : 0,
                 recordEnvironment ? 1 : 0,
                 name);
-            await this.Post(StartHolographicSimulationRecordingApi, payload);
+            await this.PostAsync(StartHolographicSimulationRecordingApi, payload);
         }
 
         /// <summary>
@@ -86,7 +86,7 @@ public async Task StartHolographicSimulationRecording(
         /// <returns>Byte array containing the recorded data.</returns>
         /// <exception cref="InvalidOperationException">No recording was in progress.</exception>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task<byte[]> StopHolographicSimulationRecording()
+        public async Task<byte[]> StopHolographicSimulationRecordingAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
@@ -99,7 +99,7 @@ public async Task<byte[]> StopHolographicSimulationRecording()
 
             byte[] dataBytes = null;
 
-            using (Stream dataStream = await this.Get(uri))
+            using (Stream dataStream = await this.GetAsync(uri))
             {
                 if ((dataStream != null) &&
                     (dataStream.Length != 0))
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestDelete.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestDelete.cs
index f329f96d..15d907aa 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestDelete.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestDelete.cs
@@ -24,11 +24,11 @@ public partial class DevicePortal
         /// <param name="apiPath">The relative portion of the uri path that specifies the API to call.</param>
         /// <param name="payload">The query string portion of the uri path that provides the parameterized data.</param>
         /// <returns>Task tracking the HTTP completion.</returns>
-        private async Task Delete(
+        private async Task DeleteAsync(
             string apiPath,
             string payload = null)
         {
-            await this.Delete<NullResponse>(apiPath, payload);
+            await this.DeleteAsync<NullResponse>(apiPath, payload);
         }
 
         /// <summary>
@@ -38,7 +38,7 @@ private async Task Delete(
         /// <param name="apiPath">The relative portion of the uri path that specifies the API to call.</param>
         /// <param name="payload">The query string portion of the uri path that provides the parameterized data.</param>
         /// <returns>Task tracking the HTTP completion.</returns>
-        private async Task<T> Delete<T>(
+        private async Task<T> DeleteAsync<T>(
             string apiPath,
             string payload = null) where T : new()
         {
@@ -51,7 +51,7 @@ private async Task<T> Delete<T>(
 
             DataContractJsonSerializer deserializer = new DataContractJsonSerializer(typeof(T));
 
-            using (Stream dataStream = await this.Delete(uri))
+            using (Stream dataStream = await this.DeleteAsync(uri))
             {
                 if ((dataStream != null) &&
                     (dataStream.Length != 0))
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestGet.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestGet.cs
index 424ca4f6..0a027444 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestGet.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestGet.cs
@@ -70,7 +70,7 @@ private static void JsonFormatCheck<T>(Stream jsonStream)
         /// <param name="apiPath">The relative portion of the uri path that specifies the API to call.</param>
         /// <param name="payload">The query string portion of the uri path that provides the parameterized data.</param>
         /// <returns>An object of the specified type containing the data returned by the request.</returns>
-        private async Task<T> Get<T>(
+        private async Task<T> GetAsync<T>(
             string apiPath,
             string payload = null) where T : new()
         {
@@ -83,7 +83,7 @@ private async Task<T> Get<T>(
 
             DataContractJsonSerializer serializer = new DataContractJsonSerializer(typeof(T));
 
-            using (Stream dataStream = await this.Get(uri))
+            using (Stream dataStream = await this.GetAsync(uri))
             {
                 if ((dataStream != null) &&
                     (dataStream.Length != 0))
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestPost.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestPost.cs
index 26d85157..9b8439e2 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestPost.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestPost.cs
@@ -27,7 +27,7 @@ public partial class DevicePortal
         /// <param name="files">List of files that we want to include in the post request.</param>
         /// <param name="payload">The query string portion of the uri path that provides the parameterized data.</param>
         /// <returns>Task tracking the POST completion.</returns>
-        private async Task Post(
+        private async Task PostAsync(
             string apiPath,
             List<string> files,
             string payload = null)
@@ -53,7 +53,7 @@ private async Task Post(
                 dataStream.Position = 0;
                 string contentType = string.Format("multipart/form-data; boundary={0}", boundaryString);
 
-                await this.Post<NullResponse>(apiPath, payload, dataStream, contentType);
+                await this.PostAsync<NullResponse>(apiPath, payload, dataStream, contentType);
             }
         }
 
@@ -65,11 +65,11 @@ private async Task Post(
         /// <param name="apiPath">The relative portion of the uri path that specifies the API to call.</param>
         /// <param name="payload">The query string portion of the uri path that provides the parameterized data.</param>
         /// <returns>Task tracking the POST completion.</returns>
-        private async Task Post(
+        private async Task PostAsync(
             string apiPath,
             string payload = null)
         {
-            await this.Post<NullResponse>(apiPath, payload);
+            await this.PostAsync<NullResponse>(apiPath, payload);
         }
 
         /// <summary>
@@ -81,7 +81,7 @@ private async Task Post(
         /// <param name="requestStream">Optional stream containing data for the request body.</param>
         /// <param name="requestStreamContentType">The type of that request body data.</param>
         /// <returns>Task tracking the POST completion.</returns>
-        private async Task<T> Post<T>(
+        private async Task<T> PostAsync<T>(
             string apiPath,
             string payload = null,
             Stream requestStream = null,
@@ -96,7 +96,7 @@ private async Task<T> Post<T>(
 
             DataContractJsonSerializer deserializer = new DataContractJsonSerializer(typeof(T));
 
-            using (Stream dataStream = await this.Post(uri, requestStream, requestStreamContentType))
+            using (Stream dataStream = await this.PostAsync(uri, requestStream, requestStreamContentType))
             {
                 if ((dataStream != null) &&
                     (dataStream.Length != 0))
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestPut.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestPut.cs
index 62d92266..4cc6490a 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestPut.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestPut.cs
@@ -41,12 +41,12 @@ public partial class DevicePortal
         /// <param name="bodyData">The data to be used for the HTTP request body.</param>
         /// <param name="payload">The query string portion of the uri path that provides the parameterized data.</param>
         /// <returns>Task tracking the PUT completion.</returns>
-        private async Task Put<K>(
+        private async Task PutAsync<K>(
             string apiPath,
             K bodyData,
             string payload = null) where K : class
         {
-            await this.Put<NullResponse, K>(apiPath, bodyData, payload);
+            await this.PutAsync<NullResponse, K>(apiPath, bodyData, payload);
         }
 
         /// <summary>
@@ -58,7 +58,7 @@ private async Task Put<K>(
         /// <param name="bodyData">The data to be used for the HTTP request body.</param>
         /// <param name="payload">The query string portion of the uri path that provides the parameterized data.</param>
         /// <returns>Task tracking the PUT completion, optional response body.</returns>
-        private async Task<T> Put<T, K>(
+        private async Task<T> PutAsync<T, K>(
             string apiPath,
             K bodyData = null,
             string payload = null) where T : new()
@@ -96,7 +96,7 @@ private async Task<T> Put<T, K>(
 
             DataContractJsonSerializer deserializer = new DataContractJsonSerializer(typeof(T));
 
-            using (Stream dataStream = await this.Put(uri, streamContent))
+            using (Stream dataStream = await this.PutAsync(uri, streamContent))
             {
                 if ((dataStream != null) &&
                     (dataStream.Length != 0))
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/WebSocket.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/WebSocket.cs
index a31061a6..93ae900b 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/WebSocket.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/WebSocket.cs
@@ -66,11 +66,11 @@ public bool IsListeningForMessages
         /// Closes the connection to the websocket and stop listening for messages.
         /// </summary>
         /// <returns>The task of closing the websocket connection.</returns>
-        internal async Task StopListeningForMessages()
+        internal async Task StopListeningForMessagesAsync()
         {
             if (this.IsListeningForMessages)
             {
-                await this.StopListeningForMessagesInternal();
+                await this.StopListeningForMessagesInternalAsync();
             }
         }
 
@@ -80,7 +80,7 @@ internal async Task StopListeningForMessages()
         /// <param name="apiPath">The relative portion of the uri path that specifies the API to call.</param>
         /// <param name="payload">The query string portion of the uri path that provides the parameterized data.</param>
         /// <returns>The task of listening for messages from the websocket.</returns>
-        internal async Task StartListeningForMessages(
+        internal async Task StartListeningForMessagesAsync(
             string apiPath,
             string payload = null)
         {
@@ -90,8 +90,7 @@ internal async Task StartListeningForMessages(
                     this.deviceConnection.WebSocketConnection,
                     apiPath,
                     payload);
-
-                await this.StartListeningForMessagesInternal(uri);
+                await this.StartListeningForMessagesInternalAsync(uri);
             }
         }
 
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ApplicationManager.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ApplicationManager.cs
index 66ad1382..a7881c25 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ApplicationManager.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ApplicationManager.cs
@@ -40,18 +40,18 @@ public partial class DevicePortal
         /// Gets List of apps.
         /// </summary>
         /// <returns>Object containing the list of applications.</returns>
-        public async Task<AppsListInfo> GetAppsListInfo()
+        public async Task<AppsListInfo> GetAppsListInfoAsync()
         {
-            return await this.Get<AppsListInfo>(AppsListApi);
+            return await this.GetAsync<AppsListInfo>(AppsListApi);
         }
 
         /// <summary>
         /// Gets list of headless apps.
         /// </summary>
         /// <returns>Object containing the list of headless applications.</returns>
-        public async Task<HeadlessAppsListInfo> GetHeadlessAppsListInfo()
+        public async Task<HeadlessAppsListInfo> GetHeadlessAppsListInfoAsync()
         {
-            return await this.Get<HeadlessAppsListInfo>(HeadlessAppsListApi);
+            return await this.GetAsync<HeadlessAppsListInfo>(HeadlessAppsListApi);
         }
 
         /// <summary>
@@ -59,9 +59,9 @@ public async Task<HeadlessAppsListInfo> GetHeadlessAppsListInfo()
         /// </summary>
         /// <param name="appId">App Id.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task UpdateStartupApp(string appId)
+        public async Task UpdateStartupAppAsync(string appId)
         {
-            await this.Post(
+            await this.PostAsync(
                  AppsListApi,
                 string.Format("appid={0}", Utilities.Hex64Encode(appId)));
         }
@@ -71,9 +71,9 @@ await this.Post(
         /// </summary>
         /// <param name="appId">App Id.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task UpdateHeadlessStartupApp(string appId)
+        public async Task UpdateHeadlessStartupAppAsync(string appId)
         {
-            await this.Post(
+            await this.PostAsync(
                  HeadlessStartupAppApi,
                 string.Format("appid={0}", Utilities.Hex64Encode(appId)));
         }
@@ -83,9 +83,9 @@ await this.Post(
         /// </summary>
         /// <param name="appId">App Id.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task RemoveHeadlessStartupApp(string appId)
+        public async Task RemoveHeadlessStartupAppAsync(string appId)
         {
-            await this.Delete(
+            await this.DeleteAsync(
                  HeadlessStartupAppApi,
                 string.Format("appid={0}", Utilities.Hex64Encode(appId)));
         }
@@ -95,9 +95,9 @@ await this.Delete(
         /// </summary>
         /// <param name="appId">App Id.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task ActivatePackage(string appId)
+        public async Task ActivatePackageAsync(string appId)
         {
-            await this.Post(
+            await this.PostAsync(
                  ActivatePackageApi,
                 string.Format("appid={0}", Utilities.Hex64Encode(appId)));
         }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/AudioDevices.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/AudioDevices.cs
index 00a955a8..c36f1b25 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/AudioDevices.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/AudioDevices.cs
@@ -35,9 +35,9 @@ public partial class DevicePortal
         /// Gets the Audio Device List Information.
         /// </summary>
         /// <returns>String containing the Audio Device List information.</returns>
-        public async Task<AudioDeviceListInfo> GetAudioDeviceListInfo()
+        public async Task<AudioDeviceListInfo> GetAudioDeviceListInfoAsync()
         {
-            return await this.Get<AudioDeviceListInfo>(AudioDeviceListApi);
+            return await this.GetAsync<AudioDeviceListInfo>(AudioDeviceListApi);
         }
 
         /// <summary>
@@ -45,9 +45,9 @@ public async Task<AudioDeviceListInfo> GetAudioDeviceListInfo()
         /// </summary>
         /// <param name="renderVolume">Render Volume.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task SetRenderVolume(string renderVolume)
+        public async Task SetRenderVolumeAsync(string renderVolume)
         {
-            await this.Post(
+            await this.PostAsync(
                  SetRenderVolumeApi,
                 string.Format("rendervolume={0}", Utilities.Hex64Encode(renderVolume)));
         }
@@ -57,9 +57,9 @@ await this.Post(
         /// </summary>
         /// <param name="captureVolume">Capture Volume.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task SetCaptureVolume(string captureVolume)
+        public async Task SetCaptureVolumeAsync(string captureVolume)
         {
-            await this.Post(
+            await this.PostAsync(
                  SetCaptureVolumeApi,
                 string.Format("capturevolume={0}", Utilities.Hex64Encode(captureVolume)));
         }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/BluetoothConnectivity.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/BluetoothConnectivity.cs
index 19b62eed..34b1d2ba 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/BluetoothConnectivity.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/BluetoothConnectivity.cs
@@ -86,12 +86,12 @@ public AvailableBluetoothDevicesInfo GetAvailableBluetoothDevicesInfo()
                 };
             this.BluetoothDeviceListReceived += bluetoothReceivedHandler;
 
-            Task startListeningForBluetooth = this.StartListeningForBluetooth(AvailableBluetoothDevicesApi);
+            Task startListeningForBluetooth = this.StartListeningForBluetoothAsync(AvailableBluetoothDevicesApi);
             startListeningForBluetooth.Wait();
 
             BluetoothReceived.WaitOne();
 
-            Task stopListeningForBluetooth = this.StopListeningForBluetooth();
+            Task stopListeningForBluetooth = this.StopListeningForBluetoothAsync();
             stopListeningForBluetooth.Wait();
 
             this.BluetoothDeviceListReceived -= bluetoothReceivedHandler;
@@ -118,12 +118,12 @@ public PairedBluetoothDevicesInfo GetPairedBluetoothDevicesInfo()
                 };
             this.PairedBluetoothDeviceListReceived += pairedBluetoothReceivedHandler;
 
-            Task startListeningForPairedBluetooth = this.StartListeningForPairedBluetooth(PairedBluetoothDevicesApi);
+            Task startListeningForPairedBluetooth = this.StartListeningForPairedBluetoothAsync(PairedBluetoothDevicesApi);
             startListeningForPairedBluetooth.Wait();
 
             PairedBluetoothReceived.WaitOne();
 
-            Task stopListeningForPairedBluetooth = this.StopListeningForPairedBluetooth();
+            Task stopListeningForPairedBluetooth = this.StopListeningForPairedBluetoothAsync();
             stopListeningForPairedBluetooth.Wait();
 
             this.PairedBluetoothDeviceListReceived -= pairedBluetoothReceivedHandler;
@@ -149,12 +149,12 @@ public PairBluetoothDevicesInfo GetPairBluetoothDevicesInfo(string deviceId)
                 };
             this.PairBluetoothDeviceListReceived += pairBluetoothReceivedHandler;
 
-            Task startListeningForPairBluetooth = this.StartListeningForPairBluetooth(PairBluetoothDevicesApi, string.Format("deviceId={0}", Utilities.Hex64Encode(deviceId)));
+            Task startListeningForPairBluetooth = this.StartListeningForPairBluetoothAsync(PairBluetoothDevicesApi, string.Format("deviceId={0}", Utilities.Hex64Encode(deviceId)));
             startListeningForPairBluetooth.Wait();
 
             PairBluetoothReceived.WaitOne();
 
-            Task stopListeningForPairBluetooth = this.StopListeningForPairBluetooth();
+            Task stopListeningForPairBluetooth = this.StopListeningForPairBluetoothAsync();
             stopListeningForPairBluetooth.Wait();
 
             this.PairBluetoothDeviceListReceived -= pairBluetoothReceivedHandler;
@@ -165,7 +165,7 @@ public PairBluetoothDevicesInfo GetPairBluetoothDevicesInfo(string deviceId)
         /// Starts listening for bluetooth list of devices returned from the BluetoothDeviceListReceived handler.
         /// </summary>
         /// <returns>Task for connecting to the websocket but not for listening to it.</returns>
-        public async Task StartListeningForBluetooth(string bluetoothApi)
+        public async Task StartListeningForBluetoothAsync(string bluetoothApi)
         {
             if (this.BluetoothWebSocket == null)
             {
@@ -185,21 +185,21 @@ public async Task StartListeningForBluetooth(string bluetoothApi)
                 }
             }
 
-            await this.BluetoothWebSocket.StartListeningForMessages(bluetoothApi);
+            await this.BluetoothWebSocket.StartListeningForMessagesAsync(bluetoothApi);
         }
 
         /// <summary>
         /// Stop listening for the list of bluetooth device.
         /// </summary>
         /// <returns>Task to stop listening for bluetooth devices and disconnecting from the websocket .</returns>
-        public async Task StopListeningForBluetooth()
+        public async Task StopListeningForBluetoothAsync()
         {
             if (this.BluetoothWebSocket == null || !this.BluetoothWebSocket.IsListeningForMessages)
             {
                 return;
             }
 
-            await this.BluetoothWebSocket.StopListeningForMessages();
+            await this.BluetoothWebSocket.StopListeningForMessagesAsync();
         }
 
         /// <summary>
@@ -223,7 +223,7 @@ private void BluetoothReceivedHandler(
         /// Starts listening for paired bluetooth list of devices returned from the PairedBluetoothDeviceListReceived handler.
         /// </summary>
         /// <returns>Task for connecting to the websocket but not for listening to it.</returns>
-        public async Task StartListeningForPairedBluetooth(string bluetoothApi)
+        public async Task StartListeningForPairedBluetoothAsync(string bluetoothApi)
         {
             if (this.PairedBluetoothWebSocket == null)
             {
@@ -243,21 +243,21 @@ public async Task StartListeningForPairedBluetooth(string bluetoothApi)
                 }
             }
 
-            await this.PairedBluetoothWebSocket.StartListeningForMessages(bluetoothApi);
+            await this.PairedBluetoothWebSocket.StartListeningForMessagesAsync(bluetoothApi);
         }
 
         /// <summary>
         /// Stop listening for the list of paired bluetooth device.
         /// </summary>
         /// <returns>Task to stop listening for bluetooth devices and disconnecting from the websocket .</returns>
-        public async Task StopListeningForPairedBluetooth()
+        public async Task StopListeningForPairedBluetoothAsync()
         {
             if (this.PairedBluetoothWebSocket == null || !this.PairedBluetoothWebSocket.IsListeningForMessages)
             {
                 return;
             }
 
-            await this.PairedBluetoothWebSocket.StopListeningForMessages();
+            await this.PairedBluetoothWebSocket.StopListeningForMessagesAsync();
         }
 
         /// <summary>
@@ -281,7 +281,7 @@ private void PairedBluetoothReceivedHandler(
         /// Starts listening for the result to pair the bluetooth device returned from the PairBluetoothDeviceListReceived handler.
         /// </summary>
         /// <returns>Task for connecting to the websocket but not for listening to it.</returns>
-        public async Task StartListeningForPairBluetooth(string bluetoothApi, string payload)
+        public async Task StartListeningForPairBluetoothAsync(string bluetoothApi, string payload)
         {
             if (this.PairBluetoothWebSocket == null)
             {
@@ -301,21 +301,21 @@ public async Task StartListeningForPairBluetooth(string bluetoothApi, string pay
                 }
             }
 
-            await this.PairBluetoothWebSocket.StartListeningForMessages(bluetoothApi, payload);
+            await this.PairBluetoothWebSocket.StartListeningForMessagesAsync(bluetoothApi, payload);
         }
 
         /// <summary>
         /// Stop listening for the results for pairing bluetooth device.
         /// </summary>
         /// <returns>Task to stop listening for the bluetooth device and disconnecting from the websocket .</returns>
-        public async Task StopListeningForPairBluetooth()
+        public async Task StopListeningForPairBluetoothAsync()
         {
             if (this.PairBluetoothWebSocket == null || !this.PairBluetoothWebSocket.IsListeningForMessages)
             {
                 return;
             }
 
-            await this.PairBluetoothWebSocket.StopListeningForMessages();
+            await this.PairBluetoothWebSocket.StopListeningForMessagesAsync();
         }
 
         /// <summary>
@@ -340,9 +340,9 @@ private void PairBluetoothReceivedHandler(
         /// </summary>
         /// <param name="deviceId">Device Id.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task<ErrorInformation> UnPairBluetoothDevice(string deviceId)
+        public async Task<ErrorInformation> UnPairBluetoothDeviceAsync(string deviceId)
         {
-            return await this.Post<ErrorInformation>(
+            return await this.PostAsync<ErrorInformation>(
                  UnpairBluetoothDevicesApi,
                 string.Format("deviceId={0}", Utilities.Hex64Encode(deviceId)));
         }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/DeviceInfo.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/DeviceInfo.cs
index 05445e48..fded71c2 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/DeviceInfo.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/DeviceInfo.cs
@@ -70,54 +70,54 @@ public partial class DevicePortal
         /// Gets the IoT OS Information.
         /// </summary>
         /// <returns>String containing the OS information.</returns>
-        public async Task<IoTOSInfo> GetIoTOSInfo()
+        public async Task<IoTOSInfo> GetIoTOSInfoAsync()
         {
-            return await this.Get<IoTOSInfo>(IoTOsInfoApi);
+            return await this.GetAsync<IoTOSInfo>(IoTOsInfoApi);
         }
 
         /// <summary>
         /// Gets the Timezone information.
         /// </summary>
         /// <returns>String containing the timezone information.</returns>
-        public async Task<TimezoneInfo> GetTimezoneInfo()
+        public async Task<TimezoneInfo> GetTimezoneInfoAsync()
         {
-            return await this.Get<TimezoneInfo>(TimezoneInfoApi);
+            return await this.GetAsync<TimezoneInfo>(TimezoneInfoApi);
         }
 
         /// <summary>
         /// Gets the datetime information.
         /// </summary>
         /// <returns>String containing the datetime information.</returns>
-        public async Task<DateTimeInfo> GetDateTimeInfo()
+        public async Task<DateTimeInfo> GetDateTimeInfoAsync()
         {
-            return await this.Get<DateTimeInfo>(DateTimeInfoApi);
+            return await this.GetAsync<DateTimeInfo>(DateTimeInfoApi);
         }
 
         /// <summary>
         /// Gets the controller driver information.
         /// </summary>
         /// <returns>String containing the controller driver information.</returns>
-        public async Task<ControllerDriverInfo> GetControllerDriverInfo()
+        public async Task<ControllerDriverInfo> GetControllerDriverInfoAsync()
         {
-            return await this.Get<ControllerDriverInfo>(ControllerDriverApi);
+            return await this.GetAsync<ControllerDriverInfo>(ControllerDriverApi);
         }
 
         /// <summary>
         /// Gets the dispaly orientation information.
         /// </summary>
         /// <returns>String containing the dispaly orientation information.</returns>
-        public async Task<DisplayOrientationInfo> GetDisplayOrientationInfo()
+        public async Task<DisplayOrientationInfo> GetDisplayOrientationInfoAsync()
         {
-            return await this.Get<DisplayOrientationInfo>(DisplayOrientationApi); 
+            return await this.GetAsync<DisplayOrientationInfo>(DisplayOrientationApi); 
         }
 
         /// <summary>
         /// Gets the dispaly resolution information.
         /// </summary>
         /// <returns>String containing the dispaly resolution information.</returns>
-        public async Task<DisplayResolutionInfo> GetDisplayResolutionInfo()
+        public async Task<DisplayResolutionInfo> GetDisplayResolutionInfoAsync()
         {
-            return await this.Get<DisplayResolutionInfo>(DisplayResolutionApi);
+            return await this.GetAsync<DisplayResolutionInfo>(DisplayResolutionApi);
         }
 
         /// <summary>
@@ -125,9 +125,9 @@ public async Task<DisplayResolutionInfo> GetDisplayResolutionInfo()
         /// </summary>
         /// <param name="name">Name to set for the device.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task SetIoTDeviceName(string name)
+        public async Task SetIoTDeviceNameAsync(string name)
         {
-            await this.Post(DeviceNameApi, string.Format("newdevicename={0}", Utilities.Hex64Encode(name)));
+            await this.PostAsync(DeviceNameApi, string.Format("newdevicename={0}", Utilities.Hex64Encode(name)));
         }
 
         /// <summary>
@@ -136,9 +136,9 @@ public async Task SetIoTDeviceName(string name)
         /// <param name="oldPassword">Old password.</param>
         /// <param name="newPassword">New desired password.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task<ErrorInformation> SetNewPassword(string oldPassword, string newPassword)
+        public async Task<ErrorInformation> SetNewPasswordAsync(string oldPassword, string newPassword)
         {
-            return await this.Post<ErrorInformation>(
+            return await this.PostAsync<ErrorInformation>(
                 ResetPasswordApi,
                 string.Format("oldpassword={0}&newpassword={1}", Utilities.Hex64Encode(oldPassword), Utilities.Hex64Encode(newPassword)));
         }
@@ -148,9 +148,9 @@ public async Task<ErrorInformation> SetNewPassword(string oldPassword, string ne
         /// </summary>
         /// <param name="newPin">New pin.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task SetNewRemoteDebuggingPin(string newPin)
+        public async Task SetNewRemoteDebuggingPinAsync(string newPin)
         {
-            await this.Post(
+            await this.PostAsync(
                  NewRemoteDebuggingPinApi,
                 string.Format("newpin={0}", Utilities.Hex64Encode(newPin)));
         }
@@ -160,9 +160,9 @@ await this.Post(
         /// </summary>
         /// <param name="newDriver">Driver to set.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task<ControllerDriverInfo> SetControllersDrivers(string newDriver)
+        public async Task<ControllerDriverInfo> SetControllersDriversAsync(string newDriver)
         {
-            return await this.Post<ControllerDriverInfo>(
+            return await this.PostAsync<ControllerDriverInfo>(
                  ControllerDriverApi,
                 string.Format("newdriver={0}", Utilities.Hex64Encode(newDriver)));
         }
@@ -172,9 +172,9 @@ public async Task<ControllerDriverInfo> SetControllersDrivers(string newDriver)
         /// </summary>
         /// <param name="index">Timezone index.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task<ErrorInformation> SetTimeZone(int index)
+        public async Task<ErrorInformation> SetTimeZoneAsync(int index)
         {
-            return await this.Post<ErrorInformation>(
+            return await this.PostAsync<ErrorInformation>(
                  SetTimeZoneApi,
                 string.Format("index={0}", index));
         }
@@ -184,9 +184,9 @@ public async Task<ErrorInformation> SetTimeZone(int index)
         /// </summary>
         /// <param name="displayResolution">New display resolution.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task SetDisplayResolution(string displayResolution)
+        public async Task SetDisplayResolutionAsync(string displayResolution)
         {
-            await this.Post(
+            await this.PostAsync(
                  DisplayResolutionApi,
                 string.Format("newdisplayresolution={0}", Utilities.Hex64Encode(displayResolution)));
         }
@@ -196,9 +196,9 @@ await this.Post(
         /// </summary>
         /// <param name="displayOrientation">Desired orientation.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task SetDisplayOrientation(string displayOrientation)
+        public async Task SetDisplayOrientationAsync(string displayOrientation)
         {
-            await this.Post(
+            await this.PostAsync(
                  DisplayOrientationApi,
                 string.Format("newdisplayorientation={0}", Utilities.Hex64Encode(displayOrientation)));
         }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/IcsManager.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/IcsManager.cs
index f317ba99..b598db67 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/IcsManager.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/IcsManager.cs
@@ -30,9 +30,9 @@ public partial class DevicePortal
         /// Gets the internet connection sharing(ICS) interfaces .
         /// </summary>
         /// <returns>String containing the internet connection sharing(ICS) interfaces.</returns>
-        public async Task<IscInterfacesInfo> GetIcsInterfacesInfo()
+        public async Task<IscInterfacesInfo> GetIcsInterfacesInfoAsync()
         {
-            return await this.Get<IscInterfacesInfo>(IcsInterfacesApi);
+            return await this.GetAsync<IscInterfacesInfo>(IcsInterfacesApi);
         }
 
         /// <summary>
@@ -41,9 +41,9 @@ public async Task<IscInterfacesInfo> GetIcsInterfacesInfo()
         /// <param name="privateInterface">Private Interface.</param>
         /// <param name="publicInterface">Public Interface.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task IcSharingStart(string privateInterface, string publicInterface)
+        public async Task IcSharingStartAsync(string privateInterface, string publicInterface)
         {
-            await this.Post(
+            await this.PostAsync(
                 IcSharingApi, string.Format("PrivateInterface={0}&PublicInterface={1}", Utilities.Hex64Encode(privateInterface), Utilities.Hex64Encode(publicInterface)));
         }
 
@@ -53,9 +53,9 @@ await this.Post(
         /// <param name="privateInterface">Private Interface.</param>
         /// <param name="publicInterface">Public Interface.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task IcSharingStop(string privateInterface, string publicInterface)
+        public async Task IcSharingStopAsync(string privateInterface, string publicInterface)
         {
-            await this.Delete(
+            await this.DeleteAsync(
                 IcSharingApi, string.Format("PrivateInterface={0}&PublicInterface={1}", Utilities.Hex64Encode(privateInterface), Utilities.Hex64Encode(publicInterface)));
         }
 
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/IoTOnboarding.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/IoTOnboarding.cs
index 6ac67f22..254d912a 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/IoTOnboarding.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/IoTOnboarding.cs
@@ -30,18 +30,18 @@ public partial class DevicePortal
         /// Retrieves the Soft AP Settings Info.
         /// </summary>
         /// <returns>SoftAPSettingsInfo for this device.</returns>
-        public async Task<SoftAPSettingsInfo> GetSoftAPSettingsInfo()
+        public async Task<SoftAPSettingsInfo> GetSoftAPSettingsInfoAsync()
         {
-            return await this.Get<SoftAPSettingsInfo>(SoftAPSettingsApi);
+            return await this.GetAsync<SoftAPSettingsInfo>(SoftAPSettingsApi);
         }
 
         /// <summary>
         /// Retrieves the All Joyn Settings Info.
         /// </summary>
         /// <returns>AllJoynSettingsInfo for this device.</returns>
-        public async Task<AllJoynSettingsInfo> GetAllJoynSettingsInfo()
+        public async Task<AllJoynSettingsInfo> GetAllJoynSettingsInfoAsync()
         {
-            return await this.Get<AllJoynSettingsInfo>(AllJoynSettingsApi);
+            return await this.GetAsync<AllJoynSettingsInfo>(AllJoynSettingsApi);
         }
 
         /// <summary>
@@ -51,9 +51,9 @@ public async Task<AllJoynSettingsInfo> GetAllJoynSettingsInfo()
         /// <param name="softApSsid">SoftAp Ssid.</param>
         /// /// <param name="SoftAp Password">SoftAp Password.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task SetSoftApSettings(string softApStatus, string softApSsid, string softApPassword)
+        public async Task SetSoftApSettingsAsync(string softApStatus, string softApSsid, string softApPassword)
         {
-            await this.Post(
+            await this.PostAsync(
                  SoftAPSettingsApi,
                 string.Format("SoftApEnabled={0}&SoftApSsid={1}&SoftApPassword={2}", Utilities.Hex64Encode(softApStatus), Utilities.Hex64Encode(softApSsid), Utilities.Hex64Encode(softApPassword)));
         }
@@ -66,9 +66,9 @@ await this.Post(
         /// <param name=" allJoynManufacturer"> AllJoyn Manufacturer.</param>
         /// <param name=" allJoynNumber"> AllJoyn Number.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task SetAllJoynSettings(string allJoynStatus, string allJoynDescription, string allJoynManufacturer, string allJoynModelNumber)
+        public async Task SetAllJoynSettingsAsync(string allJoynStatus, string allJoynDescription, string allJoynManufacturer, string allJoynModelNumber)
         {
-            await this.Post(
+            await this.PostAsync(
                  AllJoynSettingsApi,
                 string.Format("AllJoynOnboardingEnabled={0}&AllJoynOnboardingDefaultDescription={1}&AllJoynOnboardingDefaultManufacturer={2}&AllJoynOnboardingModelNumber={3}", Utilities.Hex64Encode(allJoynStatus), Utilities.Hex64Encode(allJoynDescription), Utilities.Hex64Encode(allJoynManufacturer), Utilities.Hex64Encode(allJoynModelNumber)));
         }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/Limpet.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/Limpet.cs
index 54147d88..eaeee9d0 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/Limpet.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/Limpet.cs
@@ -35,9 +35,9 @@ public partial class DevicePortal
         /// Gets Tpm Settings information.
         /// </summary>
         /// <returns>String containing theTpm Settings information.</returns>
-        public async Task<TpmSettingsInfo> GetTpmSettingsInfo()
+        public async Task<TpmSettingsInfo> GetTpmSettingsInfoAsync()
         {
-            return await this.Get<TpmSettingsInfo>(TpmSettingsApi);
+            return await this.GetAsync<TpmSettingsInfo>(TpmSettingsApi);
         }
 
         /// <summary>
@@ -45,27 +45,27 @@ public async Task<TpmSettingsInfo> GetTpmSettingsInfo()
         /// </summary>
         /// <param name="acpiTableIndex">ACPI Table Index.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task SetTpmAcpiTablesInfo(string acpiTableIndex)
+        public async Task SetTpmAcpiTablesInfoAsync(string acpiTableIndex)
         {
-            await this.Post(TpmAcpiTablesApi, string.Format("AcpiTableIndex={0}", Utilities.Hex64Encode(acpiTableIndex)));
+            await this.PostAsync(TpmAcpiTablesApi, string.Format("AcpiTableIndex={0}", Utilities.Hex64Encode(acpiTableIndex)));
         }
 
         /// <summary>
         /// Gets TPM ACPI Tables information.
         /// </summary>
         /// <returns>List of string containing the TPM ACPI Tables information.</returns>
-        public async Task<TpmAcpiTablesInfo> GetTpmAcpiTablesInfo()
+        public async Task<TpmAcpiTablesInfo> GetTpmAcpiTablesInfoAsync()
         {
-            return await this.Get<TpmAcpiTablesInfo>(TpmAcpiTablesApi);
+            return await this.GetAsync<TpmAcpiTablesInfo>(TpmAcpiTablesApi);
         }
 
         /// <summary>
         /// Gets TPM Logical Device Settings information.
         /// </summary>
         /// <returns>String containing the TPM Logical Device Settings information.</returns>
-        public async Task<TpmLogicalDeviceSettingsInfo> GetTpmLogicalDeviceSettingsInfo(int logicalDeviceId)
+        public async Task<TpmLogicalDeviceSettingsInfo> GetTpmLogicalDeviceSettingsInfoAsync(int logicalDeviceId)
         {
-            return await this.Get<TpmLogicalDeviceSettingsInfo>(string.Format("{0}/{1}", TpmSettingsApi, logicalDeviceId));
+            return await this.GetAsync<TpmLogicalDeviceSettingsInfo>(string.Format("{0}/{1}", TpmSettingsApi, logicalDeviceId));
         }
 
         /// <summary>
@@ -75,9 +75,9 @@ public async Task<TpmLogicalDeviceSettingsInfo> GetTpmLogicalDeviceSettingsInfo(
         /// <param name="azureUri">Azure Uri.</param>
         /// <param name="Azure Key">Azure Key.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task SetTpmLogicalDeviceSettingsInfo(int logicalDeviceId, string azureUri, string azureKey)
+        public async Task SetTpmLogicalDeviceSettingsInfoAsync(int logicalDeviceId, string azureUri, string azureKey)
         {
-            await this.Post(string.Format("{0}/{1}", TpmSettingsApi, logicalDeviceId), string.Format("AzureUri={0}&AzureKey={1}", Utilities.Hex64Encode(azureUri), Utilities.Hex64Encode(azureKey)));
+            await this.PostAsync(string.Format("{0}/{1}", TpmSettingsApi, logicalDeviceId), string.Format("AzureUri={0}&AzureKey={1}", Utilities.Hex64Encode(azureUri), Utilities.Hex64Encode(azureKey)));
         }
 
         /// <summary>
@@ -85,18 +85,18 @@ public async Task SetTpmLogicalDeviceSettingsInfo(int logicalDeviceId, string az
         /// </summary>
         /// <param name="logicalDeviceId">Logical Device Id.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task ResetTpmLogicalDeviceSettingsInfo(int logicalDeviceId)
+        public async Task ResetTpmLogicalDeviceSettingsInfoAsync(int logicalDeviceId)
         {
-            await this.Delete(string.Format("{0}/{1}", TpmSettingsApi, logicalDeviceId));
+            await this.DeleteAsync(string.Format("{0}/{1}", TpmSettingsApi, logicalDeviceId));
         }
         
         /// <summary>
         /// Gets TPM Azure Token information.
         /// </summary>
         /// <returns>String containing the TPM Azure Token information.</returns>
-        public async Task<TpmAzureTokenInfo> GetTpmAzureTokenInfo(int logicalDeviceId, string validity)
+        public async Task<TpmAzureTokenInfo> GetTpmAzureTokenInfoAsync(int logicalDeviceId, string validity)
         {
-            return await this.Get<TpmAzureTokenInfo>(string.Format("{0}/{1}", TpmAzureTokenApi, logicalDeviceId), string.Format("validity={0}", Utilities.Hex64Encode(validity)));
+            return await this.GetAsync<TpmAzureTokenInfo>(string.Format("{0}/{1}", TpmAzureTokenApi, logicalDeviceId), string.Format("validity={0}", Utilities.Hex64Encode(validity)));
         }
 
         #region Data contract
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ProcessManagement.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ProcessManagement.cs
index cac60c44..648d7a3c 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ProcessManagement.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ProcessManagement.cs
@@ -32,9 +32,9 @@ public partial class DevicePortal
         /// <param name="command">Command.</param>
         /// /// <param name="runAsDefaultAccount">Run As Default Account.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task RunCommand(string command,string runAsDefaultAccount)
+        public async Task RunCommandAsync(string command, string runAsDefaultAccount)
         {
-            await this.Post(
+            await this.PostAsync(
                 RunCommandApi, string.Format("command={0}&runasdefaultaccount={1}", Utilities.Hex64Encode(command), Utilities.Hex64Encode(runAsDefaultAccount)));
         }
 
@@ -45,9 +45,9 @@ await this.Post(
         /// <param name="runAsDefaultAccount">Run As Default Account.</param>
         /// <param name="timeout">Timeout.</param>
         /// <returns>String containing the output after the command is executed.</returns>
-        public async Task<RunCommandOutputInfo> RunCommandWithoutOutput(string commandWithoutOutput, string runAsDefaultAccount, string timeout)
+        public async Task<RunCommandOutputInfo> RunCommandWithoutOutputAsync(string commandWithoutOutput, string runAsDefaultAccount, string timeout)
         {
-            return await this.Post<RunCommandOutputInfo>(
+            return await this.PostAsync<RunCommandOutputInfo>(
                 RunCommandWithoutOutputApi, string.Format("command={0}&runasdefaultaccount={1}&timeout={2}", Utilities.Hex64Encode(commandWithoutOutput), Utilities.Hex64Encode(runAsDefaultAccount), Utilities.Hex64Encode(timeout)));
         }
 
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/RemoteSettings.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/RemoteSettings.cs
index 4710286e..5b54ac45 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/RemoteSettings.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/RemoteSettings.cs
@@ -35,18 +35,18 @@ public partial class DevicePortal
         /// Gets the Remote Settings Status Information.
         /// </summary>
         /// <returns>String containing the Remote Settings Status information.</returns>
-        public async Task<RemoteSettingsStatusInfo> GetRemoteSettingsStatusInfo()
+        public async Task<RemoteSettingsStatusInfo> GetRemoteSettingsStatusInfoAsync()
         {
-            return await this.Get<RemoteSettingsStatusInfo>(RemoteSettingsStatusApi);
+            return await this.GetAsync<RemoteSettingsStatusInfo>(RemoteSettingsStatusApi);
         }
 
         /// <summary>
         /// Enables the remote settings.
         /// </summary>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task<RemoteSettingsStatusInfo> RemoteSettingsEnable()
+        public async Task<RemoteSettingsStatusInfo> RemoteSettingsEnableAsync()
         {
-            return await this.Post<RemoteSettingsStatusInfo>(
+            return await this.PostAsync<RemoteSettingsStatusInfo>(
                 RemoteSettingsEnableApi);
         }
 
@@ -54,9 +54,9 @@ public async Task<RemoteSettingsStatusInfo> RemoteSettingsEnable()
         /// Disables the remote settings.
         /// </summary>
         /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task<RemoteSettingsStatusInfo> RemoteSettingsDisable()
+        public async Task<RemoteSettingsStatusInfo> RemoteSettingsDisableAsync()
         {
-            return await this.Post<RemoteSettingsStatusInfo>(
+            return await this.PostAsync<RemoteSettingsStatusInfo>(
                 RemoteSettingsDisableApi);
         }
 
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/WindowsUpdate.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/WindowsUpdate.cs
index 48dd4faf..8ac09c71 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/WindowsUpdate.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/WindowsUpdate.cs
@@ -30,18 +30,18 @@ public partial class DevicePortal
         /// Gets Status information.
         /// </summary>
         /// <returns>String containing the status information.</returns>
-        public async Task<StatusInfo> GetStatusInfo()
+        public async Task<StatusInfo> GetStatusInfoAsync()
         {
-            return await this.Get<StatusInfo>(StatusApi);
+            return await this.GetAsync<StatusInfo>(StatusApi);
         }
 
         /// <summary>
         /// Gets the update install time information.
         /// </summary>
         /// <returns>String containing the update install time information.</returns>
-        public async Task<UpdateInstallTimeInfo> GetUpdateInstallTime()
+        public async Task<UpdateInstallTimeInfo> GetUpdateInstallTimeAsync()
         {
-            return await this.Get<UpdateInstallTimeInfo>(InstallTimeApi);             
+            return await this.GetAsync<UpdateInstallTimeInfo>(InstallTimeApi);             
         }
 
         #region Data contract
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/FiddlerSetup.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/FiddlerSetup.cs
index 9fd78610..9cdaf243 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/FiddlerSetup.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/FiddlerSetup.cs
@@ -27,7 +27,7 @@ public partial class DevicePortal
         /// <param name="proxyPort">The port the proxy is listening on.</param>
         /// <param name="certFilePath">An optional path to the cert file to use.</param>
         /// <returns>Task tracking completion. A reboot will be required before the tracing begins.</returns>
-        public async Task EnableFiddlerTracing(string proxyAddress, string proxyPort, string certFilePath = null)
+        public async Task EnableFiddlerTracingAsync(string proxyAddress, string proxyPort, string certFilePath = null)
         {
             if (this.Platform != DevicePortalPlatforms.XboxOne)
             {
@@ -45,11 +45,11 @@ public async Task EnableFiddlerTracing(string proxyAddress, string proxyPort, st
 
                 queryStringList.Add("updateCert", "true");
 
-                await this.Post(FiddlerSetupApi, certFileList, Utilities.BuildQueryString(queryStringList));
+                await this.PostAsync(FiddlerSetupApi, certFileList, Utilities.BuildQueryString(queryStringList));
             }
             else
             {
-                await this.Post(FiddlerSetupApi, Utilities.BuildQueryString(queryStringList));
+                await this.PostAsync(FiddlerSetupApi, Utilities.BuildQueryString(queryStringList));
             }
         }
 
@@ -57,14 +57,14 @@ public async Task EnableFiddlerTracing(string proxyAddress, string proxyPort, st
         /// Disables Fiddler on the console.
         /// </summary>
         /// <returns>Task tracking completion. A reboot will be required before tracing stops.</returns>
-        public async Task DisableFiddlerTracing()
+        public async Task DisableFiddlerTracingAsync()
         {
             if (this.Platform != DevicePortalPlatforms.XboxOne)
             {
                 throw new NotSupportedException("This method is only supported on Xbox One.");
             }
 
-            await this.Delete(FiddlerSetupApi);
+            await this.DeleteAsync(FiddlerSetupApi);
         }
     }
 }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/SmbShare.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/SmbShare.cs
index d260b9eb..fc1b73fd 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/SmbShare.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/SmbShare.cs
@@ -24,14 +24,14 @@ public partial class DevicePortal
         /// Gets the SMB Share info for the device
         /// </summary>
         /// <returns>The SMB path, username, and password.</returns>
-        public async Task<SmbInfo> GetSmbShareInfo()
+        public async Task<SmbInfo> GetSmbShareInfoAsync()
         {
             if (this.Platform != DevicePortalPlatforms.XboxOne)
             {
                 throw new NotSupportedException("This method is only supported on Xbox One.");
             }
 
-            return await this.Get<SmbInfo>(GetSmbShareInfoApi);
+            return await this.GetAsync<SmbInfo>(GetSmbShareInfoApi);
         }
 
         #region Data contract
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/UserManagement.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/UserManagement.cs
index ed500bbb..0f1fa877 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/UserManagement.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/UserManagement.cs
@@ -25,14 +25,14 @@ public partial class DevicePortal
         /// Gets the Xbox Live user info for all users present on the device
         /// </summary>
         /// <returns>UserList object containing a List of UserInfo objects representing the users on the device.</returns>
-        public async Task<UserList> GetXboxLiveUsers()
+        public async Task<UserList> GetXboxLiveUsersAsync()
         {
             if (this.Platform != DevicePortalPlatforms.XboxOne)
             {
                 throw new NotSupportedException("This method is only supported on Xbox One.");
             }
 
-            return await this.Get<UserList>(XboxLiveUserApi);
+            return await this.GetAsync<UserList>(XboxLiveUserApi);
         }
 
         /// <summary>
@@ -40,14 +40,14 @@ public async Task<UserList> GetXboxLiveUsers()
         /// </summary>
         /// <param name="users">List of users to be updated.</param>
         /// <returns>Task for tracking async completion.</returns>
-        public async Task UpdateXboxLiveUsers(UserList users)
+        public async Task UpdateXboxLiveUsersAsync(UserList users)
         {
             if (this.Platform != DevicePortalPlatforms.XboxOne)
             {
                 throw new NotSupportedException("This method is only supported on Xbox One.");
             }
 
-            await this.Put(XboxLiveUserApi, users);
+            await this.PutAsync(XboxLiveUserApi, users);
         }
 
         #region Data contract
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxAppDeployment.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxAppDeployment.cs
index 8be29918..923f4381 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxAppDeployment.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxAppDeployment.cs
@@ -31,14 +31,14 @@ public partial class DevicePortal
         /// </summary>
         /// <param name="folderName">Relative folder path where the app can be found.</param>
         /// <returns>Task for tracking async completion.</returns>
-        public async Task RegisterApplication(string folderName)
+        public async Task RegisterApplicationAsync(string folderName)
         {
             if (this.Platform != DevicePortalPlatforms.XboxOne)
             {
                 throw new NotSupportedException("This method is only supported on Xbox One.");
             }
 
-            await this.Post(
+            await this.PostAsync(
                 RegisterPackageApi,
                 string.Format("folder={0}", Utilities.Hex64Encode(folderName)));
 
@@ -48,7 +48,7 @@ await this.Post(
             {
                 await Task.Delay(TimeSpan.FromMilliseconds(500));
 
-                status = await this.GetInstallStatus();
+                status = await this.GetInstallStatusAsync();
             }
             while (status == ApplicationInstallStatus.InProgress);
         }
@@ -59,7 +59,7 @@ await this.Post(
         /// <param name="sourceFolder">The source folder to upload.</param>
         /// <param name="destinationFolder">The destination path to upload it to.</param>
         /// <returns>Task for tracking async completion.</returns>
-        public async Task UploadPackageFolder(string sourceFolder, string destinationFolder)
+        public async Task UploadPackageFolderAsync(string sourceFolder, string destinationFolder)
         {
             if (this.Platform != DevicePortalPlatforms.XboxOne)
             {
@@ -69,7 +69,7 @@ public async Task UploadPackageFolder(string sourceFolder, string destinationFol
             List<string> files = new List<string>();
             files.AddRange(Directory.GetFiles(sourceFolder));
 
-            await this.Post(
+            await this.PostAsync(
                 UploadPackageFolderApi,
                 files,
                 string.Format("destinationFolder={0}", Utilities.Hex64Encode(destinationFolder)));
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxLiveSandbox.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxLiveSandbox.cs
index cb88bca1..7d486a02 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxLiveSandbox.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxLiveSandbox.cs
@@ -23,7 +23,7 @@ public partial class DevicePortal
         /// Gets the current Xbox Live sandbox value for this device.
         /// </summary>
         /// <returns>The value of the current sandbox this device is in.</returns>
-        public async Task<Sandbox> GetXboxLiveSandbox()
+        public async Task<Sandbox> GetXboxLiveSandboxAsync()
         {
             /*
                 This method lives with the Xbox wrappers since it's Xbox Live and
@@ -31,7 +31,7 @@ This method lives with the Xbox wrappers since it's Xbox Live and
                 there is no check for Xbox platform type here.
             */
 
-            return await this.Get<Sandbox>(XboxLiveSandboxApi);
+            return await this.GetAsync<Sandbox>(XboxLiveSandboxApi);
         }
 
         /// <summary>
@@ -39,7 +39,7 @@ This method lives with the Xbox wrappers since it's Xbox Live and
         /// </summary>
         /// <param name="newSandbox">The new sandbox to move this device into.</param>
         /// <returns>Task tracking completion. A reboot will be required may be required before the sandbox change takes effect on some devices.</returns>
-        public async Task<Sandbox> SetXboxLiveSandbox(string newSandbox)
+        public async Task<Sandbox> SetXboxLiveSandboxAsync(string newSandbox)
         {
             /*
                 This method lives with the Xbox wrappers since it's Xbox Live and
@@ -50,7 +50,7 @@ This method lives with the Xbox wrappers since it's Xbox Live and
             Sandbox sandbox = new Sandbox();
             sandbox.Value = newSandbox;
 
-            return await this.Put<Sandbox, Sandbox>(XboxLiveSandboxApi, sandbox);
+            return await this.PutAsync<Sandbox, Sandbox>(XboxLiveSandboxApi, sandbox);
         }
 
         #region Data contract
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxMediaCapture.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxMediaCapture.cs
index 9362d9c2..27bd4615 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxMediaCapture.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxMediaCapture.cs
@@ -24,7 +24,7 @@ public partial class DevicePortal
         /// Takes a current screenshot of the device.
         /// </summary>
         /// <returns>A stream of the screenshot in PNG form.</returns>
-        public async Task<Stream> TakeXboxScreenshot()
+        public async Task<Stream> TakeXboxScreenshotAsync()
         {
             if (this.Platform != DevicePortalPlatforms.XboxOne)
             {
@@ -35,7 +35,7 @@ public async Task<Stream> TakeXboxScreenshot()
                 this.deviceConnection.Connection,
                 GetXboxScreenshotApi);
 
-            return await this.Get(uri);
+            return await this.GetAsync(uri);
         }
     }
 }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxSettings.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxSettings.cs
index f7458920..8af1abb9 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxSettings.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxSettings.cs
@@ -26,14 +26,14 @@ public partial class DevicePortal
         /// Gets the Xbox Settings info for all settings which can be controlled on the device.
         /// </summary>
         /// <returns>XboxSettingList object containing a List of XboxSetting objects representing the settings on the device.</returns>
-        public async Task<XboxSettingList> GetXboxSettings()
+        public async Task<XboxSettingList> GetXboxSettingsAsync()
         {
             if (this.Platform != DevicePortalPlatforms.XboxOne)
             {
                 throw new NotSupportedException("This method is only supported on Xbox One.");
             }
 
-            return await this.Get<XboxSettingList>(XboxSettingsApi);
+            return await this.GetAsync<XboxSettingList>(XboxSettingsApi);
         }
 
         /// <summary>
@@ -41,14 +41,14 @@ public async Task<XboxSettingList> GetXboxSettings()
         /// </summary>
         /// <param name="settingName">Name of the setting we want to retrieve.</param>
         /// <returns>XboxSetting object containing a information about the settings on the device.</returns>
-        public async Task<XboxSetting> GetXboxSetting(string settingName)
+        public async Task<XboxSetting> GetXboxSettingAsync(string settingName)
         {
             if (this.Platform != DevicePortalPlatforms.XboxOne)
             {
                 throw new NotSupportedException("This method is only supported on Xbox One.");
             }
 
-            return await this.Get<XboxSetting>(Path.Combine(XboxSettingsApi, settingName));
+            return await this.GetAsync<XboxSetting>(Path.Combine(XboxSettingsApi, settingName));
         }
 
         /// <summary>
@@ -56,14 +56,14 @@ public async Task<XboxSetting> GetXboxSetting(string settingName)
         /// </summary>
         /// <param name="setting">Setting to be updated.</param>
         /// <returns>Task for tracking async completion.</returns>
-        public async Task<XboxSetting> UpdateXboxSetting(XboxSetting setting)
+        public async Task<XboxSetting> UpdateXboxSettingAsync(XboxSetting setting)
         {
             if (this.Platform != DevicePortalPlatforms.XboxOne)
             {
                 throw new NotSupportedException("This method is only supported on Xbox One.");
             }
 
-            return await this.Put<XboxSetting, XboxSetting>(Path.Combine(XboxSettingsApi, setting.Name), setting);
+            return await this.PutAsync<XboxSetting, XboxSetting>(Path.Combine(XboxSettingsApi, setting.Name), setting);
         }
 
         #region Data contract
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/CertificateHandling.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/CertificateHandling.cs
index 49482fdf..35a6261f 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/CertificateHandling.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/CertificateHandling.cs
@@ -26,7 +26,7 @@ public partial class DevicePortal
         /// <param name="acceptUntrustedCerts">Whether or not we should accept untrusted certificates.</param>
         /// <returns>The device certificate.</returns>
 #pragma warning disable 1998
-        public async Task<Certificate> GetRootDeviceCertificate(bool acceptUntrustedCerts = false)
+        public async Task<Certificate> GetRootDeviceCertificateAsync(bool acceptUntrustedCerts = false)
         {
             Certificate certificate = null;
 
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Core/AppDeployment.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Core/AppDeployment.cs
index b7f9474f..61328091 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Core/AppDeployment.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Core/AppDeployment.cs
@@ -31,7 +31,7 @@ public partial class DevicePortal
         /// </summary>
         /// <returns>The status</returns>
 #pragma warning disable 1998
-        public async Task<ApplicationInstallStatus> GetInstallStatus()
+        public async Task<ApplicationInstallStatus> GetInstallStatusAsync()
         {
             ApplicationInstallStatus status = ApplicationInstallStatus.None;
 
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestDelete.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestDelete.cs
index 25769d3e..ed8aa767 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestDelete.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestDelete.cs
@@ -18,7 +18,7 @@
 namespace Microsoft.Tools.WindowsDevicePortal
 {
     /// <content>
-    /// Universal Windows Platform implementation of HTTP Delete
+    /// Universal Windows Platform implementation of HTTP DeleteAsync
     /// </content>
     public partial class DevicePortal
     {
@@ -28,7 +28,7 @@ public partial class DevicePortal
         /// <param name="uri">The uri to which the delete request will be issued.</param>
         /// <returns>Task tracking HTTP completion</returns>
 #pragma warning disable 1998
-        private async Task<Stream> Delete(Uri uri)
+        private async Task<Stream> DeleteAsync(Uri uri)
         {
             IBuffer dataBuffer = null;
 
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestGet.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestGet.cs
index 3ffea499..38593c45 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestGet.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestGet.cs
@@ -18,7 +18,7 @@
 namespace Microsoft.Tools.WindowsDevicePortal
 {
     /// <content>
-    /// Universal Windows Platform implementation of HTTP Get
+    /// Universal Windows Platform implementation of HTTP GetAsync
     /// </content>
     public partial class DevicePortal
     {
@@ -28,7 +28,7 @@ public partial class DevicePortal
         /// <param name="uri">The uri to which the get request will be issued.</param>
         /// <returns>Response data as a stream.</returns>
 #pragma warning disable 1998
-        private async Task<Stream> Get(Uri uri)
+        private async Task<Stream> GetAsync(Uri uri)
         {
             IBuffer dataBuffer = null;
 
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestPost.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestPost.cs
index d4bc4e28..3a634322 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestPost.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestPost.cs
@@ -18,7 +18,7 @@
 namespace Microsoft.Tools.WindowsDevicePortal
 {
     /// <content>
-    /// Universal Windows Platform implementation of HTTP Post
+    /// Universal Windows Platform implementation of HTTP PostAsync
     /// </content>
     public partial class DevicePortal
     {
@@ -30,7 +30,7 @@ public partial class DevicePortal
         /// <param name="requestStreamContentType">The type of that request body data.</param>
         /// <returns>Task tracking the completion of the POST request</returns>
 #pragma warning disable 1998
-        private async Task<Stream> Post(
+        private async Task<Stream> PostAsync(
             Uri uri,
             Stream requestStream = null,
             string requestStreamContentType = null)
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestPut.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestPut.cs
index fb0656cd..36548ec0 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestPut.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestPut.cs
@@ -18,7 +18,7 @@
 namespace Microsoft.Tools.WindowsDevicePortal
 {
     /// <content>
-    /// Universal Windows Platform implementation of HTTP Put
+    /// Universal Windows Platform implementation of HTTP PutAsync
     /// </content>
     public partial class DevicePortal
     {
@@ -29,7 +29,7 @@ public partial class DevicePortal
         /// <param name="body">The HTTP content comprising the body of the request.</param>
         /// <returns>Task tracking the PUT completion.</returns>
 #pragma warning disable 1998
-        private async Task<Stream> Put(
+        private async Task<Stream> PutAsync(
             Uri uri,
             IHttpContent body = null)
         {
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/WebSocket.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/WebSocket.cs
index dd0dae4b..52395049 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/WebSocket.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/WebSocket.cs
@@ -42,7 +42,7 @@ public WebSocket(IDevicePortalConnection connection, bool sendStreams = false)
         /// <param name="endpoint">The uri that the weboscket should connect to</param>
         /// <returns>The task of opening a connection to the websocket.</returns>
 #pragma warning disable 1998
-        private async Task StartListeningForMessagesInternal(
+        private async Task StartListeningForMessagesInternalAsync(
             Uri endpoint)
         {
             this.websocket = new MessageWebSocket();
@@ -130,7 +130,7 @@ private void MessageReceived(MessageWebSocket sender, MessageWebSocketMessageRec
         /// </summary>
         /// <returns>The task of closing the websocket connection.</returns>
 #pragma warning disable 1998
-        private async Task StopListeningForMessagesInternal()
+        private async Task StopListeningForMessagesInternalAsync()
         {
             if (this.IsListeningForMessages)
             {
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Properties/AssemblyInfo.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Properties/AssemblyInfo.cs
index b2aed5e6..6f097b63 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Properties/AssemblyInfo.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Properties/AssemblyInfo.cs
@@ -29,6 +29,6 @@
 // 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("0.9.0.0")]
-[assembly: AssemblyFileVersion("0.9.0.0")]
+[assembly: AssemblyVersion("0.9.1.0")]
+[assembly: AssemblyFileVersion("0.9.1.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/WindowsDevicePortalWrapper.UniversalWindows.csproj b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/WindowsDevicePortalWrapper.UniversalWindows.csproj
index ac6abbce..52acc73d 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/WindowsDevicePortalWrapper.UniversalWindows.csproj
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/WindowsDevicePortalWrapper.UniversalWindows.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>WindowsDevicePortalWrapper.UniversalWindows</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.10586.0</TargetPlatformVersion>
+    <TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
@@ -126,7 +126,7 @@
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <Import Project="$(StyleCopTargetsDir)StyleCop.targets" Condition="'$(StyleCopTargetsDir)' != ''"/>
+  <Import Project="$(StyleCopTargetsDir)StyleCop.targets" Condition="'$(StyleCopTargetsDir)' != ''" />
   <!-- 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">
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/CertificateHandling.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/CertificateHandling.cs
index caa288d1..831e5232 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/CertificateHandling.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/CertificateHandling.cs
@@ -32,13 +32,13 @@ public partial class DevicePortal
         /// Gets the root certificate from the device.
         /// </summary>
         /// <returns>The device certificate.</returns>
-        public async Task<X509Certificate2> GetRootDeviceCertificate()
+        public async Task<X509Certificate2> GetRootDeviceCertificateAsync()
         {
             X509Certificate2 certificate = null;
 
             Uri uri = Utilities.BuildEndpoint(this.deviceConnection.Connection, RootCertificateEndpoint);
 
-            using (Stream stream = await this.Get(uri))
+            using (Stream stream = await this.GetAsync(uri))
             {
                 using (BinaryReader reader = new BinaryReader(stream))
                 {
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Core/AppDeployment.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Core/AppDeployment.cs
index 09540f5a..8457c36e 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Core/AppDeployment.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Core/AppDeployment.cs
@@ -23,7 +23,7 @@ public partial class DevicePortal
         /// Gets the status of a pending or most recent installation, if any. 
         /// </summary>
         /// <returns>The status</returns>
-        public async Task<ApplicationInstallStatus> GetInstallStatus()
+        public async Task<ApplicationInstallStatus> GetInstallStatusAsync()
         {
             ApplicationInstallStatus status = ApplicationInstallStatus.None;
 
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestDelete.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestDelete.cs
index 3080979d..29b87268 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestDelete.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestDelete.cs
@@ -13,7 +13,7 @@
 namespace Microsoft.Tools.WindowsDevicePortal
 {
     /// <content>
-    /// .net 4.x implementation of HTTP Delete
+    /// .net 4.x implementation of HTTP DeleteAsync
     /// </content>
     public partial class DevicePortal
     {
@@ -22,7 +22,7 @@ public partial class DevicePortal
         /// </summary>
         /// <param name="uri">The uri to which the delete request will be issued.</param>
         /// <returns>Task tracking HTTP completion</returns>
-        private async Task<Stream> Delete(Uri uri)
+        private async Task<Stream> DeleteAsync(Uri uri)
         {
             MemoryStream dataStream = null;
 
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestGet.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestGet.cs
index e5802c59..77f1dafa 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestGet.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestGet.cs
@@ -12,7 +12,7 @@
 namespace Microsoft.Tools.WindowsDevicePortal
 {
     /// <content>
-    /// .net 4.x implementation of HTTP Get
+    /// .net 4.x implementation of HTTP GetAsync
     /// </content>
     public partial class DevicePortal
     {
@@ -21,7 +21,7 @@ public partial class DevicePortal
         /// </summary>
         /// <param name="uri">The uri to which the get request will be issued.</param>
         /// <returns>Response data as a stream.</returns>
-        private async Task<Stream> Get(
+        private async Task<Stream> GetAsync(
             Uri uri)
         {
             MemoryStream dataStream = null;
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestPost.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestPost.cs
index 7d8de9eb..898288c6 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestPost.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestPost.cs
@@ -13,7 +13,7 @@
 namespace Microsoft.Tools.WindowsDevicePortal
 {
     /// <content>
-    /// .net 4.x implementation of HTTP Post
+    /// .net 4.x implementation of HTTP PostAsync
     /// </content>
     public partial class DevicePortal
     {
@@ -24,7 +24,7 @@ public partial class DevicePortal
         /// <param name="requestStream">Optional stream containing data for the request body.</param>
         /// <param name="requestStreamContentType">The type of that request body data.</param>
         /// <returns>Task tracking the completion of the POST request</returns>
-        private async Task<Stream> Post(
+        private async Task<Stream> PostAsync(
             Uri uri,
             Stream requestStream = null,
             string requestStreamContentType = null)
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestPut.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestPut.cs
index 94e06b7e..4e9372a8 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestPut.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestPut.cs
@@ -13,7 +13,7 @@
 namespace Microsoft.Tools.WindowsDevicePortal
 {
     /// <content>
-    /// .net 4.x implementation of HTTP Put
+    /// .net 4.x implementation of HTTP PutAsync
     /// </content>
     public partial class DevicePortal
     {
@@ -23,7 +23,7 @@ public partial class DevicePortal
         /// <param name="uri">The uri to which the put request will be issued.</param>
         /// <param name="body">The HTTP content comprising the body of the request.</param>
         /// <returns>Task tracking the PUT completion.</returns>
-        private async Task<Stream> Put(
+        private async Task<Stream> PutAsync(
             Uri uri,
             HttpContent body = null)
         {
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/WebSocket.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/WebSocket.cs
index 7a1e16e3..889bf7d1 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/WebSocket.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/WebSocket.cs
@@ -66,7 +66,7 @@ public WebSocket(IDevicePortalConnection connection, Func<object, X509Certificat
         /// </summary>
         /// <param name="endpoint">The uri that the weboscket should connect to</param>
         /// <returns>The task of opening a connection to the websocket.</returns>
-        private async Task OpenConnection(
+        private async Task OpenConnectionAsync(
             Uri endpoint)
         {
             this.websocket.Options.UseDefaultCredentials = false;
@@ -86,7 +86,7 @@ private async Task OpenConnection(
         /// Stops listening for messages and closes the connection to the websocket.
         /// </summary>
         /// <returns>The task of closing the websocket connection.</returns>
-        private async Task StopListeningForMessagesInternal()
+        private async Task StopListeningForMessagesInternalAsync()
         {
             if (this.IsListeningForMessages)
             {
@@ -108,7 +108,7 @@ private async Task StopListeningForMessagesInternal()
         /// Listen for messages from the websocket. Once they are received they are parsed and the WebSocketMessageReceived event is raised.
         /// </summary>
         /// <returns>The task of listening for messages from the websocket.</returns>
-        private async Task ListenForMessagesInternal()
+        private async Task ListenForMessagesInternalAsync()
         {
             this.receivingMessagesTask = Task.Run(async () =>
             {
@@ -187,7 +187,7 @@ private async Task ListenForMessagesInternal()
         /// </summary>
         /// <param name="endpoint">The uri that the weboscket should connect to</param>
         /// <returns>The task of listening for messages from the websocket.</returns>
-        private async Task StartListeningForMessagesInternal(Uri endpoint)
+        private async Task StartListeningForMessagesInternalAsync(Uri endpoint)
         {
             if (this.IsListeningForMessages)
             {
@@ -198,7 +198,7 @@ private async Task StartListeningForMessagesInternal(Uri endpoint)
 
             try
             {
-                await this.OpenConnection(endpoint);
+                await this.OpenConnectionAsync(endpoint);
             }
             catch
             {
@@ -206,7 +206,7 @@ private async Task StartListeningForMessagesInternal(Uri endpoint)
             }
 
             // Do not wait on actually listening for messages.
-            Task listenForMessagesInternal = this.ListenForMessagesInternal();
+            Task listenForMessagesInternal = this.ListenForMessagesInternalAsync();
         }
     }
 }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Properties/AssemblyInfo.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Properties/AssemblyInfo.cs
index c6035040..f2cc9ce2 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Properties/AssemblyInfo.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Properties/AssemblyInfo.cs
@@ -37,5 +37,5 @@
 // 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("0.9.0.0")]
-[assembly: AssemblyFileVersion("0.9.0.0")]
+[assembly: AssemblyVersion("0.9.1.0")]
+[assembly: AssemblyFileVersion("0.9.1.0")]

From c8bef65cb0b0333acb7ff17d68d09fd74a7aa005 Mon Sep 17 00:00:00 2001
From: Greg Pettyjohn <grpettyj@microsoft.com>
Date: Wed, 12 Oct 2016 13:30:37 -0700
Subject: [PATCH 15/51] Update calls into the wrapper to use the latest async
 naming convention

---
 .../ViewModels/DevicePortalViewModel.cs            | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Samples/SampleDeviceCollection/ViewModels/DevicePortalViewModel.cs b/Samples/SampleDeviceCollection/ViewModels/DevicePortalViewModel.cs
index f2cc9f54..86def849 100644
--- a/Samples/SampleDeviceCollection/ViewModels/DevicePortalViewModel.cs
+++ b/Samples/SampleDeviceCollection/ViewModels/DevicePortalViewModel.cs
@@ -223,7 +223,7 @@ private async Task ExecuteDumpIpConfigAsync()
             this.Ready = false;
             try
             {
-                IpConfiguration config = await this.Portal.GetIpConfig();
+                IpConfiguration config = await this.Portal.GetIpConfigAsync();
                 this.OutputIpConfiguration(config);
             }
             catch (Exception exn)
@@ -342,7 +342,7 @@ private async Task ExecuteRenameAsync()
                 string newName = this.deviceNameEntry;
                 this.DeviceNameEntry = string.Empty;
                 this.OutputDiagnosticString("Attempting to rename device to {0}\n", newName);
-                await this.Portal.SetDeviceName(newName);
+                await this.Portal.SetDeviceNameAsync(newName);
             }
             catch (Exception exn)
             {
@@ -398,7 +398,7 @@ private async Task RefreshDeviceNameAsync()
             this.Ready = false;
             try
             {
-                this.DeviceName = await this.Portal.GetDeviceName();
+                this.DeviceName = await this.Portal.GetDeviceNameAsync();
                 this.OutputDiagnosticString("Done refreshing device name\n");
             }
             catch (Exception exn)
@@ -459,7 +459,7 @@ private async Task ExecuteRebootAsync()
             try
             {
                 this.OutputDiagnosticString("Attempting to reboot device.\n");
-                await this.Portal.Reboot();
+                await this.Portal.RebootAsync();
 
                 // Sometimes able to reestablish the connection prematurely before the console has a chance to shut down
                 // So adding a delay here before trying to reestablish the connection.
@@ -571,7 +571,7 @@ private async Task ExecuteReestablishConnectionAsync()
             {
                 do
                 {
-                    await this.Portal.Connect();
+                    await this.Portal.ConnectAsync();
 
                     if (this.Portal.ConnectionHttpStatusCode == HttpStatusCode.Unauthorized)
                     {
@@ -654,7 +654,7 @@ private async Task ExecuteStartListeningForSystemPerfAsync()
             try
             {
                 this.Portal.SystemPerfMessageReceived += this.OnSystemPerfReceived;
-                await this.Portal.StartListeningForSystemPerf();
+                await this.Portal.StartListeningForSystemPerfAsync();
             }
             catch (Exception exn)
             {
@@ -710,7 +710,7 @@ private async Task ExecuteStopListeningForSystemPerfAsync()
             try
             {
                 this.Portal.SystemPerfMessageReceived -= this.OnSystemPerfReceived;
-                await this.Portal.StopListeningForSystemPerf();
+                await this.Portal.StopListeningForSystemPerfAsync();
             }
             catch (Exception exn)
             {

From 870c30389586b76aa3aad4c2cb7a7f96a45c5a4c Mon Sep 17 00:00:00 2001
From: Greg Pettyjohn <grpettyj@microsoft.com>
Date: Wed, 12 Oct 2016 13:38:48 -0700
Subject: [PATCH 16/51] Not tracking sync.cmd

---
 .gitignore |  1 +
 sync.cmd   | 21 ---------------------
 2 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 sync.cmd

diff --git a/.gitignore b/.gitignore
index 70ac09cd..676a854a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+sync.cmd
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
diff --git a/sync.cmd b/sync.cmd
deleted file mode 100644
index 27b718fd..00000000
--- a/sync.cmd
+++ /dev/null
@@ -1,21 +0,0 @@
-@echo off
-echo --- Fetching master branch
-git fetch upstream
-echo --- Merging contents of master
-git merge upstream/master
-set /p response=Push merged to fork (Y/N)? 
-if /i "%response:~,1%" equ "Y" goto push
-if /i "%response:~,1%" equ "y" goto push
-goto done
-
-:push
-echo --- Pushing merged fork
-git push origin
-goto done
-
-:done
-echo --- Done
-exit /b
-
-
-   

From 69912382bc0b9f1814d0d3977d78999afbbc7d3b Mon Sep 17 00:00:00 2001
From: Greg Pettyjohn <grpettyj@microsoft.com>
Date: Wed, 12 Oct 2016 14:14:46 -0700
Subject: [PATCH 17/51] Ended up with a stray orig file. Deleting

---
 .../DefaultDevicePortalConnection.cs.orig     | 216 ------------------
 1 file changed, 216 deletions(-)
 delete mode 100644 WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs.orig

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs.orig b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs.orig
deleted file mode 100644
index 26aa3b33..00000000
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/DefaultDevicePortalConnection.cs.orig
+++ /dev/null
@@ -1,216 +0,0 @@
-//----------------------------------------------------------------------------------------------
-// <copyright file="DefaultDevicePortalConnection.cs" company="Microsoft Corporation">
-//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
-// </copyright>
-//----------------------------------------------------------------------------------------------
-
-using System;
-using System.Net;
-using System.Security.Cryptography.X509Certificates;
-using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
-
-namespace Microsoft.Tools.WindowsDevicePortal
-{
-    /// <summary>
-    /// Default implementation of the IDevicePortalConnection interface.
-    /// This implementation is designed to be compatibile with all device families.
-    /// </summary>
-    public class DefaultDevicePortalConnection : IDevicePortalConnection
-    {
-        /// <summary>
-        /// The device's root certificate.
-        /// </summary>
-        private X509Certificate2 deviceCertificate = null;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DefaultDevicePortalConnection" /> class.
-        /// </summary>
-        /// <param name="address">The fully qualified (ex: "https:/1.2.3.4:4321") address of the device.</param>
-        /// <param name="userName">The user name used in the connection credentials.</param>
-        /// <param name="password">The password used in the connection credentials.</param>
-        public DefaultDevicePortalConnection(
-            string address,
-            string userName,
-            string password)
-        {
-            this.Connection = new Uri(address);
-
-            if (!string.IsNullOrEmpty(userName) &&
-                !string.IsNullOrEmpty(password))
-            {
-                // append auto- to the credentials to bypass CSRF token requirement on non-Get requests.
-                this.Credentials = new NetworkCredential(string.Format("auto-{0}", userName), password);
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="XboxDevicePortalConnection"/> class, using a SecureString to secure the password.
-        /// </summary>
-        /// <param name="address">device identifier</param>
-        /// <param name="userName">WDP username</param>
-        /// <param name="password">WDP password</param>
-        public DefaultDevicePortalConnection(
-            string address,
-            string userName,
-            System.Security.SecureString password)
-        {
-            this.Connection = new Uri(address);
-
-
-            if (!string.IsNullOrEmpty(userName) &&
-                password != null &&
-                password.Length > 0)
-            {
-                // append auto- to the credentials to bypass CSRF token requirement on non-Get requests.
-                this.Credentials = new NetworkCredential(string.Format("auto-{0}", userName), password);
-            }
-        }
-
-        /// <summary>
-        /// Gets the URI used to connect to the device.
-        /// </summary>
-        public Uri Connection
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets Web Socket Connection property
-        /// </summary>
-        public Uri WebSocketConnection
-        {
-            get
-            {
-                if (this.Connection == null)
-                {
-                    return null;
-                }
-
-                // Convert the scheme from http[s] to ws[s].
-                string scheme = this.Connection.Scheme.Equals("https", StringComparison.OrdinalIgnoreCase) ? "wss" : "ws";
-
-                return new Uri(
-                    string.Format("{0}://{1}",
-                        scheme,
-                        this.Connection.Authority));
-            }
-        }
-
-        /// <summary>
-        /// Gets the credentials used to connect to the device.
-        /// </summary>
-        public NetworkCredential Credentials
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets or sets the device's operating system family.
-        /// </summary>
-        public string Family
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the operating system information.
-        /// </summary>
-        public OperatingSystemInformation OsInfo
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets the provided device certificate.
-        /// </summary>
-        /// <returns>Stored device certificate.</returns>
-        public X509Certificate2 GetDeviceCertificate()
-        {
-            return this.deviceCertificate;
-        }
-
-        /// <summary>
-        /// Stores a manually provided device certificate.
-        /// </summary>
-        /// <param name="certificate">The device's root certificate.</param>
-        public void SetDeviceCertificate(X509Certificate2 certificate)
-        {
-            this.deviceCertificate = certificate;
-        }
-
-        /// <summary>
-        /// Updates the device's connection Uri.
-        /// </summary>
-        /// <param name="requiresHttps">Indicates whether or not to always require a secure connection.</param>
-        public void UpdateConnection(bool requiresHttps)
-        {
-            this.Connection = new Uri(
-                string.Format(
-                    "{0}://{1}",
-                    requiresHttps ? "https" : "http",
-                    this.Connection.Authority));
-        }
-        
-        /// <summary>
-        /// Updates the device's connection Uri.
-        /// </summary>
-        /// <param name="ipConfig">Object that describes the current network configuration.</param>
-        /// <param name="requiresHttps">True if an https connection is required, false otherwise.</param>
-        /// <param name="preservePort">True if the previous connection's port is to continue to be used, false otherwise.</param>
-        public void UpdateConnection(
-            IpConfiguration ipConfig,
-            bool requiresHttps,
-            bool preservePort)
-        {
-            Uri newConnection = null;
-
-            foreach (NetworkAdapterInfo adapter in ipConfig.Adapters)
-            {
-                foreach (IpAddressInfo addressInfo in adapter.IpAddresses)
-                {
-                    // We take the first, non-169.x.x.x address we find that is not 0.0.0.0.
-                    if ((addressInfo.Address != "0.0.0.0") && !addressInfo.Address.StartsWith("169."))
-                    {
-<<<<<<< HEAD
-                        string port = "";
-                        string[] addressParts = this.Connection.Authority.Split(':');
-                        if (addressParts.Length == 2)
-                        {
-                            port = string.Format(":{0}", addressParts[1]);
-=======
-                        string address = addressInfo.Address;
-                        if (preservePort)
-                        {
-                            address = string.Format("{0}:{1}",
-                                address,
-                                this.Connection.Port);
->>>>>>> upstream/master
-                        }
-
-                        newConnection = new Uri(
-                            string.Format(
-                                "{0}://{1}{2}",
-                                requiresHttps ? "https" : "http",
-<<<<<<< HEAD
-                                addressInfo.Address,
-                                port));
-=======
-                                address));
->>>>>>> upstream/master
-                        break;
-                    }
-                }
-
-                if (newConnection != null)
-                {
-                    this.Connection = newConnection;
-                    break;
-                }
-            }
-        }
-    }
-}

From d1941d9846ee0e88e911fa13c21fe112ff5d5d82 Mon Sep 17 00:00:00 2001
From: Hirsch Singhal <hps.scout@gmail.com>
Date: Fri, 14 Oct 2016 20:44:54 -0700
Subject: [PATCH 18/51] Change array return types to Lists for #189 (#191)

---
 .../Core/PerformanceDataTests.cs              |  2 +-
 .../IoT/IoT_rs1_release.cs                    |  5 +--
 .../XboxOne/XboxOne_rs1_xbox_rel_1608.cs      |  2 +-
 .../Core/PerformanceData.cs                   | 32 +++++++------------
 .../IoT/ApplicationManager.cs                 |  5 +--
 .../IoT/BluetoothConnectivity.cs              |  7 ++--
 .../IoT/DeviceInfo.cs                         |  7 ++--
 .../IoT/IcsManager.cs                         |  5 +--
 .../IoT/Limpet.cs                             |  3 +-
 9 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/WindowsDevicePortalWrapper/UnitTestProject/Core/PerformanceDataTests.cs b/WindowsDevicePortalWrapper/UnitTestProject/Core/PerformanceDataTests.cs
index 5101c52a..f1e470d5 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/Core/PerformanceDataTests.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/Core/PerformanceDataTests.cs
@@ -132,7 +132,7 @@ public void GetSystemPerfWebSocketTest()
         /// <param name="runningProcesses">The <see cref="RunningProcesses" /> to validate.</param>
         private static void ValidateRunningProcessesAsync(RunningProcesses runningProcesses)
         {
-            List<DeviceProcessInfo> processes = new List<DeviceProcessInfo>(runningProcesses.Processes);
+            List<DeviceProcessInfo> processes = runningProcesses.Processes;
 
             // Check some known things about this response.
             Assert.AreEqual(2, processes.Count);
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/IoT/IoT_rs1_release.cs b/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/IoT/IoT_rs1_release.cs
index a225de96..dd12df49 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/IoT/IoT_rs1_release.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/IoT/IoT_rs1_release.cs
@@ -5,6 +5,7 @@
 //----------------------------------------------------------------------------------------------
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -589,7 +590,7 @@ public void GetHeadlessAppsListInfo_IoT()
             HeadlessAppsListInfo appsList = getTask.Result;
 
             // Check some known things about this response.
-            Assert.AreEqual(true, appsList.AppPackages[0].IsStartup);
+            Assert.AreEqual(true, appsList.AppPackages.First().IsStartup);
         }
 
         /// <summary>
@@ -771,7 +772,7 @@ public void GetIcsInterfacesInfo_IoT()
             IscInterfacesInfo icsInterfaceInfo = getTask.Result;
 
             // Check some known things about this response.
-            Assert.AreEqual("Broadcom 802.11n Wireless SDIO Adapter", icsInterfaceInfo.PrivateInterfaces[0]);
+            Assert.AreEqual("Broadcom 802.11n Wireless SDIO Adapter", icsInterfaceInfo.PrivateInterfaces.First());
         }
 
         /// <summary>
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/XboxOne/XboxOne_rs1_xbox_rel_1608.cs b/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/XboxOne/XboxOne_rs1_xbox_rel_1608.cs
index bfb97c82..91c2335f 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/XboxOne/XboxOne_rs1_xbox_rel_1608.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/XboxOne/XboxOne_rs1_xbox_rel_1608.cs
@@ -669,7 +669,7 @@ public void SetXboxLiveSandboxTest()
         /// <param name="runningProcesses">The <see cref="RunningProcesses" /> to validate.</param>
         private static void ValidateRunningProcessesAsync(RunningProcesses runningProcesses)
         {
-            List<DeviceProcessInfo> processes = new List<DeviceProcessInfo>(runningProcesses.Processes);
+            List<DeviceProcessInfo> processes = runningProcesses.Processes;
 
             // Check some known things about this response.
             Assert.AreEqual(75, processes.Count);
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/PerformanceData.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/PerformanceData.cs
index 1b2f835a..16322971 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/PerformanceData.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/PerformanceData.cs
@@ -412,7 +412,7 @@ public class RunningProcesses
             /// Gets list of running processes.
             /// </summary>
             [DataMember(Name = "Processes")]
-            public DeviceProcessInfo[] Processes { get; private set; }
+            public List<DeviceProcessInfo> Processes { get; private set; }
 
             /// <summary>
             /// Checks to see if this process Id is in the list of processes
@@ -423,18 +423,14 @@ public bool Contains(int processId)
             {
                 bool found = false;
 
-                if (this.Processes != null)
+                foreach (DeviceProcessInfo pi in this.Processes)
                 {
-                    foreach (DeviceProcessInfo pi in this.Processes)
+                    if (pi.ProcessId == processId)
                     {
-                        if (pi.ProcessId == processId)
-                        {
-                            found = true;
-                            break;
-                        }
+                        found = true;
+                        break;
                     }
                 }
-
                 return found;
             }
 
@@ -448,21 +444,17 @@ public bool Contains(string packageName, bool caseSensitive = true)
             {
                 bool found = false;
 
-                if (this.Processes != null)
+                foreach (DeviceProcessInfo pi in this.Processes)
                 {
-                    foreach (DeviceProcessInfo pi in this.Processes)
+                    if (string.Compare(
+                            pi.PackageFullName,
+                            packageName,
+                            caseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase) == 0)
                     {
-                        if (string.Compare(
-                                pi.PackageFullName,
-                                packageName,
-                                caseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase) == 0)
-                        {
-                            found = true;
-                            break;
-                        }
+                        found = true;
+                        break;
                     }
                 }
-
                 return found;
             }
         }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ApplicationManager.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ApplicationManager.cs
index a7881c25..ee0f3a2c 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ApplicationManager.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ApplicationManager.cs
@@ -5,6 +5,7 @@
 //----------------------------------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.Serialization;
 using System.Threading.Tasks;
@@ -119,7 +120,7 @@ public class AppsListInfo
             /// Gets or sets the application packages
             /// </summary>
             [DataMember(Name = "AppPackages")]
-            public AppPackage[] AppPackages { get; private set; }
+            public List<AppPackage> AppPackages { get; private set; }
         }
 
         [DataContract]
@@ -148,7 +149,7 @@ public class HeadlessAppsListInfo
             /// Gets the list of headless application packages
             /// </summary>
             [DataMember(Name = "AppPackages")]
-            public AppPackage[] AppPackages { get; private set; }
+            public List<AppPackage> AppPackages { get; private set; }
         }
        
         #endregion // Data contract
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/BluetoothConnectivity.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/BluetoothConnectivity.cs
index 34b1d2ba..740f7cb2 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/BluetoothConnectivity.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/BluetoothConnectivity.cs
@@ -9,6 +9,7 @@
 using System.Runtime.Serialization;
 using System.Threading.Tasks;
 using System.Threading;
+using System.Collections.Generic;
 
 namespace Microsoft.Tools.WindowsDevicePortal
 {
@@ -359,7 +360,7 @@ public class AvailableBluetoothDevicesInfo
             /// Returns a list of available devices
             /// </summary>
             [DataMember(Name = "AvailableDevices")]
-            public BluetoothDeviceInfo[] AvailableDevices;
+            public List<BluetoothDeviceInfo> AvailableDevices { get; private set; }
         }
         public class BluetoothDeviceInfo 
         {
@@ -386,7 +387,7 @@ public class PairedBluetoothDevicesInfo
             /// Returns a list of paired devices
             /// </summary>
             [DataMember(Name = "PairedDevices")]
-            public BluetoothDeviceInfo[] PairedDevices;
+            public List<BluetoothDeviceInfo> PairedDevices { get; private set; }
         }
 
         /// <summary>
@@ -399,7 +400,7 @@ public class PairBluetoothDevicesInfo
             /// Returns the pair results
             /// </summary>
             [DataMember(Name = "PairResult")]
-            public PairResult PairResult;
+            public PairResult PairResult { get; private set; }
         }
 
         public class PairResult
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/DeviceInfo.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/DeviceInfo.cs
index fded71c2..bf82ecfb 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/DeviceInfo.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/DeviceInfo.cs
@@ -5,6 +5,7 @@
 //----------------------------------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.Serialization;
 using System.Threading.Tasks;
@@ -245,7 +246,7 @@ public class TimezoneInfo
             /// Gets the list of all timezones
             /// </summary>
             [DataMember(Name = "Timezones")]
-            public Timezone[] Timezones { get; private set; }
+            public List<Timezone> Timezones { get; private set; }
         }
 
         /// <summary>
@@ -345,7 +346,7 @@ public class ControllerDriverInfo
             /// Gets the list of all the controller drivers information
             /// </summary>         
             [DataMember(Name = "ControllersDrivers")]
-            public string[] ControllersDrivers { get; private set; }
+            public List<string> ControllersDrivers { get; private set; }
 
             /// <summary>
             /// Gets the request for reboot
@@ -383,7 +384,7 @@ public class DisplayResolutionInfo
             /// Gets the list of resolution specifications
             /// </summary>
             [DataMember(Name = "Resolutions")]
-            public Resolution[] Resolutions { get; private set; }
+            public List<Resolution> Resolutions { get; private set; }
         }
 
         /// <summary>
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/IcsManager.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/IcsManager.cs
index b598db67..5ffff40a 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/IcsManager.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/IcsManager.cs
@@ -5,6 +5,7 @@
 //----------------------------------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.Serialization;
 using System.Threading.Tasks;
@@ -71,13 +72,13 @@ public class IscInterfacesInfo
             /// Gets the internet connection sharing(ICS) private interfaces.
             /// </summary>
             [DataMember(Name = "PrivateInterfaces")]
-            public string[] PrivateInterfaces { get; private set; }
+            public List<string> PrivateInterfaces { get; private set; }
 
             /// <summary>
             ///  Gets the internet connection sharing(ICS) public interfaces.
             /// </summary>
             [DataMember(Name = "PublicInterfaces")]
-            public string[] PublicInterfaces { get; private set; }
+            public List<string> PublicInterfaces { get; private set; }
         }
         #endregion // Data contract
     }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/Limpet.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/Limpet.cs
index eaeee9d0..ce0cfa4c 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/Limpet.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/Limpet.cs
@@ -5,6 +5,7 @@
 //----------------------------------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.Serialization;
 using System.Threading.Tasks;
@@ -160,7 +161,7 @@ public class TpmAcpiTablesInfo
             /// Gets TPM ACPI Tables. 
             /// </summary>
             [DataMember(Name = "AcpiTables")]
-            public string[] AcpiTables { get; private set; }        
+            public List<string> AcpiTables { get; private set; }        
         }
 
         /// <summary>

From 175a5410cdb013f5cecfcd0c3dbefb25b01a343d Mon Sep 17 00:00:00 2001
From: Hirsch Singhal <hps.scout@gmail.com>
Date: Mon, 17 Oct 2016 09:31:45 -0700
Subject: [PATCH 19/51] App, process, and crash dump collection APIs (#193)

* Add usermode crash dump APIs

* Additional fixes to DumpCollection

* Add kernel, live, and app dump APIs.

* StyleCop pass
---
 .../Core/AppCrashDumpCollection.cs            | 223 ++++++++++++++++++
 .../Core/DumpCollection.cs                    | 213 +++++++++++++++--
 .../IoT/ApplicationManager.cs                 |   2 +-
 ...indowsDevicePortalWrapper.Shared.projitems |   1 +
 4 files changed, 424 insertions(+), 15 deletions(-)
 create mode 100644 WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppCrashDumpCollection.cs

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppCrashDumpCollection.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppCrashDumpCollection.cs
new file mode 100644
index 00000000..17acfa3a
--- /dev/null
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppCrashDumpCollection.cs
@@ -0,0 +1,223 @@
+//----------------------------------------------------------------------------------------------
+// <copyright file="AppCrashDumpCollection.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Threading.Tasks;
+
+namespace Microsoft.Tools.WindowsDevicePortal
+{
+    /// <content>
+    /// Wrappers for app crash dump collection methods.
+    /// </content>
+    public partial class DevicePortal
+    {
+        /// <summary>
+        /// API to retrieve list of the available crash dumps (for sideloaded applications).
+        /// </summary>
+        public static readonly string AvailableCrashDumpsApi = "api/debug/dump/usermode/dumps";
+
+        /// <summary>
+        /// API to download or delete a crash dump file (for a sideloaded application).
+        /// </summary>
+        public static readonly string CrashDumpFileApi = "api/debug/dump/usermode/crashdump";
+
+        /// <summary>
+        /// API to control the crash dump settings for a sideloaded application.
+        /// </summary>
+        public static readonly string CrashDumpSettingsApi = "api/debug/dump/usermode/crashcontrol";
+
+        /// <summary>
+        /// Get a list of app crash dumps on the device. 
+        /// </summary>
+        /// <returns>List of AppCrashDump objects, which represent crashdumps on the device. </returns>
+        public async Task<List<AppCrashDump>> GetAppCrashDumpListAsync()
+        {
+            AppCrashDumpList cdl = await this.GetAsync<AppCrashDumpList>(AvailableCrashDumpsApi);
+            return cdl.CrashDumps;
+        }
+
+        /// <summary>
+        /// Download a sideloaded app's crash dump.  
+        /// </summary>
+        /// <param name="crashdump"> The AppCrashDump to download</param>
+        /// <returns>Stream of the crash dump</returns>
+        public async Task<Stream> GetAppCrashDumpAsync(AppCrashDump crashdump)
+        {
+            string queryString = CrashDumpFileApi + string.Format("?packageFullName={0}&fileName={1}", crashdump.PackageFullName, crashdump.Filename);
+            Uri uri = Utilities.BuildEndpoint(
+                this.deviceConnection.Connection,
+                queryString);
+
+            return await this.GetAsync(uri);
+        }
+
+        /// <summary>
+        /// Delete an app crash dump stored on the device. 
+        /// </summary>
+        /// <param name="crashdump">The crashdump to be deleted</param>
+        /// <returns>Task tracking completion of the request.</returns>
+        public async Task DeleteAppCrashDumpAsync(AppCrashDump crashdump)
+        {
+            await this.DeleteAsync(CrashDumpFileApi,
+                string.Format("packageFullName={0}&fileName={1}", crashdump.PackageFullName, crashdump.Filename));
+        }
+
+        /// <summary>
+        /// Get the crash settings for a sideloaded app. 
+        /// </summary>
+        /// <param name="app">The app to get settings for</param>
+        /// <returns>The crash settings for the app</returns>
+        public async Task<AppCrashDumpSettings> GetAppCrashDumpSettingsAsync(AppPackage app)
+        {
+            return await this.GetAppCrashDumpSettingsAsync(app.PackageFullName);
+        }
+
+        /// <summary>
+        /// Get the crash settings for a sideloaded app. 
+        /// </summary>
+        /// <param name="packageFullname">The app to get settings for</param>
+        /// <returns>The crash settings for the app</returns>
+        public async Task<AppCrashDumpSettings> GetAppCrashDumpSettingsAsync(string packageFullname)
+        {
+            return await this.GetAsync<AppCrashDumpSettings>(
+                CrashDumpSettingsApi,
+                string.Format("packageFullname={0}", packageFullname));
+        }
+
+        /// <summary>
+        /// Set the crash settings for a sideloaded app. 
+        /// </summary>
+        /// <param name="app">The app to set crash settings for.</param>
+        /// <param name="enable">Whether to enable or disable crash collection for the app. </param>
+        /// <returns>Task tracking completion of the request.</returns>
+        public async Task SetAppCrashDumpSettingsAsync(AppPackage app, bool enable = true)
+        {
+            string pfn = app.PackageFullName;
+            await SetAppCrashDumpSettingsAsync(pfn, enable);
+        }
+
+        /// <summary>
+        /// Set the crash settings for a sideloaded app. 
+        /// </summary>
+        /// <param name="packageFullname">The app to set crash settings for.</param>
+        /// <param name="enable">Whether to enable or disable crash collection for the app. </param>
+        /// <returns>Task tracking completion of the request.</returns>
+        public async Task SetAppCrashDumpSettingsAsync(string packageFullName, bool enable = true)
+        {
+            if (enable)
+            {
+                await this.PostAsync(
+                    CrashDumpSettingsApi,
+                string.Format("packageFullName={0}", packageFullName));
+            }
+            else
+            {
+                await this.DeleteAsync(
+                    CrashDumpSettingsApi,
+                string.Format("packageFullName={0}", packageFullName));
+            }
+        }
+
+        #region Data contract
+
+        /// <summary>
+        /// Per-app crash dump settings.
+        /// </summary>
+        [DataContract]
+        public class AppCrashDumpSettings
+        {
+            /// <summary>
+            /// Gets whether crash dumps are enabled for the app
+            /// </summary>
+            [DataMember(Name = "CrashDumpEnabled")]
+            public bool CrashDumpEnabled
+            {
+                get;
+                private set;
+            }
+        }
+
+        /// <summary>
+        /// Represents a crash dump collected from a sideloaded app. 
+        /// </summary>
+        [DataContract]
+        public class AppCrashDump 
+        {
+
+            /// <summary>
+            /// Gets the timestamp of the crash as a string.
+            /// </summary>
+            [DataMember(Name = "FileDate")]
+            public string FileDateAsString
+            {
+                get;
+                private set;
+            }
+
+            /// <summary>
+            /// Gets the timestamp of the crash.
+            /// </summary>
+            public DateTime FileDate
+            {
+                get
+                {
+                    return DateTime.Parse(this.FileDateAsString);
+                }
+            }
+
+            /// <summary>
+            /// Gets the filename of the crash file. 
+            /// </summary>
+            [DataMember(Name = "FileName")]
+            public string Filename
+            {
+                get;
+                private set;
+            }
+
+            /// <summary>
+            /// Gets the size of the crash dump, in bytes
+            /// </summary>
+            [DataMember(Name = "FileSize")]
+            public uint FileSizeInBytes
+            {
+                get;
+                private set;
+            }
+
+            /// <summary>
+            /// Gets the package full name of the app that crashed. 
+            /// </summary>
+            [DataMember(Name = "PackageFullName")]
+            public string PackageFullName
+            {
+                get;
+                private set;
+            }
+        }
+
+        /// <summary>
+        /// A list of crash dumps.  Internal usage only. 
+        /// </summary>
+        [DataContract]
+        private class AppCrashDumpList
+        {
+            /// <summary>
+            /// Gets a list of crash dumps on the device. 
+            /// </summary>
+            [DataMember(Name = "CrashDumps")]
+            public List<AppCrashDump> CrashDumps
+            {
+                get;
+                private set;
+            }
+        }
+        #endregion Data contract
+    }
+}
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs
index dce34655..94b32808 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs
@@ -4,6 +4,12 @@
 // </copyright>
 //----------------------------------------------------------------------------------------------
 
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Threading.Tasks;
+
 namespace Microsoft.Tools.WindowsDevicePortal
 {
     /// <content>
@@ -14,12 +20,7 @@ public partial class DevicePortal
         /// <summary>
         /// API to retrieve list of the available bugcheck minidumps.
         /// </summary>
-        public static readonly string AvailableBugChecksApi = "api/debug/dump/kernel/dumplish";
-
-        /// <summary>
-        /// API to retrieve list of the available crash dumps (for sideloaded applications).
-        /// </summary>
-        public static readonly string AvailableCrashDumpsApi = "api/debug/dump/usermode/dumps";
+        public static readonly string AvailableBugChecksApi = "api/debug/dump/kernel/dumplist";
 
         /// <summary>
         /// API to download a bugcheck minidump file.
@@ -32,23 +33,207 @@ public partial class DevicePortal
         public static readonly string BugcheckSettingsApi = "api/debug/dump/kernel/crashcontrol";
 
         /// <summary>
-        /// API to download or delete a crash dump file (for a sideloaded application).
+        /// API to retrieve a live kernel dump.
         /// </summary>
-        public static readonly string CrashDumpFileApi = "api/debug/dump/usermode/crashdump";
+        public static readonly string LiveKernelDumpApi = "api/debug/dump/livekernel";
 
         /// <summary>
-        /// API to control the crash dump settings for a sideloaded application.
+        /// API to retrieve a live dump from a running user mode process.
         /// </summary>
-        public static readonly string CrashDumpSettingsApi = "api/debug/dump/usermode/crashcontrol";
+        public static readonly string LiveProcessDumpApi = "api/debug/dump/usermode/live";
 
         /// <summary>
-        /// API to retrieve a live kernel dump.
+        /// Get a list of dumpfiles on the system. 
         /// </summary>
-        public static readonly string LiveKernelDumpApi = "api/debug/dump/livekernel";
+        /// <returns>List of Dumpfiles.  Use GetDumpFile to download the file. </returns>
+        public async Task<List<Dumpfile>> GetDumpfileListAsync()
+        {
+            DumpFileList dfl = await this.GetAsync<DumpFileList>(AvailableBugChecksApi);
+            return dfl.DumpFiles;
+        }
 
         /// <summary>
-        /// API to retrieve a live dump from a running user mode process.
+        /// Download a dumpfile from the system. 
         /// </summary>
-        public static readonly string LiveProcessDumpApi = "api/debug/dump/usermode/live";
+        /// <param name="crashdump"> Dumpfile object to be downloaded</param>
+        /// <returns>Stream of the dump file </returns>
+        public async Task<Stream> GetDumpFileAsync(Dumpfile crashdump)
+        {
+            string queryString = BugcheckFileApi + string.Format("?filename={0}", crashdump.Filename);
+            Uri uri = Utilities.BuildEndpoint(
+                this.deviceConnection.Connection,
+                queryString);
+
+            return await this.GetAsync(uri);
+        }
+
+        /// <summary>
+        /// Takes a live kernel dump of the device.  This does not reboot the device. 
+        /// </summary>
+        /// <returns>Stream of the kernel dump</returns>
+        public async Task<Stream> GetLiveKernelDumpAsync()
+        {
+            Uri uri = Utilities.BuildEndpoint(
+                this.deviceConnection.Connection,
+                LiveKernelDumpApi);
+
+            return await this.GetAsync(uri);
+        }
+
+        /// <summary>
+        /// Take a live dump of a process on the system. 
+        /// </summary>
+        /// <param name="pid"> PID of the process to get a live dump of.</param>
+        /// <returns>Stream of the process live dump</returns>
+        public async Task<Stream> GetLiveProcessDumpAsync(int pid)
+        {
+            string queryString = LiveProcessDumpApi + string.Format("?pid={0}", pid);
+            Uri uri = Utilities.BuildEndpoint(
+                this.deviceConnection.Connection,
+                queryString);
+
+            return await this.GetAsync(uri);
+        }
+
+        /// <summary>
+        /// Get information on how and when dump files are saved on the device. 
+        /// </summary>
+        /// <returns>Dumpfile settings object.  This can be edited and returned to the device to alter the settings.</returns>
+        public async Task<DumpFileSettings> GetDumpFileSettingsAsync()
+        {
+            return await this.GetAsync<DumpFileSettings>(BugcheckSettingsApi);
+        }
+
+        /// <summary>
+        /// Set how and when dump files are saved on the device. 
+        /// </summary>
+        /// <param name="dfs">Altered DumpFileSettings object to set on the device</param>
+        /// <returns>Task tracking completion of the request</returns>
+        public async Task SetDumpFileSettingsAsync(DumpFileSettings dfs)
+        {
+            await this.PostAsync(
+                BugcheckSettingsApi,
+                string.Format(
+                    "autoreboot={0}&overwrite={1}&dumptype={2}&maxdumpcount={3}",
+                    dfs.AutoReboot ? "1" : "0", dfs.Overwrite ? "1" : "0", (int)dfs.DumpType, dfs.MaxDumpCount));
+        }
+    }
+
+    #region Data Contract
+
+    /// <summary>
+    /// DumpFileSettings object.  Used to get and set how and when a dump is saved on the device. 
+    /// </summary>
+    [DataContract]
+    public class DumpFileSettings
+    {
+        /// <summary>
+        /// Gets or sets whether the device should restart after a crash dump is taken.
+        /// </summary>
+        [DataMember(Name = "autoreboot")]
+        public bool AutoReboot { get; set; }
+
+        /// <summary>
+        /// Gets or sets the type of dump to be saved when a bugcheck occurs.  
+        /// </summary>
+        [DataMember(Name = "dumptype")]
+        public DumpTypes DumpType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the max number of dumps to be saved on the device. 
+        /// </summary>
+        [DataMember(Name = "maxdumpcount")]
+        public int MaxDumpCount { get; set; }
+
+        /// <summary>
+        /// Gets or sets whether new dumps should overwrite older dumps. 
+        /// </summary>
+        [DataMember(Name = "overwrite")]
+        public bool Overwrite { get; set; }
+
+        /// <summary>
+        /// The 3 types of dumps  that can be saved on the device (or not saved at all). 
+        /// </summary>
+        public enum DumpTypes
+        {
+            /// <summary>
+            /// Don't collect device crash dumps
+            /// </summary>
+            Disabled = 0,
+            
+            /// <summary>
+            /// Collect all in use memory
+            /// </summary>
+            CompleteMemoryDump = 1,
+
+            /// <summary>
+            /// Don't include usermode memory in the dump
+            /// </summary>
+            KernelDump = 2,
+            
+            /// <summary>
+            /// Limited kernel dump
+            /// </summary>
+            Minidump = 3
+        }
+    }
+
+    /// <summary>
+    /// Gets a list of kernel dumps on the device. 
+    /// </summary>
+    [DataContract]
+    public class DumpFileList
+    {
+        /// <summary>
+        /// Gets a list of kernel dumps on the device. 
+        /// </summary>
+        [DataMember(Name = "DumpFiles")]
+        public List<Dumpfile> DumpFiles { get; private set; }
+    }
+
+    /// <summary>
+    /// Represents a dumpfile stored on the device. 
+    /// </summary>
+    [DataContract]
+    public class Dumpfile
+    {
+        /// <summary>
+        /// Gets the timestamp of the crash as a string.
+        /// </summary>
+        [DataMember(Name = "FileDate")]
+        public string FileDateAsString
+        {
+            get; private set;
+        }
+
+        /// <summary>
+        /// Gets the timestamp of the crash.
+        /// </summary>
+        public DateTime FileDate
+        {
+            get
+            {
+                return DateTime.Parse(this.FileDateAsString);
+            }
+        }
+
+        /// <summary>
+        /// Gets the filename of the crash file. 
+        /// </summary>
+        [DataMember(Name = "FileName")]
+        public string Filename
+        {
+            get; private set;
+        }
+
+        /// <summary>
+        /// Gets the size of the crash dump, in bytes
+        /// </summary>
+        [DataMember(Name = "FileSize")]
+        public uint FileSizeInBytes
+        {
+            get; private set;
+        }
     }
+    #endregion Data Contract
 }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ApplicationManager.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ApplicationManager.cs
index ee0f3a2c..2842f4e2 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ApplicationManager.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ApplicationManager.cs
@@ -117,7 +117,7 @@ public class AppsListInfo
             public string DefaultApp { get; private set; }
 
             /// <summary>
-            /// Gets or sets the application packages
+            /// Gets the application packages
             /// </summary>
             [DataMember(Name = "AppPackages")]
             public List<AppPackage> AppPackages { get; private set; }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/WindowsDevicePortalWrapper.Shared.projitems b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/WindowsDevicePortalWrapper.Shared.projitems
index 658e39da..488cd40d 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/WindowsDevicePortalWrapper.Shared.projitems
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/WindowsDevicePortalWrapper.Shared.projitems
@@ -9,6 +9,7 @@
     <Import_RootNamespace>Microsoft.Tools.WindowsDevicePortal</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)Core\AppCrashDumpCollection.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\AppDeployment.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\AppFileExplorer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\DeviceManager.cs" />

From 0a6f579df66731eedb831d574bbe13dfa474e178 Mon Sep 17 00:00:00 2001
From: David Kline <davidkl_work@live.com>
Date: Wed, 19 Oct 2016 12:49:07 -0700
Subject: [PATCH 20/51] add file type association for appxbundle

---
 .../Package.appxmanifest                              | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/Samples/SampleWdpClient.UniversalWindows/Package.appxmanifest b/Samples/SampleWdpClient.UniversalWindows/Package.appxmanifest
index b615b31e..5d25bc58 100644
--- a/Samples/SampleWdpClient.UniversalWindows/Package.appxmanifest
+++ b/Samples/SampleWdpClient.UniversalWindows/Package.appxmanifest
@@ -20,10 +20,21 @@
         </uap:DefaultTile>
         <uap:SplashScreen Image="Assets\SplashScreen.png" />
       </uap:VisualElements>
+      <Extensions>
+        <uap:Extension Category="windows.fileTypeAssociation">
+          <uap:FileTypeAssociation Name="apppackagebundle">
+            <uap:EditFlags OpenIsSafe="true" />
+            <uap:SupportedFileTypes>
+              <uap:FileType>.appxbundle</uap:FileType>
+            </uap:SupportedFileTypes>
+          </uap:FileTypeAssociation>
+        </uap:Extension>
+      </Extensions>
     </Application>
   </Applications>
   <Capabilities>
     <Capability Name="internetClient" />
     <Capability Name="privateNetworkClientServer" />
+    <uap:Capability Name="removableStorage" />
   </Capabilities>
 </Package>
\ No newline at end of file

From a3af3bc0c043ee4dd4aaf39cc2cfdf2ae3de7aa4 Mon Sep 17 00:00:00 2001
From: David Kline <davidkl_work@live.com>
Date: Wed, 19 Oct 2016 12:51:07 -0700
Subject: [PATCH 21/51] tweak appxbundle association

---
 Samples/SampleWdpClient.UniversalWindows/Package.appxmanifest | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Samples/SampleWdpClient.UniversalWindows/Package.appxmanifest b/Samples/SampleWdpClient.UniversalWindows/Package.appxmanifest
index 5d25bc58..5f0b33f5 100644
--- a/Samples/SampleWdpClient.UniversalWindows/Package.appxmanifest
+++ b/Samples/SampleWdpClient.UniversalWindows/Package.appxmanifest
@@ -23,7 +23,6 @@
       <Extensions>
         <uap:Extension Category="windows.fileTypeAssociation">
           <uap:FileTypeAssociation Name="apppackagebundle">
-            <uap:EditFlags OpenIsSafe="true" />
             <uap:SupportedFileTypes>
               <uap:FileType>.appxbundle</uap:FileType>
             </uap:SupportedFileTypes>

From 0d482e0da66f1f7219c2240ef6c593d27d62c9d3 Mon Sep 17 00:00:00 2001
From: David Kline <davidkl_work@live.com>
Date: Thu, 27 Oct 2016 13:40:11 -0700
Subject: [PATCH 22/51] fix GetMrcFileDataAsync

---
 .../HoloLens/MixedRealityCapture.cs                  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
index d0ab6ce9..bb4631fd 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
@@ -199,12 +199,16 @@ public async Task<byte[]> GetMrcFileDataAsync(
 
             string apiPath = isThumbnailRequest ? MrcThumbnailApi : MrcFileApi;
 
-            using (MemoryStream data = await this.GetAsync<MemoryStream>(
+            String payload = String.Format("filename={0}", Utilities.Hex64Encode(fileName));
+            Uri uri = Utilities.BuildEndpoint(
+                this.deviceConnection.Connection,
                 apiPath,
-                string.Format("filename={0}", Utilities.Hex64Encode(fileName))))
+                payload);
+
+            using (Stream dataStream = await this.GetAsync(uri))
             {
-                dataBytes = new byte[data.Length];
-                data.Read(dataBytes, 0, dataBytes.Length);
+                dataBytes = new byte[dataStream.Length];
+                dataStream.Read(dataBytes, 0, dataBytes.Length);
             }
 
             return dataBytes;   

From 3645ccdadf6dd41a9b9bbbbbc40c3821de9f6dc4 Mon Sep 17 00:00:00 2001
From: David Kline <davidkl_work@live.com>
Date: Thu, 27 Oct 2016 13:41:14 -0700
Subject: [PATCH 23/51] remove manifest change

---
 .../Package.appxmanifest                                 | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Samples/SampleWdpClient.UniversalWindows/Package.appxmanifest b/Samples/SampleWdpClient.UniversalWindows/Package.appxmanifest
index 5f0b33f5..0c5e4426 100644
--- a/Samples/SampleWdpClient.UniversalWindows/Package.appxmanifest
+++ b/Samples/SampleWdpClient.UniversalWindows/Package.appxmanifest
@@ -20,15 +20,6 @@
         </uap:DefaultTile>
         <uap:SplashScreen Image="Assets\SplashScreen.png" />
       </uap:VisualElements>
-      <Extensions>
-        <uap:Extension Category="windows.fileTypeAssociation">
-          <uap:FileTypeAssociation Name="apppackagebundle">
-            <uap:SupportedFileTypes>
-              <uap:FileType>.appxbundle</uap:FileType>
-            </uap:SupportedFileTypes>
-          </uap:FileTypeAssociation>
-        </uap:Extension>
-      </Extensions>
     </Application>
   </Applications>
   <Capabilities>

From 3256c144e2b8bb535e760515a421f23d30163b21 Mon Sep 17 00:00:00 2001
From: David Kline <davidkl_work@live.com>
Date: Mon, 31 Oct 2016 12:52:58 -0700
Subject: [PATCH 24/51] completes implementation of the mixed reality capture
 api (issue 71)

---
 .../Package.appxmanifest                      |   1 -
 .../HoloLens/MixedRealityCapture.cs           | 261 +++++++++++++++++-
 2 files changed, 258 insertions(+), 4 deletions(-)

diff --git a/Samples/SampleWdpClient.UniversalWindows/Package.appxmanifest b/Samples/SampleWdpClient.UniversalWindows/Package.appxmanifest
index 0c5e4426..b615b31e 100644
--- a/Samples/SampleWdpClient.UniversalWindows/Package.appxmanifest
+++ b/Samples/SampleWdpClient.UniversalWindows/Package.appxmanifest
@@ -25,6 +25,5 @@
   <Capabilities>
     <Capability Name="internetClient" />
     <Capability Name="privateNetworkClientServer" />
-    <uap:Capability Name="removableStorage" />
   </Capabilities>
 </Package>
\ No newline at end of file
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
index bb4631fd..eb333e56 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
@@ -199,7 +199,7 @@ public async Task<byte[]> GetMrcFileDataAsync(
 
             string apiPath = isThumbnailRequest ? MrcThumbnailApi : MrcFileApi;
 
-            String payload = String.Format("filename={0}", Utilities.Hex64Encode(fileName));
+            string payload = string.Format("filename={0}", Utilities.Hex64Encode(fileName));
             Uri uri = Utilities.BuildEndpoint(
                 this.deviceConnection.Connection,
                 apiPath,
@@ -270,7 +270,20 @@ public Uri GetMrcLiveStreamUri(
                 payload);
         }
 
-        // TODO: GetMrcSettings()
+        /// <summary>
+        /// Gets the current Mixed Reality Capture settings
+        /// </summary>
+        /// <returns>MrcSettings object containing the current settings</returns>
+        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        public async Task<MrcSettings> GetMrcSettings()
+        {
+            if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
+            {
+                throw new NotSupportedException("This method is only supported on HoloLens.");
+            }
+
+            return await this.GetAsync<MrcSettings>(MrcSettingsApi);
+        }
 
         /// <summary>
         /// Gets the status of the reality capture
@@ -299,7 +312,31 @@ public async Task<byte[]> GetMrcThumbnailDataAsync(string fileName)
             return await this.GetMrcFileDataAsync(fileName, true);
         }
 
-        // TODO: SetMrcSettings()
+        /// <summary>
+        /// Sets the default Mixed Reality Capture settings
+        /// </summary>
+        /// <param name="settings"></param>
+        /// <returns>Task tracking completion of the REST call.</returns>
+        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        public async Task SetMrcSettings(MrcSettings settings)
+        {
+            if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
+            {
+                throw new NotSupportedException("This method is only supported on HoloLens.");
+            }
+
+            string payload = string.Format(
+                "holo={0}&pv={1}&mic={2}&appAudio={3}&vstabbuffer={4}",
+                settings.IncludeHolograms.ToString().ToLower(),
+                settings.IncludeColorCamera.ToString().ToLower(),
+                settings.IncludeMicrophone.ToString().ToLower(),
+                settings.IncludeAudio.ToString().ToLower(),
+                settings.VideoStabilizationBuffer);
+
+            await this.PostAsync(
+                MrcSettingsApi,
+                payload);
+        }
 
         /// <summary>
         /// Starts a Mixed Reality Capture recording.
@@ -452,6 +489,224 @@ public class MrcProcessStatus
             [DataMember(Name = "MrcProcess")]
             public string MrcProcess { get; private set; }  // TODO this should be an enum
         }
+
+        /// <summary>
+        /// Object representation of a Mixed Reality Capture setting.
+        /// </summary>
+        [DataContract]
+        public class MrcSetting
+        {
+            /// <summary>
+            /// Gets or sets the name of the setting
+            /// </summary>
+            [DataMember(Name = "Setting")]
+            public string Setting { get; set; }
+
+            /// <summary>
+            /// Gets or sets the value of the setting
+            /// </summary>
+            [DataMember(Name = "Value")]
+            public object Value { get; set; }
+        }
+
+        /// <summary>
+        /// Object representing the collection of Mixed Reality Capture settings
+        /// </summary>
+        [DataContract]
+        public class MrcSettings
+        {
+            /// <summary>
+            /// Gets the collection of settings
+            /// </summary>
+            [DataMember(Name = "MrcSettings")]    
+            public List<MrcSetting> Settings { get; private set; }
+
+            /// <summary>
+            /// Gets or sets a value indicating whether or not holograms are included.
+            /// </summary>
+            public bool IncludeHolograms
+            {
+                get
+                {
+                    object setting = this.GetSetting("EnableHolograms");
+
+                    if (setting == null)
+                    {
+                        return true;
+                    }
+
+                    return (bool)setting;
+                }
+                
+                set
+                {
+                    this.SetSetting(
+                        "EnableHolograms",
+                        value);
+                }
+            }
+
+            /// <summary>
+            /// Gets or sets a value indicating whether or not color camera data is included.
+            /// </summary>
+            public bool IncludeColorCamera
+            {
+                get
+                {
+                    object setting = this.GetSetting("EnableCamera");
+
+                    if (setting == null)
+                    {
+                        return true;
+                    }
+
+                    return (bool)setting;
+                }
+
+                set
+                {
+                    this.SetSetting(
+                        "EnableCamera",
+                        value);
+                }
+            }
+
+            /// <summary>
+            /// Gets or sets a value indicating whether or not microphone audio is included.
+            /// </summary>
+            public bool IncludeMicrophone
+            {
+                get
+                {
+                    object setting = this.GetSetting("EnableMicrophone");
+
+                    if (setting == null)
+                    {
+                        return true;
+                    }
+
+                    return (bool)setting;
+                }
+
+                set
+                {
+                    this.SetSetting(
+                        "EnableMicrophone",
+                        value);
+                }
+            }
+
+            /// <summary>
+            /// Gets or sets a value indicating whether or not audio is included.
+            /// </summary>
+            public bool IncludeAudio
+            {
+                get
+                {
+                    object setting = this.GetSetting("EnableSystemAudio");
+
+                    if (setting == null)
+                    {
+                        return true;
+                    }
+
+                    return (bool)setting;
+                }
+
+                set
+                {
+                    this.SetSetting(
+                        "EnableSystemAudio",
+                        value);
+                }
+            }
+
+            /// <summary>
+            /// Gets or sets the size, in frames, of the video stabilization buffer.
+            /// </summary>
+            public int VideoStabilizationBuffer
+            {
+                get
+                {
+                    object setting = this.GetSetting("VideoStabilizationBuffer");
+
+                    if (setting == null)
+                    {
+                        return 0;
+                    }
+
+                    return (int)setting;
+                }
+
+                set
+                {
+                    if (value < 0)
+                    {
+                        throw new ArgumentException("The video stabilization buffer value must be >= 0");
+                    }
+                    
+                    this.SetSetting(
+                        "VideoStabilizationBuffer",
+                        value);
+                }
+            }
+
+            /// <summary>
+            /// Gets the value of a setting
+            /// </summary>
+            /// <param name="settingName">The name of the setting</param>
+            /// <returns>The value of the setting, or if not found, null.</returns>
+            private object GetSetting(string settingName)
+            {
+                object value = null;
+
+                foreach (MrcSetting setting in this.Settings)
+                {
+                    if (setting.Setting == settingName)
+                    {
+                        value = setting.Value;
+                        break;
+                    }
+                }
+
+                return value;
+            }
+
+            /// <summary>
+            /// Sets the value of a Mixed Reality Capture setting.
+            /// </summary>
+            /// <param name="settingName">The name of the setting</param>
+            /// <param name="value">The value of the setting</param>
+            private void SetSetting(
+                string settingName,
+                object value)
+            {
+                // If the setting exists, update the value, otherwise create a new one.
+                MrcSetting mrcSetting = null;
+
+                foreach (MrcSetting setting in this.Settings)
+                {
+                    if (setting.Setting == settingName)
+                    {
+                        mrcSetting = setting;
+                        break;
+                    }
+                }
+
+                if (mrcSetting != null)
+                {
+                    mrcSetting.Value = value;
+                }
+                else
+                {
+                    mrcSetting = new MrcSetting();
+                    mrcSetting.Setting = settingName;
+                    mrcSetting.Value = value;
+
+                    this.Settings.Add(mrcSetting);
+                }
+            }
+        }
         #endregion Data contract
     }
 }

From 565886c599ff14cf20d9cea7e28b523cd634de8a Mon Sep 17 00:00:00 2001
From: David Kline <davidkl_work@live.com>
Date: Mon, 31 Oct 2016 13:16:24 -0700
Subject: [PATCH 25/51] append Async to the new methods

---
 .../HoloLens/MixedRealityCapture.cs                           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
index eb333e56..56718fdf 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
@@ -275,7 +275,7 @@ public Uri GetMrcLiveStreamUri(
         /// </summary>
         /// <returns>MrcSettings object containing the current settings</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task<MrcSettings> GetMrcSettings()
+        public async Task<MrcSettings> GetMrcSettingsAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
@@ -318,7 +318,7 @@ public async Task<byte[]> GetMrcThumbnailDataAsync(string fileName)
         /// <param name="settings"></param>
         /// <returns>Task tracking completion of the REST call.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task SetMrcSettings(MrcSettings settings)
+        public async Task SetMrcSettingsAsync(MrcSettings settings)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {

From 53cecb078e98c63dbbf843d4ad501054a57712f7 Mon Sep 17 00:00:00 2001
From: David Kline <davidkl_work@live.com>
Date: Mon, 31 Oct 2016 14:13:14 -0700
Subject: [PATCH 26/51] complete implementation of Holographic Perception
 Simulation Playback API

---
 .../HoloLens/PerceptionSimulationPlayback.cs  | 187 +++++++++++++++++-
 1 file changed, 178 insertions(+), 9 deletions(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationPlayback.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationPlayback.cs
index 87d4fc38..a7877fd6 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationPlayback.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationPlayback.cs
@@ -5,6 +5,7 @@
 //----------------------------------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Json;
@@ -43,9 +44,9 @@ public partial class DevicePortal
         public static readonly string HolographicSimulationPlaybackPlayApi = "api/holographic/simulation/playback/session/play";
 
         /// <summary>
-        /// API for loading or unloading a Holographic Perception Simulation recording.
+        /// API for getting the list of loaded Holographic Perception Simulation files.
         /// </summary>
-        public static readonly string HolographicSimulationPlaybackRecordingsApi = "api/holographic/simulation/playback/session/files";
+        public static readonly string HolographicSimulationPlaybackSessionFilesApi = "api/holographic/simulation/playback/session/files";
 
         /// <summary>
         /// API for retrieving the playback state of a Holographic Perception Simulation recording.
@@ -113,6 +114,58 @@ public async Task DeleteHolographicSimulationRecordingAsync(string name)
             await this.DeleteAsync(HolographicSimulationPlaybackFileApi, payload);
         }
 
+        /// <summary>
+        /// Gets the collection of Holographic Perception Simulation files on this HoloLens.
+        /// </summary>
+        /// <returns>HolographicSimulationPlaybackFiles object representing the files on the HoloLens</returns>
+        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        public async Task<HolographicSimulationPlaybackFiles> GetHolographicSimulationPlaybackFilesAsync()
+        {
+            if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
+            {
+                throw new NotSupportedException("This method is only supported on HoloLens.");
+            }
+
+            return await this.GetHolographicSimulationPlaybackFilesPrivateAsync(false);
+        }
+
+        /// <summary>
+        /// Gets the collection of loaded Holographic Perception Simulation files on this HoloLens.
+        /// </summary>
+        /// <returns>HolographicSimulationPlaybackFiles object representing the files loaded on the HoloLens</returns>
+        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        public async Task<HolographicSimulationPlaybackFiles> GetHolographicSimulationPlaybackSessionFilesAsync()
+        {
+            if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
+            {
+                throw new NotSupportedException("This method is only supported on HoloLens.");
+            }
+
+            return await this.GetHolographicSimulationPlaybackFilesPrivateAsync(true);
+        }
+
+        /// <summary>
+        /// Gets the types of data that are in a loaded Holographic Perception Simulation file.
+        /// </summary>
+        /// <param name="recordingName">Name of the recording file, with extension.</param>
+        /// <returns>HolographicSimulationDataTypes object representing they types of data in the file</returns>
+        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        public async Task<HolographicSimulationDataTypes> GetHolographicSimulationPlaybackSessionDataTypesAsync(string recordingName)
+        {
+            if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
+            {
+                throw new NotSupportedException("This method is only supported on HoloLens.");
+            }
+
+            string payload = string.Format(
+                "recording={0}",
+                recordingName);
+                
+            return await this.GetAsync<HolographicSimulationDataTypes>(
+                HolographicSimulationPlaybackDataTypesApi,
+                payload);
+        }
+
         /// <summary>
         /// Gets the playback state of a Holographic Simulation recording.
         /// </summary>
@@ -166,10 +219,10 @@ public async Task<HolographicSimulationPlaybackStates> GetHolographicSimulationP
         /// <summary>
         /// Loads the specified Holographic Simulation recording.
         /// </summary>
-        /// <param name="name">The name of the recording to load (ex: testsession.xef).</param>
+        /// <param name="recordingName">The name of the recording to load (ex: testsession.xef).</param>
         /// <returns>Task tracking completion of the REST call.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task LoadHolographicSimulationRecordingAsync(string name)
+        public async Task LoadHolographicSimulationRecordingAsync(string recordingName)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
@@ -178,18 +231,78 @@ public async Task LoadHolographicSimulationRecordingAsync(string name)
 
             string payload = string.Format(
                 "recording={0}",
-                name);
+                recordingName);
 
             await this.PostAsync(HolographicSimulationPlaybackSessionFileApi, payload);
         }
 
+        /// <summary>
+        /// Pauses playback of a Holographic Perception Simulation recording
+        /// </summary>
+        /// <param name="recordingName">The name of the recording to pause</param>
+        /// <returns>Task tracking completion of the REST call.</returns>
+        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        public async Task PauseHolographicSimulationRecordingAsync(string recordingName)
+        {
+            if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
+            {
+                throw new NotSupportedException("This method is only supported on HoloLens.");
+            }
+
+            string payload = string.Format(
+                "recording={0}",
+                recordingName);
+
+            await this.PostAsync(HolographicSimulationPlaybackPauseApi, payload);
+        }
+
+        /// <summary>
+        /// Starts playback of a Holographic Perception Simulation recording
+        /// </summary>
+        /// <param name="recordingName">The name of the recording to play</param>
+        /// <returns>Task tracking completion of the REST call.</returns>
+        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        public async Task PlayHolographicSimulationRecordingAsync(string recordingName)
+        {
+            if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
+            {
+                throw new NotSupportedException("This method is only supported on HoloLens.");
+            }
+
+            string payload = string.Format(
+                "recording={0}",
+                recordingName);
+
+            await this.PostAsync(HolographicSimulationPlaybackPlayApi, payload);
+        }
+
+        /// <summary>
+        /// Stops playback of a Holographic Perception Simulation recording
+        /// </summary>
+        /// <param name="recordingName">The name of the recording to stop</param>
+        /// <returns>Task tracking completion of the REST call.</returns>
+        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        public async Task StopHolographicSimulationRecordingAsync(string recordingName)
+        {
+            if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
+            {
+                throw new NotSupportedException("This method is only supported on HoloLens.");
+            }
+
+            string payload = string.Format(
+                "recording={0}",
+                recordingName);
+
+            await this.PostAsync(HolographicSimulationPlaybackStopApi, payload);
+        }
+
         /// <summary>
         /// Unloads the specified Holographic Simulation recording.
         /// </summary>
-        /// <param name="name">The name of the recording to unload (ex: testsession.xef).</param>
+        /// <param name="recordingName">The name of the recording to unload (ex: testsession.xef).</param>
         /// <returns>Task tracking completion of the REST call.</returns>
         /// <remarks>This method is only supported on HoloLens devices.</remarks>
-        public async Task UnloadHolographicSimulationRecordingAsync(string name)
+        public async Task UnloadHolographicSimulationRecordingAsync(string recordingName)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
@@ -198,14 +311,70 @@ public async Task UnloadHolographicSimulationRecordingAsync(string name)
 
             string payload = string.Format(
                 "recording={0}",
-                name);
+                recordingName);
 
             await this.DeleteAsync(HolographicSimulationPlaybackSessionFileApi, payload);
         }
 
+        /// <summary>
+        /// Gets the collection of Holographic Perception Simulation files
+        /// </summary>
+        /// <param name="session">Value indicating whether or not to return loaded files.</param>
+        /// <returns>Collection of Holographic Perception simulation file names</returns>
+        private async Task<HolographicSimulationPlaybackFiles> GetHolographicSimulationPlaybackFilesPrivateAsync(bool session)
+        {
+            string apiPath = session ? HolographicSimulationPlaybackSessionFilesApi : HolographicSimulationPlaybackFilesApi;
+
+            return await this.GetAsync<HolographicSimulationPlaybackFiles>(apiPath);
+        }
+
         #region Data contract
         /// <summary>
-        /// Object representation of the Holographic Simulation playback state
+        /// Object representing the data types in a Holographic Perception Simulation file
+        /// </summary>
+        [DataContract]
+        public class HolographicSimulationDataTypes
+        {
+            /// <summary>
+            /// Gets a value indicating whether or not the file contains hand data.
+            /// </summary>
+            [DataMember(Name = "hands")]
+            public bool IncludesHands { get; private set; }
+
+            /// <summary>
+            /// Gets a value indicating whether or not the file contains head data.
+            /// </summary>
+            [DataMember(Name = "head")]
+            public bool IncludesHead { get; private set; }
+
+            /// <summary>
+            /// Gets a value indicating whether or not the file contains environmentatl data.
+            /// </summary>
+            [DataMember(Name = "environment")]
+            public bool IncludesEnvironment { get; private set; }
+
+            /// <summary>
+            /// Gets a value indicating whether or not the file contains spatial mapping data.
+            /// </summary>
+            [DataMember(Name = "spatialMapping")]
+            public bool IncludesSpatialMapping { get; private set; }
+        }
+
+        /// <summary>
+        /// Object representation of the Holographic Perception Simulation files collection
+        /// </summary>
+        [DataContract]
+        public class HolographicSimulationPlaybackFiles
+        {
+            /// <summary>
+            /// Gets the list of recording file names.
+            /// </summary>
+            [DataMember(Name = "recordings")]
+            public List<string> Files { get; private set; }
+        }
+
+        /// <summary>
+        /// Object representation of the Holographic Perception Simulation playback state
         /// </summary>
         [DataContract]
         public class HolographicSimulationPlaybackSessionState

From 2e37027b4c9ec7b6ff297c8ea71f078a05d7b211 Mon Sep 17 00:00:00 2001
From: David Kline <davidkl_work@live.com>
Date: Mon, 31 Oct 2016 15:26:39 -0700
Subject: [PATCH 27/51] implement holographic services API

---
 .../HoloLens/HolographicOs.cs                 | 126 +++++++++++++++++-
 .../HoloLens/MixedRealityCapture.cs           |  17 ++-
 2 files changed, 135 insertions(+), 8 deletions(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs
index 6f6c4e73..322dacde 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs
@@ -14,6 +14,12 @@ namespace Microsoft.Tools.WindowsDevicePortal
     /// </content>
     public partial class DevicePortal
     {
+        public enum ProcessStatus
+        {
+            Running = 0,
+            Stopped
+        }
+
         /// <summary>
         /// API for getting or setting Interpupilary distance
         /// </summary>
@@ -29,6 +35,21 @@ public partial class DevicePortal
         /// </summary>
         public static readonly string HolographicWebManagementHttpSettingsApi = "api/holographic/os/webmanagement/settings/https";
 
+        /// <summary>
+        /// Gets the status of the Holographic Services on this HoloLens.
+        /// </summary>
+        /// <returns>HolographicServices object describing the state of the Holographic services.</returns>
+        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        public async Task<HolographicServices> GetHolographicServiceState()
+        {
+            if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
+            {
+                throw new NotSupportedException("This method is only supported on HoloLens.");
+            }
+
+            return await this.GetAsync<HolographicServices>(HolographicServicesApi);
+        }
+
         /// <summary>
         /// Gets the interpupilary distance registered on the device.
         /// </summary>
@@ -103,16 +124,56 @@ public async Task<bool> GetIsHttpsRequiredAsync()
 
         #region Data contract
         /// <summary>
-        /// Object representation for HTTP settings
+        /// Object reporesentation of the status of the Holographic services
         /// </summary>
         [DataContract]
-        public class WebManagementHttpSettings
+        public class HolographicServices
+        {
+            [DataMember(Name = "SoftwareStatus")]
+            public HolographicSoftwareStatus Status { get; private set; }
+        }
+
+        /// <summary>
+        /// Object representation of the collection of holographic services.
+        /// </summary>
+        [DataContract]
+        public class HolographicSoftwareStatus
         {
             /// <summary>
-            /// Gets a value indicating whether HTTPS is required
+            /// Gets the status of dwm.exe
             /// </summary>
-            [DataMember(Name = "httpsRequired")]
-            public bool IsHttpsRequired { get; private set; }
+            [DataMember(Name = "dwm.exe")]
+            public ServiceStatus Dwm { get; private set; }
+
+            /// <summary>
+            /// Gets the status of holoshellapp.exe
+            /// </summary>
+            [DataMember(Name = "holoshellapp.exe")]
+            public ServiceStatus HoloShellApp { get; private set; }
+
+            /// <summary>
+            /// Gets the status of holosi.exe
+            /// </summary>
+            [DataMember(Name = "holosi.exe")]
+            public ServiceStatus HoloSi { get; private set; }
+
+            /// <summary>
+            /// Gets the status of mixedrealitycapture.exe
+            /// </summary>
+            [DataMember(Name = "mixedrealitycapture.exe")]
+            public ServiceStatus MixedRealitytCapture { get; private set; }
+
+            /// <summary>
+            /// Gets the status of sihost.exe
+            /// </summary>
+            [DataMember(Name = "sihost.exe")]
+            public ServiceStatus SiHost { get; private set; }
+
+            /// <summary>
+            /// Gets the status of spectrum.exe
+            /// </summary>
+            [DataMember(Name = "spectrum.exe")]
+            public ServiceStatus Spectrum { get; private set; }
         }
 
         /// <summary>
@@ -136,6 +197,61 @@ public float Ipd
                 set { this.IpdRaw = (int)(value * 1000); }
             }
         }
+
+        /// <summary>
+        /// Object representation of the status of a  service
+        /// </summary>
+        [DataContract]
+        public class ServiceStatus
+        {
+            /// <summary>
+            /// Gets the raw value returned for the expected service status
+            /// </summary>
+            [DataMember(Name = "Expected")]
+            public string ExpectedRaw { get; private set; }
+
+            /// <summary>
+            /// Gets the raw value returned for the observed service status
+            /// </summary>
+            [DataMember(Name = "Observed")]
+            public string ObservedRaw { get; private set; }
+
+            /// <summary>
+            /// Gets the the expected service status
+            /// </summary>
+            public ProcessStatus Expected
+            {
+                get
+                {
+                    return (ExpectedRaw == "Running") ? ProcessStatus.Running : ProcessStatus.Stopped;
+                }
+            }
+
+            /// <summary>
+            /// Gets the the observed service status
+            /// </summary>
+            public ProcessStatus Observed
+            {
+                get
+                {
+                    return (ObservedRaw == "Running") ? ProcessStatus.Running : ProcessStatus.Stopped;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Object representation for HTTP settings
+        /// </summary>
+        [DataContract]
+        public class WebManagementHttpSettings
+        {
+            /// <summary>
+            /// Gets a value indicating whether HTTPS is required
+            /// </summary>
+            [DataMember(Name = "httpsRequired")]
+            public bool IsHttpsRequired { get; private set; }
+        }
+
         #endregion // Data contract
     }
 }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
index 56718fdf..46f16c29 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
@@ -478,16 +478,27 @@ public class MrcStatus
         }
 
         /// <summary>
-        /// Object representation of the recording process status
+        /// Object representation of the Mixed Reality Capture process status
         /// </summary>
         [DataContract]
         public class MrcProcessStatus
         {
             /// <summary>
-            /// Gets the process status
+            /// Gets the raw data for the Mixed Reality Capture process status
             /// </summary>
             [DataMember(Name = "MrcProcess")]
-            public string MrcProcess { get; private set; }  // TODO this should be an enum
+            public string MrcProcessRaw { get; private set; }
+
+            /// <summary>
+            /// Gets the status of the Mixed Reality Capture process
+            /// </summary>
+            public ProcessStatus MrcProcess
+            {
+                get
+                {
+                    return (this.MrcProcessRaw == "Running") ? ProcessStatus.Running : ProcessStatus.Stopped;
+                }
+            }
         }
 
         /// <summary>

From 18f3b280b4cc381326145e00870c394dc86dfb0c Mon Sep 17 00:00:00 2001
From: David Kline <davidkl_work@live.com>
Date: Mon, 31 Oct 2016 15:35:32 -0700
Subject: [PATCH 28/51] add comments, fix style warnings

---
 .../HoloLens/HolographicOs.cs                 | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs
index 322dacde..b6599159 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs
@@ -14,12 +14,6 @@ namespace Microsoft.Tools.WindowsDevicePortal
     /// </content>
     public partial class DevicePortal
     {
-        public enum ProcessStatus
-        {
-            Running = 0,
-            Stopped
-        }
-
         /// <summary>
         /// API for getting or setting Interpupilary distance
         /// </summary>
@@ -35,6 +29,22 @@ public enum ProcessStatus
         /// </summary>
         public static readonly string HolographicWebManagementHttpSettingsApi = "api/holographic/os/webmanagement/settings/https";
 
+        /// <summary>
+        /// Enumeration describing the status of a process
+        /// </summary>
+        public enum ProcessStatus
+        {
+            /// <summary>
+            /// The process is running
+            /// </summary>
+            Running = 0,
+            
+            /// <summary>
+            /// The process is stopped
+            /// </summary>
+            Stopped
+        }
+
         /// <summary>
         /// Gets the status of the Holographic Services on this HoloLens.
         /// </summary>
@@ -129,6 +139,9 @@ public async Task<bool> GetIsHttpsRequiredAsync()
         [DataContract]
         public class HolographicServices
         {
+            /// <summary>
+            /// Gets the status for the collection of holographic services
+            /// </summary>
             [DataMember(Name = "SoftwareStatus")]
             public HolographicSoftwareStatus Status { get; private set; }
         }
@@ -223,7 +236,7 @@ public ProcessStatus Expected
             {
                 get
                 {
-                    return (ExpectedRaw == "Running") ? ProcessStatus.Running : ProcessStatus.Stopped;
+                    return (this.ExpectedRaw == "Running") ? ProcessStatus.Running : ProcessStatus.Stopped;
                 }
             }
 
@@ -234,7 +247,7 @@ public ProcessStatus Observed
             {
                 get
                 {
-                    return (ObservedRaw == "Running") ? ProcessStatus.Running : ProcessStatus.Stopped;
+                    return (this.ObservedRaw == "Running") ? ProcessStatus.Running : ProcessStatus.Stopped;
                 }
             }
         }

From 9458038cb74a83158e11973a1a68f7f00a4adc1c Mon Sep 17 00:00:00 2001
From: David Kline <davidkl_work@live.com>
Date: Fri, 4 Nov 2016 14:34:17 -0700
Subject: [PATCH 29/51] partial implementation of holographic perception

---
 .../HoloLens/HolographicOs.cs                 | 10 +--
 .../HoloLens/HolographicPerception.cs         | 82 ++++++++++++++++++-
 .../HoloLens/HolographicThermal.cs            |  2 +-
 .../HoloLens/MixedRealityCapture.cs           | 30 +++----
 .../HoloLens/PerceptionSimulationPlayback.cs  | 20 ++---
 .../HoloLens/PerceptionSimulationRecording.cs |  6 +-
 6 files changed, 113 insertions(+), 37 deletions(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs
index b6599159..199784ac 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs
@@ -49,7 +49,7 @@ public enum ProcessStatus
         /// Gets the status of the Holographic Services on this HoloLens.
         /// </summary>
         /// <returns>HolographicServices object describing the state of the Holographic services.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<HolographicServices> GetHolographicServiceState()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -64,7 +64,7 @@ public async Task<HolographicServices> GetHolographicServiceState()
         /// Gets the interpupilary distance registered on the device.
         /// </summary>
         /// <returns>Interpupilary distance, in millimeters.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<float> GetInterPupilaryDistanceAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -81,7 +81,7 @@ public async Task<float> GetInterPupilaryDistanceAsync()
         /// </summary>
         /// <param name="httpsRequired">Desired value for HTTPS communication</param>
         /// <returns>True if WiFi based communication requires a secure connection, false otherwise.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task SetIsHttpsRequiredAsync(bool httpsRequired)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -101,7 +101,7 @@ await this.PostAsync(
         /// </summary>
         /// <param name="ipd">Interpupilary distance, in millimeters.</param>
         /// <returns>Task for tracking the POST call</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task SetInterPupilaryDistanceAsync(float ipd)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -120,7 +120,7 @@ await this.PostAsync(
         /// Gets the WiFi http security requirements for communication with the device.
         /// </summary>
         /// <returns>True if WiFi based communication requires a secure connection, false otherwise.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<bool> GetIsHttpsRequiredAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
index f7d7ebe3..f8b52b8e 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
@@ -28,7 +28,7 @@ public partial class DevicePortal
         /// <summary>
         /// API for controlling the Holographic Perception Simulation control stream.
         /// </summary>
-        public static readonly string HolographicSimulationStreamApi = "api/holographic/simulation/control/Stream";
+        public static readonly string HolographicSimulationStreamApi = "api/holographic/simulation/control/stream";
 
         /// <summary>
         /// Enumeration defining the control modes used by the Holographic Perception Simulation.
@@ -56,11 +56,71 @@ public enum SimulationControlMode
             Legacy
         }
 
+        /// <summary>
+        /// Enumeration defining the priority levels for the Holographic Perception Simulation control stream.
+        /// </summary>
+        public enum SimulationControlStreamPriority
+        {
+            /// <summary>
+            /// Low priority.
+            /// </summary>
+            Low = 0,
+
+            /// <summary>
+            /// Normal priority.
+            /// </summary>
+            Normal
+        }
+
+        /// <summary>
+        /// Creates a simulation control stream.
+        /// </summary>
+        /// <param name="priority">The control stream priority.</param>
+        /// <returns>PerceptionSimulationControlStreamId containing the identifier of the created stream.</returns>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
+        public async Task<PerceptionSimulationControlStreamId> CreatePerceptionSimulationControlStream(SimulationControlStreamPriority priority)
+        {
+            if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
+            {
+                throw new NotSupportedException("This method is only supported on HoloLens.");
+            }
+
+            string payload = string.Format(
+                "priority={0}",
+                (int)priority);
+
+            return await this.GetAsync<PerceptionSimulationControlStreamId>(
+                HolographicSimulationStreamApi,
+                payload);
+        }
+
+        /// <summary>
+        /// Deletes a simulation control stream.
+        /// </summary>
+        /// <param name="streamId">The identifier of the stream to be deleted.</param>
+        /// <returns>Task tracking completion of the REST call.</returns>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
+        public async Task DeletePerceptionSimulationControlStream(string streamId)
+        {
+            if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
+            {
+                throw new NotSupportedException("This method is only supported on HoloLens.");
+            }
+
+            string payload = string.Format(
+                "streamId={0}",
+                streamId);
+
+            await this.DeleteAsync(
+                HolographicSimulationStreamApi,
+                payload);
+        }
+
         /// <summary>
         /// Gets the perception simulation control mode.
         /// </summary>
         /// <returns>The simulation control mode.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<SimulationControlMode> GetPerceptionSimulationControlModeAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -72,12 +132,15 @@ public async Task<SimulationControlMode> GetPerceptionSimulationControlModeAsync
             return controlMode.Mode;
         }
 
+        // TODO
+        //public async Task GetPerceptionSimulationControlStream()
+
         /// <summary>
         /// Sets the perception simulation control mode.
         /// </summary>
         /// <param name="mode">The simulation control mode.</param>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
         /// <returns>Task tracking completion of the REST call.</returns>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task SetPerceptionSimulationControlModeAsync(SimulationControlMode mode)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -105,5 +168,18 @@ public class PerceptionSimulationControlMode
             public SimulationControlMode Mode { get; private set; }
         }
         #endregion // Data contract
+
+        /// <summary>
+        /// Object representation of the response recevied when creating a Perception Simulation control stream.
+        /// </summary>
+        [DataContract]
+        public class PerceptionSimulationControlStreamId
+        {
+            /// <summary>
+            /// Gets the stream identifier.
+            /// </summary>
+            [DataMember(Name = "streamId")]
+            public string StreamId { get; private set; }
+        }
     }
 }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicThermal.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicThermal.cs
index 92732853..068efb1b 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicThermal.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicThermal.cs
@@ -50,7 +50,7 @@ public partial class DevicePortal
         /// Gets the current thermal stage reading from the device.
         /// </summary>
         /// <returns>ThermalStages enum value.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<ThermalStages> GetThermalStageAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
index 46f16c29..848f1458 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
@@ -82,7 +82,7 @@ public partial class DevicePortal
         /// </summary>
         /// <param name="fileName">The name of the file to be deleted.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task DeleteMrcFileAsync(string fileName)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -103,7 +103,7 @@ await this.DeleteAsync(
         /// <param name="includeMicrophone">Specifies whether or not to include microphone data</param>
         /// <param name="includeAudio">Specifies whether or not to include audio data</param>
         /// <returns>Uri used to retreive the Mixed Reality Capture stream.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public Uri GetHighResolutionMrcLiveStreamUri(
             bool includeHolograms = true,
             bool includeColorCamera = true,
@@ -131,7 +131,7 @@ public Uri GetHighResolutionMrcLiveStreamUri(
         /// <param name="includeMicrophone">Specifies whether or not to include microphone data</param>
         /// <param name="includeAudio">Specifies whether or not to include audio data</param>
         /// <returns>Uri used to retreive the Mixed Reality Capture stream.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public Uri GetLowResolutionMrcLiveStreamUri(
             bool includeHolograms = true,
             bool includeColorCamera = true,
@@ -159,7 +159,7 @@ public Uri GetLowResolutionMrcLiveStreamUri(
         /// <param name="includeMicrophone">Specifies whether or not to include microphone data</param>
         /// <param name="includeAudio">Specifies whether or not to include audio data</param>
         /// <returns>Uri used to retreive the Mixed Reality Capture stream.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public Uri GetMediumResolutionMrcLiveStreamUri(
             bool includeHolograms = true,
             bool includeColorCamera = true,
@@ -185,7 +185,7 @@ public Uri GetMediumResolutionMrcLiveStreamUri(
         /// <param name="fileName">Name of the file to retrieve.</param>
         /// <param name="isThumbnailRequest">Specifies whether or not we are requesting a thumbnail image.</param>
         /// <returns>Byte array containing the file data.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<byte[]> GetMrcFileDataAsync(
             string fileName,
             bool isThumbnailRequest = false)
@@ -218,7 +218,7 @@ public async Task<byte[]> GetMrcFileDataAsync(
         /// Gets the list of capture files
         /// </summary>
         /// <returns>List of the capture files</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<MrcFileList> GetMrcFileListAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -250,7 +250,7 @@ public async Task<MrcFileList> GetMrcFileListAsync()
         /// <param name="includeMicrophone">Specifies whether or not to include microphone data</param>
         /// <param name="includeAudio">Specifies whether or not to include audio data</param>
         /// <returns>Uri used to retreive the Mixed Reality Capture stream.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public Uri GetMrcLiveStreamUri(
             bool includeHolograms = true,
             bool includeColorCamera = true,
@@ -274,7 +274,7 @@ public Uri GetMrcLiveStreamUri(
         /// Gets the current Mixed Reality Capture settings
         /// </summary>
         /// <returns>MrcSettings object containing the current settings</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<MrcSettings> GetMrcSettingsAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -289,7 +289,7 @@ public async Task<MrcSettings> GetMrcSettingsAsync()
         /// Gets the status of the reality capture
         /// </summary>
         /// <returns>Status of the capture</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<MrcStatus> GetMrcStatusAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -305,7 +305,7 @@ public async Task<MrcStatus> GetMrcStatusAsync()
         /// </summary>
         /// <param name="fileName">Name of the capture file</param>
         /// <returns>Byte array containing the thumbnail image data</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<byte[]> GetMrcThumbnailDataAsync(string fileName)
         {
             // GetMrcFileData checks for the appropriate platform. We do not need to duplicate the check here.
@@ -315,9 +315,9 @@ public async Task<byte[]> GetMrcThumbnailDataAsync(string fileName)
         /// <summary>
         /// Sets the default Mixed Reality Capture settings
         /// </summary>
-        /// <param name="settings"></param>
+        /// <param name="settings">Mixed Reality Capture settings to be used as the default.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task SetMrcSettingsAsync(MrcSettings settings)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -346,7 +346,7 @@ await this.PostAsync(
         /// <param name="includeMicrophone">Specifies whether or not to include microphone data</param>
         /// <param name="includeAudio">Specifies whether or not to include audio data</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task StartMrcRecordingAsync(
             bool includeHolograms = true,
             bool includeColorCamera = true,
@@ -374,7 +374,7 @@ await this.PostAsync(
         /// Stops the Mixed Reality Capture recording
         /// </summary>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task StopMrcRecordingAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -391,7 +391,7 @@ public async Task StopMrcRecordingAsync()
         /// <param name="includeHolograms">Specifies whether or not to include holograms</param>
         /// <param name="includeColorCamera">Specifies whether or not to include the color camera</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task TakeMrcPhotoAsync(
             bool includeHolograms = true,
             bool includeColorCamera = true)
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationPlayback.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationPlayback.cs
index a7877fd6..2ce05f07 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationPlayback.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationPlayback.cs
@@ -99,7 +99,7 @@ public enum HolographicSimulationPlaybackStates
         /// </summary>
         /// <param name="name">The name of the recording to delete (ex: testsession.xef).</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task DeleteHolographicSimulationRecordingAsync(string name)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -118,7 +118,7 @@ public async Task DeleteHolographicSimulationRecordingAsync(string name)
         /// Gets the collection of Holographic Perception Simulation files on this HoloLens.
         /// </summary>
         /// <returns>HolographicSimulationPlaybackFiles object representing the files on the HoloLens</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<HolographicSimulationPlaybackFiles> GetHolographicSimulationPlaybackFilesAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -133,7 +133,7 @@ public async Task<HolographicSimulationPlaybackFiles> GetHolographicSimulationPl
         /// Gets the collection of loaded Holographic Perception Simulation files on this HoloLens.
         /// </summary>
         /// <returns>HolographicSimulationPlaybackFiles object representing the files loaded on the HoloLens</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<HolographicSimulationPlaybackFiles> GetHolographicSimulationPlaybackSessionFilesAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -149,7 +149,7 @@ public async Task<HolographicSimulationPlaybackFiles> GetHolographicSimulationPl
         /// </summary>
         /// <param name="recordingName">Name of the recording file, with extension.</param>
         /// <returns>HolographicSimulationDataTypes object representing they types of data in the file</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<HolographicSimulationDataTypes> GetHolographicSimulationPlaybackSessionDataTypesAsync(string recordingName)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -171,7 +171,7 @@ public async Task<HolographicSimulationDataTypes> GetHolographicSimulationPlayba
         /// </summary>
         /// <param name="name">The name of the recording (ex: testsession.xef).</param>
         /// <returns>HolographicSimulationPlaybackStates enum value describing the state of the recording.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<HolographicSimulationPlaybackStates> GetHolographicSimulationPlaybackStateAsync(string name)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -221,7 +221,7 @@ public async Task<HolographicSimulationPlaybackStates> GetHolographicSimulationP
         /// </summary>
         /// <param name="recordingName">The name of the recording to load (ex: testsession.xef).</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task LoadHolographicSimulationRecordingAsync(string recordingName)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -241,7 +241,7 @@ public async Task LoadHolographicSimulationRecordingAsync(string recordingName)
         /// </summary>
         /// <param name="recordingName">The name of the recording to pause</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task PauseHolographicSimulationRecordingAsync(string recordingName)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -261,7 +261,7 @@ public async Task PauseHolographicSimulationRecordingAsync(string recordingName)
         /// </summary>
         /// <param name="recordingName">The name of the recording to play</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task PlayHolographicSimulationRecordingAsync(string recordingName)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -281,7 +281,7 @@ public async Task PlayHolographicSimulationRecordingAsync(string recordingName)
         /// </summary>
         /// <param name="recordingName">The name of the recording to stop</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task StopHolographicSimulationRecordingAsync(string recordingName)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -301,7 +301,7 @@ public async Task StopHolographicSimulationRecordingAsync(string recordingName)
         /// </summary>
         /// <param name="recordingName">The name of the recording to unload (ex: testsession.xef).</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task UnloadHolographicSimulationRecordingAsync(string recordingName)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationRecording.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationRecording.cs
index 7f9e9ccc..a97d11e4 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationRecording.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationRecording.cs
@@ -36,7 +36,7 @@ public partial class DevicePortal
         /// Gets the holographic simulation recording status.
         /// </summary>
         /// <returns>True if recording, false otherwise.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<bool> GetHolographicSimulationRecordingStatusAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -57,7 +57,7 @@ public async Task<bool> GetHolographicSimulationRecordingStatusAsync()
         /// <param name="recordSpatialMapping">Should Spatial Mapping data be recorded? The default value is true.</param>
         /// <param name="recordEnvironment">Should environment data be recorded? The default value is true.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task StartHolographicSimulationRecordingAsync(
             string name,
             bool recordHead = true,
@@ -85,7 +85,7 @@ public async Task StartHolographicSimulationRecordingAsync(
         /// </summary>
         /// <returns>Byte array containing the recorded data.</returns>
         /// <exception cref="InvalidOperationException">No recording was in progress.</exception>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<byte[]> StopHolographicSimulationRecordingAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))

From 704133eb0ad9e68a2ad592d52280091b9cd4d750 Mon Sep 17 00:00:00 2001
From: David Kline <davidkl_work@live.com>
Date: Fri, 4 Nov 2016 14:54:15 -0700
Subject: [PATCH 30/51] pr feedback change

---
 .../HoloLens/HolographicPerception.cs                | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
index f8b52b8e..c6fc82f0 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
@@ -76,9 +76,9 @@ public enum SimulationControlStreamPriority
         /// Creates a simulation control stream.
         /// </summary>
         /// <param name="priority">The control stream priority.</param>
-        /// <returns>PerceptionSimulationControlStreamId containing the identifier of the created stream.</returns>
+        /// <returns>The identifier of the created stream.</returns>
         /// <remarks>This method is only supported on HoloLens.</remarks>
-        public async Task<PerceptionSimulationControlStreamId> CreatePerceptionSimulationControlStream(SimulationControlStreamPriority priority)
+        public async Task<string> CreatePerceptionSimulationControlStream(SimulationControlStreamPriority priority)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
@@ -89,9 +89,11 @@ public async Task<PerceptionSimulationControlStreamId> CreatePerceptionSimulatio
                 "priority={0}",
                 (int)priority);
 
-            return await this.GetAsync<PerceptionSimulationControlStreamId>(
-                HolographicSimulationStreamApi,
-                payload);
+            PerceptionSimulationControlStreamId controlStreamId =  await this.GetAsync<PerceptionSimulationControlStreamId>(
+                            HolographicSimulationStreamApi,
+                            payload);
+
+            return controlStreamId.StreamId;
         }
 
         /// <summary>

From d44e77124d78c11dbba5708a7e4b923191d6a2dd Mon Sep 17 00:00:00 2001
From: David Kline <david.kline@microsoft.com>
Date: Fri, 4 Nov 2016 14:57:26 -0700
Subject: [PATCH 31/51] partial implementation of holographic perception (#202)

* partial implementation of holographic perception

* pr feedback change
---
 .../HoloLens/HolographicOs.cs                 | 10 +--
 .../HoloLens/HolographicPerception.cs         | 84 ++++++++++++++++++-
 .../HoloLens/HolographicThermal.cs            |  2 +-
 .../HoloLens/MixedRealityCapture.cs           | 30 +++----
 .../HoloLens/PerceptionSimulationPlayback.cs  | 20 ++---
 .../HoloLens/PerceptionSimulationRecording.cs |  6 +-
 6 files changed, 115 insertions(+), 37 deletions(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs
index b6599159..199784ac 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicOs.cs
@@ -49,7 +49,7 @@ public enum ProcessStatus
         /// Gets the status of the Holographic Services on this HoloLens.
         /// </summary>
         /// <returns>HolographicServices object describing the state of the Holographic services.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<HolographicServices> GetHolographicServiceState()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -64,7 +64,7 @@ public async Task<HolographicServices> GetHolographicServiceState()
         /// Gets the interpupilary distance registered on the device.
         /// </summary>
         /// <returns>Interpupilary distance, in millimeters.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<float> GetInterPupilaryDistanceAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -81,7 +81,7 @@ public async Task<float> GetInterPupilaryDistanceAsync()
         /// </summary>
         /// <param name="httpsRequired">Desired value for HTTPS communication</param>
         /// <returns>True if WiFi based communication requires a secure connection, false otherwise.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task SetIsHttpsRequiredAsync(bool httpsRequired)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -101,7 +101,7 @@ await this.PostAsync(
         /// </summary>
         /// <param name="ipd">Interpupilary distance, in millimeters.</param>
         /// <returns>Task for tracking the POST call</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task SetInterPupilaryDistanceAsync(float ipd)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -120,7 +120,7 @@ await this.PostAsync(
         /// Gets the WiFi http security requirements for communication with the device.
         /// </summary>
         /// <returns>True if WiFi based communication requires a secure connection, false otherwise.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<bool> GetIsHttpsRequiredAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
index f7d7ebe3..c6fc82f0 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
@@ -28,7 +28,7 @@ public partial class DevicePortal
         /// <summary>
         /// API for controlling the Holographic Perception Simulation control stream.
         /// </summary>
-        public static readonly string HolographicSimulationStreamApi = "api/holographic/simulation/control/Stream";
+        public static readonly string HolographicSimulationStreamApi = "api/holographic/simulation/control/stream";
 
         /// <summary>
         /// Enumeration defining the control modes used by the Holographic Perception Simulation.
@@ -56,11 +56,73 @@ public enum SimulationControlMode
             Legacy
         }
 
+        /// <summary>
+        /// Enumeration defining the priority levels for the Holographic Perception Simulation control stream.
+        /// </summary>
+        public enum SimulationControlStreamPriority
+        {
+            /// <summary>
+            /// Low priority.
+            /// </summary>
+            Low = 0,
+
+            /// <summary>
+            /// Normal priority.
+            /// </summary>
+            Normal
+        }
+
+        /// <summary>
+        /// Creates a simulation control stream.
+        /// </summary>
+        /// <param name="priority">The control stream priority.</param>
+        /// <returns>The identifier of the created stream.</returns>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
+        public async Task<string> CreatePerceptionSimulationControlStream(SimulationControlStreamPriority priority)
+        {
+            if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
+            {
+                throw new NotSupportedException("This method is only supported on HoloLens.");
+            }
+
+            string payload = string.Format(
+                "priority={0}",
+                (int)priority);
+
+            PerceptionSimulationControlStreamId controlStreamId =  await this.GetAsync<PerceptionSimulationControlStreamId>(
+                            HolographicSimulationStreamApi,
+                            payload);
+
+            return controlStreamId.StreamId;
+        }
+
+        /// <summary>
+        /// Deletes a simulation control stream.
+        /// </summary>
+        /// <param name="streamId">The identifier of the stream to be deleted.</param>
+        /// <returns>Task tracking completion of the REST call.</returns>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
+        public async Task DeletePerceptionSimulationControlStream(string streamId)
+        {
+            if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
+            {
+                throw new NotSupportedException("This method is only supported on HoloLens.");
+            }
+
+            string payload = string.Format(
+                "streamId={0}",
+                streamId);
+
+            await this.DeleteAsync(
+                HolographicSimulationStreamApi,
+                payload);
+        }
+
         /// <summary>
         /// Gets the perception simulation control mode.
         /// </summary>
         /// <returns>The simulation control mode.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<SimulationControlMode> GetPerceptionSimulationControlModeAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -72,12 +134,15 @@ public async Task<SimulationControlMode> GetPerceptionSimulationControlModeAsync
             return controlMode.Mode;
         }
 
+        // TODO
+        //public async Task GetPerceptionSimulationControlStream()
+
         /// <summary>
         /// Sets the perception simulation control mode.
         /// </summary>
         /// <param name="mode">The simulation control mode.</param>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
         /// <returns>Task tracking completion of the REST call.</returns>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task SetPerceptionSimulationControlModeAsync(SimulationControlMode mode)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -105,5 +170,18 @@ public class PerceptionSimulationControlMode
             public SimulationControlMode Mode { get; private set; }
         }
         #endregion // Data contract
+
+        /// <summary>
+        /// Object representation of the response recevied when creating a Perception Simulation control stream.
+        /// </summary>
+        [DataContract]
+        public class PerceptionSimulationControlStreamId
+        {
+            /// <summary>
+            /// Gets the stream identifier.
+            /// </summary>
+            [DataMember(Name = "streamId")]
+            public string StreamId { get; private set; }
+        }
     }
 }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicThermal.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicThermal.cs
index 92732853..068efb1b 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicThermal.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicThermal.cs
@@ -50,7 +50,7 @@ public partial class DevicePortal
         /// Gets the current thermal stage reading from the device.
         /// </summary>
         /// <returns>ThermalStages enum value.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<ThermalStages> GetThermalStageAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
index 46f16c29..848f1458 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/MixedRealityCapture.cs
@@ -82,7 +82,7 @@ public partial class DevicePortal
         /// </summary>
         /// <param name="fileName">The name of the file to be deleted.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task DeleteMrcFileAsync(string fileName)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -103,7 +103,7 @@ await this.DeleteAsync(
         /// <param name="includeMicrophone">Specifies whether or not to include microphone data</param>
         /// <param name="includeAudio">Specifies whether or not to include audio data</param>
         /// <returns>Uri used to retreive the Mixed Reality Capture stream.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public Uri GetHighResolutionMrcLiveStreamUri(
             bool includeHolograms = true,
             bool includeColorCamera = true,
@@ -131,7 +131,7 @@ public Uri GetHighResolutionMrcLiveStreamUri(
         /// <param name="includeMicrophone">Specifies whether or not to include microphone data</param>
         /// <param name="includeAudio">Specifies whether or not to include audio data</param>
         /// <returns>Uri used to retreive the Mixed Reality Capture stream.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public Uri GetLowResolutionMrcLiveStreamUri(
             bool includeHolograms = true,
             bool includeColorCamera = true,
@@ -159,7 +159,7 @@ public Uri GetLowResolutionMrcLiveStreamUri(
         /// <param name="includeMicrophone">Specifies whether or not to include microphone data</param>
         /// <param name="includeAudio">Specifies whether or not to include audio data</param>
         /// <returns>Uri used to retreive the Mixed Reality Capture stream.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public Uri GetMediumResolutionMrcLiveStreamUri(
             bool includeHolograms = true,
             bool includeColorCamera = true,
@@ -185,7 +185,7 @@ public Uri GetMediumResolutionMrcLiveStreamUri(
         /// <param name="fileName">Name of the file to retrieve.</param>
         /// <param name="isThumbnailRequest">Specifies whether or not we are requesting a thumbnail image.</param>
         /// <returns>Byte array containing the file data.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<byte[]> GetMrcFileDataAsync(
             string fileName,
             bool isThumbnailRequest = false)
@@ -218,7 +218,7 @@ public async Task<byte[]> GetMrcFileDataAsync(
         /// Gets the list of capture files
         /// </summary>
         /// <returns>List of the capture files</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<MrcFileList> GetMrcFileListAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -250,7 +250,7 @@ public async Task<MrcFileList> GetMrcFileListAsync()
         /// <param name="includeMicrophone">Specifies whether or not to include microphone data</param>
         /// <param name="includeAudio">Specifies whether or not to include audio data</param>
         /// <returns>Uri used to retreive the Mixed Reality Capture stream.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public Uri GetMrcLiveStreamUri(
             bool includeHolograms = true,
             bool includeColorCamera = true,
@@ -274,7 +274,7 @@ public Uri GetMrcLiveStreamUri(
         /// Gets the current Mixed Reality Capture settings
         /// </summary>
         /// <returns>MrcSettings object containing the current settings</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<MrcSettings> GetMrcSettingsAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -289,7 +289,7 @@ public async Task<MrcSettings> GetMrcSettingsAsync()
         /// Gets the status of the reality capture
         /// </summary>
         /// <returns>Status of the capture</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<MrcStatus> GetMrcStatusAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -305,7 +305,7 @@ public async Task<MrcStatus> GetMrcStatusAsync()
         /// </summary>
         /// <param name="fileName">Name of the capture file</param>
         /// <returns>Byte array containing the thumbnail image data</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<byte[]> GetMrcThumbnailDataAsync(string fileName)
         {
             // GetMrcFileData checks for the appropriate platform. We do not need to duplicate the check here.
@@ -315,9 +315,9 @@ public async Task<byte[]> GetMrcThumbnailDataAsync(string fileName)
         /// <summary>
         /// Sets the default Mixed Reality Capture settings
         /// </summary>
-        /// <param name="settings"></param>
+        /// <param name="settings">Mixed Reality Capture settings to be used as the default.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task SetMrcSettingsAsync(MrcSettings settings)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -346,7 +346,7 @@ await this.PostAsync(
         /// <param name="includeMicrophone">Specifies whether or not to include microphone data</param>
         /// <param name="includeAudio">Specifies whether or not to include audio data</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task StartMrcRecordingAsync(
             bool includeHolograms = true,
             bool includeColorCamera = true,
@@ -374,7 +374,7 @@ await this.PostAsync(
         /// Stops the Mixed Reality Capture recording
         /// </summary>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task StopMrcRecordingAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -391,7 +391,7 @@ public async Task StopMrcRecordingAsync()
         /// <param name="includeHolograms">Specifies whether or not to include holograms</param>
         /// <param name="includeColorCamera">Specifies whether or not to include the color camera</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task TakeMrcPhotoAsync(
             bool includeHolograms = true,
             bool includeColorCamera = true)
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationPlayback.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationPlayback.cs
index a7877fd6..2ce05f07 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationPlayback.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationPlayback.cs
@@ -99,7 +99,7 @@ public enum HolographicSimulationPlaybackStates
         /// </summary>
         /// <param name="name">The name of the recording to delete (ex: testsession.xef).</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task DeleteHolographicSimulationRecordingAsync(string name)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -118,7 +118,7 @@ public async Task DeleteHolographicSimulationRecordingAsync(string name)
         /// Gets the collection of Holographic Perception Simulation files on this HoloLens.
         /// </summary>
         /// <returns>HolographicSimulationPlaybackFiles object representing the files on the HoloLens</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<HolographicSimulationPlaybackFiles> GetHolographicSimulationPlaybackFilesAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -133,7 +133,7 @@ public async Task<HolographicSimulationPlaybackFiles> GetHolographicSimulationPl
         /// Gets the collection of loaded Holographic Perception Simulation files on this HoloLens.
         /// </summary>
         /// <returns>HolographicSimulationPlaybackFiles object representing the files loaded on the HoloLens</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<HolographicSimulationPlaybackFiles> GetHolographicSimulationPlaybackSessionFilesAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -149,7 +149,7 @@ public async Task<HolographicSimulationPlaybackFiles> GetHolographicSimulationPl
         /// </summary>
         /// <param name="recordingName">Name of the recording file, with extension.</param>
         /// <returns>HolographicSimulationDataTypes object representing they types of data in the file</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<HolographicSimulationDataTypes> GetHolographicSimulationPlaybackSessionDataTypesAsync(string recordingName)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -171,7 +171,7 @@ public async Task<HolographicSimulationDataTypes> GetHolographicSimulationPlayba
         /// </summary>
         /// <param name="name">The name of the recording (ex: testsession.xef).</param>
         /// <returns>HolographicSimulationPlaybackStates enum value describing the state of the recording.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<HolographicSimulationPlaybackStates> GetHolographicSimulationPlaybackStateAsync(string name)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -221,7 +221,7 @@ public async Task<HolographicSimulationPlaybackStates> GetHolographicSimulationP
         /// </summary>
         /// <param name="recordingName">The name of the recording to load (ex: testsession.xef).</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task LoadHolographicSimulationRecordingAsync(string recordingName)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -241,7 +241,7 @@ public async Task LoadHolographicSimulationRecordingAsync(string recordingName)
         /// </summary>
         /// <param name="recordingName">The name of the recording to pause</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task PauseHolographicSimulationRecordingAsync(string recordingName)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -261,7 +261,7 @@ public async Task PauseHolographicSimulationRecordingAsync(string recordingName)
         /// </summary>
         /// <param name="recordingName">The name of the recording to play</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task PlayHolographicSimulationRecordingAsync(string recordingName)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -281,7 +281,7 @@ public async Task PlayHolographicSimulationRecordingAsync(string recordingName)
         /// </summary>
         /// <param name="recordingName">The name of the recording to stop</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task StopHolographicSimulationRecordingAsync(string recordingName)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -301,7 +301,7 @@ public async Task StopHolographicSimulationRecordingAsync(string recordingName)
         /// </summary>
         /// <param name="recordingName">The name of the recording to unload (ex: testsession.xef).</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task UnloadHolographicSimulationRecordingAsync(string recordingName)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationRecording.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationRecording.cs
index 7f9e9ccc..a97d11e4 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationRecording.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/PerceptionSimulationRecording.cs
@@ -36,7 +36,7 @@ public partial class DevicePortal
         /// Gets the holographic simulation recording status.
         /// </summary>
         /// <returns>True if recording, false otherwise.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<bool> GetHolographicSimulationRecordingStatusAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
@@ -57,7 +57,7 @@ public async Task<bool> GetHolographicSimulationRecordingStatusAsync()
         /// <param name="recordSpatialMapping">Should Spatial Mapping data be recorded? The default value is true.</param>
         /// <param name="recordEnvironment">Should environment data be recorded? The default value is true.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task StartHolographicSimulationRecordingAsync(
             string name,
             bool recordHead = true,
@@ -85,7 +85,7 @@ public async Task StartHolographicSimulationRecordingAsync(
         /// </summary>
         /// <returns>Byte array containing the recorded data.</returns>
         /// <exception cref="InvalidOperationException">No recording was in progress.</exception>
-        /// <remarks>This method is only supported on HoloLens devices.</remarks>
+        /// <remarks>This method is only supported on HoloLens.</remarks>
         public async Task<byte[]> StopHolographicSimulationRecordingAsync()
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))

From 32d51c500de3d41926f3870c37a4ceb5961b92b5 Mon Sep 17 00:00:00 2001
From: David Kline <davidkl_work@live.com>
Date: Tue, 29 Nov 2016 13:29:28 -0800
Subject: [PATCH 32/51] increase wrapper version to 0.9.2

---
 .../Properties/AssemblyInfo.cs                                | 4 ++--
 .../WindowsDevicePortalWrapper/Properties/AssemblyInfo.cs     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Properties/AssemblyInfo.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Properties/AssemblyInfo.cs
index 6f097b63..903fff1b 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Properties/AssemblyInfo.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Properties/AssemblyInfo.cs
@@ -29,6 +29,6 @@
 // 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("0.9.1.0")]
-[assembly: AssemblyFileVersion("0.9.1.0")]
+[assembly: AssemblyVersion("0.9.2.0")]
+[assembly: AssemblyFileVersion("0.9.2.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Properties/AssemblyInfo.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Properties/AssemblyInfo.cs
index f2cc9ce2..020c92ca 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Properties/AssemblyInfo.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Properties/AssemblyInfo.cs
@@ -37,5 +37,5 @@
 // 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("0.9.1.0")]
-[assembly: AssemblyFileVersion("0.9.1.0")]
+[assembly: AssemblyVersion("0.9.2.0")]
+[assembly: AssemblyFileVersion("0.9.2.0")]

From 3574f9a9b1ce0259983fa36f6e312ad39870b7a1 Mon Sep 17 00:00:00 2001
From: David Kline <davidkl_work@live.com>
Date: Tue, 29 Nov 2016 13:34:37 -0800
Subject: [PATCH 33/51] cleanup

---
 .../HoloLens/HolographicPerception.cs         | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
index c6fc82f0..3d6e5866 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
@@ -43,17 +43,7 @@ public enum SimulationControlMode
             /// <summary>
             /// Simulation mode.
             /// </summary>
-            Simulation,
-
-            /// <summary>
-            /// Remote mode.
-            /// </summary>
-            Remote,
-
-            /// <summary>
-            /// Legacy mode.
-            /// </summary>
-            Legacy
+            Simulation
         }
 
         /// <summary>
@@ -78,13 +68,18 @@ public enum SimulationControlStreamPriority
         /// <param name="priority">The control stream priority.</param>
         /// <returns>The identifier of the created stream.</returns>
         /// <remarks>This method is only supported on HoloLens.</remarks>
-        public async Task<string> CreatePerceptionSimulationControlStream(SimulationControlStreamPriority priority)
+        public async Task<string> CreatePerceptionSimulationControlStreamAsync(SimulationControlStreamPriority priority)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
                 throw new NotSupportedException("This method is only supported on HoloLens.");
             }
 
+            if (!(await VerifySimulationControlMode(SimulationControlMode.Simulation)))
+            {
+                throw new InvalidOperationException("The simulation control mode on the target HoloLens must be 'Simulation'.");
+            }
+
             string payload = string.Format(
                 "priority={0}",
                 (int)priority);
@@ -102,13 +97,18 @@ public async Task<string> CreatePerceptionSimulationControlStream(SimulationCont
         /// <param name="streamId">The identifier of the stream to be deleted.</param>
         /// <returns>Task tracking completion of the REST call.</returns>
         /// <remarks>This method is only supported on HoloLens.</remarks>
-        public async Task DeletePerceptionSimulationControlStream(string streamId)
+        public async Task DeletePerceptionSimulationControlStreamAsync(string streamId)
         {
             if (!Utilities.IsHoloLens(this.Platform, this.DeviceFamily))
             {
                 throw new NotSupportedException("This method is only supported on HoloLens.");
             }
 
+            if (!(await VerifySimulationControlMode(SimulationControlMode.Simulation)))
+            {
+                throw new InvalidOperationException("The simulation control mode on the target HoloLens must be 'Simulation'.");
+            }
+
             string payload = string.Format(
                 "streamId={0}",
                 streamId);
@@ -134,9 +134,6 @@ public async Task<SimulationControlMode> GetPerceptionSimulationControlModeAsync
             return controlMode.Mode;
         }
 
-        // TODO
-        //public async Task GetPerceptionSimulationControlStream()
-
         /// <summary>
         /// Sets the perception simulation control mode.
         /// </summary>
@@ -156,6 +153,17 @@ public async Task SetPerceptionSimulationControlModeAsync(SimulationControlMode
             await this.PostAsync(HolographicSimulationModeApi, payload);
         }
 
+        /// <summary>
+        /// Compares the current simulation control mode with the expected mode.
+        /// </summary>
+        /// <param name="expectedMode">The simulation control mode that we expect the device to be in.</param>
+        /// <returns>The simulation control mode.</returns>
+        private async Task<bool> VerifySimulationControlMode(SimulationControlMode expectedMode)
+        {
+            SimulationControlMode simMode = await this.GetPerceptionSimulationControlModeAsync();
+            return (simMode == expectedMode);
+        }
+
         #region Data contract
         /// <summary>
         /// Object representation of Perception Simulation control mode.
@@ -169,7 +177,6 @@ public class PerceptionSimulationControlMode
             [DataMember(Name = "mode")]
             public SimulationControlMode Mode { get; private set; }
         }
-        #endregion // Data contract
 
         /// <summary>
         /// Object representation of the response recevied when creating a Perception Simulation control stream.
@@ -183,5 +190,6 @@ public class PerceptionSimulationControlStreamId
             [DataMember(Name = "streamId")]
             public string StreamId { get; private set; }
         }
+        #endregion // Data contract
     }
 }

From 0dc303d8483e98847c20a500ff67b2c6aed179f3 Mon Sep 17 00:00:00 2001
From: David Kline <davidkl_work@live.com>
Date: Tue, 29 Nov 2016 14:46:55 -0800
Subject: [PATCH 34/51] pr feedback

---
 .../HoloLens/HolographicPerception.cs                       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
index 3d6e5866..e60b04bd 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HoloLens/HolographicPerception.cs
@@ -75,7 +75,7 @@ public async Task<string> CreatePerceptionSimulationControlStreamAsync(Simulatio
                 throw new NotSupportedException("This method is only supported on HoloLens.");
             }
 
-            if (!(await VerifySimulationControlMode(SimulationControlMode.Simulation)))
+            if (!(await VerifySimulationControlModeAsync(SimulationControlMode.Simulation)))
             {
                 throw new InvalidOperationException("The simulation control mode on the target HoloLens must be 'Simulation'.");
             }
@@ -104,7 +104,7 @@ public async Task DeletePerceptionSimulationControlStreamAsync(string streamId)
                 throw new NotSupportedException("This method is only supported on HoloLens.");
             }
 
-            if (!(await VerifySimulationControlMode(SimulationControlMode.Simulation)))
+            if (!(await VerifySimulationControlModeAsync(SimulationControlMode.Simulation)))
             {
                 throw new InvalidOperationException("The simulation control mode on the target HoloLens must be 'Simulation'.");
             }
@@ -158,7 +158,7 @@ public async Task SetPerceptionSimulationControlModeAsync(SimulationControlMode
         /// </summary>
         /// <param name="expectedMode">The simulation control mode that we expect the device to be in.</param>
         /// <returns>The simulation control mode.</returns>
-        private async Task<bool> VerifySimulationControlMode(SimulationControlMode expectedMode)
+        private async Task<bool> VerifySimulationControlModeAsync(SimulationControlMode expectedMode)
         {
             SimulationControlMode simMode = await this.GetPerceptionSimulationControlModeAsync();
             return (simMode == expectedMode);

From 6dcab45a284ac3a3293371e1a1d5afcbab7d6ec9 Mon Sep 17 00:00:00 2001
From: Hirsch Singhal <hirsin@microsoft.com>
Date: Thu, 1 Dec 2016 09:43:27 -0800
Subject: [PATCH 35/51] Fix failing MRC test

---
 .../Device-VersionTests/HoloLens/HoloLens_rs1_release.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/HoloLens/HoloLens_rs1_release.cs b/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/HoloLens/HoloLens_rs1_release.cs
index 010448bf..05722f37 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/HoloLens/HoloLens_rs1_release.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/Device-VersionTests/HoloLens/HoloLens_rs1_release.cs
@@ -194,7 +194,7 @@ public void GetMrcStatus_HoloLens_1607()
 
             // Check some known things about this response.
             MrcProcessStatus processStatus = getTask.Result.Status;
-            Assert.AreEqual("Running", processStatus.MrcProcess);
+            Assert.AreEqual(ProcessStatus.Running, processStatus.MrcProcess);
         }
 
         /// <summary>

From 4be375721f8a33f34b6b5f565e7753714b08fabd Mon Sep 17 00:00:00 2001
From: Hirsch Singhal <hps.scout@gmail.com>
Date: Thu, 1 Dec 2016 10:28:06 -0800
Subject: [PATCH 36/51] =?UTF-8?q?Add=20release=20steps=C2=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CONTRIBUTING.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 021dd98d..2cf8f08f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -71,6 +71,17 @@ Address any review comments, force push to your topic branch, and post a comment
 
 If the pull request review goes well, a project maintainer will merge your changes. Thank you for helping improve the Windows Device Portal Wrapper!
 
+# NuGet release and versioning
+
+**For maintainers**
+
+When creating a new NuGet and GitHub release, the following steps should be taken:
+1. Bump the version number as appropriate in master (after 1.0, WDP Wrapper will correctly use semver)
+2. Merge from Master to Release, with a PR appropriately named ("v1.2.3 release")
+3. Squash and merge commits, leaving major feature entries and fixes in the description. 
+4. Compile release builds of the .NET and UWP libraries, sign them, and upload to NuGet 
+5. Cut a new release on GitHub using the same version number ("v1.2.3") and attach the signed libraries to the release. 
+6. Update code documentation. 
 
 # Updating code documentation
 

From 0e24f5df55c13e06fabc269050fa8fc0abde185c Mon Sep 17 00:00:00 2001
From: Jason Williams <jaswill@microsoft.com>
Date: Tue, 24 Jan 2017 11:53:39 -0800
Subject: [PATCH 37/51] Add an IsFolder method to FileOrFolderInformation
 class. (#207)

* Add an IsFolder method to FileOrFolderInformation class.

* Updated per review feedback
---
 .../Core/AppFileExplorer.cs                               | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppFileExplorer.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppFileExplorer.cs
index cc93f29e..5829f175 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppFileExplorer.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppFileExplorer.cs
@@ -310,6 +310,12 @@ public class FileOrFolderInformation
             [DataMember(Name = "FileSize")]
             public long SizeInBytes { get; private set; }
 
+            /// <summary>
+            /// Gets whether the current item is a folder by checking for FILE_ATTRIBUTE_DIRECTORY
+            /// See https://msdn.microsoft.com/en-us/library/windows/desktop/gg258117(v=vs.85).aspx
+            /// </summary>
+            public bool IsFolder { get { return (this.Type & 0x10) == 0x10; } }
+
             /// <summary>
             /// Overridden ToString method providing a user readable
             /// display of a file or folder. Tries to match the formatting
@@ -321,7 +327,7 @@ public override string ToString()
                 DateTime timestamp = DateTime.FromFileTime(this.DateCreated);
 
                 // Check if this is a folder.
-                if (!string.Equals(this.SubPath, this.CurrentDir))
+                if (this.IsFolder)
                 {
                     return string.Format("{0,-24:MM/dd/yyyy  HH:mm tt}{1,-14} {2}\n", timestamp, "<DIR>", this.Name);
                 }

From 6b8a62bd698682f5cadc24b1b73c6e21584b5109 Mon Sep 17 00:00:00 2001
From: Jason Williams <jaswill@microsoft.com>
Date: Thu, 26 Jan 2017 10:05:50 -0800
Subject: [PATCH 38/51] Adds PackageOrigin to PackageInfo (#210)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add an IsFolder method to FileOrFolderInformation class.

* Updated per review feedback

* Adds PackageOrigin to PackageInfo class.

* PackageOrigin details and helper method

Quick helper method to determine if the app is sideloaded.
---
 .../Core/AppDeployment.cs                     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppDeployment.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppDeployment.cs
index 062dc6a1..8dc87504 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppDeployment.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppDeployment.cs
@@ -366,6 +366,28 @@ public class PackageInfo
             [DataMember(Name = "Version")]
             public PackageVersion Version { get; private set; }
 
+            /// <summary>
+            /// Gets package origin, a measure of how the app was installed. 
+            /// PackageOrigin_Unknown            = 0,
+            /// PackageOrigin_Unsigned           = 1,
+            /// PackageOrigin_Inbox              = 2,
+            /// PackageOrigin_Store              = 3,
+            /// PackageOrigin_DeveloperUnsigned  = 4,
+            /// PackageOrigin_DeveloperSigned    = 5,
+            /// PackageOrigin_LineOfBusiness     = 6
+            /// </summary>
+            [DataMember(Name = "PackageOrigin")]
+            public int PackageOrigin { get; private set; }
+
+            // <summary>
+            /// Helper method to determine if the app was sideloaded and therefore can be used with e.g. GetFolderContentsAsync
+            /// </summary>
+            /// <returns> True if the package is sideloaded. </returns>
+            public bool IsSideloaded()
+            {
+                return (this.PackageOrigin == 4 || this.PackageOrigin == 5);
+            }
+            
             /// <summary>
             /// Get a string representation of the package
             /// </summary>

From 612ca51878851e2165f499e16bbf42d3565b1de9 Mon Sep 17 00:00:00 2001
From: David Kline <david.kline@microsoft.com>
Date: Mon, 30 Jan 2017 16:01:42 -0800
Subject: [PATCH 39/51] BREAKING CHANGE: ConnectAsync(updateConnection)

---
 .../WindowsDevicePortalWrapper.Shared/DevicePortal.cs           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs
index e58eae5f..01bfe26a 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs
@@ -189,7 +189,7 @@ public string PlatformName
         public async Task ConnectAsync(
             string ssid = null,
             string ssidKey = null,
-            bool updateConnection = true,
+            bool updateConnection = false,
 #if WINDOWS_UWP
             Certificate manualCertificate = null)
 #else

From 6d23ead93c7adc6240e4873c5b7337b1af825ca4 Mon Sep 17 00:00:00 2001
From: David Kline <david.kline@microsoft.com>
Date: Tue, 31 Jan 2017 09:35:03 -0800
Subject: [PATCH 40/51] increase version number after breaking change to
 ConnectAsync (#212)

---
 .../Properties/AssemblyInfo.cs                                | 4 ++--
 .../WindowsDevicePortalWrapper/Properties/AssemblyInfo.cs     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Properties/AssemblyInfo.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Properties/AssemblyInfo.cs
index 903fff1b..041695ec 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Properties/AssemblyInfo.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Properties/AssemblyInfo.cs
@@ -29,6 +29,6 @@
 // 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("0.9.2.0")]
-[assembly: AssemblyFileVersion("0.9.2.0")]
+[assembly: AssemblyVersion("0.9.3.0")]
+[assembly: AssemblyFileVersion("0.9.3.0")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Properties/AssemblyInfo.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Properties/AssemblyInfo.cs
index 020c92ca..7e884766 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Properties/AssemblyInfo.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Properties/AssemblyInfo.cs
@@ -37,5 +37,5 @@
 // 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("0.9.2.0")]
-[assembly: AssemblyFileVersion("0.9.2.0")]
+[assembly: AssemblyVersion("0.9.3.0")]
+[assembly: AssemblyFileVersion("0.9.3.0")]

From b4d29f0a2946703b63b1a189ae62bc8e9166c4fe Mon Sep 17 00:00:00 2001
From: Chris Baudin <cbaud@outlook.com>
Date: Wed, 8 Feb 2017 00:06:25 -0800
Subject: [PATCH 41/51] Initial implementation of wrapper for the ETW APIs
 (issue #31)

---
 .../MockDataGenerator/Program.cs              |   3 +
 .../UnitTestProject/Core/EtwTests.cs          | 108 +++++++++++++
 ...ocket_api_etw_session_realtime_Default.dat |   1 +
 .../api_etw_customproviders_Default.dat       |   1 +
 .../Defaults/api_etw_providers_Default.dat    |   1 +
 .../UnitTestProject/UnitTestProject.csproj    |  10 ++
 .../Core/Etw.cs                               | 144 +++++++++++++++++-
 7 files changed, 263 insertions(+), 5 deletions(-)
 create mode 100644 WindowsDevicePortalWrapper/UnitTestProject/Core/EtwTests.cs
 create mode 100644 WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/WebSocket_api_etw_session_realtime_Default.dat
 create mode 100644 WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_etw_customproviders_Default.dat
 create mode 100644 WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_etw_providers_Default.dat

diff --git a/WindowsDevicePortalWrapper/MockDataGenerator/Program.cs b/WindowsDevicePortalWrapper/MockDataGenerator/Program.cs
index fdf35088..a86be83a 100644
--- a/WindowsDevicePortalWrapper/MockDataGenerator/Program.cs
+++ b/WindowsDevicePortalWrapper/MockDataGenerator/Program.cs
@@ -40,8 +40,11 @@ public class Program
             new Endpoint(HttpMethods.Get, DevicePortal.IpConfigApi),
             new Endpoint(HttpMethods.Get, DevicePortal.SystemPerfApi),
             new Endpoint(HttpMethods.Get, DevicePortal.RunningProcessApi),
+            new Endpoint(HttpMethods.Get, DevicePortal.CustomEtwProvidersApi),
+            new Endpoint(HttpMethods.Get, DevicePortal.EtwProvidersApi),
             new Endpoint(HttpMethods.WebSocket, DevicePortal.SystemPerfApi),
             new Endpoint(HttpMethods.WebSocket, DevicePortal.RunningProcessApi),
+            new Endpoint(HttpMethods.WebSocket, DevicePortal.RealtimeEtwSessionApi),
 
             // HoloLens specific endpoints
             new Endpoint(HttpMethods.Get, DevicePortal.HolographicIpdApi),
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/Core/EtwTests.cs b/WindowsDevicePortalWrapper/UnitTestProject/Core/EtwTests.cs
new file mode 100644
index 00000000..7a7f61d2
--- /dev/null
+++ b/WindowsDevicePortalWrapper/UnitTestProject/Core/EtwTests.cs
@@ -0,0 +1,108 @@
+//----------------------------------------------------------------------------------------------
+// <copyright file="EtwTests.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
+
+namespace Microsoft.Tools.WindowsDevicePortal.Tests.Core
+{
+    /// <summary>
+    /// Test class for ETW APIs.
+    /// </summary>
+    [TestClass]
+    public class EtwTests : BaseTests
+    {
+        /// <summary>
+        /// Basic test of GET method for getting a list of custom registered ETW providers.
+        /// </summary>
+        [TestMethod]
+        public void GetCustomEtwProvidersTest()
+        {
+            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.CustomEtwProvidersApi, HttpMethods.Get);
+
+            Task<EtwProviders> getCustomEtwProvidersTask = TestHelpers.Portal.GetCustomEtwProvidersAsync();
+            getCustomEtwProvidersTask.Wait();
+
+            Assert.AreEqual(TaskStatus.RanToCompletion, getCustomEtwProvidersTask.Status);
+
+            ValidateEtwProviders(getCustomEtwProvidersTask.Result);
+        }
+
+        /// <summary>
+        /// Basic test of GET method for getting a list of registered ETW providers.
+        /// </summary>
+        [TestMethod]
+        public void GetEtwProvidersTest()
+        {
+            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.EtwProvidersApi, HttpMethods.Get);
+
+            Task<EtwProviders> getEtwProvidersTask = TestHelpers.Portal.GetEtwProvidersAsync();
+            getEtwProvidersTask.Wait();
+
+            Assert.AreEqual(TaskStatus.RanToCompletion, getEtwProvidersTask.Status);
+
+            ValidateEtwProviders(getEtwProvidersTask.Result);
+        }
+
+        [TestMethod]
+        public void GetEtwEventsTest()
+        {
+            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.RealtimeEtwSessionApi, HttpMethods.WebSocket);
+
+            ManualResetEvent etwEventsReceived = new ManualResetEvent(false);
+            EtwEvents etwEvents = null;
+
+            WindowsDevicePortal.WebSocketMessageReceivedEventHandler<EtwEvents> etwEventsReceivedHandler =
+                delegate (DevicePortal sender, WebSocketMessageReceivedEventArgs<EtwEvents> args)
+                {
+                    if (args.Message != null)
+                    {
+                        etwEvents = args.Message;
+                        etwEventsReceived.Set();
+                    }
+                };
+
+            TestHelpers.Portal.RealtimeEventsMessageReceived += etwEventsReceivedHandler;
+
+            Task startListeningForEtwEventsTask = TestHelpers.Portal.StartListeningForEtwEventsAsync();
+            startListeningForEtwEventsTask.Wait();
+            Assert.AreEqual(TaskStatus.RanToCompletion, startListeningForEtwEventsTask.Status);
+
+            etwEventsReceived.WaitOne();
+
+            Task stopListeningForEtwEventsTask = TestHelpers.Portal.StopListeningForEtwEventsAsync();
+            stopListeningForEtwEventsTask.Wait();
+            Assert.AreEqual(TaskStatus.RanToCompletion, stopListeningForEtwEventsTask.Status);
+
+            TestHelpers.Portal.RealtimeEventsMessageReceived -= etwEventsReceivedHandler;
+
+            ValidateEtwEvents(etwEvents);
+        }
+
+        /// <summary>
+        /// Validate the <see cref="EtwEvents"/>  returned from the tests.
+        /// </summary>
+        /// <param name="etwEvents">The <see cref="EtwEvents"/> to validate.</param>
+        private static void ValidateEtwEvents(EtwEvents etwEvents)
+        {
+            Assert.IsNotNull(etwEvents);
+        }
+        
+        /// <summary>
+        /// Validate the <see cref="EtwProviders"/> returned from the tests. 
+        /// </summary>
+        /// <param name="etw">The <see cref="EtwProviders"/> to validate.</param>
+        private static void ValidateEtwProviders(EtwProviders etw)
+        {
+            EtwProviderInfo providerInfo = etw?.Providers?.FirstOrDefault();
+            Assert.IsNotNull(providerInfo);
+        }
+    }
+}
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/WebSocket_api_etw_session_realtime_Default.dat b/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/WebSocket_api_etw_session_realtime_Default.dat
new file mode 100644
index 00000000..f7bcb871
--- /dev/null
+++ b/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/WebSocket_api_etw_session_realtime_Default.dat
@@ -0,0 +1 @@
+{  }
\ No newline at end of file
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_etw_customproviders_Default.dat b/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_etw_customproviders_Default.dat
new file mode 100644
index 00000000..0b713c77
--- /dev/null
+++ b/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_etw_customproviders_Default.dat
@@ -0,0 +1 @@
+{ "Providers": [ { "GUID": "ProviderGUID", "Name": "ProviderName" } ] }
\ No newline at end of file
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_etw_providers_Default.dat b/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_etw_providers_Default.dat
new file mode 100644
index 00000000..0b713c77
--- /dev/null
+++ b/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_etw_providers_Default.dat
@@ -0,0 +1 @@
+{ "Providers": [ { "GUID": "ProviderGUID", "Name": "ProviderName" } ] }
\ No newline at end of file
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/UnitTestProject.csproj b/WindowsDevicePortalWrapper/UnitTestProject/UnitTestProject.csproj
index 5f96bccb..7ff5def3 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/UnitTestProject.csproj
+++ b/WindowsDevicePortalWrapper/UnitTestProject/UnitTestProject.csproj
@@ -62,6 +62,7 @@
   <ItemGroup>
     <Compile Include="BaseTests.cs" />
     <Compile Include="Core\AppFileExplorerTests.cs" />
+    <Compile Include="Core\EtwTests.cs" />
     <Compile Include="Core\PerformanceDataTests.cs" />
     <Compile Include="Device-VersionTests\HoloLens\HoloLensHelpers.cs" />
     <Compile Include="Device-VersionTests\HoloLens\HoloLens_rs1_release.cs" />
@@ -85,9 +86,18 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="MockData\Defaults\WebSocket_api_etw_session_realtime_Default.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="MockData\Defaults\api_etw_providers_Default.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="MockData\Defaults\api_os_devicefamily_Default.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="MockData\Defaults\api_etw_customproviders_Default.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="MockData\Defaults\api_os_info_Default.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
index 91d6b976..64b6ffcb 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
@@ -4,6 +4,11 @@
 // </copyright>
 //----------------------------------------------------------------------------------------------
 
+using System;
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+using System.Threading.Tasks;
+
 namespace Microsoft.Tools.WindowsDevicePortal
 {
     /// <content>
@@ -14,16 +19,145 @@ public partial class DevicePortal
         /// <summary>
         /// API to create a realtime ETW session.
         /// </summary>
-        public static readonly string CreateRealtimeEtwSessionApi = "api/etw/session/realtime";
+        public static readonly string RealtimeEtwSessionApi = "api/etw/session/realtime";
+
+        /// <summary>
+        /// API to get the list of registered custom ETW providers.
+        /// </summary>
+        public static readonly string CustomEtwProvidersApi = "api/etw/customproviders";
+
+        /// <summary>
+        /// API to get the list of registered ETW providers.
+        /// </summary>
+        public static readonly string EtwProvidersApi = "api/etw/providers";
+
+        /// <summary>
+        /// Web socket to get ETW events.!
+        /// </summary>
+        private WebSocket<EtwEvents> realtimeEventsWebSocket;
 
         /// <summary>
-        /// API to getthe list of registered custom ETW providers.
+        /// The ETW event message received handler
         /// </summary>
-        public static readonly string GetCustomEtwProvidersApi = "api/etw/customproviders";
+        public event WebSocketMessageReceivedEventHandler<EtwEvents> RealtimeEventsMessageReceived;
 
         /// <summary>
-        /// API to getthe list of registered ETW providers.
+        /// Returns the current set of registered custom ETW providers.
         /// </summary>
-        public static readonly string GetEtwProvidersApi = "api/etw/providers";
+        /// <returns>EtwProviders object containing a list of providers, friendly name and GUID</returns>
+        public async Task<EtwProviders> GetCustomEtwProvidersAsync()
+        {
+            return await this.GetAsync<EtwProviders>(CustomEtwProvidersApi);
+        }
+
+        /// <summary>
+        /// Returns the current set of registered ETW providers.
+        /// </summary>
+        /// <returns>EtwProviders object containing a list of providers, friendly name and GUID</returns>
+        public async Task<EtwProviders> GetEtwProvidersAsync()
+        {
+            return await this.GetAsync<EtwProviders>(EtwProvidersApi);
+        }
+
+        /// <summary>
+        /// Starts listening for ETW events with it being returned via the RealtimeEventsMessageReceived event handler.
+        /// </summary>
+        /// <returns>Task for connecting to the WebSocket but not for listening to it.</returns>
+        public async Task StartListeningForEtwEventsAsync()
+        {
+            if (this.realtimeEventsWebSocket == null)
+            {
+#if WINDOWS_UWP
+                this.realtimeEventsWebSocket = new WebSocket<EtwEvents>(this.deviceConnection);
+#else
+                this.realtimeEventsWebSocket = new WebSocket<EtwEvents>(this.deviceConnection, this.ServerCertificateValidation);
+#endif
+
+                this.realtimeEventsWebSocket.WebSocketMessageReceived += this.EtwEventsReceivedHandler;
+            }
+            else
+            {
+                if (this.realtimeEventsWebSocket.IsListeningForMessages)
+                {
+                    return;
+                }
+            }
+
+            await this.realtimeEventsWebSocket.StartListeningForMessagesAsync(RealtimeEtwSessionApi);
+        }
+
+        /// <summary>
+        /// Stop listening for ETW events.
+        /// </summary>
+        /// <returns>Task for stop listening for ETW events and disconnecting from the WebSocket.</returns>
+        public async Task StopListeningForEtwEventsAsync()
+        {
+            if (this.realtimeEventsWebSocket == null || !this.realtimeEventsWebSocket.IsListeningForMessages)
+            {
+                return;
+            }
+
+            await this.realtimeEventsWebSocket.StopListeningForMessagesAsync();
+        }
+
+        /// <summary>
+        /// Handler for the ETW received event that passes the event to the RealtimeEventsMessageReceived handler.
+        /// </summary>
+        /// <param name="sender">The <see cref="WebSocket{EtwEvents}"/> object sending the event.</param>
+        /// <param name="args">The event data.</param>
+        private void EtwEventsReceivedHandler(
+            WebSocket<EtwEvents> sender,
+            WebSocketMessageReceivedEventArgs<EtwEvents> args)
+        {
+            if (args.Message != null)
+            {
+                this.RealtimeEventsMessageReceived?.Invoke(
+                    this,
+                    args);
+            }
+        }
+
+        #region Data contract
+
+        /// <summary>
+        /// ETW Events.
+        /// </summary>
+        [DataContract]
+        public class EtwEvents
+        {
+        }
+
+        /// <summary>
+        /// ETW Providers.
+        /// </summary>
+        [DataContract]
+        public class EtwProviders
+        {
+            /// <summary>
+            /// Gets list of ETW providers
+            /// </summary>
+            [DataMember(Name = "Providers")]
+            public List<EtwProviderInfo> Providers { get; private set; }
+        }
+
+        /// <summary>
+        /// ETW Provider Info. Contains the Name and GUID.
+        /// </summary>
+        public class EtwProviderInfo
+        {
+            /// <summary>
+            /// Gets provider guid.
+            /// </summary>
+            [DataMember(Name = "GUID")]
+            public string GUID { get; private set; }
+
+            /// <summary>
+            /// Gets provider name.
+            /// </summary>
+            [DataMember(Name = "Name")]
+            public string Name { get; private set; }
+        }
+
+#endregion // Data contract
     }
 }

From 5861be2191284e87151093705277b81f69b0ca5b Mon Sep 17 00:00:00 2001
From: Chris Baudin <cbaud@microsoft.com>
Date: Thu, 9 Feb 2017 18:46:38 -0800
Subject: [PATCH 42/51] Update ETW API tests to validate the contents of the
 EtwProviders object. (Issue #31)

---
 .../UnitTestProject/Core/EtwTests.cs                      | 8 ++++++--
 .../MockData/Defaults/api_etw_customproviders_Default.dat | 2 +-
 .../MockData/Defaults/api_etw_providers_Default.dat       | 2 +-
 .../WindowsDevicePortalWrapper.Shared/Core/Etw.cs         | 1 +
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/WindowsDevicePortalWrapper/UnitTestProject/Core/EtwTests.cs b/WindowsDevicePortalWrapper/UnitTestProject/Core/EtwTests.cs
index 7a7f61d2..c168141e 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/Core/EtwTests.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/Core/EtwTests.cs
@@ -4,6 +4,7 @@
 // </copyright>
 //----------------------------------------------------------------------------------------------
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -101,8 +102,11 @@ private static void ValidateEtwEvents(EtwEvents etwEvents)
         /// <param name="etw">The <see cref="EtwProviders"/> to validate.</param>
         private static void ValidateEtwProviders(EtwProviders etw)
         {
-            EtwProviderInfo providerInfo = etw?.Providers?.FirstOrDefault();
-            Assert.IsNotNull(providerInfo);
+            Guid result;
+            Assert.IsTrue(etw.Providers.Count > 0);
+            Assert.IsTrue(etw.Providers.All(etwProvider => 
+                Guid.TryParse(etwProvider.GUID, out result) &&
+                !string.IsNullOrEmpty(etwProvider.Name)));
         }
     }
 }
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_etw_customproviders_Default.dat b/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_etw_customproviders_Default.dat
index 0b713c77..d332e2d4 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_etw_customproviders_Default.dat
+++ b/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_etw_customproviders_Default.dat
@@ -1 +1 @@
-{ "Providers": [ { "GUID": "ProviderGUID", "Name": "ProviderName" } ] }
\ No newline at end of file
+{"Providers" : [{"GUID" : "3A43D90E-530E-41E5-A897-B555516070E2", "Name" : "Provider.One"},{"GUID" : "52B1715B-5AB6-4B48-A61A-A93EE8D4B5CD", "Name" : "Provider-Two"},{"GUID" : "698F02FF-2B63-4CBB-AB06-FEB88011347E", "Name" : "Provider.Three"}]}
\ No newline at end of file
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_etw_providers_Default.dat b/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_etw_providers_Default.dat
index 0b713c77..d332e2d4 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_etw_providers_Default.dat
+++ b/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_etw_providers_Default.dat
@@ -1 +1 @@
-{ "Providers": [ { "GUID": "ProviderGUID", "Name": "ProviderName" } ] }
\ No newline at end of file
+{"Providers" : [{"GUID" : "3A43D90E-530E-41E5-A897-B555516070E2", "Name" : "Provider.One"},{"GUID" : "52B1715B-5AB6-4B48-A61A-A93EE8D4B5CD", "Name" : "Provider-Two"},{"GUID" : "698F02FF-2B63-4CBB-AB06-FEB88011347E", "Name" : "Provider.Three"}]}
\ No newline at end of file
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
index 64b6ffcb..f249ba9e 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
@@ -143,6 +143,7 @@ public class EtwProviders
         /// <summary>
         /// ETW Provider Info. Contains the Name and GUID.
         /// </summary>
+        [DataContract]
         public class EtwProviderInfo
         {
             /// <summary>

From 834b52d1473767f8e547117db241352cf2d04585 Mon Sep 17 00:00:00 2001
From: Chris Baudin <cbaud@microsoft.com>
Date: Mon, 13 Feb 2017 19:12:06 -0800
Subject: [PATCH 43/51] Refactor the WebSocket class implementations to
 decouple the Connect, Close, Receive and Send actions. (Issue #31)

---
 .../WDPMockImplementations/WebSocket.cs       |  72 +++++-
 .../Core/Etw.cs                               |  67 +++--
 .../Core/PerformanceData.cs                   |  22 +-
 .../DevicePortal.cs                           |   7 +-
 .../HttpRest/WebSocket.cs                     |  67 +++--
 .../IoT/ApplicationManager.cs                 |   5 +-
 .../IoT/BluetoothConnectivity.cs              | 232 +++++++++---------
 .../HttpRest/WebSocket.cs                     | 107 ++++----
 .../HttpRest/WebSocket.cs                     |  88 ++++---
 9 files changed, 408 insertions(+), 259 deletions(-)

diff --git a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/WebSocket.cs b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/WebSocket.cs
index 8a499e7c..2973898e 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/WebSocket.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/WebSocket.cs
@@ -36,6 +36,11 @@ internal partial class WebSocket<T>
         /// </summary>
         private Func<object, X509Certificate, X509Chain, SslPolicyErrors, bool> serverCertificateValidationHandler;
 
+        /// <summary>
+        /// The connection to the websocket.
+        /// </summary>
+        private Task<HttpResponseMessage> webSocketTask;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="WebSocket{T}" /> class.
         /// </summary>
@@ -50,6 +55,34 @@ public WebSocket(IDevicePortalConnection connection, Func<object, X509Certificat
             this.serverCertificateValidationHandler = serverCertificateValidationHandler;
         }
 
+        /// <summary>
+        /// Initialize a connection to the websocket.
+        /// </summary>
+        /// <param name="endpoint">The uri that the weboscket should connect to.</param>
+        /// <returns>The task of opening a connection to the websocket.</returns>
+        private async Task ConnectInternalAsync(Uri endpoint)
+        {
+            await Task.Run(() =>
+            {
+                webSocketTask = TestHelpers.MockHttpResponder.WebSocketAsync(endpoint);
+                this.IsConnected = true;
+            });
+        }
+
+        /// <summary>
+        /// Closes the connection to the websocket.
+        /// </summary>
+        /// <returns>The task of closing the websocket connection.</returns>
+        private async Task CloseInternalAsync()
+        {
+            await Task.Run(() =>
+            {
+                webSocketTask.Dispose();
+                webSocketTask = null;
+                this.IsConnected = false;
+            });
+        }
+
         /// <summary>
         /// Stops listneing for messages from the websocket and closes the connection to the websocket.
         /// </summary>
@@ -57,35 +90,31 @@ public WebSocket(IDevicePortalConnection connection, Func<object, X509Certificat
 #pragma warning disable 1998
         private async Task StopListeningForMessagesInternalAsync()
         {
+            this.keepListeningForMessages = false;
+
+            // Wait for web socket to no longer be receiving messages.
             if (this.IsListeningForMessages)
             {
-                this.keepListeningForMessages = false;
-
-                // Wait for web socket to no longer be receiving messages.
-                if (this.IsListeningForMessages)
-                {
-                    this.stoppedReceivingMessages.WaitOne();
-                    this.stoppedReceivingMessages.Reset();
-                }
+                this.stoppedReceivingMessages.WaitOne();
+                this.stoppedReceivingMessages.Reset();
             }
         }
 #pragma warning restore 1998
 
         /// <summary>
-        /// Connects to the websocket and starts listening for messages from the websocket.
+        /// Starts listening for messages from the websocket.
         /// Once they are received they are parsed and the WebSocketMessageReceived event is raised.
         /// </summary>
-        /// <param name="endpoint">The uri that the weboscket should connect to</param>
         /// <returns>The task of listening for messages from the websocket.</returns>
-        private async Task StartListeningForMessagesInternalAsync(Uri endpoint)
+        private async Task StartListeningForMessagesInternalAsync()
         {
+            this.IsListeningForMessages = true;
             this.keepListeningForMessages = true;
 
             try
             {
                 while (this.keepListeningForMessages)
                 {
-                    Task<HttpResponseMessage> webSocketTask = TestHelpers.MockHttpResponder.WebSocketAsync(endpoint);
                     await webSocketTask.ConfigureAwait(false);
                     webSocketTask.Wait();
 
@@ -121,5 +150,24 @@ private async Task StartListeningForMessagesInternalAsync(Uri endpoint)
                 this.IsListeningForMessages = false;
             }
         }
+
+        /// <summary>
+        /// Sends a message to the server.
+        /// </summary>
+        /// <param name="message">The message to send.</param>
+        /// <returns>The task of sending the message to the websocket</returns>
+        private async Task SendMessageInternalAsync(string message)
+        {
+            await webSocketTask.ConfigureAwait(false);
+            webSocketTask.Wait();
+
+            using (HttpResponseMessage response = webSocketTask.Result)
+            {
+                if (!response.IsSuccessStatusCode)
+                {
+                    throw new DevicePortalException(response);
+                }
+            }
+        }
     }
 }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
index f249ba9e..a0e1ceed 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
@@ -32,10 +32,15 @@ public partial class DevicePortal
         public static readonly string EtwProvidersApi = "api/etw/providers";
 
         /// <summary>
-        /// Web socket to get ETW events.!
+        /// Web socket to get ETW events.
         /// </summary>
         private WebSocket<EtwEvents> realtimeEventsWebSocket;
 
+        /// <summary>
+        /// Determines if the event listener has been registered
+        /// </summary>
+        private bool isListeningForRealtimeEvents = false;
+
         /// <summary>
         /// The ETW event message received handler
         /// </summary>
@@ -59,31 +64,36 @@ public async Task<EtwProviders> GetEtwProvidersAsync()
             return await this.GetAsync<EtwProviders>(EtwProvidersApi);
         }
 
+        /// <summary>
+        /// Toggles the listening state of a specific provider on the realtime events WebSocket.
+        /// </summary>
+        /// <param name="etwProvider">The provider to update the listening state of.</param>
+        /// <param name="isEnabled">Determines whether the listening state should be enabled or disabled.</param>
+        /// <returns>Task for toggling the listening state of the specified provider.</returns>
+        public async Task ToggleEtwProviderAsync(EtwProviderInfo etwProvider, bool isEnabled = true)
+        {
+            string action = isEnabled ? "enable" : "disable";
+            string message = $"provider {etwProvider.GUID} {action}";
+
+            await this.InitializeRealtimeEventsWebSocket();
+            await this.realtimeEventsWebSocket.SendMessageAsync(message);
+        }
+
         /// <summary>
         /// Starts listening for ETW events with it being returned via the RealtimeEventsMessageReceived event handler.
         /// </summary>
         /// <returns>Task for connecting to the WebSocket but not for listening to it.</returns>
         public async Task StartListeningForEtwEventsAsync()
         {
-            if (this.realtimeEventsWebSocket == null)
-            {
-#if WINDOWS_UWP
-                this.realtimeEventsWebSocket = new WebSocket<EtwEvents>(this.deviceConnection);
-#else
-                this.realtimeEventsWebSocket = new WebSocket<EtwEvents>(this.deviceConnection, this.ServerCertificateValidation);
-#endif
+            await this.InitializeRealtimeEventsWebSocket();
 
-                this.realtimeEventsWebSocket.WebSocketMessageReceived += this.EtwEventsReceivedHandler;
-            }
-            else
+            if (!this.isListeningForRealtimeEvents)
             {
-                if (this.realtimeEventsWebSocket.IsListeningForMessages)
-                {
-                    return;
-                }
+                this.isListeningForRealtimeEvents = true;
+                this.realtimeEventsWebSocket.WebSocketMessageReceived += this.EtwEventsReceivedHandler;
             }
 
-            await this.realtimeEventsWebSocket.StartListeningForMessagesAsync(RealtimeEtwSessionApi);
+            await this.realtimeEventsWebSocket.ReceiveMessagesAsync();
         }
 
         /// <summary>
@@ -92,12 +102,31 @@ public async Task StartListeningForEtwEventsAsync()
         /// <returns>Task for stop listening for ETW events and disconnecting from the WebSocket.</returns>
         public async Task StopListeningForEtwEventsAsync()
         {
-            if (this.realtimeEventsWebSocket == null || !this.realtimeEventsWebSocket.IsListeningForMessages)
+            if (this.isListeningForRealtimeEvents)
+            {
+                this.isListeningForRealtimeEvents = false;
+                this.realtimeEventsWebSocket.WebSocketMessageReceived -= this.EtwEventsReceivedHandler;
+            }
+
+            await this.realtimeEventsWebSocket.CloseAsync();
+        }
+
+        /// <summary>
+        /// Creates a new <see cref="WebSocket{EtwEvents}"/> if it hasn't already been initialized.
+        /// </summary>
+        /// <returns>Task for connecting the ETW realtime event WebSocket.</returns>
+        private async Task InitializeRealtimeEventsWebSocket()
+        {
+            if (this.realtimeEventsWebSocket == null)
             {
-                return;
+#if WINDOWS_UWP
+                this.realtimeEventsWebSocket = new WebSocket<EtwEvents>(this.deviceConnection);
+#else
+                this.realtimeEventsWebSocket = new WebSocket<EtwEvents>(this.deviceConnection, this.ServerCertificateValidation);
+#endif
             }
 
-            await this.realtimeEventsWebSocket.StopListeningForMessagesAsync();
+            await this.realtimeEventsWebSocket.ConnectAsync(RealtimeEtwSessionApi);
         }
 
         /// <summary>
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/PerformanceData.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/PerformanceData.cs
index 16322971..e14fcf1c 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/PerformanceData.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/PerformanceData.cs
@@ -79,7 +79,8 @@ public async Task StartListeningForRunningProcessesAsync()
                 }
             }
 
-            await this.deviceProcessesWebSocket.StartListeningForMessagesAsync(RunningProcessApi);
+            await this.deviceProcessesWebSocket.ConnectAsync(RunningProcessApi);
+            await this.deviceProcessesWebSocket.ReceiveMessagesAsync();
         }
 
         /// <summary>
@@ -88,12 +89,7 @@ public async Task StartListeningForRunningProcessesAsync()
         /// <returns>Task for stop listening for processes and disconnecting from the websocket .</returns>
         public async Task StopListeningForRunningProcessesAsync()
         {
-            if (this.deviceProcessesWebSocket == null || !this.deviceProcessesWebSocket.IsListeningForMessages)
-            {
-                return;
-            }
-
-            await this.deviceProcessesWebSocket.StopListeningForMessagesAsync();
+            await this.deviceProcessesWebSocket.CloseAsync();
         }
 
         /// <summary>
@@ -129,7 +125,8 @@ public async Task StartListeningForSystemPerfAsync()
                 }
             }
 
-            await this.systemPerfWebSocket.StartListeningForMessagesAsync(SystemPerfApi);
+            await this.systemPerfWebSocket.ConnectAsync(SystemPerfApi);
+            await this.systemPerfWebSocket.ReceiveMessagesAsync();
         }
 
         /// <summary>
@@ -138,12 +135,7 @@ public async Task StartListeningForSystemPerfAsync()
         /// <returns>Task for stop listening for system perf and disconnecting from the websocket .</returns>
         public async Task StopListeningForSystemPerfAsync()
         {
-            if (this.systemPerfWebSocket == null || !this.systemPerfWebSocket.IsListeningForMessages)
-            {
-                return;
-            }
-
-            await this.systemPerfWebSocket.StopListeningForMessagesAsync();
+            await this.systemPerfWebSocket.CloseAsync();
         }
 
         /// <summary>
@@ -431,6 +423,7 @@ public bool Contains(int processId)
                         break;
                     }
                 }
+
                 return found;
             }
 
@@ -455,6 +448,7 @@ public bool Contains(string packageName, bool caseSensitive = true)
                         break;
                     }
                 }
+
                 return found;
             }
         }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs
index 01bfe26a..bff970db 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs
@@ -372,12 +372,15 @@ public async Task SaveEndpointResponseToFileAsync(
 
                 websocket.WebSocketStreamReceived += streamReceivedHandler;
 
-                Task startListeningForStreamTask = websocket.StartListeningForMessagesAsync(endpoint);
+                Task connect = websocket.ConnectAsync(endpoint);
+                connect.Wait();
+
+                Task startListeningForStreamTask = websocket.ReceiveMessagesAsync();
                 startListeningForStreamTask.Wait();
 
                 streamReceived.WaitOne();
 
-                Task stopListeningForStreamTask = websocket.StopListeningForMessagesAsync();
+                Task stopListeningForStreamTask = websocket.CloseAsync();
                 stopListeningForStreamTask.Wait();
 
                 websocket.WebSocketStreamReceived -= streamReceivedHandler;
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/WebSocket.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/WebSocket.cs
index 93ae900b..1fc98b05 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/WebSocket.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/WebSocket.cs
@@ -53,6 +53,15 @@ internal partial class WebSocket<T>
         /// </summary>
         public event WebSocketStreamReceivedEventInternalHandler<T> WebSocketStreamReceived;
 
+        /// <summary>
+        /// Gets a value indicating whether the web socket is connected.
+        /// </summary>
+        public bool IsConnected
+        {
+            get;
+            private set;
+        }
+
         /// <summary>
         /// Gets a value indicating whether the web socket is listening for messages.
         /// </summary>
@@ -62,35 +71,65 @@ public bool IsListeningForMessages
             private set;
         }
 
+        /// <summary>
+        /// Initialize a connection to the websocket.
+        /// </summary>
+        /// <param name="apiPath">The relative portion of the uri path that specifies the API to call.</param>
+        /// <param name="payload">The query string portion of the uri path that provides the parameterized data.</param>
+        /// <returns>The task of opening the websocket connection.</returns>
+        internal async Task ConnectAsync(string apiPath, string payload = null)
+        {
+            if (this.IsConnected)
+            {
+                return;
+            }
+
+            Uri uri = Utilities.BuildEndpoint(
+                this.deviceConnection.WebSocketConnection,
+                apiPath,
+                payload);
+            await this.ConnectInternalAsync(uri);
+        }
+
         /// <summary>
         /// Closes the connection to the websocket and stop listening for messages.
         /// </summary>
         /// <returns>The task of closing the websocket connection.</returns>
-        internal async Task StopListeningForMessagesAsync()
+        internal async Task CloseAsync()
         {
-            if (this.IsListeningForMessages)
+            if (this.IsConnected)
             {
-                await this.StopListeningForMessagesInternalAsync();
+                if (this.IsListeningForMessages)
+                {
+                    await this.StopListeningForMessagesInternalAsync();
+                }
+
+                await this.CloseInternalAsync();
             }
         }
 
         /// <summary>
         /// Starts listening for messages from the websocket. Once they are received they are parsed and the WebSocketMessageReceived event is raised.
         /// </summary>
-        /// <param name="apiPath">The relative portion of the uri path that specifies the API to call.</param>
-        /// <param name="payload">The query string portion of the uri path that provides the parameterized data.</param>
         /// <returns>The task of listening for messages from the websocket.</returns>
-        internal async Task StartListeningForMessagesAsync(
-            string apiPath,
-            string payload = null)
+        internal async Task ReceiveMessagesAsync()
+        {
+            if (this.IsConnected && !this.IsListeningForMessages)
+            {
+                await this.StartListeningForMessagesInternalAsync();
+            }
+        }
+
+        /// <summary>
+        /// Sends a message to the server.
+        /// </summary>
+        /// <param name="message">The message to send.</param>
+        /// <returns>The task of sending a message to the websocket.</returns>
+        internal async Task SendMessageAsync(string message)
         {
-            if (!this.IsListeningForMessages)
+            if (this.IsConnected)
             {
-                Uri uri = Utilities.BuildEndpoint(
-                    this.deviceConnection.WebSocketConnection,
-                    apiPath,
-                    payload);
-                await this.StartListeningForMessagesInternalAsync(uri);
+                await this.SendMessageInternalAsync(message);
             }
         }
 
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ApplicationManager.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ApplicationManager.cs
index 2842f4e2..460e8291 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ApplicationManager.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/ApplicationManager.cs
@@ -123,11 +123,14 @@ public class AppsListInfo
             public List<AppPackage> AppPackages { get; private set; }
         }
 
+        /// <summary>
+        /// Application package.
+        /// </summary>
         [DataContract]
         public class AppPackage
         {
             /// <summary>
-            /// Gets an app as the startup app
+            /// Gets a value indicating whether the app is the startup app
             /// </summary>
             [DataMember(Name = "IsStartup")]
             public bool IsStartup { get; private set; }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/BluetoothConnectivity.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/BluetoothConnectivity.cs
index 740f7cb2..7e15254b 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/BluetoothConnectivity.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/BluetoothConnectivity.cs
@@ -5,11 +5,11 @@
 //----------------------------------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.Serialization;
-using System.Threading.Tasks;
 using System.Threading;
-using System.Collections.Generic;
+using System.Threading.Tasks;
 
 namespace Microsoft.Tools.WindowsDevicePortal
 {
@@ -41,27 +41,27 @@ public partial class DevicePortal
         /// <summary>
         /// Web socket to get list of bluetooth devices.
         /// </summary>
-        private WebSocket<AvailableBluetoothDevicesInfo> BluetoothWebSocket;
+        private WebSocket<AvailableBluetoothDevicesInfo> bluetoothWebSocket;
 
         /// <summary>
-        /// Gets or sets the list of bluetooth devices received handler.
+        /// Web socket to get list of paired bluetooth devices.
         /// </summary>
-        public event WebSocketMessageReceivedEventHandler<AvailableBluetoothDevicesInfo> BluetoothDeviceListReceived;
+        private WebSocket<PairedBluetoothDevicesInfo> pairedBluetoothWebSocket;
 
         /// <summary>
-        /// Web socket to get list of paired bluetooth devices.
+        /// Web socket to get the results of bluetooth device pairing.
         /// </summary>
-        private WebSocket<PairedBluetoothDevicesInfo> PairedBluetoothWebSocket;
+        private WebSocket<PairBluetoothDevicesInfo> pairBluetoothWebSocket;
 
         /// <summary>
-        /// Gets or sets the list of paired bluetooth devices received handler.
+        /// Gets or sets the list of bluetooth devices received handler.
         /// </summary>
-        public event WebSocketMessageReceivedEventHandler<PairedBluetoothDevicesInfo> PairedBluetoothDeviceListReceived;
+        public event WebSocketMessageReceivedEventHandler<AvailableBluetoothDevicesInfo> BluetoothDeviceListReceived;
 
         /// <summary>
-        /// Web socket to get the results of bluetooth device pairing.
+        /// Gets or sets the list of paired bluetooth devices received handler.
         /// </summary>
-        private WebSocket<PairBluetoothDevicesInfo> PairBluetoothWebSocket;
+        public event WebSocketMessageReceivedEventHandler<PairedBluetoothDevicesInfo> PairedBluetoothDeviceListReceived;
 
         /// <summary>
         /// Gets the results of pairing bluetooth device received handler.
@@ -75,14 +75,14 @@ public partial class DevicePortal
         public AvailableBluetoothDevicesInfo GetAvailableBluetoothDevicesInfo()
         {
             AvailableBluetoothDevicesInfo bluetooth = null;
-            ManualResetEvent BluetoothReceived = new ManualResetEvent(false);
+            ManualResetEvent bluetoothReceived = new ManualResetEvent(false);
             WebSocketMessageReceivedEventHandler<AvailableBluetoothDevicesInfo> bluetoothReceivedHandler =
-                delegate (DevicePortal sender, WebSocketMessageReceivedEventArgs<AvailableBluetoothDevicesInfo> BluetoothArgs)
+                delegate(DevicePortal sender, WebSocketMessageReceivedEventArgs<AvailableBluetoothDevicesInfo> bluetoothArgs)
                 {
-                    if (BluetoothArgs.Message != null)
+                    if (bluetoothArgs.Message != null)
                     {
-                        bluetooth = BluetoothArgs.Message;
-                        BluetoothReceived.Set();
+                        bluetooth = bluetoothArgs.Message;
+                        bluetoothReceived.Set();
                     }
                 };
             this.BluetoothDeviceListReceived += bluetoothReceivedHandler;
@@ -90,7 +90,7 @@ public AvailableBluetoothDevicesInfo GetAvailableBluetoothDevicesInfo()
             Task startListeningForBluetooth = this.StartListeningForBluetoothAsync(AvailableBluetoothDevicesApi);
             startListeningForBluetooth.Wait();
 
-            BluetoothReceived.WaitOne();
+            bluetoothReceived.WaitOne();
 
             Task stopListeningForBluetooth = this.StopListeningForBluetoothAsync();
             stopListeningForBluetooth.Wait();
@@ -99,7 +99,6 @@ public AvailableBluetoothDevicesInfo GetAvailableBluetoothDevicesInfo()
             return bluetooth;
         }
 
-
         /// <summary>
         /// Gets the paired bluetooth device information.
         /// </summary>
@@ -107,14 +106,14 @@ public AvailableBluetoothDevicesInfo GetAvailableBluetoothDevicesInfo()
         public PairedBluetoothDevicesInfo GetPairedBluetoothDevicesInfo()
         {
             PairedBluetoothDevicesInfo bluetooth = null;
-            ManualResetEvent PairedBluetoothReceived = new ManualResetEvent(false);
+            ManualResetEvent pairedBluetoothReceived = new ManualResetEvent(false);
             WebSocketMessageReceivedEventHandler<PairedBluetoothDevicesInfo> pairedBluetoothReceivedHandler =
-                delegate (DevicePortal sender, WebSocketMessageReceivedEventArgs<PairedBluetoothDevicesInfo> BluetoothArgs)
+                delegate(DevicePortal sender, WebSocketMessageReceivedEventArgs<PairedBluetoothDevicesInfo> bluetoothArgs)
                 {
-                    if (BluetoothArgs.Message != null)
+                    if (bluetoothArgs.Message != null)
                     {
-                        bluetooth = BluetoothArgs.Message;
-                        PairedBluetoothReceived.Set();
+                        bluetooth = bluetoothArgs.Message;
+                        pairedBluetoothReceived.Set();
                     }
                 };
             this.PairedBluetoothDeviceListReceived += pairedBluetoothReceivedHandler;
@@ -122,7 +121,7 @@ public PairedBluetoothDevicesInfo GetPairedBluetoothDevicesInfo()
             Task startListeningForPairedBluetooth = this.StartListeningForPairedBluetoothAsync(PairedBluetoothDevicesApi);
             startListeningForPairedBluetooth.Wait();
 
-            PairedBluetoothReceived.WaitOne();
+            pairedBluetoothReceived.WaitOne();
 
             Task stopListeningForPairedBluetooth = this.StopListeningForPairedBluetoothAsync();
             stopListeningForPairedBluetooth.Wait();
@@ -134,18 +133,19 @@ public PairedBluetoothDevicesInfo GetPairedBluetoothDevicesInfo()
         /// <summary>
         /// Gets the results for pairing a bluetooth device.
         /// </summary>
+        /// <param name="deviceId">Device Id.</param>
         /// <returns>Results of pairing a bluetooth device</returns>
         public PairBluetoothDevicesInfo GetPairBluetoothDevicesInfo(string deviceId)
         {
             PairBluetoothDevicesInfo bluetooth = null;
-            ManualResetEvent PairBluetoothReceived = new ManualResetEvent(false);
+            ManualResetEvent pairBluetoothReceived = new ManualResetEvent(false);
             WebSocketMessageReceivedEventHandler<PairBluetoothDevicesInfo> pairBluetoothReceivedHandler =
-                delegate (DevicePortal sender, WebSocketMessageReceivedEventArgs<PairBluetoothDevicesInfo> BluetoothArgs)
+                delegate(DevicePortal sender, WebSocketMessageReceivedEventArgs<PairBluetoothDevicesInfo> bluetoothArgs)
                 {
-                    if (BluetoothArgs.Message != null)
+                    if (bluetoothArgs.Message != null)
                     {
-                        bluetooth = BluetoothArgs.Message;
-                        PairBluetoothReceived.Set();
+                        bluetooth = bluetoothArgs.Message;
+                        pairBluetoothReceived.Set();
                     }
                 };
             this.PairBluetoothDeviceListReceived += pairBluetoothReceivedHandler;
@@ -153,7 +153,7 @@ public PairBluetoothDevicesInfo GetPairBluetoothDevicesInfo(string deviceId)
             Task startListeningForPairBluetooth = this.StartListeningForPairBluetoothAsync(PairBluetoothDevicesApi, string.Format("deviceId={0}", Utilities.Hex64Encode(deviceId)));
             startListeningForPairBluetooth.Wait();
 
-            PairBluetoothReceived.WaitOne();
+            pairBluetoothReceived.WaitOne();
 
             Task stopListeningForPairBluetooth = this.StopListeningForPairBluetoothAsync();
             stopListeningForPairBluetooth.Wait();
@@ -165,28 +165,30 @@ public PairBluetoothDevicesInfo GetPairBluetoothDevicesInfo(string deviceId)
         /// <summary>
         /// Starts listening for bluetooth list of devices returned from the BluetoothDeviceListReceived handler.
         /// </summary>
+        /// <param name="bluetoothApi">The relative portion of the uri path that specifies the API to call.</param>
         /// <returns>Task for connecting to the websocket but not for listening to it.</returns>
         public async Task StartListeningForBluetoothAsync(string bluetoothApi)
         {
-            if (this.BluetoothWebSocket == null)
+            if (this.bluetoothWebSocket == null)
             {
 #if WINDOWS_UWP
-                this.BluetoothWebSocket = new WebSocket<AvailableBluetoothDevicesInfo>(this.deviceConnection);
+                this.bluetoothWebSocket = new WebSocket<AvailableBluetoothDevicesInfo>(this.deviceConnection);
 #else
-                this.BluetoothWebSocket = new WebSocket<AvailableBluetoothDevicesInfo>(this.deviceConnection, this.ServerCertificateValidation);
+                this.bluetoothWebSocket = new WebSocket<AvailableBluetoothDevicesInfo>(this.deviceConnection, this.ServerCertificateValidation);
 #endif
 
-                this.BluetoothWebSocket.WebSocketMessageReceived += this.BluetoothReceivedHandler;
+                this.bluetoothWebSocket.WebSocketMessageReceived += this.BluetoothReceivedHandler;
             }
             else
             {
-                if (this.BluetoothWebSocket.IsListeningForMessages)
+                if (this.bluetoothWebSocket.IsListeningForMessages)
                 {
                     return;
                 }
             }
 
-            await this.BluetoothWebSocket.StartListeningForMessagesAsync(bluetoothApi);
+            await this.bluetoothWebSocket.ConnectAsync(bluetoothApi);
+            await this.bluetoothWebSocket.ReceiveMessagesAsync();
         }
 
         /// <summary>
@@ -195,56 +197,36 @@ public async Task StartListeningForBluetoothAsync(string bluetoothApi)
         /// <returns>Task to stop listening for bluetooth devices and disconnecting from the websocket .</returns>
         public async Task StopListeningForBluetoothAsync()
         {
-            if (this.BluetoothWebSocket == null || !this.BluetoothWebSocket.IsListeningForMessages)
-            {
-                return;
-            }
-
-            await this.BluetoothWebSocket.StopListeningForMessagesAsync();
-        }
-
-        /// <summary>
-        /// Handler for the list of bluetooth devices received event to pass it on to the BluetoothDeviceListReceived handler.
-        /// </summary>
-        /// <param name="sender">The <see cref="WebSocket{AvailableBluetoothDevicesInfo}"/> object sending the event.</param>
-        /// <param name="args">The event data.</param>
-        private void BluetoothReceivedHandler(
-            WebSocket<AvailableBluetoothDevicesInfo> sender,
-            WebSocketMessageReceivedEventArgs<AvailableBluetoothDevicesInfo> args)
-        {
-            if (args.Message != null)
-            {
-                this.BluetoothDeviceListReceived?.Invoke(
-                            this,
-                            args);
-            }
+            await this.bluetoothWebSocket.CloseAsync();
         }
 
         /// <summary>
         /// Starts listening for paired bluetooth list of devices returned from the PairedBluetoothDeviceListReceived handler.
         /// </summary>
+        /// <param name="bluetoothApi">The relative portion of the uri path that specifies the API to call.</param>
         /// <returns>Task for connecting to the websocket but not for listening to it.</returns>
         public async Task StartListeningForPairedBluetoothAsync(string bluetoothApi)
         {
-            if (this.PairedBluetoothWebSocket == null)
+            if (this.pairedBluetoothWebSocket == null)
             {
 #if WINDOWS_UWP
-                this.PairedBluetoothWebSocket = new WebSocket<PairedBluetoothDevicesInfo>(this.deviceConnection);
+                this.pairedBluetoothWebSocket = new WebSocket<PairedBluetoothDevicesInfo>(this.deviceConnection);
 #else
-                this.PairedBluetoothWebSocket = new WebSocket<PairedBluetoothDevicesInfo>(this.deviceConnection, this.ServerCertificateValidation);
+                this.pairedBluetoothWebSocket = new WebSocket<PairedBluetoothDevicesInfo>(this.deviceConnection, this.ServerCertificateValidation);
 #endif
 
-                this.PairedBluetoothWebSocket.WebSocketMessageReceived += this.PairedBluetoothReceivedHandler;
+                this.pairedBluetoothWebSocket.WebSocketMessageReceived += this.PairedBluetoothReceivedHandler;
             }
             else
             {
-                if (this.PairedBluetoothWebSocket.IsListeningForMessages)
+                if (this.pairedBluetoothWebSocket.IsListeningForMessages)
                 {
                     return;
                 }
             }
 
-            await this.PairedBluetoothWebSocket.StartListeningForMessagesAsync(bluetoothApi);
+            await this.pairedBluetoothWebSocket.ConnectAsync(bluetoothApi);
+            await this.pairedBluetoothWebSocket.ReceiveMessagesAsync();
         }
 
         /// <summary>
@@ -253,56 +235,42 @@ public async Task StartListeningForPairedBluetoothAsync(string bluetoothApi)
         /// <returns>Task to stop listening for bluetooth devices and disconnecting from the websocket .</returns>
         public async Task StopListeningForPairedBluetoothAsync()
         {
-            if (this.PairedBluetoothWebSocket == null || !this.PairedBluetoothWebSocket.IsListeningForMessages)
+            if (this.pairedBluetoothWebSocket == null || !this.pairedBluetoothWebSocket.IsListeningForMessages)
             {
                 return;
             }
 
-            await this.PairedBluetoothWebSocket.StopListeningForMessagesAsync();
-        }
-
-        /// <summary>
-        /// Handler for the list of paired bluetooth devices received event to pass it on to the PairedBluetoothDeviceListReceived handler.
-        /// </summary>
-        /// <param name="sender">The <see cref="WebSocket{PairedBluetoothDevicesInfo}"/> object sending the event.</param>
-        /// <param name="args">The event data.</param>
-        private void PairedBluetoothReceivedHandler(
-            WebSocket<PairedBluetoothDevicesInfo> sender,
-            WebSocketMessageReceivedEventArgs<PairedBluetoothDevicesInfo> args)
-        {
-            if (args.Message != null)
-            {
-                this.PairedBluetoothDeviceListReceived?.Invoke(
-                            this,
-                            args);
-            }
+            await this.pairedBluetoothWebSocket.CloseAsync();
         }
 
         /// <summary>
         /// Starts listening for the result to pair the bluetooth device returned from the PairBluetoothDeviceListReceived handler.
         /// </summary>
+        /// <param name="bluetoothApi">The relative portion of the uri path that specifies the API to call.</param>
+        /// <param name="payload">The query string portion of the uri path that provides the parameterized data.</param>
         /// <returns>Task for connecting to the websocket but not for listening to it.</returns>
         public async Task StartListeningForPairBluetoothAsync(string bluetoothApi, string payload)
         {
-            if (this.PairBluetoothWebSocket == null)
+            if (this.pairBluetoothWebSocket == null)
             {
 #if WINDOWS_UWP
-                this.PairBluetoothWebSocket = new WebSocket<PairBluetoothDevicesInfo>(this.deviceConnection);
+                this.pairBluetoothWebSocket = new WebSocket<PairBluetoothDevicesInfo>(this.deviceConnection);
 #else
-                this.PairBluetoothWebSocket = new WebSocket<PairBluetoothDevicesInfo>(this.deviceConnection, this.ServerCertificateValidation);
+                this.pairBluetoothWebSocket = new WebSocket<PairBluetoothDevicesInfo>(this.deviceConnection, this.ServerCertificateValidation);
 #endif
 
-                this.PairBluetoothWebSocket.WebSocketMessageReceived += this.PairBluetoothReceivedHandler;
+                this.pairBluetoothWebSocket.WebSocketMessageReceived += this.PairBluetoothReceivedHandler;
             }
             else
             {
-                if (this.PairBluetoothWebSocket.IsListeningForMessages)
+                if (this.pairBluetoothWebSocket.IsListeningForMessages)
                 {
                     return;
                 }
             }
 
-            await this.PairBluetoothWebSocket.StartListeningForMessagesAsync(bluetoothApi, payload);
+            await this.pairBluetoothWebSocket.ConnectAsync(bluetoothApi, payload);
+            await this.pairBluetoothWebSocket.ReceiveMessagesAsync();
         }
 
         /// <summary>
@@ -311,12 +279,53 @@ public async Task StartListeningForPairBluetoothAsync(string bluetoothApi, strin
         /// <returns>Task to stop listening for the bluetooth device and disconnecting from the websocket .</returns>
         public async Task StopListeningForPairBluetoothAsync()
         {
-            if (this.PairBluetoothWebSocket == null || !this.PairBluetoothWebSocket.IsListeningForMessages)
+            await this.pairBluetoothWebSocket.CloseAsync();
+        }
+
+        /// <summary>
+        /// Unpairs the bluetooth device.
+        /// </summary>
+        /// <param name="deviceId">Device Id.</param>
+        /// <returns>Task tracking completion of the REST call.</returns>
+        public async Task<ErrorInformation> UnPairBluetoothDeviceAsync(string deviceId)
+        {
+            return await this.PostAsync<ErrorInformation>(
+                 UnpairBluetoothDevicesApi,
+                string.Format("deviceId={0}", Utilities.Hex64Encode(deviceId)));
+        }
+
+        /// <summary>
+        /// Handler for the list of bluetooth devices received event to pass it on to the BluetoothDeviceListReceived handler.
+        /// </summary>
+        /// <param name="sender">The <see cref="WebSocket{AvailableBluetoothDevicesInfo}"/> object sending the event.</param>
+        /// <param name="args">The event data.</param>
+        private void BluetoothReceivedHandler(
+            WebSocket<AvailableBluetoothDevicesInfo> sender,
+            WebSocketMessageReceivedEventArgs<AvailableBluetoothDevicesInfo> args)
+        {
+            if (args.Message != null)
             {
-                return;
+                this.BluetoothDeviceListReceived?.Invoke(
+                            this,
+                            args);
             }
+        }
 
-            await this.PairBluetoothWebSocket.StopListeningForMessagesAsync();
+        /// <summary>
+        /// Handler for the list of paired bluetooth devices received event to pass it on to the PairedBluetoothDeviceListReceived handler.
+        /// </summary>
+        /// <param name="sender">The <see cref="WebSocket{PairedBluetoothDevicesInfo}"/> object sending the event.</param>
+        /// <param name="args">The event data.</param>
+        private void PairedBluetoothReceivedHandler(
+            WebSocket<PairedBluetoothDevicesInfo> sender,
+            WebSocketMessageReceivedEventArgs<PairedBluetoothDevicesInfo> args)
+        {
+            if (args.Message != null)
+            {
+                this.PairedBluetoothDeviceListReceived?.Invoke(
+                            this,
+                            args);
+            }
         }
 
         /// <summary>
@@ -336,18 +345,6 @@ private void PairBluetoothReceivedHandler(
             }
         }
 
-        /// <summary>
-        /// Unpairs the bluetooth device.
-        /// </summary>
-        /// <param name="deviceId">Device Id.</param>
-        /// <returns>Task tracking completion of the REST call.</returns>
-        public async Task<ErrorInformation> UnPairBluetoothDeviceAsync(string deviceId)
-        {
-            return await this.PostAsync<ErrorInformation>(
-                 UnpairBluetoothDevicesApi,
-                string.Format("deviceId={0}", Utilities.Hex64Encode(deviceId)));
-        }
-
         #region Data contract
 
         /// <summary>
@@ -357,21 +354,25 @@ public async Task<ErrorInformation> UnPairBluetoothDeviceAsync(string deviceId)
         public class AvailableBluetoothDevicesInfo 
         {
             /// <summary>
-            /// Returns a list of available devices
+            /// Gets a list of available devices
             /// </summary>
             [DataMember(Name = "AvailableDevices")]
             public List<BluetoothDeviceInfo> AvailableDevices { get; private set; }
         }
+
+        /// <summary>
+        /// Information about a bluetooth device.
+        /// </summary>
         public class BluetoothDeviceInfo 
         {
             /// <summary>
-            /// Returns the bluetooth device ID
+            /// Gets the bluetooth device ID
             /// </summary>
             [DataMember(Name = "ID")]
             public string ID { get; private set; }
 
             /// <summary>
-            /// Returns the bluetooth device name
+            /// Gets the bluetooth device name
             /// </summary>
             [DataMember(Name = "Name")]
             public string Name { get; private set; }
@@ -384,7 +385,7 @@ public class BluetoothDeviceInfo
         public class PairedBluetoothDevicesInfo 
         {
             /// <summary>
-            /// Returns a list of paired devices
+            /// Gets a list of paired devices
             /// </summary>
             [DataMember(Name = "PairedDevices")]
             public List<BluetoothDeviceInfo> PairedDevices { get; private set; }
@@ -397,28 +398,31 @@ public class PairedBluetoothDevicesInfo
         public class PairBluetoothDevicesInfo 
         {
             /// <summary>
-            /// Returns the pair results
+            /// Gets the pair results
             /// </summary>
             [DataMember(Name = "PairResult")]
             public PairResult PairResult { get; private set; }
         }
 
+        /// <summary>
+        /// Information about device pairing.
+        /// </summary>
         public class PairResult
         {
             /// <summary>
-            /// Returns the result about the device pairing
+            /// Gets the result about the device pairing
             /// </summary>
             [DataMember(Name = "Result")]
             public string Result { get; private set; }
 
             /// <summary>
-            /// Returns the deviceId to be paired
+            /// Gets the deviceId to be paired
             /// </summary>
             [DataMember(Name = "deviceId")]
-            public string deviceId { get; private set; }
+            public string DeviceId { get; private set; }
 
             /// <summary>
-            /// Returns the pin
+            /// Gets the pin
             /// </summary>
             [DataMember(Name = "Pin")]
             public string Pin { get; private set; }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/WebSocket.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/WebSocket.cs
index 52395049..c1603bde 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/WebSocket.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/WebSocket.cs
@@ -24,6 +24,11 @@ internal partial class WebSocket<T>
         /// </summary>
         private MessageWebSocket websocket = null;
 
+        /// <summary>
+        /// The websocket connection has closed after the request was fulfilled.
+        /// </summary>
+        private UInt16 WebSocketCloseStatus_NormalClosure = 1000;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="WebSocket{T}" /> class.
         /// </summary>
@@ -37,12 +42,11 @@ public WebSocket(IDevicePortalConnection connection, bool sendStreams = false)
         }
 
         /// <summary>
-        /// Opens a connection to the specified websocket API and starts listening for messages.
+        /// Opens a connection to the specified websocket API.
         /// </summary>
         /// <param name="endpoint">The uri that the weboscket should connect to</param>
         /// <returns>The task of opening a connection to the websocket.</returns>
-#pragma warning disable 1998
-        private async Task StartListeningForMessagesInternalAsync(
+        private async Task ConnectInternalAsync(
             Uri endpoint)
         {
             this.websocket = new MessageWebSocket();
@@ -72,36 +76,36 @@ private async Task StartListeningForMessagesInternalAsync(
 
             this.websocket.SetRequestHeader("Origin", this.deviceConnection.Connection.AbsoluteUri);
 
-            // Do not wait on receiving messages.
-            Task connectTask = this.ConnectAsync(endpoint);
+            await this.websocket.ConnectAsync(endpoint);
+
+            this.IsConnected = true;
         }
-#pragma warning restore 1998
 
         /// <summary>
-        /// Opens a connection to the specified websocket API.
+        /// Closes the connection to the websocket.
+        /// </summary>
+        /// <returns>The task of closing the websocket connection.</returns>
+        private async Task CloseInternalAsync()
+        {
+            await Task.Run(() =>
+            {
+                this.websocket.Close(WebSocketCloseStatus_NormalClosure, "Closed due to user request.");
+                this.websocket.Dispose();
+                this.websocket = null;
+                this.IsConnected = false;
+            });
+        }
+
+        /// <summary>
+        /// Opens a connection to the specified websocket API and starts listening for messages.
         /// </summary>
-        /// <param name="endpoint">The uri that the weboscket should connect to</param>
         /// <returns>The task of opening a connection to the websocket.</returns>
-        private async Task ConnectAsync(
-            Uri endpoint)
+        private async Task StartListeningForMessagesInternalAsync()
         {
-            bool connecting = true;
-            try
+            await Task.Run(() =>
             {
-                await this.websocket.ConnectAsync(endpoint);
-                connecting = false;
                 this.IsListeningForMessages = true;
-            }
-            catch (Exception)
-            {
-                // Error happened during connect operation.
-                if (connecting && this.websocket != null)
-                {
-                    this.websocket.Dispose();
-                    this.websocket = null;
-                    this.IsListeningForMessages = false;
-                }
-            }
+            });
         }
 
         /// <summary>
@@ -111,38 +115,55 @@ private async Task ConnectAsync(
         /// <param name="args">The message from the web socket.</param>
         private void MessageReceived(MessageWebSocket sender, MessageWebSocketMessageReceivedEventArgs args)
         {
-            using (IInputStream inputStream = args.GetDataStream())
+            if (this.IsListeningForMessages)
             {
-                Stream stream = new MemoryStream();
+                using (IInputStream inputStream = args.GetDataStream())
+                {
+                    Stream stream = new MemoryStream();
 
-                Task copyTask = inputStream.AsStreamForRead().CopyToAsync(stream);
-                copyTask.Wait();
+                    Task copyTask = inputStream.AsStreamForRead().CopyToAsync(stream);
+                    copyTask.Wait();
 
-                // Ensure we return with the stream pointed at the origin.
-                stream.Position = 0;
+                    // Ensure we return with the stream pointed at the origin.
+                    stream.Position = 0;
 
-                this.ConvertStreamToMessage(stream);
+                    this.ConvertStreamToMessage(stream);
+                }
             }
         }
 
         /// <summary>
-        /// Closes the connection to the websocket.
+        /// Stops listening for messages from the websocket.
         /// </summary>
         /// <returns>The task of closing the websocket connection.</returns>
-#pragma warning disable 1998
         private async Task StopListeningForMessagesInternalAsync()
         {
-            if (this.IsListeningForMessages)
+            await Task.Run(() =>
             {
-                if (this.websocket != null)
-                {
-                    // Code 1000 indicates that the purpose of the connection has been fulfilled and the connection is no longer needed.
-                    this.websocket.Close(1000, "Closed due to user request.");
-                    this.websocket = null;
-                    this.IsListeningForMessages = false;
-                }
+                this.IsListeningForMessages = false;
+            });
+        }
+
+        /// <summary>
+        /// Sends a message to the websocket.
+        /// </summary>
+        /// <param name="message">The message to be sent.</param>
+        /// <returns>The task of sending the specified message to the server.</returns>
+        private async Task SendMessageInternalAsync(string message)
+        {
+            using (DataWriter data = new DataWriter(this.websocket.OutputStream))
+            {
+                // Load the content into the data writer.
+                data.UnicodeEncoding = UnicodeEncoding.Utf8;
+                data.WriteString(message);
+
+                // Send the content to the output stream.
+                await data.StoreAsync();
+                await data.FlushAsync();
+
+                // Do not close the output stream when the data writer is disposed.
+                data.DetachStream();
             }
         }
-#pragma warning restore 1998
     }
 }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/WebSocket.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/WebSocket.cs
index 889bf7d1..ad844e32 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/WebSocket.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/WebSocket.cs
@@ -11,6 +11,7 @@
 using System.Net.Sockets;
 using System.Net.WebSockets;
 using System.Security.Cryptography.X509Certificates;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -35,7 +36,7 @@ internal partial class WebSocket<T>
         /// <summary>
         /// The <see cref="ClientWebSocket" /> that is being wrapped.
         /// </summary>
-        private ClientWebSocket websocket = new ClientWebSocket();
+        private ClientWebSocket websocket;
 
         /// <summary>
         /// <see cref="Task" /> for receiving messages.
@@ -62,13 +63,14 @@ public WebSocket(IDevicePortalConnection connection, Func<object, X509Certificat
         }
 
         /// <summary>
-        /// Opens a connection to the specified websocket API and starts listening for messages.
+        /// Opens a connection to the specified websocket API.
         /// </summary>
         /// <param name="endpoint">The uri that the weboscket should connect to</param>
         /// <returns>The task of opening a connection to the websocket.</returns>
-        private async Task OpenConnectionAsync(
+        private async Task ConnectInternalAsync(
             Uri endpoint)
         {
+            this.websocket = new ClientWebSocket();
             this.websocket.Options.UseDefaultCredentials = false;
             this.websocket.Options.Credentials = this.deviceConnection.Credentials;
             this.websocket.Options.SetRequestHeader("Origin", this.deviceConnection.Connection.AbsoluteUri);
@@ -80,36 +82,58 @@ private async Task OpenConnectionAsync(
             };
 
             await this.websocket.ConnectAsync(endpoint, CancellationToken.None);
+            this.IsConnected = true;
         }
 
         /// <summary>
-        /// Stops listening for messages and closes the connection to the websocket.
+        /// Closes the connection to the websocket.
         /// </summary>
         /// <returns>The task of closing the websocket connection.</returns>
-        private async Task StopListeningForMessagesInternalAsync()
+        private async Task CloseInternalAsync()
         {
-            if (this.IsListeningForMessages)
+            await Task.Run(() =>
             {
-                await this.websocket.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
+                this.websocket.Dispose();
+                this.websocket = null;
+                this.IsConnected = false;
+            });
+        }
 
-                // Wait for web socket to no longer be receiving messages.
-                if (this.IsListeningForMessages)
-                {
-                    await this.receivingMessagesTask;
-                    this.receivingMessagesTask = null;
-                }
+        /// <summary>
+        /// Stops listening for messages.
+        /// </summary>
+        /// <returns>The task of closing the websocket connection.</returns>
+        private async Task StopListeningForMessagesInternalAsync()
+        {
+            await this.websocket.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, string.Empty, CancellationToken.None);
 
-                // Reset websocket as WDP will abort the connection once it receives the close message.
-                this.websocket = new ClientWebSocket();
+            // Wait for web socket to no longer be receiving messages.
+            if (this.IsListeningForMessages)
+            {
+                await this.receivingMessagesTask;
+                this.receivingMessagesTask = null;
             }
         }
 
         /// <summary>
-        /// Listen for messages from the websocket. Once they are received they are parsed and the WebSocketMessageReceived event is raised.
+        /// Starts listening for messages from the websocket. Once they are received they are parsed and the WebSocketMessageReceived event is raised.
         /// </summary>
         /// <returns>The task of listening for messages from the websocket.</returns>
-        private async Task ListenForMessagesInternalAsync()
+        private async Task StartListeningForMessagesInternalAsync()
+        {
+            await Task.Run(() =>
+            {
+                this.StartListeningForMessagesInternal();
+            });
+        }
+
+        /// <summary>
+        /// Starts listening for messages from the websocket. Once they are received they are parsed and the WebSocketMessageReceived event is raised.
+        /// </summary>
+        private void StartListeningForMessagesInternal()
         {
+            this.IsListeningForMessages = true;
+
             this.receivingMessagesTask = Task.Run(async () =>
             {
                 try
@@ -178,35 +202,19 @@ private async Task ListenForMessagesInternalAsync()
                     this.IsListeningForMessages = false;
                 }
             });
-
-            await this.receivingMessagesTask;
         }
 
         /// <summary>
-        /// Starts listening for messages from the websocket. Once they are received they are parsed and the WebSocketMessageReceived event is raised.
+        /// Sends a message to the server.
         /// </summary>
-        /// <param name="endpoint">The uri that the weboscket should connect to</param>
-        /// <returns>The task of listening for messages from the websocket.</returns>
-        private async Task StartListeningForMessagesInternalAsync(Uri endpoint)
+        /// <param name="message">The message to send.</param>
+        /// <returns>The task of sending a message to the websocket.</returns>
+        private async Task SendMessageInternalAsync(string message)
         {
-            if (this.IsListeningForMessages)
-            {
-                return;
-            }
-
-            this.IsListeningForMessages = true;
-
-            try
-            {
-                await this.OpenConnectionAsync(endpoint);
-            }
-            catch
-            {
-                this.IsListeningForMessages = false;
-            }
+            byte[] bytes = Encoding.UTF8.GetBytes(message);
+            ArraySegment<byte> buffer = new ArraySegment<byte>(bytes);
 
-            // Do not wait on actually listening for messages.
-            Task listenForMessagesInternal = this.ListenForMessagesInternalAsync();
+            await this.websocket.SendAsync(buffer, WebSocketMessageType.Text, true, CancellationToken.None);
         }
     }
 }

From 74b313746635dd5d9b29c70a814cfac480ed2262 Mon Sep 17 00:00:00 2001
From: Chris Baudin <cbaud@microsoft.com>
Date: Mon, 13 Feb 2017 19:22:36 -0800
Subject: [PATCH 44/51] Implement the Data Contract for the realtime ETW API.
 (Issue #31)

---
 .../Core/Etw.cs                               | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
index a0e1ceed..f6aa4146 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
@@ -154,6 +154,78 @@ private void EtwEventsReceivedHandler(
         [DataContract]
         public class EtwEvents
         {
+            /// <summary>
+            /// Gets the event.
+            /// </summary>
+            [DataMember(Name = "Events")]
+            public List<EtwEventInfo> Event { get; private set; }
+
+            /// <summary>
+            /// Gets the event frequency.
+            /// </summary>
+            [DataMember(Name = "Frequency")]
+            public long Frequency { get; private set; }
+        }
+
+        /// <summary>
+        /// ETW Event Info.
+        /// </summary>
+        [DataContract]
+        public class EtwEventInfo
+        {
+            /// <summary>
+            /// Gets the event latency.
+            /// </summary>
+            [DataMember(Name = "EventLatency")]
+            public string EventLatency { get; private set; }
+
+            /// <summary>
+            /// Gets the event payload.
+            /// </summary>
+            [DataMember(Name = "EventPayload")]
+            public string EventPayload { get; private set; }
+
+            /// <summary>
+            /// Gets the event persistence.
+            /// </summary>
+            [DataMember(Name = "EventPersistence")]
+            public string EventPersistence { get; private set; }
+
+            /// <summary>
+            /// Gets the event identifer.
+            /// </summary>
+            [DataMember(Name = "ID")]
+            public string ID { get; private set; }
+
+            /// <summary>
+            /// Gets the event keyword.
+            /// </summary>
+            [DataMember(Name = "Keyword")]
+            public string Keywword { get; private set; }
+
+            /// <summary>
+            /// Gets the event level.
+            /// </summary>
+            [DataMember(Name = "Level")]
+            public string Level { get; private set; }
+
+            /// <summary>
+            /// Gets the event provider name.
+            /// </summary>
+            [DataMember(Name = "ProviderName")]
+            public string ProviderName { get; private set; }
+
+            /// <summary>
+            /// Gets the event task name.
+            /// </summary>
+            [DataMember(Name = "TaskName")]
+            public string TaskName { get; private set; }
+
+            /// <summary>
+            /// Gets the event timestamp.
+            /// </summary>
+            [DataMember(Name = "Timestamp")]
+            public string Timestamp { get; private set; }
         }
 
         /// <summary>

From 42c7ed84ce2626c51f34970539cacc0879ffa32a Mon Sep 17 00:00:00 2001
From: Chris Baudin <cbaud@microsoft.com>
Date: Mon, 13 Feb 2017 20:09:06 -0800
Subject: [PATCH 45/51] Update the Data Contract for the realtime ETW API to
 use the correct property types. (Issue #31)

---
 .../Core/Etw.cs                                | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
index f6aa4146..7a3dfe3a 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
@@ -177,55 +177,55 @@ public class EtwEventInfo
             /// Gets the event latency.
             /// </summary>
             [DataMember(Name = "EventLatency")]
-            public string EventLatency { get; private set; }
+            public int Latency { get; private set; }
 
             /// <summary>
             /// Gets the event payload.
             /// </summary>
             [DataMember(Name = "EventPayload")]
-            public string EventPayload { get; private set; }
+            public string Payload { get; private set; }
 
             /// <summary>
             /// Gets the event persistence.
             /// </summary>
             [DataMember(Name = "EventPersistence")]
-            public string EventPersistence { get; private set; }
+            public int Persistence { get; private set; }
 
             /// <summary>
             /// Gets the event identifer.
             /// </summary>
             [DataMember(Name = "ID")]
-            public string ID { get; private set; }
+            public ushort ID { get; private set; }
 
             /// <summary>
             /// Gets the event keyword.
             /// </summary>
             [DataMember(Name = "Keyword")]
-            public string Keywword { get; private set; }
+            public ulong Keyword { get; private set; }
 
             /// <summary>
             /// Gets the event level.
             /// </summary>
             [DataMember(Name = "Level")]
-            public string Level { get; private set; }
+            public uint Level { get; private set; }
 
             /// <summary>
             /// Gets the event provider name.
             /// </summary>
             [DataMember(Name = "ProviderName")]
-            public string ProviderName { get; private set; }
+            public string Provider { get; private set; }
 
             /// <summary>
             /// Gets the event task name.
             /// </summary>
             [DataMember(Name = "TaskName")]
-            public string TaskName { get; private set; }
+            public string Task { get; private set; }
 
             /// <summary>
             /// Gets the event timestamp.
             /// </summary>
             [DataMember(Name = "Timestamp")]
-            public string Timestamp { get; private set; }
+            public ulong Timestamp { get; private set; }
         }
 
         /// <summary>

From 83d12b23f1dea48d028cb181bb273ed12970fd72 Mon Sep 17 00:00:00 2001
From: Morten Nielsen <mn@iter.dk>
Date: Wed, 15 Feb 2017 11:54:41 -0800
Subject: [PATCH 46/51] Refactored use of async. (#215)

* Refactored use of async. No tight while-loops but instead using await and continue on background threads.

* Remove use of .Wait() to avoid potential deadlocks. increase use of ConfigureAwait, and remove await where not needed

* Simplified async code. Instead of forwarding to tasks and have to switch to ui thread, it's easier to just await and continue on the same thread here.
---
 .../MainPage.xaml.cs                          | 405 +++++++-----------
 .../WDPMockImplementations/RestDelete.cs      |   2 +-
 .../WDPMockImplementations/RestGet.cs         |   2 +-
 .../WDPMockImplementations/RestPost.cs        |   2 +-
 .../WDPMockImplementations/RestPut.cs         |   2 +-
 .../WDPMockImplementations/WebSocket.cs       |   9 +-
 .../Core/AppDeployment.cs                     |   2 +-
 .../Core/OsInformation.cs                     |  10 +-
 .../DevicePortal.cs                           |  22 +-
 .../Exceptions/DevicePortalException.cs       |  36 +-
 .../HttpRest/RestGet.cs                       |   2 +-
 .../IoT/BluetoothConnectivity.cs              |  24 +-
 .../Xbox/XboxAppDeployment.cs                 |   6 +-
 .../CertificateHandling.cs                    |  17 +-
 .../Core/AppDeployment.cs                     |  16 +-
 .../HttpRest/RestDelete.cs                    |  18 +-
 .../HttpRest/RestGet.cs                       |  18 +-
 .../HttpRest/RestPost.cs                      |  18 +-
 .../HttpRest/RestPut.cs                       |  17 +-
 .../HttpRest/WebSocket.cs                     |   5 +-
 .../Core/AppDeployment.cs                     |  13 +-
 .../HttpRest/RestDelete.cs                    |  12 +-
 .../HttpRest/RestGet.cs                       |  12 +-
 .../HttpRest/RestPost.cs                      |  12 +-
 .../HttpRest/RestPut.cs                       |  12 +-
 .../HttpRest/WebSocket.cs                     |   2 +-
 26 files changed, 233 insertions(+), 463 deletions(-)

diff --git a/Samples/SampleWdpClient.UniversalWindows/MainPage.xaml.cs b/Samples/SampleWdpClient.UniversalWindows/MainPage.xaml.cs
index fca8e65a..ad8d8d3e 100644
--- a/Samples/SampleWdpClient.UniversalWindows/MainPage.xaml.cs
+++ b/Samples/SampleWdpClient.UniversalWindows/MainPage.xaml.cs
@@ -62,7 +62,7 @@ private void ClearOutput()
         /// </summary>
         /// <param name="sender">The caller of this method.</param>
         /// <param name="e">The arguments associated with this event.</param>
-        private void ConnectToDevice_Click(object sender, RoutedEventArgs e)
+        private async void ConnectToDevice_Click(object sender, RoutedEventArgs e)
         {
             this.EnableConnectionControls(false);
             this.EnableDeviceControls(false);
@@ -78,61 +78,51 @@ private void ConnectToDevice_Click(object sender, RoutedEventArgs e)
                     this.password.Password));
 
             StringBuilder sb = new StringBuilder();
-            Task connectTask = new Task(
-                async () =>
-                {
-                    sb.Append(this.MarshalGetCommandOutput());
-                    sb.AppendLine("Connecting...");
-                    this.MarshalUpdateCommandOutput(sb.ToString());
-                    portal.ConnectionStatus += (portal, connectArgs) =>
-                    {
-                        if (connectArgs.Status == DeviceConnectionStatus.Connected)
-                        {
-                            sb.Append("Connected to: ");
-                            sb.AppendLine(portal.Address);
-                            sb.Append("OS version: ");
-                            sb.AppendLine(portal.OperatingSystemVersion);
-                            sb.Append("Device family: ");
-                            sb.AppendLine(portal.DeviceFamily);
-                            sb.Append("Platform: ");
-                            sb.AppendLine(String.Format("{0} ({1})",
-                                portal.PlatformName,
-                                portal.Platform.ToString()));
-                        }
-                        else if (connectArgs.Status == DeviceConnectionStatus.Failed)
-                        {
-                            sb.AppendLine("Failed to connect to the device.");
-                            sb.AppendLine(connectArgs.Message);
-                        }
-                    };
-
-                    try
-                    {
-                        // If the user wants to allow untrusted connections, make a call to GetRootDeviceCertificate
-                        // with acceptUntrustedCerts set to true. This will enable untrusted connections for the
-                        // remainder of this session.
-                        if (allowUntrusted)
-                        {
-                            this.certificate = await portal.GetRootDeviceCertificateAsync(true);
-                        }
-                        await portal.ConnectAsync(manualCertificate: this.certificate);
-                    }
-                    catch (Exception exception)
-                    {
-                        sb.AppendLine(exception.Message);
-                    }
 
-                    this.MarshalUpdateCommandOutput(sb.ToString());
-                });
+            sb.Append(this.commandOutput.Text);
+            sb.AppendLine("Connecting...");
+            this.commandOutput.Text = sb.ToString();
+            portal.ConnectionStatus += (portal, connectArgs) =>
+            {
+                if (connectArgs.Status == DeviceConnectionStatus.Connected)
+                {
+                    sb.Append("Connected to: ");
+                    sb.AppendLine(portal.Address);
+                    sb.Append("OS version: ");
+                    sb.AppendLine(portal.OperatingSystemVersion);
+                    sb.Append("Device family: ");
+                    sb.AppendLine(portal.DeviceFamily);
+                    sb.Append("Platform: ");
+                    sb.AppendLine(String.Format("{0} ({1})",
+                        portal.PlatformName,
+                        portal.Platform.ToString()));
+                }
+                else if (connectArgs.Status == DeviceConnectionStatus.Failed)
+                {
+                    sb.AppendLine("Failed to connect to the device.");
+                    sb.AppendLine(connectArgs.Message);
+                }
+            };
 
-            Task continuationTask = connectTask.ContinueWith(
-                (t) =>
+            try
+            {
+                // If the user wants to allow untrusted connections, make a call to GetRootDeviceCertificate
+                // with acceptUntrustedCerts set to true. This will enable untrusted connections for the
+                // remainder of this session.
+                if (allowUntrusted)
                 {
-                    this.MarshalEnableDeviceControls(true);
-                    this.MarshalEnableConnectionControls(true);
-                });
+                    this.certificate = await portal.GetRootDeviceCertificateAsync(true);
+                }
+                await portal.ConnectAsync(manualCertificate: this.certificate);
+            }
+            catch (Exception exception)
+            {
+                sb.AppendLine(exception.Message);
+            }
 
-            connectTask.Start();
+            this.commandOutput.Text = sb.ToString();
+            EnableDeviceControls(true);
+            EnableConnectionControls(true);
         }
 
         /// <summary>
@@ -179,55 +169,45 @@ private void EnableDeviceControls(bool enable)
         /// </summary>
         /// <param name="sender">The caller of this method.</param>
         /// <param name="e">The arguments associated with this event.</param>
-        private void GetIPConfig_Click(object sender, RoutedEventArgs e)
+        private async void GetIPConfig_Click(object sender, RoutedEventArgs e)
         {
             this.ClearOutput();
             this.EnableConnectionControls(false);
             this.EnableDeviceControls(false);
 
             StringBuilder sb = new StringBuilder();
-            Task getTask = new Task(
-                async () =>
-                {
-                    sb.Append(this.MarshalGetCommandOutput());
-                    sb.AppendLine("Getting IP configuration...");
-                    this.MarshalUpdateCommandOutput(sb.ToString());
+            sb.Append(commandOutput.Text);
+            sb.AppendLine("Getting IP configuration...");
+            commandOutput.Text = sb.ToString();
 
-                    try
-                    {
-                        IpConfiguration ipconfig = await portal.GetIpConfigAsync();
-
-                        foreach (NetworkAdapterInfo adapterInfo in ipconfig.Adapters)
-                        {
-                            sb.Append(" ");
-                            sb.AppendLine(adapterInfo.Description);
-                            sb.Append("  MAC address :");
-                            sb.AppendLine(adapterInfo.MacAddress);
-                            foreach (IpAddressInfo address in adapterInfo.IpAddresses)
-                            {
-                                sb.Append("  IP address :");
-                                sb.AppendLine(address.Address);
-                            }
-                            sb.Append("  DHCP address :");
-                            sb.AppendLine(adapterInfo.Dhcp.Address.Address);
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        sb.AppendLine("Failed to get IP config info.");
-                        sb.AppendLine(ex.GetType().ToString() + " - " + ex.Message);
-                    }
-                });
+            try
+            {
+                IpConfiguration ipconfig = await portal.GetIpConfigAsync();
 
-            Task continuationTask = getTask.ContinueWith(
-                (t) =>
+                foreach (NetworkAdapterInfo adapterInfo in ipconfig.Adapters)
                 {
-                    this.MarshalUpdateCommandOutput(sb.ToString());
-                    this.MarshalEnableDeviceControls(true);
-                    this.MarshalEnableConnectionControls(true);
-                });
+                    sb.Append(" ");
+                    sb.AppendLine(adapterInfo.Description);
+                    sb.Append("  MAC address :");
+                    sb.AppendLine(adapterInfo.MacAddress);
+                    foreach (IpAddressInfo address in adapterInfo.IpAddresses)
+                    {
+                        sb.Append("  IP address :");
+                        sb.AppendLine(address.Address);
+                    }
+                    sb.Append("  DHCP address :");
+                    sb.AppendLine(adapterInfo.Dhcp.Address.Address);
+                }
+            }
+            catch (Exception ex)
+            {
+                sb.AppendLine("Failed to get IP config info.");
+                sb.AppendLine(ex.GetType().ToString() + " - " + ex.Message);
+            }
 
-            getTask.Start();
+            commandOutput.Text = sb.ToString();
+            EnableDeviceControls(true);
+            EnableConnectionControls(true);
         }
 
         /// <summary>
@@ -235,130 +215,57 @@ private void GetIPConfig_Click(object sender, RoutedEventArgs e)
         /// </summary>
         /// <param name="sender">The caller of this method.</param>
         /// <param name="e">The arguments associated with this event.</param>
-        private void GetWifiInfo_Click(object sender, RoutedEventArgs e)
+        private async void GetWifiInfo_Click(object sender, RoutedEventArgs e)
         {
             this.ClearOutput();
             this.EnableConnectionControls(false);
             this.EnableDeviceControls(false);
 
             StringBuilder sb = new StringBuilder();
-            Task getTask = new Task(
-                async () =>
-                {
-                    sb.Append(this.MarshalGetCommandOutput());
-                    sb.AppendLine("Getting WiFi interfaces and networks...");
-                    this.MarshalUpdateCommandOutput(sb.ToString());
-
-                    try
-                    {
-                        WifiInterfaces wifiInterfaces = await portal.GetWifiInterfacesAsync();
-                        sb.AppendLine("WiFi Interfaces:");
-                        foreach (WifiInterface wifiInterface in wifiInterfaces.Interfaces)
-                        {
-                            sb.Append(" ");
-                            sb.AppendLine(wifiInterface.Description);
-                            sb.Append("  GUID: ");
-                            sb.AppendLine(wifiInterface.Guid.ToString());
-
-                            WifiNetworks wifiNetworks = await portal.GetWifiNetworksAsync(wifiInterface.Guid);
-                            sb.AppendLine("  Networks:");
-                            foreach (WifiNetworkInfo network in wifiNetworks.AvailableNetworks)
-                            {
-                                sb.Append("   SSID: ");
-                                sb.AppendLine(network.Ssid);
-                                sb.Append("   Profile name: ");
-                                sb.AppendLine(network.ProfileName);
-                                sb.Append("   is connected: ");
-                                sb.AppendLine(network.IsConnected.ToString());
-                                sb.Append("   Channel: ");
-                                sb.AppendLine(network.Channel.ToString());
-                                sb.Append("   Authentication algorithm: ");
-                                sb.AppendLine(network.AuthenticationAlgorithm);
-                                sb.Append("   Signal quality: ");
-                                sb.AppendLine(network.SignalQuality.ToString());
-                            }
-                        };
-                    }
-                    catch (Exception ex)
-                    {
-                        sb.AppendLine("Failed to get WiFi info.");
-                        sb.AppendLine(ex.GetType().ToString() + " - " + ex.Message);
-                    }
-                });
-
-            Task continuationTask = getTask.ContinueWith(
-                (t) =>
-                {
-                    this.MarshalUpdateCommandOutput(sb.ToString());
-                    this.MarshalEnableDeviceControls(true);
-                    this.MarshalEnableConnectionControls(true);
-                });
 
-            getTask.Start();
-        }
-
-        /// <summary>
-        /// Executes the EnabledConnectionControls method on the UI thread.
-        /// </summary>
-        /// <param name="enable">True to enable the controls, false to disable them.</param>
-        private void MarshalEnableConnectionControls(bool enable)
-        {
-            Task t = this.Dispatcher.RunAsync(
-                CoreDispatcherPriority.Normal,
-                () =>
-                {
-                    this.EnableConnectionControls(enable);
-                }).AsTask();
-            t.Wait();
-        }
+            sb.Append(commandOutput.Text);
+            sb.AppendLine("Getting WiFi interfaces and networks...");
+            commandOutput.Text = sb.ToString();
 
-        /// <summary>
-        /// Executes the EnabledDeviceControls method on the UI thread.
-        /// </summary>
-        /// <param name="enable">True to enable the controls, false to disable them.</param>
-        private void MarshalEnableDeviceControls(bool enable)
-        {
-            Task t = this.Dispatcher.RunAsync(
-                CoreDispatcherPriority.Normal,
-                () =>
-                {
-                    this.EnableDeviceControls(enable);
-                }).AsTask();
-            t.Wait();
-        }
-
-        /// <summary>
-        /// Executes the fetching of the text displayed in the command output UI element on the UI thread.
-        /// </summary>
-        /// <returns>The contents of the command output UI element.</returns>
-        private string MarshalGetCommandOutput()
-        {
-            string output = string.Empty;
-
-            Task t = this.Dispatcher.RunAsync(
-                CoreDispatcherPriority.Normal,
-                () =>
+            try
+            {
+                WifiInterfaces wifiInterfaces = await portal.GetWifiInterfacesAsync();
+                sb.AppendLine("WiFi Interfaces:");
+                foreach (WifiInterface wifiInterface in wifiInterfaces.Interfaces)
                 {
-                    output = this.commandOutput.Text;
-                }).AsTask();
-            t.Wait();
-
-            return output;
-        }
+                    sb.Append(" ");
+                    sb.AppendLine(wifiInterface.Description);
+                    sb.Append("  GUID: ");
+                    sb.AppendLine(wifiInterface.Guid.ToString());
+
+                    WifiNetworks wifiNetworks = await portal.GetWifiNetworksAsync(wifiInterface.Guid);
+                    sb.AppendLine("  Networks:");
+                    foreach (WifiNetworkInfo network in wifiNetworks.AvailableNetworks)
+                    {
+                        sb.Append("   SSID: ");
+                        sb.AppendLine(network.Ssid);
+                        sb.Append("   Profile name: ");
+                        sb.AppendLine(network.ProfileName);
+                        sb.Append("   is connected: ");
+                        sb.AppendLine(network.IsConnected.ToString());
+                        sb.Append("   Channel: ");
+                        sb.AppendLine(network.Channel.ToString());
+                        sb.Append("   Authentication algorithm: ");
+                        sb.AppendLine(network.AuthenticationAlgorithm);
+                        sb.Append("   Signal quality: ");
+                        sb.AppendLine(network.SignalQuality.ToString());
+                    }
+                };
+            }
+            catch (Exception ex)
+            {
+                sb.AppendLine("Failed to get WiFi info.");
+                sb.AppendLine(ex.GetType().ToString() + " - " + ex.Message);
+            }
 
-        /// <summary>
-        /// Executes the update of the text displayed in the command output UI element ont he UI thread.
-        /// </summary>
-        /// <param name="output">The text to display in the command output UI element.</param>
-        private void MarshalUpdateCommandOutput(string output)
-        {
-            Task t = this.Dispatcher.RunAsync(
-                CoreDispatcherPriority.Normal,
-                () =>
-                {
-                    this.commandOutput.Text = output;
-                }).AsTask();
-            t.Wait();
+            commandOutput.Text = sb.ToString();
+            EnableDeviceControls(true);
+            EnableConnectionControls(true);
         }
 
         /// <summary>
@@ -376,7 +283,7 @@ private void Password_PasswordChanged(object sender, RoutedEventArgs e)
         /// </summary>
         /// <param name="sender">The caller of this method.</param>
         /// <param name="e">The arguments associated with this event.</param>
-        private void RebootDevice_Click(object sender, RoutedEventArgs e)
+        private async void RebootDevice_Click(object sender, RoutedEventArgs e)
         {
             bool reenableDeviceControls = false;
 
@@ -385,34 +292,25 @@ private void RebootDevice_Click(object sender, RoutedEventArgs e)
             this.EnableDeviceControls(false);
 
             StringBuilder sb = new StringBuilder();
-            Task rebootTask = new Task(
-                async () =>
-                {
-                    sb.Append(this.MarshalGetCommandOutput());
-                    sb.AppendLine("Rebooting the device");
-                    this.MarshalUpdateCommandOutput(sb.ToString());
 
-                    try
-                    {
-                        await portal.RebootAsync();
-                    }
-                    catch (Exception ex)
-                    {
-                        sb.AppendLine("Failed to reboot the device.");
-                        sb.AppendLine(ex.GetType().ToString() + " - " + ex.Message);
-                        reenableDeviceControls = true;
-                    }
-                });
+            sb.Append(commandOutput.Text);
+            sb.AppendLine("Rebooting the device");
+            commandOutput.Text = sb.ToString();
 
-            Task continuationTask = rebootTask.ContinueWith(
-                (t) =>
-                {
-                    this.MarshalUpdateCommandOutput(sb.ToString());
-                    this.MarshalEnableDeviceControls(reenableDeviceControls);
-                    this.MarshalEnableConnectionControls(true);
-                });
+            try
+            {
+                await portal.RebootAsync();
+            }
+            catch (Exception ex)
+            {
+                sb.AppendLine("Failed to reboot the device.");
+                sb.AppendLine(ex.GetType().ToString() + " - " + ex.Message);
+                reenableDeviceControls = true;
+            }
 
-            rebootTask.Start();
+            commandOutput.Text = sb.ToString();
+            EnableDeviceControls(reenableDeviceControls);
+            EnableConnectionControls(true);
         }
 
         /// <summary>
@@ -420,7 +318,7 @@ private void RebootDevice_Click(object sender, RoutedEventArgs e)
         /// </summary>
         /// <param name="sender">The caller of this method.</param>
         /// <param name="e">The arguments associated with this event.</param>
-        private void ShutdownDevice_Click(object sender, RoutedEventArgs e)
+        private async void ShutdownDevice_Click(object sender, RoutedEventArgs e)
         {
             bool reenableDeviceControls = false;
 
@@ -429,34 +327,23 @@ private void ShutdownDevice_Click(object sender, RoutedEventArgs e)
             this.EnableDeviceControls(false);
 
             StringBuilder sb = new StringBuilder();
-            Task shutdownTask = new Task(
-                async () =>
-                {
-                    sb.Append(this.MarshalGetCommandOutput());
-                    sb.AppendLine("Shutting down the device");
-                    this.MarshalUpdateCommandOutput(sb.ToString());
-
-                    try
-                    {
-                        await portal.ShutdownAsync();
-                    }
-                    catch (Exception ex)
-                    {
-                        sb.AppendLine("Failed to shut down the device.");
-                        sb.AppendLine(ex.GetType().ToString() + " - " + ex.Message);
-                        reenableDeviceControls = true;
-                    }
-                });
-
-            Task continuationTask = shutdownTask.ContinueWith(
-                (t) =>
-                {
-                    this.MarshalUpdateCommandOutput(sb.ToString());
-                    this.MarshalEnableDeviceControls(reenableDeviceControls);
-                    this.MarshalEnableConnectionControls(true);
-                });
+            sb.Append(commandOutput.Text);
+            sb.AppendLine("Shutting down the device");
+            commandOutput.Text = sb.ToString();
+            try
+            {
+                await portal.ShutdownAsync();
+            }
+            catch (Exception ex)
+            {
+                sb.AppendLine("Failed to shut down the device.");
+                sb.AppendLine(ex.GetType().ToString() + " - " + ex.Message);
+                reenableDeviceControls = true;
+            }
 
-            shutdownTask.Start();
+            commandOutput.Text = sb.ToString();
+            EnableDeviceControls(reenableDeviceControls);
+            EnableConnectionControls(true);
         }
 
         /// <summary>
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestDelete.cs b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestDelete.cs
index 773180df..05019cda 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestDelete.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestDelete.cs
@@ -43,7 +43,7 @@ private async Task<Stream> DeleteAsync(Uri uri)
                 {
                     if (!response.IsSuccessStatusCode)
                     {
-                        throw new DevicePortalException(response);
+                        throw await DevicePortalException.CreateAsync(response);
                     }
 
                     if (response.Content != null)
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestGet.cs b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestGet.cs
index bca5ee88..c3e45d45 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestGet.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestGet.cs
@@ -44,7 +44,7 @@ private async Task<Stream> GetAsync(
                 {
                     if (!response.IsSuccessStatusCode)
                     {
-                        throw new DevicePortalException(response);
+                        throw await DevicePortalException.CreateAsync(response);
                     }
 
                     using (HttpContent content = response.Content)
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestPost.cs b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestPost.cs
index 6fa1755e..87423035 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestPost.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestPost.cs
@@ -56,7 +56,7 @@ private async Task<Stream> PostAsync(
                 {
                     if (!response.IsSuccessStatusCode)
                     {
-                        throw new DevicePortalException(response);
+                        throw await DevicePortalException.CreateAsync(response);
                     }
 
                     if (response.Content != null)
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestPut.cs b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestPut.cs
index d0f89aab..98c38a8d 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestPut.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/RestPut.cs
@@ -47,7 +47,7 @@ private async Task<Stream> PutAsync(
                 {
                     if (!response.IsSuccessStatusCode)
                     {
-                        throw new DevicePortalException(response);
+                        throw await DevicePortalException.CreateAsync(response);
                     }
 
                     if (response.Content != null)
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/WebSocket.cs b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/WebSocket.cs
index 2973898e..5439b300 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/WebSocket.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/WDPMockImplementations/WebSocket.cs
@@ -116,22 +116,19 @@ private async Task StartListeningForMessagesInternalAsync()
                 while (this.keepListeningForMessages)
                 {
                     await webSocketTask.ConfigureAwait(false);
-                    webSocketTask.Wait();
 
                     using (HttpResponseMessage response = webSocketTask.Result)
                     {
                         if (!response.IsSuccessStatusCode)
                         {
-                            throw new DevicePortalException(response);
+                            throw await DevicePortalException.CreateAsync(response);
                         }
 
                         using (HttpContent content = response.Content)
                         {
                             MemoryStream dataStream = new MemoryStream();
 
-                            Task copyTask = content.CopyToAsync(dataStream);
-                            await copyTask.ConfigureAwait(false);
-                            copyTask.Wait();
+                            await content.CopyToAsync(dataStream).ConfigureAwait(false);
 
                             // Ensure we return with the stream pointed at the origin.
                             dataStream.Position = 0;
@@ -165,7 +162,7 @@ private async Task SendMessageInternalAsync(string message)
             {
                 if (!response.IsSuccessStatusCode)
                 {
-                    throw new DevicePortalException(response);
+                    throw await DevicePortalException.CreateAsync(response);
                 }
             }
         }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppDeployment.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppDeployment.cs
index 8dc87504..be904419 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppDeployment.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppDeployment.cs
@@ -185,7 +185,7 @@ public async Task InstallApplicationAsync(
 
                     await Task.Delay(TimeSpan.FromMilliseconds(stateCheckIntervalMs));
 
-                    status = await this.GetInstallStatusAsync();
+                    status = await this.GetInstallStatusAsync().ConfigureAwait(false);
                 }
                 while (status == ApplicationInstallStatus.InProgress);
 
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/OsInformation.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/OsInformation.cs
index 0530bf9e..17771459 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/OsInformation.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/OsInformation.cs
@@ -93,7 +93,7 @@ public enum DevicePortalPlatforms
         /// <returns>String containing the device's family.</returns>
         public async Task<string> GetDeviceFamilyAsync()
         {
-            DeviceOsFamily deviceFamily = await this.GetAsync<DeviceOsFamily>(DeviceFamilyApi);
+            DeviceOsFamily deviceFamily = await this.GetAsync<DeviceOsFamily>(DeviceFamilyApi).ConfigureAwait(false);
             return deviceFamily.Family;
         }
 
@@ -111,9 +111,9 @@ public async Task<string> GetDeviceNameAsync()
         /// Gets information about the device's operating system.
         /// </summary>
         /// <returns>OperatingSystemInformation object containing details of the installed operating system.</returns>
-        public async Task<OperatingSystemInformation> GetOperatingSystemInformationAsync()
+        public Task<OperatingSystemInformation> GetOperatingSystemInformationAsync()
         {
-            return await this.GetAsync<OperatingSystemInformation>(OsInfoApi);
+            return this.GetAsync<OperatingSystemInformation>(OsInfoApi);
         }
 
         /// <summary>
@@ -122,9 +122,9 @@ public async Task<OperatingSystemInformation> GetOperatingSystemInformationAsync
         /// <param name="name">The name to assign to the device.</param>
         /// <remarks>The new name does not take effect until the device has been restarted.</remarks>
         /// <returns>Task tracking setting the device name completion.</returns>
-        public async Task SetDeviceNameAsync(string name)
+        public Task SetDeviceNameAsync(string name)
         {
-            await this.PostAsync(
+            return this.PostAsync(
                 MachineNameApi,
                 string.Format("name={0}", Utilities.Hex64Encode(name)));
         }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs
index bff970db..ed6278c7 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/DevicePortal.cs
@@ -216,8 +216,8 @@ public async Task ConnectAsync(
                     DeviceConnectionStatus.Connecting,
                     DeviceConnectionPhase.RequestingOperatingSystemInformation,
                     connectionPhaseDescription);
-                this.deviceConnection.Family = await this.GetDeviceFamilyAsync();
-                this.deviceConnection.OsInfo = await this.GetOperatingSystemInformationAsync();
+                this.deviceConnection.Family = await this.GetDeviceFamilyAsync().ConfigureAwait(false);
+                this.deviceConnection.OsInfo = await this.GetOperatingSystemInformationAsync().ConfigureAwait(false);
 
                 // Default to using whatever was specified in the connection.
                 bool requiresHttps = this.IsUsingHttps();
@@ -231,7 +231,7 @@ public async Task ConnectAsync(
                         DeviceConnectionStatus.Connecting,
                         DeviceConnectionPhase.DeterminingConnectionRequirements,
                         connectionPhaseDescription);
-                    requiresHttps = await this.GetIsHttpsRequiredAsync();
+                    requiresHttps = await this.GetIsHttpsRequiredAsync().ConfigureAwait(false);
                 }
 
                 // Connect the device to the specified network.
@@ -242,10 +242,10 @@ public async Task ConnectAsync(
                         DeviceConnectionStatus.Connecting,
                         DeviceConnectionPhase.ConnectingToTargetNetwork,
                         connectionPhaseDescription);
-                    WifiInterfaces wifiInterfaces = await this.GetWifiInterfacesAsync();
+                    WifiInterfaces wifiInterfaces = await this.GetWifiInterfacesAsync().ConfigureAwait(false);
 
                     // TODO - consider what to do if there is more than one wifi interface on a device
-                    await this.ConnectToWifiNetworkAsync(wifiInterfaces.Interfaces[0].Guid, ssid, ssidKey);
+                    await this.ConnectToWifiNetworkAsync(wifiInterfaces.Interfaces[0].Guid, ssid, ssidKey).ConfigureAwait(false);
                 }
 
                 // Get the device's IP configuration and update the connection as appropriate.
@@ -268,7 +268,7 @@ public async Task ConnectAsync(
                     }
 
                     this.deviceConnection.UpdateConnection(
-                        await this.GetIpConfigAsync(), 
+                        await this.GetIpConfigAsync().ConfigureAwait(false), 
                         requiresHttps,
                         preservePort);
                 }
@@ -296,6 +296,7 @@ await this.GetIpConfigAsync(),
                     while (innermostException.InnerException != null)
                     {
                         innermostException = innermostException.InnerException;
+                        await Task.Yield();
                     }
 
                     this.ConnectionFailedDescription = innermostException.Message;
@@ -372,16 +373,13 @@ public async Task SaveEndpointResponseToFileAsync(
 
                 websocket.WebSocketStreamReceived += streamReceivedHandler;
 
-                Task connect = websocket.ConnectAsync(endpoint);
-                connect.Wait();
+                await websocket.ConnectAsync(endpoint);
 
-                Task startListeningForStreamTask = websocket.ReceiveMessagesAsync();
-                startListeningForStreamTask.Wait();
+                await websocket.ReceiveMessagesAsync();
 
                 streamReceived.WaitOne();
 
-                Task stopListeningForStreamTask = websocket.CloseAsync();
-                stopListeningForStreamTask.Wait();
+                await websocket.CloseAsync();
 
                 websocket.WebSocketStreamReceived -= streamReceivedHandler;
 
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Exceptions/DevicePortalException.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Exceptions/DevicePortalException.cs
index 6abfd68a..6fb6f5c7 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Exceptions/DevicePortalException.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Exceptions/DevicePortalException.cs
@@ -72,16 +72,16 @@ public DevicePortalException(
         /// <param name="responseMessage">Http response message.</param>
         /// <param name="message">Optional exception message.</param>
         /// <param name="innerException">Optional inner exception.</param>
-        public DevicePortalException(
+        public static async Task<DevicePortalException> CreateAsync(
             HttpResponseMessage responseMessage,
             string message = "",
-            Exception innerException = null) : this(
-                                                    responseMessage.StatusCode,
+            Exception innerException = null)
+        {
+            DevicePortalException error = new DevicePortalException(responseMessage.StatusCode,
                                                     responseMessage.ReasonPhrase,
                                                     responseMessage.RequestMessage != null ? responseMessage.RequestMessage.RequestUri : null,
                                                     message,
-                                                    innerException)
-        {
+                                                    innerException);
             try
             {
                 if (responseMessage.Content != null)
@@ -92,9 +92,7 @@ public DevicePortalException(
                 {
                     dataStream = new MemoryStream();
 
-                    Task copyTask = content.CopyToAsync(dataStream);
-                    copyTask.ConfigureAwait(false);
-                    copyTask.Wait();
+                    await content.CopyToAsync(dataStream).ConfigureAwait(false);
 
                     // Ensure we point the stream at the origin.
                     dataStream.Position = 0;
@@ -103,12 +101,7 @@ public DevicePortalException(
                     IBuffer dataBuffer = null;
                     using (IHttpContent messageContent = responseMessage.Content)
                     {
-                        IAsyncOperationWithProgress<IBuffer, ulong> bufferOperation = messageContent.ReadAsBufferAsync();
-                        while (bufferOperation.Status != AsyncStatus.Completed)
-                        {
-                        }
-
-                        dataBuffer = bufferOperation.GetResults();
+                        dataBuffer = await messageContent.ReadAsBufferAsync();
 
                         if (dataBuffer != null)
                         {
@@ -123,19 +116,21 @@ public DevicePortalException(
 
                         HttpErrorResponse errorResponse = (HttpErrorResponse)serializer.ReadObject(dataStream);
 
-                        this.HResult = errorResponse.ErrorCode;
-                        this.Reason = errorResponse.ErrorMessage;
+                        error.HResult = errorResponse.ErrorCode;
+                        error.Reason = errorResponse.ErrorMessage;
 
                         // If we didn't get the Hresult and reason from these properties, try the other ones.
-                        if (this.HResult == 0)
+                        if (error.HResult == 0)
                         {
-                            this.HResult = errorResponse.Code;
+                            error.HResult = errorResponse.Code;
                         }
 
-                        if (string.IsNullOrEmpty(this.Reason))
+                        if (string.IsNullOrEmpty(error.Reason))
                         {
-                            this.Reason = errorResponse.Reason;
+                            error.Reason = errorResponse.Reason;
                         }
+
+                        dataStream.Dispose();
                     }
                 }
             }
@@ -143,6 +138,7 @@ public DevicePortalException(
             {
                 // Do nothing if we fail to get additional error details from the response body.
             }
+            return error;
         }
 
         /// <summary>
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestGet.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestGet.cs
index 0a027444..8f5b4c31 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestGet.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/RestGet.cs
@@ -83,7 +83,7 @@ private async Task<T> GetAsync<T>(
 
             DataContractJsonSerializer serializer = new DataContractJsonSerializer(typeof(T));
 
-            using (Stream dataStream = await this.GetAsync(uri))
+            using (Stream dataStream = await this.GetAsync(uri).ConfigureAwait(false))
             {
                 if ((dataStream != null) &&
                     (dataStream.Length != 0))
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/BluetoothConnectivity.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/BluetoothConnectivity.cs
index 7e15254b..7a27ba55 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/BluetoothConnectivity.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/IoT/BluetoothConnectivity.cs
@@ -72,7 +72,7 @@ public partial class DevicePortal
         /// Gets the available bluetooth device information.
         /// </summary>
         /// <returns>List of Available bluetooth devices</returns>
-        public AvailableBluetoothDevicesInfo GetAvailableBluetoothDevicesInfo()
+        public async Task<AvailableBluetoothDevicesInfo> GetAvailableBluetoothDevicesInfoAsync()
         {
             AvailableBluetoothDevicesInfo bluetooth = null;
             ManualResetEvent bluetoothReceived = new ManualResetEvent(false);
@@ -87,13 +87,11 @@ public AvailableBluetoothDevicesInfo GetAvailableBluetoothDevicesInfo()
                 };
             this.BluetoothDeviceListReceived += bluetoothReceivedHandler;
 
-            Task startListeningForBluetooth = this.StartListeningForBluetoothAsync(AvailableBluetoothDevicesApi);
-            startListeningForBluetooth.Wait();
+            await this.StartListeningForBluetoothAsync(AvailableBluetoothDevicesApi);
 
             bluetoothReceived.WaitOne();
 
-            Task stopListeningForBluetooth = this.StopListeningForBluetoothAsync();
-            stopListeningForBluetooth.Wait();
+            await this.StopListeningForBluetoothAsync();
 
             this.BluetoothDeviceListReceived -= bluetoothReceivedHandler;
             return bluetooth;
@@ -103,7 +101,7 @@ public AvailableBluetoothDevicesInfo GetAvailableBluetoothDevicesInfo()
         /// Gets the paired bluetooth device information.
         /// </summary>
         /// <returns>List of paired bluetooth devices</returns>
-        public PairedBluetoothDevicesInfo GetPairedBluetoothDevicesInfo()
+        public async Task<PairedBluetoothDevicesInfo> GetPairedBluetoothDevicesInfoAsync()
         {
             PairedBluetoothDevicesInfo bluetooth = null;
             ManualResetEvent pairedBluetoothReceived = new ManualResetEvent(false);
@@ -118,13 +116,11 @@ public PairedBluetoothDevicesInfo GetPairedBluetoothDevicesInfo()
                 };
             this.PairedBluetoothDeviceListReceived += pairedBluetoothReceivedHandler;
 
-            Task startListeningForPairedBluetooth = this.StartListeningForPairedBluetoothAsync(PairedBluetoothDevicesApi);
-            startListeningForPairedBluetooth.Wait();
+            await this.StartListeningForPairedBluetoothAsync(PairedBluetoothDevicesApi);
 
             pairedBluetoothReceived.WaitOne();
 
-            Task stopListeningForPairedBluetooth = this.StopListeningForPairedBluetoothAsync();
-            stopListeningForPairedBluetooth.Wait();
+            await this.StopListeningForPairedBluetoothAsync();
 
             this.PairedBluetoothDeviceListReceived -= pairedBluetoothReceivedHandler;
             return bluetooth;
@@ -135,7 +131,7 @@ public PairedBluetoothDevicesInfo GetPairedBluetoothDevicesInfo()
         /// </summary>
         /// <param name="deviceId">Device Id.</param>
         /// <returns>Results of pairing a bluetooth device</returns>
-        public PairBluetoothDevicesInfo GetPairBluetoothDevicesInfo(string deviceId)
+        public async Task<PairBluetoothDevicesInfo> GetPairBluetoothDevicesInfoAsync(string deviceId)
         {
             PairBluetoothDevicesInfo bluetooth = null;
             ManualResetEvent pairBluetoothReceived = new ManualResetEvent(false);
@@ -150,13 +146,11 @@ public PairBluetoothDevicesInfo GetPairBluetoothDevicesInfo(string deviceId)
                 };
             this.PairBluetoothDeviceListReceived += pairBluetoothReceivedHandler;
 
-            Task startListeningForPairBluetooth = this.StartListeningForPairBluetoothAsync(PairBluetoothDevicesApi, string.Format("deviceId={0}", Utilities.Hex64Encode(deviceId)));
-            startListeningForPairBluetooth.Wait();
+            await this.StartListeningForPairBluetoothAsync(PairBluetoothDevicesApi, string.Format("deviceId={0}", Utilities.Hex64Encode(deviceId)));
 
             pairBluetoothReceived.WaitOne();
 
-            Task stopListeningForPairBluetooth = this.StopListeningForPairBluetoothAsync();
-            stopListeningForPairBluetooth.Wait();
+            await this.StopListeningForPairBluetoothAsync();
 
             this.PairBluetoothDeviceListReceived -= pairBluetoothReceivedHandler;
             return bluetooth;
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxAppDeployment.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxAppDeployment.cs
index 923f4381..074e9b51 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxAppDeployment.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Xbox/XboxAppDeployment.cs
@@ -40,15 +40,15 @@ public async Task RegisterApplicationAsync(string folderName)
 
             await this.PostAsync(
                 RegisterPackageApi,
-                string.Format("folder={0}", Utilities.Hex64Encode(folderName)));
+                string.Format("folder={0}", Utilities.Hex64Encode(folderName))).ConfigureAwait(false);
 
             // Poll the status until complete.
             ApplicationInstallStatus status = ApplicationInstallStatus.InProgress;
             do
             {
-                await Task.Delay(TimeSpan.FromMilliseconds(500));
+                await Task.Delay(TimeSpan.FromMilliseconds(500)).ConfigureAwait(false);
 
-                status = await this.GetInstallStatusAsync();
+                status = await this.GetInstallStatusAsync().ConfigureAwait(false);
             }
             while (status == ApplicationInstallStatus.InProgress);
         }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/CertificateHandling.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/CertificateHandling.cs
index 35a6261f..5c140920 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/CertificateHandling.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/CertificateHandling.cs
@@ -43,24 +43,11 @@ public async Task<Certificate> GetRootDeviceCertificateAsync(bool acceptUntruste
             using (HttpClient client = new HttpClient(requestSettings))
             {
                 this.ApplyHttpHeaders(client, HttpMethods.Get);
-
-                IAsyncOperationWithProgress<HttpResponseMessage, HttpProgress> responseOperation = client.GetAsync(uri);
-                TaskAwaiter<HttpResponseMessage> responseAwaiter = responseOperation.GetAwaiter();
-                while (!responseAwaiter.IsCompleted)
-                { 
-                }
-
-                using (HttpResponseMessage response = responseOperation.GetResults())
+                using (HttpResponseMessage response = await client.GetAsync(uri))
                 {
                     using (IHttpContent messageContent = response.Content)
                     {
-                        IAsyncOperationWithProgress<IBuffer, ulong> bufferOperation = messageContent.ReadAsBufferAsync();
-                        TaskAwaiter<IBuffer> readBufferAwaiter = bufferOperation.GetAwaiter();
-                        while (!readBufferAwaiter.IsCompleted)
-                        { 
-                        }
-
-                        certificate = new Certificate(bufferOperation.GetResults());
+                        certificate = new Certificate(await messageContent.ReadAsBufferAsync());
                     }
                 }
             }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Core/AppDeployment.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Core/AppDeployment.cs
index 61328091..f8959235 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Core/AppDeployment.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/Core/AppDeployment.cs
@@ -53,12 +53,7 @@ public async Task<ApplicationInstallStatus> GetInstallStatusAsync()
             {
                 this.ApplyHttpHeaders(client, HttpMethods.Get);
 
-                IAsyncOperationWithProgress<HttpResponseMessage, HttpProgress> responseOperation = client.GetAsync(uri);
-                while (responseOperation.Status != AsyncStatus.Completed)
-                { 
-                }
-
-                using (HttpResponseMessage response = responseOperation.GetResults())
+                using (HttpResponseMessage response = await client.GetAsync(uri))
                 {
                     if (response.IsSuccessStatusCode)
                     {
@@ -72,12 +67,7 @@ public async Task<ApplicationInstallStatus> GetInstallStatusAsync()
                                 IBuffer dataBuffer = null;
                                 using (IHttpContent messageContent = response.Content)
                                 {
-                                    IAsyncOperationWithProgress<IBuffer, ulong> bufferOperation = messageContent.ReadAsBufferAsync();
-                                    while (bufferOperation.Status != AsyncStatus.Completed)
-                                    {
-                                    }
-
-                                    dataBuffer = bufferOperation.GetResults();
+                                    dataBuffer = await messageContent.ReadAsBufferAsync();
 
                                     if (dataBuffer != null)
                                     {
@@ -114,7 +104,7 @@ public async Task<ApplicationInstallStatus> GetInstallStatusAsync()
                     }
                     else
                     {
-                        throw new DevicePortalException(response);
+                        throw await DevicePortalException.CreateAsync(response);
                     }
                 }
             }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestDelete.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestDelete.cs
index ed8aa767..8ae60a44 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestDelete.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestDelete.cs
@@ -45,30 +45,18 @@ private async Task<Stream> DeleteAsync(Uri uri)
             using (HttpClient client = new HttpClient(httpFilter))
             {
                 this.ApplyHttpHeaders(client, HttpMethods.Delete);
-
-                IAsyncOperationWithProgress<HttpResponseMessage, HttpProgress> responseOperation = client.DeleteAsync(uri);
-                TaskAwaiter<HttpResponseMessage> responseAwaiter = responseOperation.GetAwaiter();
-                while (!responseAwaiter.IsCompleted)
-                { 
-                }
-
-                using (HttpResponseMessage response = responseOperation.GetResults())
+                using (HttpResponseMessage response = await client.DeleteAsync(uri))
                 {
                     if (!response.IsSuccessStatusCode)
                     {
-                        throw new DevicePortalException(response);
+                        throw await DevicePortalException.CreateAsync(response);
                     }
 
                     if (response.Content != null)
                     {
                         using (IHttpContent messageContent = response.Content)
                         {
-                            IAsyncOperationWithProgress<IBuffer, ulong> bufferOperation = messageContent.ReadAsBufferAsync();
-                            while (bufferOperation.Status != AsyncStatus.Completed)
-                            {
-                            }
-
-                            dataBuffer = bufferOperation.GetResults();
+                            dataBuffer = await messageContent.ReadAsBufferAsync();
                         }
                     }
                 }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestGet.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestGet.cs
index 38593c45..10e3952b 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestGet.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestGet.cs
@@ -45,28 +45,16 @@ private async Task<Stream> GetAsync(Uri uri)
             using (HttpClient client = new HttpClient(requestSettings))
             {
                 this.ApplyHttpHeaders(client, HttpMethods.Get);
-
-                IAsyncOperationWithProgress<HttpResponseMessage, HttpProgress> responseOperation = client.GetAsync(uri);
-                TaskAwaiter<HttpResponseMessage> responseAwaiter = responseOperation.GetAwaiter();
-                while (!responseAwaiter.IsCompleted)
-                { 
-                }
-
-                using (HttpResponseMessage response = responseOperation.GetResults())
+                using (HttpResponseMessage response = await client.GetAsync(uri))
                 {
                     if (!response.IsSuccessStatusCode)
                     {
-                        throw new DevicePortalException(response);
+                        throw await DevicePortalException.CreateAsync(response);
                     }
 
                     using (IHttpContent messageContent = response.Content)
                     {
-                        IAsyncOperationWithProgress<IBuffer, ulong> bufferOperation = messageContent.ReadAsBufferAsync();
-                        while (bufferOperation.Status != AsyncStatus.Completed)
-                        { 
-                        }
-
-                        dataBuffer = bufferOperation.GetResults();
+                        dataBuffer = await messageContent.ReadAsBufferAsync();
                     }
                 }
             }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestPost.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestPost.cs
index 3a634322..b8eabb84 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestPost.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestPost.cs
@@ -58,30 +58,18 @@ private async Task<Stream> PostAsync(
             using (HttpClient client = new HttpClient(httpFilter))
             {
                 this.ApplyHttpHeaders(client, HttpMethods.Post);
-
-                IAsyncOperationWithProgress<HttpResponseMessage, HttpProgress> responseOperation = client.PostAsync(uri, requestContent);
-                TaskAwaiter<HttpResponseMessage> responseAwaiter = responseOperation.GetAwaiter();
-                while (!responseAwaiter.IsCompleted)
-                {
-                }
-
-                using (HttpResponseMessage response = responseOperation.GetResults())
+                using (HttpResponseMessage response = await client.PostAsync(uri, requestContent))
                 {
                     if (!response.IsSuccessStatusCode)
                     {
-                        throw new DevicePortalException(response);
+                        throw await DevicePortalException.CreateAsync(response);
                     }
 
                     if (response.Content != null)
                     {
                         using (IHttpContent messageContent = response.Content)
                         {
-                            IAsyncOperationWithProgress<IBuffer, ulong> bufferOperation = messageContent.ReadAsBufferAsync();
-                            while (bufferOperation.Status != AsyncStatus.Completed)
-                            {
-                            }
-
-                            dataBuffer = bufferOperation.GetResults();
+                            dataBuffer = await messageContent.ReadAsBufferAsync();
                         }
                     }
                 }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestPut.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestPut.cs
index 36548ec0..18661ab6 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestPut.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/RestPut.cs
@@ -50,29 +50,18 @@ private async Task<Stream> PutAsync(
                 this.ApplyHttpHeaders(client, HttpMethods.Put);
 
                 // Send the request
-                IAsyncOperationWithProgress<HttpResponseMessage, HttpProgress> responseOperation = client.PutAsync(uri, null);
-                TaskAwaiter<HttpResponseMessage> responseAwaiter = responseOperation.GetAwaiter();
-                while (!responseAwaiter.IsCompleted)
-                { 
-                }
-
-                using (HttpResponseMessage response = responseOperation.GetResults())
+                using (HttpResponseMessage response = await client.PutAsync(uri, null))
                 {
                     if (!response.IsSuccessStatusCode)
                     {
-                        throw new DevicePortalException(response);
+                        throw await DevicePortalException.CreateAsync(response);
                     }
 
                     if (response.Content != null)
                     {
                         using (IHttpContent messageContent = response.Content)
                         {
-                            IAsyncOperationWithProgress<IBuffer, ulong> bufferOperation = messageContent.ReadAsBufferAsync();
-                            while (bufferOperation.Status != AsyncStatus.Completed)
-                            {
-                            }
-
-                            dataBuffer = bufferOperation.GetResults();
+                            dataBuffer = await messageContent.ReadAsBufferAsync();
                         }
                     }
                 }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/WebSocket.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/WebSocket.cs
index c1603bde..36e77b04 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/WebSocket.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.UniversalWindows/HttpRest/WebSocket.cs
@@ -113,7 +113,7 @@ await Task.Run(() =>
         /// </summary>
         /// <param name="sender">The  <see cref="MessageWebSocket" /> that sent the message.</param>
         /// <param name="args">The message from the web socket.</param>
-        private void MessageReceived(MessageWebSocket sender, MessageWebSocketMessageReceivedEventArgs args)
+        private async void MessageReceived(MessageWebSocket sender, MessageWebSocketMessageReceivedEventArgs args)
         {
             if (this.IsListeningForMessages)
             {
@@ -121,8 +121,7 @@ private void MessageReceived(MessageWebSocket sender, MessageWebSocketMessageRec
                 {
                     Stream stream = new MemoryStream();
 
-                    Task copyTask = inputStream.AsStreamForRead().CopyToAsync(stream);
-                    copyTask.Wait();
+                    await inputStream.AsStreamForRead().CopyToAsync(stream);
 
                     // Ensure we return with the stream pointed at the origin.
                     stream.Position = 0;
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Core/AppDeployment.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Core/AppDeployment.cs
index 8457c36e..c410b35a 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Core/AppDeployment.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/Core/AppDeployment.cs
@@ -39,12 +39,7 @@ public async Task<ApplicationInstallStatus> GetInstallStatusAsync()
             using (HttpClient client = new HttpClient(handler))
             {
                 this.ApplyHttpHeaders(client, HttpMethods.Get);
-
-                Task<HttpResponseMessage> getTask = client.GetAsync(uri);
-                await getTask.ConfigureAwait(false);
-                getTask.Wait();
-
-                using (HttpResponseMessage response = getTask.Result)
+                using (HttpResponseMessage response = await client.GetAsync(uri).ConfigureAwait(false))
                 {
                     if (response.IsSuccessStatusCode)
                     {
@@ -64,9 +59,7 @@ public async Task<ApplicationInstallStatus> GetInstallStatusAsync()
                                 {
                                     dataStream = new MemoryStream();
 
-                                    Task copyTask = content.CopyToAsync(dataStream);
-                                    await copyTask.ConfigureAwait(false);
-                                    copyTask.Wait();
+                                    await content.CopyToAsync(dataStream).ConfigureAwait(false);
 
                                     // Ensure we point the stream at the origin.
                                     dataStream.Position = 0;
@@ -101,7 +94,7 @@ public async Task<ApplicationInstallStatus> GetInstallStatusAsync()
                     }
                     else
                     {
-                        throw new DevicePortalException(response);
+                        throw await DevicePortalException.CreateAsync(response);
                     }
                 }
             }
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestDelete.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestDelete.cs
index 29b87268..428c65c5 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestDelete.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestDelete.cs
@@ -35,15 +35,11 @@ private async Task<Stream> DeleteAsync(Uri uri)
             {
                 this.ApplyHttpHeaders(client, HttpMethods.Delete);
 
-                Task<HttpResponseMessage> deleteTask = client.DeleteAsync(uri);
-                await deleteTask.ConfigureAwait(false);
-                deleteTask.Wait();
-
-                using (HttpResponseMessage response = deleteTask.Result)
+                using (HttpResponseMessage response = await client.DeleteAsync(uri).ConfigureAwait(false))
                 {
                     if (!response.IsSuccessStatusCode)
                     {
-                        throw new DevicePortalException(response);
+                        throw await DevicePortalException.CreateAsync(response);
                     }
 
                     if (response.Content != null)
@@ -52,9 +48,7 @@ private async Task<Stream> DeleteAsync(Uri uri)
                         {
                             dataStream = new MemoryStream();
 
-                            Task copyTask = content.CopyToAsync(dataStream);
-                            await copyTask.ConfigureAwait(false);
-                            copyTask.Wait();
+                            await content.CopyToAsync(dataStream).ConfigureAwait(false);
 
                             // Ensure we return with the stream pointed at the origin.
                             dataStream.Position = 0;
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestGet.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestGet.cs
index 77f1dafa..e6c0d170 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestGet.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestGet.cs
@@ -35,24 +35,18 @@ private async Task<Stream> GetAsync(
             {
                 this.ApplyHttpHeaders(client, HttpMethods.Get);
 
-                Task<HttpResponseMessage> getTask = client.GetAsync(uri);
-                await getTask.ConfigureAwait(false);
-                getTask.Wait();
-
-                using (HttpResponseMessage response = getTask.Result)
+                using (HttpResponseMessage response = await client.GetAsync(uri).ConfigureAwait(false))
                 {
                     if (!response.IsSuccessStatusCode)
                     {
-                        throw new DevicePortalException(response);
+                        throw await DevicePortalException.CreateAsync(response);
                     }
 
                     using (HttpContent content = response.Content)
                     {
                         dataStream = new MemoryStream();
 
-                        Task copyTask = content.CopyToAsync(dataStream);
-                        await copyTask.ConfigureAwait(false);
-                        copyTask.Wait();
+                        await content.CopyToAsync(dataStream).ConfigureAwait(false);
 
                         // Ensure we return with the stream pointed at the origin.
                         dataStream.Position = 0;
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestPost.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestPost.cs
index 898288c6..13f5a015 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestPost.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestPost.cs
@@ -48,15 +48,11 @@ private async Task<Stream> PostAsync(
             {
                 this.ApplyHttpHeaders(client, HttpMethods.Post);
 
-                Task<HttpResponseMessage> postTask = client.PostAsync(uri, requestContent);
-                await postTask.ConfigureAwait(false);
-                postTask.Wait();
-
-                using (HttpResponseMessage response = postTask.Result)
+                using (HttpResponseMessage response = await client.PostAsync(uri, requestContent).ConfigureAwait(false))
                 {
                     if (!response.IsSuccessStatusCode)
                     {
-                        throw new DevicePortalException(response);
+                        throw await DevicePortalException.CreateAsync(response);
                     }
 
                     if (response.Content != null)
@@ -65,9 +61,7 @@ private async Task<Stream> PostAsync(
                         {
                             responseDataStream = new MemoryStream();
 
-                            Task copyTask = responseContent.CopyToAsync(responseDataStream);
-                            await copyTask.ConfigureAwait(false);
-                            copyTask.Wait();
+                            await responseContent.CopyToAsync(responseDataStream).ConfigureAwait(false);
 
                             // Ensure we return with the stream pointed at the origin.
                             responseDataStream.Position = 0;
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestPut.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestPut.cs
index 4e9372a8..7097c753 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestPut.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/RestPut.cs
@@ -39,15 +39,11 @@ private async Task<Stream> PutAsync(
                 this.ApplyHttpHeaders(client, HttpMethods.Put);
 
                 // Send the request
-                Task<HttpResponseMessage> putTask = client.PutAsync(uri, body);
-                await putTask.ConfigureAwait(false);
-                putTask.Wait();
-
-                using (HttpResponseMessage response = putTask.Result)
+                using (HttpResponseMessage response = await client.PutAsync(uri, body).ConfigureAwait(false))
                 {
                     if (!response.IsSuccessStatusCode)
                     {
-                        throw new DevicePortalException(response);
+                        throw await DevicePortalException.CreateAsync(response);
                     }
 
                     if (response.Content != null)
@@ -56,9 +52,7 @@ private async Task<Stream> PutAsync(
                         {
                             dataStream = new MemoryStream();
 
-                            Task copyTask = content.CopyToAsync(dataStream);
-                            await copyTask.ConfigureAwait(false);
-                            copyTask.Wait();
+                            await content.CopyToAsync(dataStream).ConfigureAwait(false);
 
                             // Ensure we return with the stream pointed at the origin.
                             dataStream.Position = 0;
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/WebSocket.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/WebSocket.cs
index ad844e32..14de4cd4 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/WebSocket.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper/HttpRest/WebSocket.cs
@@ -150,7 +150,7 @@ private void StartListeningForMessagesInternal()
 
                             do
                             {
-                                result = await this.websocket.ReceiveAsync(buffer, CancellationToken.None);
+                                result = await this.websocket.ReceiveAsync(buffer, CancellationToken.None).ConfigureAwait(false);
 
                                 if (result.MessageType == WebSocketMessageType.Close)
                                 {

From 64078b5b769c6bac83691a1acf3647c91c7443ed Mon Sep 17 00:00:00 2001
From: Hirsch Singhal <hps.scout@gmail.com>
Date: Sun, 19 Feb 2017 13:10:56 -0800
Subject: [PATCH 47/51] Expose extra ETW Payload in ETW tracing (#220)

* Change ETW datacontract to expose custom payload.
Alters WebSocket parsing routine.

* StyleCop pass
---
 .../Core/AppCrashDumpCollection.cs            |  10 +-
 .../Core/Etw.cs                               | 140 ++++++++++++------
 .../HttpRest/WebSocket.cs                     |   8 +-
 3 files changed, 109 insertions(+), 49 deletions(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppCrashDumpCollection.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppCrashDumpCollection.cs
index 17acfa3a..99b1eef3 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppCrashDumpCollection.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppCrashDumpCollection.cs
@@ -64,7 +64,8 @@ public async Task<Stream> GetAppCrashDumpAsync(AppCrashDump crashdump)
         /// <returns>Task tracking completion of the request.</returns>
         public async Task DeleteAppCrashDumpAsync(AppCrashDump crashdump)
         {
-            await this.DeleteAsync(CrashDumpFileApi,
+            await this.DeleteAsync(
+                CrashDumpFileApi,
                 string.Format("packageFullName={0}&fileName={1}", crashdump.PackageFullName, crashdump.Filename));
         }
 
@@ -99,13 +100,13 @@ public async Task<AppCrashDumpSettings> GetAppCrashDumpSettingsAsync(string pack
         public async Task SetAppCrashDumpSettingsAsync(AppPackage app, bool enable = true)
         {
             string pfn = app.PackageFullName;
-            await SetAppCrashDumpSettingsAsync(pfn, enable);
+            await this.SetAppCrashDumpSettingsAsync(pfn, enable);
         }
 
         /// <summary>
         /// Set the crash settings for a sideloaded app. 
         /// </summary>
-        /// <param name="packageFullname">The app to set crash settings for.</param>
+        /// <param name="packageFullName">The app to set crash settings for.</param>
         /// <param name="enable">Whether to enable or disable crash collection for the app. </param>
         /// <returns>Task tracking completion of the request.</returns>
         public async Task SetAppCrashDumpSettingsAsync(string packageFullName, bool enable = true)
@@ -133,7 +134,7 @@ await this.DeleteAsync(
         public class AppCrashDumpSettings
         {
             /// <summary>
-            /// Gets whether crash dumps are enabled for the app
+            /// Gets a value indicating whether crash dumps are enabled for the app
             /// </summary>
             [DataMember(Name = "CrashDumpEnabled")]
             public bool CrashDumpEnabled
@@ -149,7 +150,6 @@ public bool CrashDumpEnabled
         [DataContract]
         public class AppCrashDump 
         {
-
             /// <summary>
             /// Gets the timestamp of the crash as a string.
             /// </summary>
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
index 7a3dfe3a..8b131015 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/Etw.cs
@@ -69,13 +69,26 @@ public async Task<EtwProviders> GetEtwProvidersAsync()
         /// </summary>
         /// <param name="etwProvider">The provider to update the listening state of.</param>
         /// <param name="isEnabled">Determines whether the listening state should be enabled or disabled.</param>
+        /// /// <param name="level">Verbosity level - 1 for least, 5 for most verbose. </param>
         /// <returns>Task for toggling the listening state of the specified provider.</returns>
-        public async Task ToggleEtwProviderAsync(EtwProviderInfo etwProvider, bool isEnabled = true)
+        public async Task ToggleEtwProviderAsync(EtwProviderInfo etwProvider, bool isEnabled = true, int level = 5)
+        {
+            await this.ToggleEtwProviderAsync(etwProvider.GUID, isEnabled, level);
+        }
+
+        /// <summary>
+        /// Toggles the listening state of a specific provider on the realtime events WebSocket.
+        /// </summary>
+        /// <param name="etwProvider">The GUID of the provider to update the listening state of.</param>
+        /// <param name="isEnabled">Determines whether the listening state should be enabled or disabled.</param>
+        /// <param name="level">Verbosity level - 1 for least, 5 for most verbose. </param>
+        /// <returns>Task for toggling the listening state of the specified provider.</returns>
+        public async Task ToggleEtwProviderAsync(Guid etwProvider, bool isEnabled = true, int level = 5)
         {
             string action = isEnabled ? "enable" : "disable";
-            string message = $"provider {etwProvider.GUID} {action}";
+            string message = $"provider {etwProvider} {action} {level}";
 
-            await this.InitializeRealtimeEventsWebSocket();
+            await this.InitializeRealtimeEventsWebSocketAsync();
             await this.realtimeEventsWebSocket.SendMessageAsync(message);
         }
 
@@ -85,7 +98,7 @@ public async Task ToggleEtwProviderAsync(EtwProviderInfo etwProvider, bool isEna
         /// <returns>Task for connecting to the WebSocket but not for listening to it.</returns>
         public async Task StartListeningForEtwEventsAsync()
         {
-            await this.InitializeRealtimeEventsWebSocket();
+            await this.InitializeRealtimeEventsWebSocketAsync();
 
             if (!this.isListeningForRealtimeEvents)
             {
@@ -115,7 +128,7 @@ public async Task StopListeningForEtwEventsAsync()
         /// Creates a new <see cref="WebSocket{EtwEvents}"/> if it hasn't already been initialized.
         /// </summary>
         /// <returns>Task for connecting the ETW realtime event WebSocket.</returns>
-        private async Task InitializeRealtimeEventsWebSocket()
+        private async Task InitializeRealtimeEventsWebSocketAsync()
         {
             if (this.realtimeEventsWebSocket == null)
             {
@@ -155,77 +168,118 @@ private void EtwEventsReceivedHandler(
         public class EtwEvents
         {
             /// <summary>
-            /// Gets the event.
+            /// Gets or sets the raw list of events.  Not for straight usage, as it's entirely unformatted. 
             /// </summary>
             [DataMember(Name = "Events")]
-            public List<EtwEventInfo> Event { get; private set; }
+            private List<Dictionary<string, string>> RawEvents { get; set; }
 
             /// <summary>
-            /// Gets the event frequency.
+            /// Saves the downconverted list of events 
+            /// </summary>
+            private List<EtwEventInfo> stashedList; 
+
+            /// <summary>
+            /// Get the list of ETW Events that occured in the last second. 
+            /// </summary>
+            public List<EtwEventInfo> Events
+            {
+                get
+                {
+                    if (this.stashedList != null)
+                    {
+                        return this.stashedList;
+                    }
+
+                    List<EtwEventInfo> events = new List<EtwEventInfo>();
+                    foreach (Dictionary<string, string> dic in RawEvents )
+                    {
+                        events.Add(new EtwEventInfo(dic));
+                    }
+
+                    this.stashedList = events;
+                    return this.stashedList;
+                }
+            }
+
+
+            /// <summary>
+            /// Gets the event frequency. 
+            /// This is always 10 million (10000000) in RS2 devices.  
             /// </summary>
             [DataMember(Name = "Frequency")]
             public long Frequency { get; private set; }
         }
 
         /// <summary>
-        /// ETW Event Info.
+        /// ETW Events Info. Allows strongly typed access to guaranteed fields 
+        /// like ID or Timestamp, and raw (as string) access to all other 
+        /// payload data, like Latency or PID. 
         /// </summary>
-        [DataContract]
-        public class EtwEventInfo
+        public class EtwEventInfo : Dictionary<string, string>
         {
-            /// <summary>
-            /// Gets the event latency.
-            /// </summary>
-            [DataMember(Name = "EventLatency")]
-            public int Latency { get; private set; }
 
             /// <summary>
-            /// Gets the event payload.
+            ///  Initializes a new instance of the <see cref="EtwEventInfo" /> class.  Used by the DataContract at access time. 
             /// </summary>
-            [DataMember(Name = "EventPayload")]
-            public string Payload { get; private set; }
-
-            /// <summary>
-            /// Gets the event persistence.
-            /// </summary>
-            [DataMember(Name = "EventPersistence")]
-            public int Persistence { get; private set; }
+            /// <param name="dictionary">Base dictionary used to populate the object. </param>
+            internal EtwEventInfo(IDictionary<string, string> dictionary) : base(dictionary)
+            {
+            }
 
             /// <summary>
             /// Gets the event identifer.
             /// </summary>
-            [DataMember(Name = "ID")]
-            public ushort ID { get; private set; }
+            public ushort ID
+            {
+                get
+                {
+                    return ushort.Parse(this["ID"]);
+                }
+            }
 
             /// <summary>
             /// Gets the event keyword.
             /// </summary>
-            [DataMember(Name = "Keyword")]
-            public ulong Keyword { get; private set; }
+            public ulong Keyword
+            {
+                get
+                {
+                    return ulong.Parse(this["Keyword"]);
+                }
+            }
 
             /// <summary>
             /// Gets the event level.
             /// </summary>
-            [DataMember(Name = "Level")]
-            public uint Level { get; private set; }
+            public uint Level
+            {
+                get
+                {
+                    return uint.Parse(this["Level"]);
+                }
+            }
 
             /// <summary>
             /// Gets the event provider name.
             /// </summary>
-            [DataMember(Name = "ProviderName")]
-            public string Provider { get; private set; }
-
-            /// <summary>
-            /// Gets the event task name.
-            /// </summary>
-            [DataMember(Name = "TaskName")]
-            public string Task { get; private set; }
+            public string Provider
+            {
+                get
+                {
+                    return this["ProviderName"];
+                }
+            }
 
             /// <summary>
-            /// Gets the event timestamp.
+            /// Gets the event timestamp. 
             /// </summary>
-            [DataMember(Name = "Timestamp")]
-            public ulong Timestamp { get; private set; }
+            public ulong Timestamp
+            {
+                get
+                {
+                    return ulong.Parse(this["Timestamp"]);
+                }
+            }
         }
 
         /// <summary>
@@ -251,7 +305,7 @@ public class EtwProviderInfo
             /// Gets provider guid.
             /// </summary>
             [DataMember(Name = "GUID")]
-            public string GUID { get; private set; }
+            public Guid GUID { get; private set; }
 
             /// <summary>
             /// Gets provider name.
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/WebSocket.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/WebSocket.cs
index 1fc98b05..05f16a7b 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/WebSocket.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/HttpRest/WebSocket.cs
@@ -153,7 +153,13 @@ private void ConvertStreamToMessage(Stream stream)
                 {
                     using (stream)
                     {
-                        DataContractJsonSerializer serializer = new DataContractJsonSerializer(typeof(T));
+                        DataContractJsonSerializerSettings settings = new DataContractJsonSerializerSettings()
+                        {
+                            UseSimpleDictionaryFormat = true
+                        };
+                        DataContractJsonSerializer serializer = new DataContractJsonSerializer(typeof(T), settings);
+                        
+
                         T message = (T)serializer.ReadObject(stream);
 
                         this.WebSocketMessageReceived?.Invoke(

From 4575542cec860b56a401fc1f2a3459b8691d88f2 Mon Sep 17 00:00:00 2001
From: Chris Baudin <CBaud@users.noreply.github.com>
Date: Thu, 23 Feb 2017 16:49:32 -0800
Subject: [PATCH 48/51] Fix unit test build break. (#222)

---
 WindowsDevicePortalWrapper/UnitTestProject/Core/EtwTests.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/WindowsDevicePortalWrapper/UnitTestProject/Core/EtwTests.cs b/WindowsDevicePortalWrapper/UnitTestProject/Core/EtwTests.cs
index c168141e..6774e3da 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/Core/EtwTests.cs
+++ b/WindowsDevicePortalWrapper/UnitTestProject/Core/EtwTests.cs
@@ -102,11 +102,8 @@ private static void ValidateEtwEvents(EtwEvents etwEvents)
         /// <param name="etw">The <see cref="EtwProviders"/> to validate.</param>
         private static void ValidateEtwProviders(EtwProviders etw)
         {
-            Guid result;
             Assert.IsTrue(etw.Providers.Count > 0);
-            Assert.IsTrue(etw.Providers.All(etwProvider => 
-                Guid.TryParse(etwProvider.GUID, out result) &&
-                !string.IsNullOrEmpty(etwProvider.Name)));
+            Assert.IsTrue(etw.Providers.All(etwProvider => !string.IsNullOrEmpty(etwProvider.Name)));
         }
     }
 }

From faa6f8bd02d61ff9bde522818aa43d1fc33ca84d Mon Sep 17 00:00:00 2001
From: Chris Baudin <CBaud@users.noreply.github.com>
Date: Mon, 27 Feb 2017 10:43:46 -0800
Subject: [PATCH 49/51] Issue #29: WindowsErrorReporting is unimplemented
 (#224)

* Fix unit test build break.

* WindowsErrorReporting is unimplemented (Issue #29)

* Convenience accessor for SYSTEM reports

I had to dig into behavior to figure this out and test across multiple devices to figure out how this API actually worked - hopefully this helps other developers not have to do the same thing
---
 .../Core/WindowsErrorReportingTests.cs        |  78 ++++++++
 .../Defaults/api_wer_report_files_Default.dat |   1 +
 .../Defaults/api_wer_reports_Default.dat      |   1 +
 .../UnitTestProject/UnitTestProject.csproj    |   7 +
 .../Core/WindowsErrorReporting.cs             | 184 ++++++++++++++++++
 5 files changed, 271 insertions(+)
 create mode 100644 WindowsDevicePortalWrapper/UnitTestProject/Core/WindowsErrorReportingTests.cs
 create mode 100644 WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_wer_report_files_Default.dat
 create mode 100644 WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_wer_reports_Default.dat

diff --git a/WindowsDevicePortalWrapper/UnitTestProject/Core/WindowsErrorReportingTests.cs b/WindowsDevicePortalWrapper/UnitTestProject/Core/WindowsErrorReportingTests.cs
new file mode 100644
index 00000000..9335c9c7
--- /dev/null
+++ b/WindowsDevicePortalWrapper/UnitTestProject/Core/WindowsErrorReportingTests.cs
@@ -0,0 +1,78 @@
+//----------------------------------------------------------------------------------------------
+// <copyright file="WindowsErrorReportingTests.cs" company="Microsoft Corporation">
+//     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
+// </copyright>
+//----------------------------------------------------------------------------------------------
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using static Microsoft.Tools.WindowsDevicePortal.DevicePortal;
+
+namespace Microsoft.Tools.WindowsDevicePortal.Tests.Core
+{
+    /// <summary>
+    /// Test class for Windows Error Reporting (WER) APIs.
+    /// </summary>
+    [TestClass]
+    public class WindowsErrorReportingTests : BaseTests
+    {
+        /// <summary>
+        /// Basic test of GET method for getting a list of Windows Error Reporting (WER) reports.
+        /// </summary>
+        [TestMethod]
+        public void GetWindowsErrorReportsTest()
+        {
+            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.WindowsErrorReportsApi, HttpMethods.Get);
+
+            Task<WerDeviceReports> getWerReportsTask = TestHelpers.Portal.GetWindowsErrorReportsAsync();
+            getWerReportsTask.Wait();
+
+            Assert.AreEqual(TaskStatus.RanToCompletion, getWerReportsTask.Status);
+
+            List<WerUserReports> deviceReports = getWerReportsTask.Result.UserReports;
+            Assert.AreEqual(6, deviceReports.Count);
+            deviceReports.ForEach(userReport =>
+            {
+                Assert.IsFalse(string.IsNullOrWhiteSpace(userReport.UserName));
+                userReport.Reports.ForEach(report =>
+                {
+                    Assert.AreNotEqual(0, report.CreationTime);
+                    Assert.IsFalse(string.IsNullOrWhiteSpace(report.Name));
+                    switch (report.Type.ToLower())
+                    {
+                        case "queue":
+                        case "archive":
+                            break;
+                        default:
+                            Assert.Fail($"Expected the report type to be 'Queue' or 'Archive'. Actual value is '{report.Type}'.");
+                            break;
+                    }
+                });
+            });
+        }
+
+        /// <summary>
+        /// Basic test of GET method for getting a list of Windows Error Reporting (WER) report files.
+        /// </summary>
+        [TestMethod]
+        public void GetWindowsErrorReportFilesTest()
+        {
+            TestHelpers.MockHttpResponder.AddMockResponse(DevicePortal.WindowsErrorReportingFilesApi, HttpMethods.Get);
+
+            Task<WerFiles> getWerReportingFilesTask = TestHelpers.Portal.GetWindowsErrorReportingFileListAsync(string.Empty, string.Empty, string.Empty);
+            getWerReportingFilesTask.Wait();
+
+            Assert.AreEqual(TaskStatus.RanToCompletion, getWerReportingFilesTask.Status);
+
+            List<WerFileInformation> list = getWerReportingFilesTask.Result.Files;
+            Assert.AreEqual(2, list.Count);
+            list.ForEach(file =>
+            {
+                Assert.IsFalse(string.IsNullOrWhiteSpace(file.Name));
+                Assert.AreNotEqual(0, file.Size);
+            });
+        }
+    }
+}
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_wer_report_files_Default.dat b/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_wer_report_files_Default.dat
new file mode 100644
index 00000000..5af22c47
--- /dev/null
+++ b/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_wer_report_files_Default.dat
@@ -0,0 +1 @@
+{"Files" : [{"Name" : "DMI59C3.tmp.log.xml", "Size" : 17490},{"Name" : "Report.wer", "Size" : 2354}]}
\ No newline at end of file
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_wer_reports_Default.dat b/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_wer_reports_Default.dat
new file mode 100644
index 00000000..fd900ce2
--- /dev/null
+++ b/WindowsDevicePortalWrapper/UnitTestProject/MockData/Defaults/api_wer_reports_Default.dat
@@ -0,0 +1 @@
+{"WerReports" : [{"User" : "All Users", "Reports" : []},{"User" : "Default", "Reports" : []},{"User" : "Default User", "Reports" : []},{"User" : "defaultuser0", "Reports" : []},{"User" : "Public", "Reports" : []},{"User" : "SYSTEM", "Reports" : [{"CreationTime" : 131318340058889142, "Name" : "NonCritical_x64_7929388dba23a244febb598fddbb379b5a87d15_00000000_cab_03f96433", "Type" : "Queue"},{"CreationTime" : 131318340058732887, "Name" : "NonCritical_x64_bf8ef24cbbad37c50f759d68f2292f1f2b0e7df_00000000_cab_03f96423", "Type" : "Queue"},{"CreationTime" : 131318550054539960, "Name" : "NonCritical_x64_f52a5825f740cca45c7b0c8078746ec73beaac_00000000_18add298", "Type" : "Archive"},{"CreationTime" : 131318340063576709, "Name" : "NonCritical_x64_f728cd6f9e9f34997130a4d3dd3d855648a6f_00000000_0ca56608", "Type" : "Archive"}]}]}
\ No newline at end of file
diff --git a/WindowsDevicePortalWrapper/UnitTestProject/UnitTestProject.csproj b/WindowsDevicePortalWrapper/UnitTestProject/UnitTestProject.csproj
index 7ff5def3..f3f1c29f 100644
--- a/WindowsDevicePortalWrapper/UnitTestProject/UnitTestProject.csproj
+++ b/WindowsDevicePortalWrapper/UnitTestProject/UnitTestProject.csproj
@@ -62,6 +62,7 @@
   <ItemGroup>
     <Compile Include="BaseTests.cs" />
     <Compile Include="Core\AppFileExplorerTests.cs" />
+    <Compile Include="Core\WindowsErrorReportingTests.cs" />
     <Compile Include="Core\EtwTests.cs" />
     <Compile Include="Core\PerformanceDataTests.cs" />
     <Compile Include="Device-VersionTests\HoloLens\HoloLensHelpers.cs" />
@@ -86,6 +87,12 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="MockData\Defaults\api_wer_report_files_Default.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="MockData\Defaults\api_wer_reports_Default.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="MockData\Defaults\WebSocket_api_etw_session_realtime_Default.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/WindowsErrorReporting.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/WindowsErrorReporting.cs
index c2842cbe..4291fe47 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/WindowsErrorReporting.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/WindowsErrorReporting.cs
@@ -6,6 +6,12 @@
 
 namespace Microsoft.Tools.WindowsDevicePortal
 {
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Runtime.Serialization;
+    using System.Threading.Tasks;
+
     /// <content>
     /// Wrappers for DNS methods
     /// </content>
@@ -25,5 +31,183 @@ public partial class DevicePortal
         /// API for getting the list of Windows error reports.
         /// </summary>
         public static readonly string WindowsErrorReportsApi = "api/wer/reports";
+
+        /// <summary>
+        /// Gets the list of Windows Error Reporting (WER) reports.
+        /// </summary>
+        /// <returns>The list of Windows Error Reporting (WER) reports.</returns>
+        public async Task<WerDeviceReports> GetWindowsErrorReportsAsync()
+        {
+            this.CheckPlatformSupport();
+
+            return await this.GetAsync<WerDeviceReports>(WindowsErrorReportsApi);
+        }
+
+        /// <summary>
+        /// Gets the list of files in a Windows Error Reporting (WER) report.
+        /// </summary>
+        /// <param name="user">The user associated with the report.</param>
+        /// <param name="type">The type of report. This can be either 'queried' or 'archived'.</param>
+        /// <param name="name">The name of the report.</param>
+        /// <returns>The list of files.</returns>
+        public async Task<WerFiles> GetWindowsErrorReportingFileListAsync(string user, string type, string name)
+        {
+            this.CheckPlatformSupport();
+
+            Dictionary<string, string> payload = new Dictionary<string, string>();
+            payload.Add("user", user);
+            payload.Add("type", type);
+            payload.Add("name", Utilities.Hex64Encode(name));
+
+            return await this.GetAsync<WerFiles>(WindowsErrorReportingFilesApi, Utilities.BuildQueryString(payload));
+        }
+
+        /// <summary>
+        /// Gets the specified file from a Windows Error Reporting (WER) report.
+        /// </summary>
+        /// <param name="user">The user associated with the report.</param>
+        /// <param name="type">The type of report. This can be either 'queried' or 'archived'.</param>
+        /// <param name="name">The name of the report.</param>
+        /// <param name="file">The name of the file to download from the report.</param>
+        /// <returns>Byte array containing the file data</returns>
+        public async Task<byte[]> GetWindowsErrorReportingFileAsync(string user, string type, string name, string file)
+        {
+            this.CheckPlatformSupport();
+
+            Dictionary<string, string> payload = new Dictionary<string, string>();
+            payload.Add("user", user);
+            payload.Add("type", type);
+            payload.Add("name", Utilities.Hex64Encode(name));
+            payload.Add("file", Utilities.Hex64Encode(file));
+
+            Uri uri = Utilities.BuildEndpoint(
+                this.deviceConnection.Connection,
+                WindowsErrorReportingFileApi,
+                Utilities.BuildQueryString(payload));
+
+            byte[] werFile = null;
+            using (Stream stream = await this.GetAsync(uri))
+            {
+                werFile = new byte[stream.Length];
+                stream.Read(werFile, 0, werFile.Length);
+            }
+
+            return werFile;
+        }
+
+        /// <summary>
+        /// Checks if the Windows Error Reporting (WER) APIs are being called on a supported platform.
+        /// </summary>
+        private void CheckPlatformSupport()
+        {
+            switch (this.Platform)
+            {
+                case DevicePortalPlatforms.Mobile:
+                case DevicePortalPlatforms.XboxOne:
+                    throw new NotSupportedException("This method is only supported on Windows Desktop, HoloLens and IoT platforms.");
+            }
+        }
+
+        /// <summary>
+        /// A list of all files contained within a Windows Error Reporting (WER) report.
+        /// </summary>
+        [DataContract]
+        public class WerFiles
+        {
+            /// <summary>
+            /// Gets a list of all files contained within a Windows Error Reporting (WER) report.
+            /// </summary>
+            [DataMember(Name = "Files")]
+            public List<WerFileInformation> Files { get; private set; }
+        }
+
+        /// <summary>
+        /// Information about a Windows Error Reporting (WER) report file.
+        /// </summary>
+        [DataContract]
+        public class WerFileInformation
+        {
+            /// <summary>
+            /// Gets the name of the file.
+            /// </summary>
+            [DataMember(Name = "Name")]
+            public string Name { get; private set; }
+
+            /// <summary>
+            /// Gets the size of the file (in bytes).
+            /// </summary>
+            [DataMember(Name = "Size")]
+            public int Size { get; private set; }
+        }
+
+        /// <summary>
+        /// A list of all Windows Error Reporting (WER) reports on a device.
+        /// </summary>
+        [DataContract]
+        public class WerDeviceReports
+        {
+            /// <summary>
+            ///  Gets a list of all Windows Error Reporting (WER) reports on a 
+            ///  device.  The SYSTEM user account usually holds the bulk of the 
+            ///  error reports. 
+            /// </summary>
+            [DataMember(Name = "WerReports")]
+            public List<WerUserReports> UserReports { get; private set; }
+
+            /// <summary>
+            /// Convenience accessor for the System error reports - this is 
+            /// where most error reports end up. 
+            /// </summary>
+            public WerUserReports SystemErrorReports {
+                get
+                {
+                    return UserReports.First(x => x.UserName == "SYSTEM");
+                }
+            }
+        }
+
+        /// <summary>
+        /// A list of Windows Error Reporting (WER) reports for a specific user.
+        /// </summary>
+        [DataContract]
+        public class WerUserReports
+        {
+            /// <summary>
+            /// Gets the user name.
+            /// </summary>
+            [DataMember(Name = "User")]
+            public string UserName { get; private set; }
+
+            /// <summary>
+            /// Gets a list of Windows Error Reporting (WER) reports
+            /// </summary>
+            [DataMember(Name = "Reports")]
+            public List<WerReportInformation> Reports { get; private set; }
+        }
+
+        /// <summary>
+        /// Information about a Windows Error Reporting (WER) report.
+        /// </summary>
+        [DataContract]
+        public class WerReportInformation
+        {
+            /// <summary>
+            /// Gets the creation time.
+            /// </summary>
+            [DataMember(Name = "CreationTime")]
+            public ulong CreationTime { get; private set; }
+
+            /// <summary>
+            /// Gets the report name (not base64 encoded).
+            /// </summary>
+            [DataMember(Name = "Name")]
+            public string Name { get; private set; }
+
+            /// <summary>
+            /// Gets the report type ("Queue" or "Archive").
+            /// </summary>
+            [DataMember(Name = "Type")]
+            public string Type { get; private set; }
+        }
     }
 }

From 6e039036cb17313da5aabe2c5b231bbb62a79cad Mon Sep 17 00:00:00 2001
From: Hirsch Singhal <hps.scout@gmail.com>
Date: Mon, 27 Feb 2017 10:52:03 -0800
Subject: [PATCH 50/51] Update content for WER (#225)

---
 .../Core/WindowsErrorReporting.cs                               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/WindowsErrorReporting.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/WindowsErrorReporting.cs
index 4291fe47..e8455865 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/WindowsErrorReporting.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/WindowsErrorReporting.cs
@@ -13,7 +13,7 @@ namespace Microsoft.Tools.WindowsDevicePortal
     using System.Threading.Tasks;
 
     /// <content>
-    /// Wrappers for DNS methods
+    /// Wrapper for collecting Windows Error Reports from the device. 
     /// </content>
     public partial class DevicePortal
     {

From 4fd8709b083148412e2a81adf765df4168e1c136 Mon Sep 17 00:00:00 2001
From: Hirsch Singhal <hps.scout@gmail.com>
Date: Mon, 27 Feb 2017 12:06:59 -0800
Subject: [PATCH 51/51] Missing using in WER

---
 .../Core/WindowsErrorReporting.cs                                | 1 +
 1 file changed, 1 insertion(+)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/WindowsErrorReporting.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/WindowsErrorReporting.cs
index e8455865..cf53ab2e 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/WindowsErrorReporting.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/WindowsErrorReporting.cs
@@ -9,6 +9,7 @@ namespace Microsoft.Tools.WindowsDevicePortal
     using System;
     using System.Collections.Generic;
     using System.IO;
+    using System.Linq;
     using System.Runtime.Serialization;
     using System.Threading.Tasks;