From 23913c55a21f15276b52ef6c72875747040a413c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Sim=C3=B5es?= <jose.simoes@eclo.solutions>
Date: Fri, 12 May 2023 17:21:07 +0100
Subject: [PATCH] Fix install and update of nanoclr

- Corrected regex checking for version after update.
- Improvements in formatting output messages.
- Minor code style fixes.
---
 source/TestAdapter/NanoCLRHelper.cs | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/source/TestAdapter/NanoCLRHelper.cs b/source/TestAdapter/NanoCLRHelper.cs
index 1d05c8c..c1493d4 100644
--- a/source/TestAdapter/NanoCLRHelper.cs
+++ b/source/TestAdapter/NanoCLRHelper.cs
@@ -93,6 +93,8 @@ public static bool InstallNanoClr(LogMessenger logger)
                         {
                             logger.LogMessage($"No need to update. Running v{latestPackageVersion}",
                                               Settings.LoggingLevel.Verbose);
+
+                            performInstallUpdate = false;
                         }
                     }
                     else
@@ -137,7 +139,7 @@ public static bool InstallNanoClr(LogMessenger logger)
                         }
                         else
                         {
-                            logger.LogPanicMessage($"*** Failed to install/update nanoclr. {cliResult.StandardOutput}.");
+                            logger.LogPanicMessage($"*** Failed to install/update nanoclr *** {Environment.NewLine} {cliResult.StandardOutput}");
 
                             NanoClrIsInstalled = false;
                         }
@@ -193,23 +195,24 @@ public static void UpdateNanoCLRInstance(
                     // 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+))");
+                    var regexResult = Regex.Match(cliResult.StandardOutput, @"((?>v)(?'version'\d+\.\d+\.\d+\.\d+))");
 
                     if (regexResult.Success)
                     {
-                        logger.LogMessage($"nanoCLR instance updated to v{regexResult.Groups["version"].Value}",
-                                          Settings.LoggingLevel.Verbose);
+                        logger.LogMessage(
+                            $"nanoCLR instance updated to v{regexResult.Groups["version"].Value}",
+                            Settings.LoggingLevel.Verbose);
                     }
                     else
                     {
-                        logger.LogPanicMessage($"*** Failed to update nanoCLR instance. {cliResult.StandardOutput}.");
+                        logger.LogPanicMessage($"*** Failed to update nanoCLR instance ***");
                     }
                 }
                 else
                 {
                     logger.LogMessage(
                         $"Failed to update nanoCLR instance. Exit code {cliResult.ExitCode}.",
-                                          Settings.LoggingLevel.Detailed);
+                        Settings.LoggingLevel.Detailed);
                 }
             }
         }
@@ -217,6 +220,5 @@ internal class NuGetPackage
         {
             public string[] Versions { get; set; }
         }
-
     }
 }