diff --git a/src/code/LocalServerApiCalls.cs b/src/code/LocalServerApiCalls.cs index e03be71aa..324db1081 100644 --- a/src/code/LocalServerApiCalls.cs +++ b/src/code/LocalServerApiCalls.cs @@ -261,28 +261,17 @@ private FindResults FindNameHelper(string packageName, string[] tags, bool inclu // this regex pattern matches packageName followed by a version (4 digit or 3 with prerelease word) string regexPattern = $"{packageName}" + @"(\.\d+){1,3}(?:[a-zA-Z0-9-.]+|.\d)?\.nupkg"; - Regex rx = new Regex(regexPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase); _cmdletPassedIn.WriteDebug($"package file name pattern to be searched for is: {regexPattern}"); foreach (string path in Directory.GetFiles(Repository.Uri.LocalPath)) { string packageFullName = Path.GetFileName(path); - MatchCollection matches = rx.Matches(packageFullName); - if (matches.Count == 0) - { - continue; - } - - Match match = matches[0]; - - GroupCollection groups = match.Groups; - if (groups.Count == 0) + bool isMatch = Regex.IsMatch(packageFullName, regexPattern, RegexOptions.IgnoreCase); + if (!isMatch) { continue; } - Capture group = groups[0]; - NuGetVersion nugetVersion = GetInfoFromFileName(packageFullName: packageFullName, packageName: packageName, actualName: out actualPkgName, out errRecord); _cmdletPassedIn.WriteDebug($"Version parsed as '{nugetVersion}'"); @@ -389,7 +378,6 @@ private FindResults FindVersionHelper(string packageName, string version, string // this regex pattern matches packageName followed by the requested version string regexPattern = $"{packageName}.{requiredVersion.ToNormalizedString()}" + @".nupkg"; - Regex rx = new Regex(regexPattern, RegexOptions.Compiled | RegexOptions.IgnoreCase); _cmdletPassedIn.WriteDebug($"pattern is: {regexPattern}"); string pkgPath = String.Empty; string actualPkgName = String.Empty; @@ -397,22 +385,12 @@ private FindResults FindVersionHelper(string packageName, string version, string foreach (string path in Directory.GetFiles(Repository.Uri.LocalPath)) { string packageFullName = Path.GetFileName(path); - MatchCollection matches = rx.Matches(packageFullName); - if (matches.Count == 0) - { - continue; - } - - Match match = matches[0]; - - GroupCollection groups = match.Groups; - if (groups.Count == 0) + bool isMatch = Regex.IsMatch(packageFullName, regexPattern, RegexOptions.IgnoreCase); + if (!isMatch) { continue; } - Capture group = groups[0]; - NuGetVersion nugetVersion = GetInfoFromFileName(packageFullName: packageFullName, packageName: packageName, actualName: out actualPkgName, out errRecord); _cmdletPassedIn.WriteDebug($"Version parsed as '{nugetVersion}'");