CLR helper now updates local CLR instance (#203)

***NO_CI***

Author: josesimoes

source/TestAdapter/Executor.cs

@@ -80,7 +80,7 @@ public void RunTests(IEnumerable<string> sources, IRunContext runContext, IFrame
             try
             {
                 InitializeLogger(runContext, frameworkHandle);
-                
+
                 foreach (var source in sources)
                 {
                     var testsCases = TestDiscoverer.ComposeTestCases(source);
@@ -198,8 +198,8 @@ private async Task<List<TestResult>> RunTestOnHardwareAsync(List<TestCase> tests
             var serialDebugClient = PortBase.CreateInstanceForSerial(true, 2000);
 
         retryConnection:
-            
-            if(string.IsNullOrEmpty(_settings.RealHardwarePort))
+
+            if (string.IsNullOrEmpty(_settings.RealHardwarePort))
             {
                 _logger.LogMessage($"Waiting for device enumeration to complete.", Settings.LoggingLevel.Verbose);
             }
@@ -241,7 +241,7 @@ private async Task<List<TestResult>> RunTestOnHardwareAsync(List<TestCase> tests
                 device = serialDebugClient.NanoFrameworkDevices.FirstOrDefault(m => m.SerialNumber == _settings.RealHardwarePort);
 
                 // sanity check
-                if(device is null)
+                if (device is null)
                 {
                     // no device, done here
                     _logger.LogMessage($"No device available at {_settings.RealHardwarePort}.", Settings.LoggingLevel.Verbose);
@@ -595,6 +595,14 @@ private async Task<List<TestResult>> RunTestOnEmulatorAsync(
                 return results;
             }
 
+            // update nanoCLR instance, if not running a local one
+            if (string.IsNullOrEmpty(_settings.PathToLocalCLRInstance))
+            {
+                NanoCLRHelper.UpdateNanoCLRInstance(
+                    _settings.CLRVersion,
+                    _logger);
+            }
+
             _logger.LogMessage(
                 "Processing assemblies to load into test runner...",
                 Settings.LoggingLevel.Verbose);
@@ -621,7 +629,7 @@ private async Task<List<TestResult>> RunTestOnEmulatorAsync(
             }
 
             // if requested, set diagnostic output
-            if(_settings.Logging > Settings.LoggingLevel.None)
+            if (_settings.Logging > Settings.LoggingLevel.None)
             {
                 arguments.Append(" -v diag");
             }
@@ -640,7 +648,7 @@ private async Task<List<TestResult>> RunTestOnEmulatorAsync(
             {
                 var cliResult = await cmd.ExecuteBufferedAsync(cts.Token);
                 var exitCode = cliResult.ExitCode;
-                
+
                 // read standard output
                 var output = cliResult.StandardOutput;
 
@@ -684,7 +692,7 @@ private async Task<List<TestResult>> RunTestOnEmulatorAsync(
 
                     results.First().Outcome = TestOutcome.Failed;
                     results.First().ErrorMessage = $"nanoCLR execution ended with exit code: {exitCode}. Check log for details.";
-                    
+
                     return results;
                 }
             }
@@ -793,7 +801,7 @@ private void ParseTestResults(string rawOutput, List<TestResult> results)
                             var allTestToSkip = results.Where(m => m.TestCase.FullyQualifiedName.Contains(testCasesToSkipName));
                             foreach (var testToSkip in allTestToSkip)
                             {
-                                if(testToSkip.TestCase.FullyQualifiedName == resultDataSet[1])
+                                if (testToSkip.TestCase.FullyQualifiedName == resultDataSet[1])
                                 {
                                     continue;
                                 }

source/TestAdapter/NanoCLRHelper.cs

@@ -75,5 +75,56 @@ public static bool InstallNanoClr(LogMessenger logger)
             // report outcome
             return NanoClrIsInstalled;
         }
+
+        public static void UpdateNanoCLRInstance(
+            string clrVersion,
+            LogMessenger logger)
+        {
+            logger.LogMessage(
+                "Upate nanoCLR instance",
+                Settings.LoggingLevel.Verbose);
+
+            var arguments = "instance --update";
+
+            if (!string.IsNullOrEmpty(clrVersion))
+            {
+                arguments += $" --clrversion {clrVersion}";
+            }
+
+            var cmd = Cli.Wrap("nanoclr")
+                .WithArguments(arguments)
+                .WithValidation(CommandResultValidation.None);
+
+            // setup cancellation token with a timeout of 1 minute
+            using (var cts = new CancellationTokenSource(TimeSpan.FromMinutes(1)))
+            {
+                var cliResult = cmd.ExecuteBufferedAsync(cts.Token).Task.Result;
+
+                if (cliResult.ExitCode == 0)
+                {
+                    // this will be either (on update): 
+                    // Updated to v1.8.1.102
+                    // or (on same version):
+                    // Already at v1.8.1.102
+                    var regexResult = Regex.Match(cliResult.StandardOutput, @"((?>version )(?'version'\d+\.\d+\.\d+))");
+
+                    if (regexResult.Success)
+                    {
+                        logger.LogMessage($"nanoCLR instance updated to v{regexResult.Groups["version"].Value}",
+                                          Settings.LoggingLevel.Verbose);
+                    }
+                    else
+                    {
+                        logger.LogPanicMessage($"*** Failed to update nanoCLR instance. {cliResult.StandardOutput}.");
+                    }
+                }
+                else
+                {
+                    logger.LogMessage(
+                        $"Failed to update nanoCLR instance. Exit code {cliResult.ExitCode}.",
+                                          Settings.LoggingLevel.Detailed);
+                }
+            }
+        }
     }
 }

source/TestAdapter/Settings.cs

@@ -29,6 +29,11 @@ public class Settings
         /// </summary>
         public string PathToLocalCLRInstance { get; set; } = string.Empty;
 
+        /// <summary>
+        /// Version of nanoCLR instance to use when running Unit Tests.
+        /// </summary>
+        public string CLRVersion { get; set; } = string.Empty;
+
         /// <summary>
         /// Level of logging for test execution.
         /// </summary>
@@ -65,6 +70,12 @@ public static Settings Extract(XmlNode node)
                         settings.Logging = logging;
                     }
                 }
+
+                var clrversion = node.SelectSingleNode(nameof(CLRVersion))?.FirstChild;
+                if (clrversion != null && clrversion.NodeType == XmlNodeType.Text)
+                {
+                    settings.CLRVersion = clrversion.Value;
+                }
             }
 
             return settings;

source/runsettings/nano.runsettings

@@ -11,5 +11,6 @@
    <nanoFrameworkAdapter>
        <Logging>None</Logging>
        <IsRealHardware>False</IsRealHardware>
+       <CLRVersion></CLRVersion><!--Specify the nanoCLR version to use. If not specified, the latest available will be used. -->
    </nanoFrameworkAdapter>
 </RunSettings>