From 6f1c6539468cd88209fa811310909d2b6f6f6951 Mon Sep 17 00:00:00 2001
From: Hirsch Singhal <hirsin@microsoft.com>
Date: Thu, 22 Sep 2016 12:52:48 -0700
Subject: [PATCH 1/4] Add usermode crash dump APIs

---
 .../Core/DumpCollection.cs                    | 125 +++++++++++++++++-
 ...evicePortalWrapper.UniversalWindows.csproj |   4 +-
 2 files changed, 126 insertions(+), 3 deletions(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs
index dce34655..fa088d6a 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs
@@ -4,6 +4,11 @@
 // </copyright>
 //----------------------------------------------------------------------------------------------
 
+using System;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Threading.Tasks;
+
 namespace Microsoft.Tools.WindowsDevicePortal
 {
     /// <content>
@@ -14,7 +19,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";
+        public static readonly string AvailableBugChecksApi = "api/debug/dump/kernel/dumplist";
 
         /// <summary>
         /// API to retrieve list of the available crash dumps (for sideloaded applications).
@@ -50,5 +55,123 @@ public partial class DevicePortal
         /// API to retrieve a live dump from a running user mode process.
         /// </summary>
         public static readonly string LiveProcessDumpApi = "api/debug/dump/usermode/live";
+
+        public async Task<CrashDump[]> GetAppCrashDumps()
+        {
+            CrashDumpList cdl = await this.Get<CrashDumpList>(AvailableCrashDumpsApi);
+            return cdl.CrashDumps;
+        }
+
+        public async Task<Stream> GetAppCrashDump(CrashDump 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.Get(uri);
+        }
+
+        public async Task DeleteAppCrashDump(CrashDump crashdump)
+        {
+            await this.Delete(CrashDumpFileApi,
+                string.Format("packageFullname={0}&fileName={1}", crashdump.PackageFullName, crashdump.Filename));
+        }
+
+        public async Task<CrashDumpSettings> GetAppCrashDumpSettings(AppPackage app)
+        {
+            return await this.GetAppCrashDumpSettings(app.PackageFullName);
+        }
+
+        public async Task<CrashDumpSettings> GetAppCrashDumpSettings(string packageFullname)
+        {
+            return await this.Get<CrashDumpSettings>(
+                CrashDumpSettingsApi,
+                string.Format("packageFullname={0}", packageFullname));
+        }
+
+        public async Task SetAppCrashDumpSettings(AppPackage app, bool enable = true)
+        {
+            string pfn = app.PackageFullName;
+            if (enable)
+            {
+                await this.Post(
+                    CrashDumpSettingsApi,
+                string.Format("packageFullname={0}", pfn));
+            } else
+            {
+                await this.Delete(
+                    CrashDumpSettingsApi,
+                string.Format("packageFullname={0}", pfn));
+            }
+        }
+
+        #region Data contract
+
+        /// <summary>
+        /// Per-app crash dump settings.
+        /// </summary>
+        [DataContract]
+        public class CrashDumpSettings
+        {
+            /// <summary>
+            /// Gets whether crash dumps are enabled for the app
+            /// </summary>
+            [DataMember(Name = "CrashDumpEnabled")]
+            public bool CrashDumpEnabled
+            {
+                get; private set;
+            }
+        }
+
+
+        public class CrashDump
+        {
+            /// <summary>
+            /// Gets whether crash dumps are enabled for the app
+            /// </summary>
+            [DataMember(Name = "FileDate")]
+            public DateTime FileDate
+            {
+                get; private set;
+            }
+
+            /// <summary>
+            /// Gets whether crash dumps are enabled for the app
+            /// </summary>
+            [DataMember(Name = "FileName")]
+            public string Filename
+            {
+                get; private set;
+            }
+
+            /// <summary>
+            /// Gets whether crash dumps are enabled for the app
+            /// </summary>
+            [DataMember(Name = "FileSize")]
+            public int FileSizeInBytes
+            {
+                get; private set;
+            }
+
+            /// <summary>
+            /// Gets whether crash dumps are enabled for the app
+            /// </summary>
+            [DataMember(Name = "PackageFullName")]
+            public bool PackageFullName
+            {
+                get; private set;
+            }
+}
+
+        private class CrashDumpList
+        {
+            [DataMember(Name = "CrashDumps")]
+            public CrashDump[] CrashDumps
+            {
+                get; private set;
+            }
+        }
+        #endregion Data contract
     }
 }
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">

From 4495cdeee57c1fd846344d8c0dab0a2b3b9d69e2 Mon Sep 17 00:00:00 2001
From: Hirsch Singhal <hirsin@microsoft.com>
Date: Tue, 4 Oct 2016 16:20:13 -0700
Subject: [PATCH 2/4] Additional fixes to DumpCollection

---
 .../Core/DumpCollection.cs                    | 44 +++++++++++++------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs
index fa088d6a..d19e63ec 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs
@@ -64,7 +64,7 @@ public async Task<CrashDump[]> GetAppCrashDumps()
 
         public async Task<Stream> GetAppCrashDump(CrashDump crashdump)
         {
-            string queryString = CrashDumpFileApi + string.Format("packageFullname={0}&fileName={1}", crashdump.PackageFullName, crashdump.Filename);
+            string queryString = CrashDumpFileApi + string.Format("?packageFullName={0}&fileName={1}", crashdump.PackageFullName, crashdump.Filename);
             Uri uri = Utilities.BuildEndpoint(
                 this.deviceConnection.Connection,
                 queryString);
@@ -75,7 +75,7 @@ public async Task<Stream> GetAppCrashDump(CrashDump crashdump)
         public async Task DeleteAppCrashDump(CrashDump crashdump)
         {
             await this.Delete(CrashDumpFileApi,
-                string.Format("packageFullname={0}&fileName={1}", crashdump.PackageFullName, crashdump.Filename));
+                string.Format("packageFullName={0}&fileName={1}", crashdump.PackageFullName, crashdump.Filename));
         }
 
         public async Task<CrashDumpSettings> GetAppCrashDumpSettings(AppPackage app)
@@ -97,12 +97,12 @@ public async Task SetAppCrashDumpSettings(AppPackage app, bool enable = true)
             {
                 await this.Post(
                     CrashDumpSettingsApi,
-                string.Format("packageFullname={0}", pfn));
+                string.Format("packageFullName={0}", pfn));
             } else
             {
                 await this.Delete(
                     CrashDumpSettingsApi,
-                string.Format("packageFullname={0}", pfn));
+                string.Format("packageFullName={0}", pfn));
             }
         }
 
@@ -124,20 +124,31 @@ public bool CrashDumpEnabled
             }
         }
 
-
+        [DataContract]
         public class CrashDump
         {
             /// <summary>
-            /// Gets whether crash dumps are enabled for the app
+            /// Gets the timestamp of the crash as a string.
             /// </summary>
             [DataMember(Name = "FileDate")]
-            public DateTime FileDate
+            public string FileDateAsString
             {
                 get; private set;
             }
 
             /// <summary>
-            /// Gets whether crash dumps are enabled for the app
+            /// 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
@@ -146,26 +157,33 @@ public string Filename
             }
 
             /// <summary>
-            /// Gets whether crash dumps are enabled for the app
+            /// Gets the size of the crash dump, in bytes
             /// </summary>
             [DataMember(Name = "FileSize")]
-            public int FileSizeInBytes
+            public uint FileSizeInBytes
             {
                 get; private set;
             }
 
             /// <summary>
-            /// Gets whether crash dumps are enabled for the app
+            /// Gets the package full name of the app that crashed. 
             /// </summary>
             [DataMember(Name = "PackageFullName")]
-            public bool PackageFullName
+            public string PackageFullName
             {
                 get; private set;
             }
-}
+    }
 
+        /// <summary>
+        /// A list of crash dumps.  Internal usage only. 
+        /// </summary>
+        [DataContract]
         private class CrashDumpList
         {
+            /// <summary>
+            /// Gets a list of crash dumps on the device. 
+            /// </summary>
             [DataMember(Name = "CrashDumps")]
             public CrashDump[] CrashDumps
             {

From 0b27bb8cc15ea70c41f1e229de04d1a32e47c78d Mon Sep 17 00:00:00 2001
From: Hirsch Singhal <hirsin@microsoft.com>
Date: Sat, 15 Oct 2016 17:39:59 -0700
Subject: [PATCH 3/4] Add kernel, live, and app dump APIs.

---
 .../Core/AppCrashDumpCollection.cs            | 178 +++++++++++++++
 .../Core/DumpCollection.cs                    | 209 ++++++++----------
 ...indowsDevicePortalWrapper.Shared.projitems |   1 +
 3 files changed, 275 insertions(+), 113 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..45601e71
--- /dev/null
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppCrashDumpCollection.cs
@@ -0,0 +1,178 @@
+//----------------------------------------------------------------------------------------------
+// <copyright file="DumpCollection.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";
+
+        public async Task<List<AppCrashDump>> GetAppCrashDumpListAsync()
+        {
+            AppCrashDumpList cdl = await this.GetAsync<AppCrashDumpList>(AvailableCrashDumpsApi);
+            return cdl.CrashDumps;
+        }
+
+        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);
+        }
+
+        public async Task DeleteAppCrashDumpAsync(AppCrashDump crashdump)
+        {
+            await this.DeleteAsync(CrashDumpFileApi,
+                string.Format("packageFullName={0}&fileName={1}", crashdump.PackageFullName, crashdump.Filename));
+        }
+
+        public async Task<AppCrashDumpSettings> GetAppCrashDumpSettingsAsync(AppPackage app)
+        {
+            return await this.GetAppCrashDumpSettingsAsync(app.PackageFullName);
+        }
+
+        public async Task<AppCrashDumpSettings> GetAppCrashDumpSettingsAsync(string packageFullname)
+        {
+            return await this.GetAsync<AppCrashDumpSettings>(
+                CrashDumpSettingsApi,
+                string.Format("packageFullname={0}", packageFullname));
+        }
+
+        public async Task SetAppCrashDumpSettingsAsync(AppPackage app, bool enable = true)
+        {
+            string pfn = app.PackageFullName;
+            await SetAppCrashDumpSettingsAsync(pfn, enable);
+        }
+
+        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;
+            }
+        }
+
+        [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 d19e63ec..4c28f810 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs
@@ -5,6 +5,7 @@
 //----------------------------------------------------------------------------------------------
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Runtime.Serialization;
 using System.Threading.Tasks;
@@ -21,11 +22,6 @@ public partial class DevicePortal
         /// </summary>
         public static readonly string AvailableBugChecksApi = "api/debug/dump/kernel/dumplist";
 
-        /// <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 a bugcheck minidump file.
         /// </summary>
@@ -36,16 +32,6 @@ public partial class DevicePortal
         /// </summary>
         public static readonly string BugcheckSettingsApi = "api/debug/dump/kernel/crashcontrol";
 
-        /// <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>
         /// API to retrieve a live kernel dump.
         /// </summary>
@@ -56,140 +42,137 @@ public partial class DevicePortal
         /// </summary>
         public static readonly string LiveProcessDumpApi = "api/debug/dump/usermode/live";
 
-        public async Task<CrashDump[]> GetAppCrashDumps()
+        public async Task<List<Dumpfile>> GetDumpfileListAsync()
         {
-            CrashDumpList cdl = await this.Get<CrashDumpList>(AvailableCrashDumpsApi);
-            return cdl.CrashDumps;
+            DumpFileList dfl = await this.GetAsync<DumpFileList>(AvailableBugChecksApi);
+            return dfl.DumpFiles;
         }
 
-        public async Task<Stream> GetAppCrashDump(CrashDump crashdump)
+        public async Task<Stream> GetDumpFileAsync(Dumpfile crashdump)
         {
-            string queryString = CrashDumpFileApi + string.Format("?packageFullName={0}&fileName={1}", crashdump.PackageFullName, crashdump.Filename);
+            string queryString = BugcheckFileApi + string.Format("?filename={0}", crashdump.Filename);
             Uri uri = Utilities.BuildEndpoint(
                 this.deviceConnection.Connection,
                 queryString);
 
-            return await this.Get(uri);
+            return await this.GetAsync(uri);
         }
 
-        public async Task DeleteAppCrashDump(CrashDump crashdump)
+        public async Task<Stream> GetLiveKernelDumpAsync()
         {
-            await this.Delete(CrashDumpFileApi,
-                string.Format("packageFullName={0}&fileName={1}", crashdump.PackageFullName, crashdump.Filename));
+            Uri uri = Utilities.BuildEndpoint(
+                this.deviceConnection.Connection,
+                LiveKernelDumpApi);
+
+            return await this.GetAsync(uri);
         }
 
-        public async Task<CrashDumpSettings> GetAppCrashDumpSettings(AppPackage app)
+        public async Task<Stream> GetLiveProcessDumpAsync(int pid)
         {
-            return await this.GetAppCrashDumpSettings(app.PackageFullName);
+            string queryString = LiveProcessDumpApi + string.Format("?pid={0}", pid);
+            Uri uri = Utilities.BuildEndpoint(
+                this.deviceConnection.Connection,
+                queryString);
+
+            return await this.GetAsync(uri);
         }
 
-        public async Task<CrashDumpSettings> GetAppCrashDumpSettings(string packageFullname)
+        public async Task<DumpFileSettings> GetDumpFileSettingsAsync()
         {
-            return await this.Get<CrashDumpSettings>(
-                CrashDumpSettingsApi,
-                string.Format("packageFullname={0}", packageFullname));
+            return await this.GetAsync<DumpFileSettings>(BugcheckSettingsApi);
         }
 
-        public async Task SetAppCrashDumpSettings(AppPackage app, bool enable = true)
+        public async Task SetDumpFileSettingsAsync(DumpFileSettings dfs)
         {
-            string pfn = app.PackageFullName;
-            if (enable)
-            {
-                await this.Post(
-                    CrashDumpSettingsApi,
-                string.Format("packageFullName={0}", pfn));
-            } else
-            {
-                await this.Delete(
-                    CrashDumpSettingsApi,
-                string.Format("packageFullName={0}", pfn));
-            }
+            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
+    [DataContract]
+    public class DumpFileSettings
+    {
+        [DataMember(Name = "autoreboot")]
+        public bool AutoReboot { get; set; }
 
-        #region Data contract
+        [DataMember(Name = "dumptype")]
+        public DumpTypes DumpType { get; set; }
 
+        [DataMember(Name = "maxdumpcount")]
+        public int MaxDumpCount { get; set; }
+
+        [DataMember(Name = "overwrite")]
+        public bool Overwrite { get; set; }
+
+        public enum DumpTypes
+        {
+            Disabled=0,
+            CompleteMemoryDump=1,
+            KernelDump=2,
+            Minidump=3
+        }
+    }
+
+    /// <summary>
+    /// Gets a list of kernel dumps on the device. 
+    /// </summary>
+    [DataContract]
+    public class DumpFileList
+    {
         /// <summary>
-        /// Per-app crash dump settings.
+        /// Gets a list of kernel dumps on the device. 
         /// </summary>
-        [DataContract]
-        public class CrashDumpSettings
+        [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
         {
-            /// <summary>
-            /// Gets whether crash dumps are enabled for the app
-            /// </summary>
-            [DataMember(Name = "CrashDumpEnabled")]
-            public bool CrashDumpEnabled
-            {
-                get; private set;
-            }
+            get; private set;
         }
 
-        [DataContract]
-        public class CrashDump
+        /// <summary>
+        /// Gets the timestamp of the crash.
+        /// </summary>
+        public DateTime FileDate
         {
-            /// <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
             {
-                get; private set;
+                return DateTime.Parse(this.FileDateAsString);
             }
+        }
 
-            /// <summary>
-            /// Gets the package full name of the app that crashed. 
-            /// </summary>
-            [DataMember(Name = "PackageFullName")]
-            public string PackageFullName
-            {
-                get; private set;
-            }
-    }
+        /// <summary>
+        /// Gets the filename of the crash file. 
+        /// </summary>
+        [DataMember(Name = "FileName")]
+        public string Filename
+        {
+            get; private set;
+        }
 
         /// <summary>
-        /// A list of crash dumps.  Internal usage only. 
+        /// Gets the size of the crash dump, in bytes
         /// </summary>
-        [DataContract]
-        private class CrashDumpList
+        [DataMember(Name = "FileSize")]
+        public uint FileSizeInBytes
         {
-            /// <summary>
-            /// Gets a list of crash dumps on the device. 
-            /// </summary>
-            [DataMember(Name = "CrashDumps")]
-            public CrashDump[] CrashDumps
-            {
-                get; private set;
-            }
+            get; private set;
         }
-        #endregion Data contract
     }
+    #endregion Data Contract
 }
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 2732e586677ab626332d849bbf4b8fd6473aa30a Mon Sep 17 00:00:00 2001
From: Hirsch Singhal <hirsin@microsoft.com>
Date: Sat, 15 Oct 2016 18:40:02 -0700
Subject: [PATCH 4/4] StyleCop pass

---
 .../Core/AppCrashDumpCollection.cs            | 63 +++++++++++++---
 .../Core/DumpCollection.cs                    | 71 +++++++++++++++++--
 .../IoT/ApplicationManager.cs                 |  2 +-
 3 files changed, 121 insertions(+), 15 deletions(-)

diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppCrashDumpCollection.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppCrashDumpCollection.cs
index 45601e71..17acfa3a 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppCrashDumpCollection.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/AppCrashDumpCollection.cs
@@ -1,5 +1,5 @@
 //----------------------------------------------------------------------------------------------
-// <copyright file="DumpCollection.cs" company="Microsoft Corporation">
+// <copyright file="AppCrashDumpCollection.cs" company="Microsoft Corporation">
 //     Licensed under the MIT License. See LICENSE.TXT in the project root license information.
 // </copyright>
 //----------------------------------------------------------------------------------------------
@@ -32,12 +32,21 @@ public partial class DevicePortal
         /// </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);
@@ -48,17 +57,32 @@ public async Task<Stream> GetAppCrashDumpAsync(AppCrashDump crashdump)
             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>(
@@ -66,12 +90,24 @@ public async Task<AppCrashDumpSettings> GetAppCrashDumpSettingsAsync(string pack
                 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)
@@ -88,8 +124,6 @@ await this.DeleteAsync(
             }
         }
 
-
-
         #region Data contract
 
         /// <summary>
@@ -104,20 +138,26 @@ public class AppCrashDumpSettings
             [DataMember(Name = "CrashDumpEnabled")]
             public bool CrashDumpEnabled
             {
-                get; private set;
+                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;
+                get;
+                private set;
             }
 
             /// <summary>
@@ -137,7 +177,8 @@ public DateTime FileDate
             [DataMember(Name = "FileName")]
             public string Filename
             {
-                get; private set;
+                get;
+                private set;
             }
 
             /// <summary>
@@ -146,15 +187,18 @@ public string Filename
             [DataMember(Name = "FileSize")]
             public uint FileSizeInBytes
             {
-                get; private set;
+                get;
+                private set;
             }
+
             /// <summary>
             /// Gets the package full name of the app that crashed. 
             /// </summary>
             [DataMember(Name = "PackageFullName")]
             public string PackageFullName
             {
-                get; private set;
+                get;
+                private set;
             }
         }
 
@@ -170,7 +214,8 @@ private class AppCrashDumpList
             [DataMember(Name = "CrashDumps")]
             public List<AppCrashDump> CrashDumps
             {
-                get; private set;
+                get;
+                private set;
             }
         }
         #endregion Data contract
diff --git a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs
index 4c28f810..94b32808 100644
--- a/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs
+++ b/WindowsDevicePortalWrapper/WindowsDevicePortalWrapper.Shared/Core/DumpCollection.cs
@@ -42,12 +42,21 @@ public partial class DevicePortal
         /// </summary>
         public static readonly string LiveProcessDumpApi = "api/debug/dump/usermode/live";
 
+        /// <summary>
+        /// Get a list of dumpfiles on the system. 
+        /// </summary>
+        /// <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>
+        /// Download a dumpfile from the system. 
+        /// </summary>
+        /// <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);
@@ -58,6 +67,10 @@ public async Task<Stream> GetDumpFileAsync(Dumpfile crashdump)
             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(
@@ -67,6 +80,11 @@ public async Task<Stream> GetLiveKernelDumpAsync()
             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);
@@ -77,43 +95,86 @@ public async Task<Stream> GetLiveProcessDumpAsync(int pid)
             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));
+                    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
         {
-            Disabled=0,
-            CompleteMemoryDump=1,
-            KernelDump=2,
-            Minidump=3
+            /// <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
         }
     }
 
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; }