From 8326d77a0393fbd1286b049a56a21517b2da2c7a Mon Sep 17 00:00:00 2001
From: Maxim Lobanov <v-malob@microsoft.com>
Date: Wed, 24 Mar 2021 17:19:27 +0300
Subject: [PATCH] test 1

---
 dist/setup/index.js                 | 24 ++++++++++++-----------
 src/distributions/base-installer.ts | 30 +++++++++++++----------------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/dist/setup/index.js b/dist/setup/index.js
index 124909eb..33ed805f 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -3943,23 +3943,25 @@ class JavaBase {
         // if *-ea is provided, take only ea versions from toolcache, otherwise - only stable versions
         const availableVersions = tc
             .findAllVersions(this.toolcacheFolderName, this.architecture)
-            .filter(item => item.endsWith('-ea') === !this.stable);
+            .filter(item => item.endsWith('-ea') === !this.stable)
+            .map(item => {
+            return {
+                version: item.replace(/-ea$/, '').replace('-', '+'),
+                path: util_1.getToolcachePath(this.toolcacheFolderName, item, this.architecture)
+            };
+        });
         console.log(`availableVersions = ${JSON.stringify(availableVersions)}`);
         const satisfiedVersions = availableVersions
-            .filter(item => util_1.isVersionSatisfies(this.version, item.replace(/-ea$/, '').replace('-', '+')))
-            .sort(semver_1.default.rcompare);
+            .filter(item => util_1.isVersionSatisfies(this.version, item.version))
+            .filter(item => item.path !== null)
+            .sort((a, b) => {
+            return -semver_1.default.compareBuild(a.version, b.version);
+        });
         if (!satisfiedVersions || satisfiedVersions.length === 0) {
             return null;
         }
         console.log(`satisfiedVersions = ${JSON.stringify(satisfiedVersions)}`);
-        const javaPath = util_1.getToolcachePath(this.toolcacheFolderName, satisfiedVersions[0], this.architecture);
-        if (!javaPath) {
-            return null;
-        }
-        return {
-            version: util_1.getVersionFromToolcachePath(javaPath),
-            path: javaPath
-        };
+        return satisfiedVersions[0];
     }
     normalizeVersion(version) {
         let stable = true;
diff --git a/src/distributions/base-installer.ts b/src/distributions/base-installer.ts
index 6489065c..4b4f7eec 100644
--- a/src/distributions/base-installer.ts
+++ b/src/distributions/base-installer.ts
@@ -71,33 +71,29 @@ export abstract class JavaBase {
     // if *-ea is provided, take only ea versions from toolcache, otherwise - only stable versions
     const availableVersions = tc
       .findAllVersions(this.toolcacheFolderName, this.architecture)
-      .filter(item => item.endsWith('-ea') === !this.stable);
+      .filter(item => item.endsWith('-ea') === !this.stable)
+      .map(item => {
+        return {
+          version: item.replace(/-ea$/, '').replace('-', '+'),
+          path: getToolcachePath(this.toolcacheFolderName, item, this.architecture)
+        } as JavaInstallerResults;
+      });
 
     console.log(`availableVersions = ${JSON.stringify(availableVersions)}`);
 
     const satisfiedVersions = availableVersions
-      .filter(item => isVersionSatisfies(this.version, item.replace(/-ea$/, '').replace('-', '+')))
-      .sort(semver.rcompare);
+      .filter(item => isVersionSatisfies(this.version, item.version))
+      .filter(item => item.path !== null)
+      .sort((a, b) => {
+        return -semver.compareBuild(a.version, b.version);
+      });
     if (!satisfiedVersions || satisfiedVersions.length === 0) {
       return null;
     }
 
-
     console.log(`satisfiedVersions = ${JSON.stringify(satisfiedVersions)}`);
 
-    const javaPath = getToolcachePath(
-      this.toolcacheFolderName,
-      satisfiedVersions[0],
-      this.architecture
-    );
-    if (!javaPath) {
-      return null;
-    }
-
-    return {
-      version: getVersionFromToolcachePath(javaPath),
-      path: javaPath
-    };
+    return satisfiedVersions[0];
   }
 
   protected normalizeVersion(version: string) {