Rework deliverables (#146)

Author: josesimoes

azure-pipelines.yml

@@ -173,7 +173,7 @@ jobs:
   - Check_Build_Options
 
   pool:
-    vmImage: 'windows-2019'
+    vmImage: 'windows-latest'
 
   variables:
     DOTNET_NOLOGO: true
@@ -238,14 +238,6 @@ jobs:
         eq(variables['UPDATE_DEPENDENTS'], 'false')
       )
 
-  - script: dotnet pack --runtime win-x64 -c $(BuildConfiguration) -p:PublicRelease=true -p:PackGlobalTool=true --no-restore
-    displayName: Build .NET Core Tool NuGet package
-    condition: >-
-      and(
-        eq(variables['isTag'], 'false'),
-        eq(variables['UPDATE_DEPENDENTS'], 'false')
-      )
-
   - task: PowerShell@2
     condition: >-
       and(
@@ -274,7 +266,7 @@ jobs:
     condition: >-
       and(
         succeeded(),
-        ne(variables['system.pullrequest.isfork'], true),
+        eq(variables['System.PullRequest.PullRequestId'], ''),
         eq(variables['isTag'], 'false'),
         eq(variables['UPDATE_DEPENDENTS'], 'false')
       )

nanoFirmwareFlasher/CC13x26x2Device.cs renamed to nanoFirmwareFlasher.Library/CC13x26x2Device.cs

@@ -261,9 +261,9 @@ private static string RunUniflashCli(string arguments)
                 var uniflashCli = new Process
                 {
                     StartInfo = new ProcessStartInfo(
-                        Path.Combine(Program.ExecutingPath, "uniflash\\DebugServer\\bin", "DSLite.exe"), arguments)
+                        Path.Combine(Utilities.ExecutingPath, "uniflash\\DebugServer\\bin", "DSLite.exe"), arguments)
                     {
-                        WorkingDirectory = Path.Combine(Program.ExecutingPath, "uniflash"),
+                        WorkingDirectory = Path.Combine(Utilities.ExecutingPath, "uniflash"),
                         UseShellExecute = false,
                         RedirectStandardOutput = true,
                     }

nanoFirmwareFlasher/CC13x26x2Firmware.cs renamed to nanoFirmwareFlasher.Library/CC13x26x2Firmware.cs

@@ -11,9 +11,9 @@
 
 namespace nanoFramework.Tools.FirmwareFlasher
 {
-    internal class CC13x26x2Operations
+    public class CC13x26x2Operations
     {
-        internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync(
+        public static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync(
             string targetName,
             string fwVersion,
             bool preview,
@@ -87,11 +87,11 @@ internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync
 
             if (targetName.Contains("CC1352R"))
             {
-                configFile = Path.Combine(Program.ExecutingPath, "uniflash", "CC1352R1F3.ccxml");
+                configFile = Path.Combine(Utilities.ExecutingPath, "uniflash", "CC1352R1F3.ccxml");
             }
             else if (targetName.Contains("CC1352P"))
             {
-                configFile = Path.Combine(Program.ExecutingPath, "uniflash", "CC1352P1F3.ccxml");
+                configFile = Path.Combine(Utilities.ExecutingPath, "uniflash", "CC1352P1F3.ccxml");
             }
             else
             {
@@ -125,19 +125,19 @@ internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync
             return programResult;
         }
 
-        internal static ExitCodes InstallXds110Drivers(VerbosityLevel verbosityLevel)
+        public static ExitCodes InstallXds110Drivers(VerbosityLevel verbosityLevel)
         {
             try
             {
-                string driversPath = Path.Combine(Program.ExecutingPath, "uniflash\\emulation\\windows\\xds110_drivers");
+                string driversPath = Path.Combine(Utilities.ExecutingPath, "uniflash\\emulation\\windows\\xds110_drivers");
 
                 var uniflashCli = new Process
                 {
                     StartInfo = new ProcessStartInfo(
-                        Path.Combine(Program.ExecutingPath, "uniflash", "dpinst_64_eng.exe"),
+                        Path.Combine(Utilities.ExecutingPath, "uniflash", "dpinst_64_eng.exe"),
                         $"/SE /SW /SA /PATH {driversPath}")
                     {
-                        WorkingDirectory = Path.Combine(Program.ExecutingPath, "uniflash"),
+                        WorkingDirectory = Path.Combine(Utilities.ExecutingPath, "uniflash"),
                         // need to use ShellExecute to show elevate prompt
                         UseShellExecute = true,
                     }

nanoFirmwareFlasher/CC13x26x2Operations.cs renamed to nanoFirmwareFlasher.Library/CC13x26x2Operations.cs

@@ -11,7 +11,7 @@ namespace nanoFramework.Tools.FirmwareFlasher
     /// <summary>
     /// Structure for holding the information about the connected ESP32 together
     /// </summary>
-    internal class Esp32DeviceInfo
+    public class Esp32DeviceInfo
     {
         /// <summary>
         /// Chip type.
@@ -21,12 +21,12 @@ internal class Esp32DeviceInfo
         /// <summary>
         /// Name of the ESP32 chip
         /// </summary>
-        internal string ChipName { get; }
+        public string ChipName { get; }
 
         /// <summary>
         /// ESP32 chip features
         /// </summary>
-        internal string Features { get; }
+        public string Features { get; }
 
         /// <summary>
         /// Crystal fitted in ESP32.
@@ -36,33 +36,33 @@ internal class Esp32DeviceInfo
         /// <summary>
         /// MAC address of the ESP32 chip
         /// </summary>
-        internal string MacAddress { get; }
+        public string MacAddress { get; }
 
         /// <summary>
         /// Flash manufacturer ID.
         /// </summary>
         /// <remarks>
         /// See http://code.coreboot.org/p/flashrom/source/tree/HEAD/trunk/flashchips.h for more details.
         /// </remarks>
-        internal byte FlashManufacturerId { get; }
+        public byte FlashManufacturerId { get; }
 
         /// <summary>
         /// Flash device type ID.
         /// </summary>
         /// <remarks>
         /// See http://code.coreboot.org/p/flashrom/source/tree/HEAD/trunk/flashchips.h for more details.
         /// </remarks>
-        internal short FlashDeviceId { get; }
+        public short FlashDeviceId { get; }
 
         /// <summary>
         /// The size of the flash in bytes; 4 MB = 0x40000 bytes
         /// </summary>
-        internal int FlashSize { get; }
+        public int FlashSize { get; }
 
         /// <summary>
         /// Availability of PSRAM on the device.
         /// </summary>
-        internal PSRamAvailability PSRamAvailable { get; }
+        public PSRamAvailability PSRamAvailable { get; }
 
         /// <summary>
         /// Constructor
@@ -74,7 +74,7 @@ internal class Esp32DeviceInfo
         /// <param name="flashManufacturerId">Flash manufacturer ID</param>
         /// <param name="flashDeviceModelId">Flash device type ID</param>
         /// <param name="flashSize">The size of the flash in bytes</param>
-        internal Esp32DeviceInfo(
+        public Esp32DeviceInfo(
             string chipType,
             string chipName,
             string features,

nanoFirmwareFlasher/CloudSmithPackageDetails.cs renamed to nanoFirmwareFlasher.Library/CloudSmithPackageDetails.cs

@@ -6,12 +6,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Threading;
 
 namespace nanoFramework.Tools.FirmwareFlasher
 {
-    internal class Esp32Operations
+    public class Esp32Operations
     {
         public static ExitCodes BackupFlash(
             EspTool tool,
@@ -80,7 +78,7 @@ public static ExitCodes BackupFlash(
             return ExitCodes.OK;
         }
 
-        internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync(
+        public static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync(
             EspTool espTool,
             Esp32DeviceInfo esp32Device,
             string targetName,

nanoFirmwareFlasher/CloudsmithPackageInfo.cs renamed to nanoFirmwareFlasher.Library/CloudsmithPackageInfo.cs

@@ -19,7 +19,7 @@ namespace nanoFramework.Tools.FirmwareFlasher
     /// <summary>
     /// Class the handles all the calls to the esptool.exe.
     /// </summary>
-    internal partial class EspTool
+    public partial class EspTool
     {
         private string _esptoolMessage;
 
@@ -69,7 +69,7 @@ internal partial class EspTool
         /// <summary>
         /// This property is <see langword="true"/> if the specified COM port is valid.
         /// </summary>
-        internal bool ComPortAvailable => !string.IsNullOrEmpty(_serialPort);
+        public bool ComPortAvailable => !string.IsNullOrEmpty(_serialPort);
 
         /// <summary>
         /// Option to output progress messages.
@@ -94,7 +94,7 @@ internal partial class EspTool
         /// <param name="flashMode">The flash mode for the esptool</param>
         /// <param name="flashFrequency">The flash frequency for the esptool</param>
         /// <param name="partitionTableSize">Partition table size to use</param>
-        internal EspTool(
+        public EspTool(
             string serialPort,
             int baudRate,
             string flashMode,
@@ -159,7 +159,7 @@ internal EspTool(
         /// Tries reading ESP32 device details.
         /// </summary>
         /// <returns>The filled info structure with all the information about the connected ESP32 device or null if an error occured</returns>
-        internal Esp32DeviceInfo GetDeviceDetails(
+        public Esp32DeviceInfo GetDeviceDetails(
             string targetName,
             bool requireFlashSize = true)
         {
@@ -297,13 +297,13 @@ private PSRamAvailability FindPSRamAvailable()
             var bootloaderPartition = new Dictionary<int, string>
             {
 				// bootloader goes to 0x1000
-				{ 0x1000, Path.Combine(Program.ExecutingPath, $"{_chipType}bootloader", "bootloader.bin") },
+				{ 0x1000, Path.Combine(Utilities.ExecutingPath, $"{_chipType}bootloader", "bootloader.bin") },
 
 				// nanoCLR goes to 0x10000
-				{ 0x10000, Path.Combine(Program.ExecutingPath, $"{_chipType}bootloader", "test_startup.bin") },
+				{ 0x10000, Path.Combine(Utilities.ExecutingPath, $"{_chipType}bootloader", "test_startup.bin") },
 
                 // partition table goes to 0x8000; there are partition tables for 2MB, 4MB, 8MB and 16MB flash sizes
-				{ 0x8000, Path.Combine(Program.ExecutingPath, $"{_chipType}bootloader", $"partitions_{Esp32DeviceInfo.GetFlashSizeAsString(_flashSize).ToLowerInvariant()}.bin") }
+				{ 0x8000, Path.Combine(Utilities.ExecutingPath, $"{_chipType}bootloader", $"partitions_{Esp32DeviceInfo.GetFlashSizeAsString(_flashSize).ToLowerInvariant()}.bin") }
             };
 
             // need to use standard baud rate here because of boards put in download mode
@@ -567,17 +567,17 @@ private bool RunEspTool(
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
                 appName = "esptool.exe";
-                appDir = Path.Combine(Program.ExecutingPath, "esptool", "esptoolWin");
+                appDir = Path.Combine(Utilities.ExecutingPath, "esptool", "esptoolWin");
             }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
                 appName = "esptool";
-                appDir = Path.Combine(Program.ExecutingPath, "esptool", "esptoolMac");
+                appDir = Path.Combine(Utilities.ExecutingPath, "esptool", "esptoolMac");
             }
             else
             {
                 appName = "esptool";
-                appDir = Path.Combine(Program.ExecutingPath, "esptool", "esptoolLinux");
+                appDir = Path.Combine(Utilities.ExecutingPath, "esptool", "esptoolLinux");
                 Process espToolExex = new Process();
                 // Making sure the esptool is executable
                 espToolExex.StartInfo = new ProcessStartInfo("chmod", $"+x {Path.Combine(appDir, appName)}")