refactored version logic

__tests__/installer.test.ts

@@ -34,7 +34,10 @@ describe('installer tests', () => {
 
   it('Aquires multiple versions of dotnet', async () => {
     const versions = ['2.2.207', '3.1.120'];
-    await getDotnet(versions);
+
+    for (const version of versions) {
+      await getDotnet(version);
+    }
     expect(fs.existsSync(path.join(toolDir, 'sdk', '2.2.207'))).toBe(true);
     expect(fs.existsSync(path.join(toolDir, 'sdk', '3.1.120'))).toBe(true);
 
@@ -51,7 +54,7 @@ describe('installer tests', () => {
   }, 600000);
 
   it('Acquires version of dotnet if no matching version is installed', async () => {
-    await getDotnet(['3.1.201']);
+    await getDotnet('3.1.201');
     expect(fs.existsSync(path.join(toolDir, 'sdk', '3.1.201'))).toBe(true);
     if (IS_WINDOWS) {
       expect(fs.existsSync(path.join(toolDir, 'dotnet.exe'))).toBe(true);
@@ -66,7 +69,7 @@ describe('installer tests', () => {
   }, 600000); //This needs some time to download on "slower" internet connections
 
   it('Acquires generic version of dotnet if no matching version is installed', async () => {
-    await getDotnet(['3.1']);
+    await getDotnet('3.1');
     var directory = fs
       .readdirSync(path.join(toolDir, 'sdk'))
       .filter(fn => fn.startsWith('3.1.'));
@@ -86,7 +89,7 @@ describe('installer tests', () => {
   it('Throws if no location contains correct dotnet version', async () => {
     let thrown = false;
     try {
-      await getDotnet(['1000.0.0']);
+      await getDotnet('1000.0.0');
     } catch {
       thrown = true;
     }
@@ -141,7 +144,7 @@ function normalizeFileContents(contents: string): string {
     .replace(new RegExp('\r', 'g'), '\n');
 }
 
-async function getDotnet(versions: string[]): Promise<void> {
+async function getDotnet(version: string): Promise<void> {
-  const dotnetInstaller = new installer.DotnetCoreInstaller(versions);
+  const dotnetInstaller = new installer.DotnetCoreInstaller(version);
   await dotnetInstaller.installDotnet();
 }

__tests__/setup-dotnet.test.ts

@@ -53,10 +53,10 @@ describe('setup-dotnet tests', () => {
       fs.writeFileSync(globalJsonPath, jsonContents);
     }
 
-    const version = ['3.1'];
+    const version = '3.1';
     const installer = new dotnetInstaller.DotnetCoreInstaller(version);
     const patchVersion = await installer.resolveVersion(
-      new dotnetInstaller.DotNetVersionInfo(version[0])
+      new dotnetInstaller.DotNetVersionInfo(version)
     );
     await setup.run();
 

__tests__/versionutil.test.ts

@@ -78,7 +78,7 @@ describe('version tests', () => {
   );
 
   it('Resolving a nonexistent generic version fails', async () => {
-    const dotnetInstaller = new installer.DotnetCoreInstaller(['999.1.x']);
+    const dotnetInstaller = new installer.DotnetCoreInstaller('999.1.x');
     try {
       await dotnetInstaller.resolveVersion(
         new installer.DotNetVersionInfo('999.1.x')

dist/index.js

@@ -8686,9 +8686,12 @@ function run() {
             if (versions) {
                 const includePrerelease = (core.getInput('include-prerelease') || 'false').toLowerCase() ===
                     'true';
-                const dotnetInstaller = new installer.DotnetCoreInstaller(versions, includePrerelease);
+                let dotnetInstaller;
+                for (const version of versions) {
+                    dotnetInstaller = new installer.DotnetCoreInstaller(version, includePrerelease);
                     yield dotnetInstaller.installDotnet();
                 }
+            }
             const sourceUrl = core.getInput('source-url');
             const configFile = core.getInput('config-file');
             if (sourceUrl) {
@@ -17963,13 +17966,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DotnetCoreInstaller = exports.DotNetVersionInfo = void 0;
 // Load tempDirectory before it gets wiped by tool-cache
@@ -18035,19 +18031,15 @@ class DotNetVersionInfo {
 }
 exports.DotNetVersionInfo = DotNetVersionInfo;
 class DotnetCoreInstaller {
-    constructor(versions, includePrerelease = false) {
+    constructor(version, includePrerelease = false) {
-        this.versions = versions;
+        this.version = version;
         this.includePrerelease = includePrerelease;
     }
     installDotnet() {
-        var e_1, _a;
         return __awaiter(this, void 0, void 0, function* () {
             let output = '';
             let resultCode = 0;
-            try {
+            let calculatedVersion = yield this.resolveVersion(new DotNetVersionInfo(this.version));
-                for (var _b = __asyncValues(this.versions), _c; _c = yield _b.next(), !_c.done;) {
-                    const version = _c.value;
-                    let calculatedVersion = yield this.resolveVersion(new DotNetVersionInfo(version));
             var envVariables = {};
             for (let key in process.env) {
                 if (process.env[key]) {
@@ -18111,15 +18103,6 @@ class DotnetCoreInstaller {
                     env: envVariables
                 });
             }
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) yield _a.call(_b);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
             if (process.env['DOTNET_INSTALL_DIR']) {
                 core.addPath(process.env['DOTNET_INSTALL_DIR']);
                 core.exportVariable('DOTNET_ROOT', process.env['DOTNET_INSTALL_DIR']);

src/installer.ts

@@ -79,8 +79,8 @@ export class DotNetVersionInfo {
 }
 
 export class DotnetCoreInstaller {
-  constructor(versions: string[], includePrerelease: boolean = false) {
+  constructor(version: string, includePrerelease: boolean = false) {
-    this.versions = versions;
+    this.version = version;
     this.includePrerelease = includePrerelease;
   }
 
@@ -88,9 +88,8 @@ export class DotnetCoreInstaller {
     let output = '';
     let resultCode = 0;
 
-    for await (const version of this.versions) {
     let calculatedVersion = await this.resolveVersion(
-        new DotNetVersionInfo(version)
+      new DotNetVersionInfo(this.version)
     );
 
     var envVariables: {[key: string]: string} = {};
@@ -165,7 +164,6 @@ export class DotnetCoreInstaller {
         env: envVariables
       });
     }
-    }
     if (process.env['DOTNET_INSTALL_DIR']) {
       core.addPath(process.env['DOTNET_INSTALL_DIR']);
       core.exportVariable('DOTNET_ROOT', process.env['DOTNET_INSTALL_DIR']);
@@ -287,7 +285,7 @@ export class DotnetCoreInstaller {
     return releasesInfo[0]['releases.json'];
   }
 
-  private versions: string[];
+  private version: string;
   private includePrerelease: boolean;
 }
 

src/setup-dotnet.ts

@@ -27,13 +27,15 @@ export async function run() {
       const includePrerelease: boolean =
         (core.getInput('include-prerelease') || 'false').toLowerCase() ===
         'true';
-
+      let dotnetInstaller: installer.DotnetCoreInstaller;
-      const dotnetInstaller = new installer.DotnetCoreInstaller(
+      for (const version of versions) {
-        versions,
+        dotnetInstaller = new installer.DotnetCoreInstaller(
+          version,
           includePrerelease
         );
         await dotnetInstaller.installDotnet();
       }
+    }
 
     const sourceUrl: string = core.getInput('source-url');
     const configFile: string = core.getInput('config-file');