base compare without build metadata

Author: StephenHodgson

src/android-sdk.ts

@@ -138,13 +138,15 @@ async function getAndroidSdkPath(editor: UnityEditor, androidTargetSdk: number):
 
     // if 2019+ test editor path, else use system android installation
     if (editor.version.isGreaterThanOrEqualTo('2019.0.0')) {
+        logger.info('Using Android SDK bundled with Unity 2019+');
         try {
             sdkPath = await ResolveGlobToPath([editor.editorPath, '**', 'PlaybackEngines', 'AndroidPlayer', 'SDK', 'platforms', `android-${androidTargetSdk}/`]);
         } catch (error) {
             logger.debug(`android-${androidTargetSdk} not installed`);
             return undefined;
         }
     } else { // fall back to system android installation
+        logger.info('Using system Android SDK for Unity versions prior to 2019');
         try {
             const systemSdkPath = process.env.ANDROID_SDK_ROOT || process.env.ANDROID_HOME;
 

src/unity-version.ts

@@ -42,7 +42,7 @@ export class UnityVersion {
     }
 
     static compare(a: UnityVersion, b: UnityVersion): number {
-        const baseComparison = compare(a.semVer, b.semVer, true);
+        const baseComparison = UnityVersion.baseCompare(a, b);
 
         if (baseComparison !== 0) {
             return baseComparison;
@@ -51,6 +51,10 @@ export class UnityVersion {
         return UnityVersion.compareBuildMetadata(a.semVer, b.semVer);
     }
 
+    static baseCompare(a: UnityVersion, b: UnityVersion): number {
+        return compare(a.semVer, b.semVer, true);
+    }
+
     toString(): string {
         return this.changeset ? `${this.version} (${this.changeset})` : this.version;
     }
@@ -109,22 +113,22 @@ export class UnityVersion {
 
     isGreaterThan(other: string | UnityVersion): boolean {
         const otherVersion = other instanceof UnityVersion ? other : new UnityVersion(other);
-        return UnityVersion.compare(this, otherVersion) > 0;
+        return UnityVersion.baseCompare(this, otherVersion) > 0;
     }
 
     isGreaterThanOrEqualTo(other: string | UnityVersion): boolean {
         const otherVersion = other instanceof UnityVersion ? other : new UnityVersion(other);
-        return UnityVersion.compare(this, otherVersion) >= 0;
+        return UnityVersion.baseCompare(this, otherVersion) >= 0;
     }
 
     isLessThan(other: string | UnityVersion): boolean {
         const otherVersion = other instanceof UnityVersion ? other : new UnityVersion(other);
-        return UnityVersion.compare(this, otherVersion) < 0;
+        return UnityVersion.baseCompare(this, otherVersion) < 0;
     }
 
     isLessThanOrEqualTo(other: string | UnityVersion): boolean {
         const otherVersion = other instanceof UnityVersion ? other : new UnityVersion(other);
-        return UnityVersion.compare(this, otherVersion) <= 0;
+        return UnityVersion.baseCompare(this, otherVersion) <= 0;
     }
 
     equals(other: UnityVersion): boolean {