Update regular expresiion for isLatestPatchSyntax()

actions · May 18, 2023 · 83a1653 · 83a1653
1 parent 898aa0c
commit 83a1653
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 21 deletions.
diff --git a/__tests__/installer.test.ts b/__tests__/installer.test.ts
@@ -359,16 +359,7 @@ describe('installer tests', () => {
         }
       );
 
-      each([
-        '3',
-        '3.1',
-        '3.1.x',
-        '3.1.*',
-        '3.1.X',
-        '6.0.2xx',
-        '6.0.2XX',
-        '6.0.2**'
-      ]).test(
+      each(['3', '3.1', '3.1.x', '3.1.*', '3.1.X', '6.0.2xx']).test(
         "if version that can be resolved to 'channel' option is supplied (%s), it should set type to 'channel' in version object",
         async version => {
           const dotnetVersionResolver = new installer.DotnetVersionResolver(
@@ -383,15 +374,7 @@ describe('installer tests', () => {
         }
       );
 
-      each([
-        '6.0',
-        '6.0.x',
-        '6.0.*',
-        '6.0.X',
-        '6.0.2xx',
-        '6.0.2XX',
-        '6.0.2**'
-      ]).test(
+      each(['6.0', '6.0.x', '6.0.*', '6.0.X', '6.0.2xx']).test(
         "if version that can be resolved to 'channel' option is supplied and its major tag is >= 6 (%s), it should set type to 'channel' and qualityFlag to 'true' in version object",
         async version => {
           const dotnetVersionResolver = new installer.DotnetVersionResolver(

diff --git a/dist/index.js b/dist/index.js
@@ -270,7 +270,7 @@ class DotnetVersionResolver {
     }
     isLatestPatchSyntax() {
         var _b, _c;
-        const majorTag = (_c = (_b = this.inputVersion.match(/^(?<majorTag>\d+)\.\d+\.\d{1}(x|X|\*){2}$/)) === null || _b === void 0 ? void 0 : _b.groups) === null || _c === void 0 ? void 0 : _c.majorTag;
+        const majorTag = (_c = (_b = this.inputVersion.match(/^(?<majorTag>\d+)\.\d+\.\d{1}x{2}$/)) === null || _b === void 0 ? void 0 : _b.groups) === null || _c === void 0 ? void 0 : _c.majorTag;
         if (majorTag &&
             parseInt(majorTag) <
                 DotnetInstallerLimits.LatestPatchSyntaxMinimalMajorTag) {

diff --git a/src/installer.ts b/src/installer.ts
@@ -49,7 +49,7 @@ export class DotnetVersionResolver {
 
   private isLatestPatchSyntax() {
     const majorTag = this.inputVersion.match(
-      /^(?<majorTag>\d+)\.\d+\.\d{1}(x|X|\*){2}$/
+      /^(?<majorTag>\d+)\.\d+\.\d{1}x{2}$/
     )?.groups?.majorTag;
     if (
       majorTag &&