Add tests and additional version check

__tests__/installer.test.ts

@@ -4,8 +4,6 @@ import os = require('os');
 import path = require('path');
 import hc = require('@actions/http-client');
 
-import each from 'jest-each';
-
 const toolDir = path.join(__dirname, 'runner', 'tools');
 const tempDir = path.join(__dirname, 'runner', 'temp');
 
@@ -16,62 +14,6 @@ import * as installer from '../src/installer';
 
 const IS_WINDOWS = process.platform === 'win32';
 
-describe('version tests', () => {
-  each(['3.1.999', '3.1.101-preview.3']).test(
-    "Exact version '%s' should be the same",
-    vers => {
-      let versInfo = new installer.DotNetVersionInfo(vers);
-
-      expect(versInfo.isExactVersion()).toBe(true);
-      expect(versInfo.version()).toBe(vers);
-    }
-  );
-
-  each([
-    ['3.1.x', '3.1'],
-    ['1.1.*', '1.1'],
-    ['2.0', '2.0']
-  ]).test("Generic version '%s' should be '%s'", (vers, resVers) => {
-    let versInfo = new installer.DotNetVersionInfo(vers);
-
-    expect(versInfo.isExactVersion()).toBe(false);
-    expect(versInfo.version()).toBe(resVers);
-  });
-
-  each([
-    '',
-    '.',
-    '..',
-    ' . ',
-    '. ',
-    ' .',
-    ' . . ',
-    ' .. ',
-    ' .  ',
-    '-1.-1',
-    '-1',
-    '-1.-1.-1',
-    '..3',
-    '1..3',
-    '1..',
-    '.2.3',
-    '.2.x',
-    '1',
-    '2.x',
-    '*.*.1',
-    '*.1',
-    '*.',
-    '1.2.',
-    '1.2.-abc',
-    'a.b',
-    'a.b.c',
-    'a.b.c-preview',
-    ' 0 . 1 . 2 '
-  ]).test("Malformed version '%s' should throw", vers => {
-    expect(() => new installer.DotNetVersionInfo(vers)).toThrow();
-  });
-});
-
 describe('installer tests', () => {
   beforeAll(async () => {
     process.env.RUNNER_TOOL_CACHE = toolDir;
@@ -90,47 +32,6 @@ describe('installer tests', () => {
     }
   }, 30000);
 
-  it('Resolving a normal generic version works', async () => {
-    const dotnetInstaller = new installer.DotnetCoreInstaller('3.1.x');
-    let versInfo = await dotnetInstaller.resolveVersion(
-      new installer.DotNetVersionInfo('3.1.x')
-    );
-
-    expect(versInfo.startsWith('3.1.'));
-  }, 100000);
-
-  it('Resolving a nonexistent generic version fails', async () => {
-    const dotnetInstaller = new installer.DotnetCoreInstaller('999.1.x');
-    try {
-      await dotnetInstaller.resolveVersion(
-        new installer.DotNetVersionInfo('999.1.x')
-      );
-      fail();
-    } catch {
-      expect(true);
-    }
-  }, 100000);
-
-  it('Resolving a exact stable version works', async () => {
-    const dotnetInstaller = new installer.DotnetCoreInstaller('3.1.201');
-    let versInfo = await dotnetInstaller.resolveVersion(
-      new installer.DotNetVersionInfo('3.1.201')
-    );
-
-    expect(versInfo).toBe('3.1.201');
-  }, 100000);
-
-  it('Resolving a exact preview version works', async () => {
-    const dotnetInstaller = new installer.DotnetCoreInstaller(
-      '5.0.0-preview.6'
-    );
-    let versInfo = await dotnetInstaller.resolveVersion(
-      new installer.DotNetVersionInfo('5.0.0-preview.6')
-    );
-
-    expect(versInfo).toBe('5.0.0-preview.6');
-  }, 100000);
-
   it('Acquires version of dotnet if no matching version is installed', async () => {
     await getDotnet('3.1.201');
     expect(fs.existsSync(path.join(toolDir, 'sdk', '3.1.201'))).toBe(true);

__tests__/versionutil.test.ts

@@ -0,0 +1,90 @@
+import each from 'jest-each';
+import * as installer from '../src/installer';
+
+describe('version tests', () => {
+  each(['3.1.999', '3.1.101-preview.3']).test(
+    "Exact version '%s' should be the same",
+    vers => {
+      let versInfo = new installer.DotNetVersionInfo(vers);
+
+      expect(versInfo.isExactVersion()).toBe(true);
+      expect(versInfo.version()).toBe(vers);
+    }
+  );
+
+  each([
+    ['3.1.x', '3.1'],
+    ['1.1.*', '1.1'],
+    ['2.0', '2.0']
+  ]).test("Generic version '%s' should be '%s'", (vers, resVers) => {
+    let versInfo = new installer.DotNetVersionInfo(vers);
+
+    expect(versInfo.isExactVersion()).toBe(false);
+    expect(versInfo.version()).toBe(resVers);
+  });
+
+  each([
+    '',
+    '.',
+    '..',
+    ' . ',
+    '. ',
+    ' .',
+    ' . . ',
+    ' .. ',
+    ' .  ',
+    '-1.-1',
+    '-1',
+    '-1.-1.-1',
+    '..3',
+    '1..3',
+    '1..',
+    '.2.3',
+    '.2.x',
+    '1',
+    '2.x',
+    '*.*.1',
+    '*.1',
+    '*.',
+    '1.2.',
+    '1.2.-abc',
+    'a.b',
+    'a.b.c',
+    'a.b.c-preview',
+    ' 0 . 1 . 2 '
+  ]).test("Malformed version '%s' should throw", vers => {
+    expect(() => new installer.DotNetVersionInfo(vers)).toThrow();
+  });
+
+  each([
+    ['3.1.x', '3.1.'],
+    ['3.1.*', '3.1.'],
+    ['3.1', '3.1.'],
+    ['5.0.0-preview.6', '5.0.0-preview.6'],
+    ['3.1.201', '3.1.201']
+  ]).test(
+    "Resolving version '%s' as '%s'",
+    async (input, expectedVersion) => {
+      const dotnetInstaller = new installer.DotnetCoreInstaller(input);
+      let versInfo = await dotnetInstaller.resolveVersion(
+        new installer.DotNetVersionInfo(input)
+      );
+      console.log(versInfo);
+
+      expect(versInfo.startsWith(expectedVersion));
+    },
+    100000
+  );
+
+  it('Resolving a nonexistent generic version fails', async () => {
+    const dotnetInstaller = new installer.DotnetCoreInstaller('999.1.x');
+    try {
+      await dotnetInstaller.resolveVersion(
+        new installer.DotNetVersionInfo('999.1.x')
+      );
+      fail();
+    } catch {
+      expect(true);
+    }
+  }, 100000);
+});

dist/index.js

@@ -16972,10 +16972,11 @@ class DotnetCoreInstaller {
             const response = yield httpClient.getJson(DotNetCoreIndexUrl);
             const result = response.result || {};
             let releasesInfo = result['releases-index'];
+            console.log(versionParts);
             releasesInfo = releasesInfo.filter((info) => {
                 // channel-version is the first 2 elements of the version (e.g. 2.1), filter out versions that don't match 2.1.x.
                 const sdkParts = info['channel-version'].split('.');
-                if (versionParts.length >= 2 && versionParts[1] != 'x') {
+                if (versionParts.length == 2 || versionParts.length > 2 && !(versionParts[2] == 'x' || versionParts[2] == '*')) {
                     return versionParts[0] == sdkParts[0] && versionParts[1] == sdkParts[1];
                 }
                 return versionParts[0] == sdkParts[0];

src/installer.ts

@@ -253,19 +253,28 @@ export class DotnetCoreInstaller {
     const response = await httpClient.getJson<any>(DotNetCoreIndexUrl);
     const result = response.result || {};
     let releasesInfo: any[] = result['releases-index'];
+
+    console.log(versionParts);
+
     releasesInfo = releasesInfo.filter((info: any) => {
       // channel-version is the first 2 elements of the version (e.g. 2.1), filter out versions that don't match 2.1.x.
       const sdkParts: string[] = info['channel-version'].split('.');
-      if (versionParts.length >= 2 && versionParts[1] != 'x') {
+      if (
+        versionParts.length == 2 ||
+        (versionParts.length > 2 &&
+          !(versionParts[2] == 'x' || versionParts[2] == '*'))
+      ) {
         return versionParts[0] == sdkParts[0] && versionParts[1] == sdkParts[1];
       }
       return versionParts[0] == sdkParts[0];
     });
+
     if (releasesInfo.length === 0) {
       throw `Could not find info for version ${versionParts.join(
         '.'
       )} at ${DotNetCoreIndexUrl}`;
     }
+
     return releasesInfo[0]['releases.json'];
   }