Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions source/TestAdapter/NanoCLRHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -193,30 +195,30 @@ 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);
}
}
}
internal class NuGetPackage
{
public string[] Versions { get; set; }
}

}
}