Fix bump version (#499)

jfrog · Aug 1, 2024 · d52e9a4 · d52e9a4
1 parent 3b4346f
commit d52e9a4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/buildScripts/bump-version.js b/buildScripts/bump-version.js
@@ -38,12 +38,12 @@ function assertVersion() {
     let vssExtension = fs.readFileSync('vss-extension.json', 'utf8');
     let vssExtensionJson = JSON.parse(vssExtension);
     let oldExtensionVersionSplit = vssExtensionJson.version.split('.');
-    assert.ok(
-        (oldExtensionVersionSplit[1] < requestedVersionSplit[1] && requestedVersionSplit[2] === '0') || // Minor release
-            (oldExtensionVersionSplit[1] === requestedVersionSplit[1] && oldExtensionVersionSplit[2] < requestedVersionSplit[2]), // Patch release
-        'Input version must be bigger than current version',
-    );
-    assert.strictEqual(oldExtensionVersionSplit[0], requestedVersionSplit[0], 'Upgrading Major version using this script is forbidden');
+    const [oldMajor, oldMinor, oldPatch] = oldExtensionVersionSplit.map(Number);
+    const [newMajor, newMinor, newPatch] = requestedVersionSplit.map(Number);
+    let isMinorRelease = oldMinor < newMinor && newPatch === 0;
+    let isPatchRelease = oldMinor === newMinor && oldPatch < newPatch;
+    assert.ok(isMinorRelease || isPatchRelease, 'Input version must be bigger than current version');
+    assert.strictEqual(oldMajor, newMajor, 'Upgrading Major version using this script is forbidden');
 }
 
 /**

diff --git a/tests/resources/dotnet/custom.js b/tests/resources/dotnet/custom.js
@@ -8,7 +8,7 @@ let inputs = {
     arguments: '"--build-name=DotNET Test" "--build-number=7"',
     rootPath: join(testUtils.getLocalTestDir(TEST_NAME)),
     targetResolveRepo: testUtils.getRepoKeys().nugetVirtualRepo,
-    nugetProtocolVersion: "v3"
+    nugetProtocolVersion: 'v3',
 };
 
 testUtils.copyTestFilesToTestWorkDir(TEST_NAME, 'restore');