Add reboot option to RebootDevice API

nanoFramework.Runtime.Native/Power.cs

@@ -22,22 +22,26 @@ public class Power
         /// Occurs before the device reboots.
         /// </summary>
         /// <remarks>
-        /// The event handlers may have an execution constraint placed on them by the caller of the <see cref="RebootDevice()"/> method.
+        /// The event handlers may have an execution constraint placed on them by the caller of the <see cref="RebootDevice(RebootOption)"/> method.
         /// Therefore, it is recommended that the event handlers perform short, atomic operations.
         /// </remarks>
         public static event RebootEventHandler OnRebootEvent;
 
         /// <summary>
-        /// Forces a reboot of the device.
+        /// Forces a reboot of the device using the optional <paramref name="rebootOption"/> parameter.
         /// </summary>
         /// <remarks>
+        /// <para>
         /// This method raises the <see cref="OnRebootEvent"/>. If there are any handlers subscribing to <see cref="OnRebootEvent"/>, the reboot will occur only after all handlers complete their execution, regardless of the time taken.
-        /// To set a timeout for the handlers to complete, use the <see cref="RebootDevice(int)"/> method and specify an execution constraint.
+        /// To set a timeout for the handlers to complete, use the <see cref="RebootDevice(int, RebootOption)"/> method and specify an execution constraint.
+        /// </para>
+        /// <para>
+        /// If the rebootOptions parameter is set to an option other than <see cref="RebootOption.ClrOnly"/>, any ongoing debug session will be terminated.
+        /// </para>
         /// </remarks>
-        public static void RebootDevice()
-        {
-            RebootDevice(-1);
-        }
+        public static void RebootDevice(RebootOption rebootOption = RebootOption.NormalReboot) => RebootDevice(
+            -1,
+            rebootOption);
 
         /// <summary>
         /// Forces a reboot of the device with an execution constraint timeout for event handlers.
@@ -46,7 +50,10 @@ public static void RebootDevice()
         /// The execution constraint timeout, in milliseconds, for the event handlers to complete. 
         /// If the event handlers take longer than the allotted time, they will be aborted and the reboot will be executed.
         /// </param>
-        public static void RebootDevice(int exeConstraintTimeout)
+        /// <param name="rebootOption">The reboot options. </param>
+        public static void RebootDevice(
+            int exeConstraintTimeout,
+            RebootOption rebootOption = RebootOption.NormalReboot)
         {
             try
             {
@@ -59,14 +66,14 @@ public static void RebootDevice(int exeConstraintTimeout)
             }
             finally
             {
-                NativeReboot();
+                NativeReboot(rebootOption);
             }
         }
 
         #region external methods declarations
 
         [MethodImpl(MethodImplOptions.InternalCall)]
-        internal static extern void NativeReboot();
+        internal static extern void NativeReboot(RebootOption rebootOption);
 
         #endregion
     }

nanoFramework.Runtime.Native/Properties/AssemblyInfo.cs

@@ -14,7 +14,7 @@
 
 ////////////////////////////////////////////////////////////////
 // update this whenever the native assembly signature changes //
-[assembly: AssemblyNativeVersion("100.0.9.0")]
+[assembly: AssemblyNativeVersion("100.0.10.0")]
 ////////////////////////////////////////////////////////////////
 
 // Setting ComVisible to false makes the types in this assembly not visible 

nanoFramework.Runtime.Native/RebootOption.cs

@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+namespace nanoFramework.Runtime.Native
+{
+    ///////////////////////////////////////////////////////////////////////////////////////
+    // !!! KEEP IN SYNC WITH nanoFramework.Tools.Debugger.WireProtocol.RebootOptions !!! //
+    ///////////////////////////////////////////////////////////////////////////////////////
+
+    /// <summary>
+    /// Specifies the reboot options for a .NET nanoFramework device.
+    /// </summary>
+    public enum RebootOption
+    {
+        /// <summary>
+        /// Perform a normal reboot of the CPU. This is an hard reset.
+        /// </summary>
+#pragma warning disable S2346 // Need this to be 0 because of native implementation
+        NormalReboot = 0,
+#pragma warning restore S2346 // Flags enumerations zero-value members should be named "None"
+
+        /// <summary>
+        /// Reboot and enter the nanoBooter.
+        /// </summary>
+        EnterNanoBooter = 1,
+
+        /// <summary>
+        /// Reboot the Common Language Runtime (CLR) only.
+        /// </summary>
+        ClrOnly = 2,
+
+        //////////////////////////////
+        // can't use option value 4 //
+        //////////////////////////////
+
+        /// <summary>
+        /// Reboot and enter the proprietary bootloader.
+        /// </summary>
+        EnterProprietaryBooter = 8,
+    };
+}

nanoFramework.Runtime.Native/nanoFramework.Runtime.Native.nfproj

@@ -12,7 +12,8 @@
     <ProjectGuid>4C4AA37C-19D9-4C41-ADD0-BA83A0E593DA</ProjectGuid>
     <OutputType>Library</OutputType>
     <FileAlignment>512</FileAlignment>
-    <RootNamespace></RootNamespace>
+    <RootNamespace>
+    </RootNamespace>
     <AssemblyName>nanoFramework.Runtime.Native</AssemblyName>
     <TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
     <NF_IsCoreLibrary>True</NF_IsCoreLibrary>
@@ -42,6 +43,7 @@
   </ItemGroup>
   <Import Project="$(NanoFrameworkProjectSystemPath)NFProjectSystem.props" Condition="Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.props')" />
   <ItemGroup>
+    <Compile Include="RebootOption.cs" />
     <Compile Include="Power.cs" />
     <Compile Include="GC.cs" />
     <Compile Include="SystemInfo.cs" />

version.json

@@ -1,6 +1,6 @@
-{
+{
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "1.6",
+  "version": "1.7",
   "assemblyVersion": {
     "precision": "build"
   },