Add version helper and update snap tasks for new versioning scheme

Co-authored-by: dibarbet <5749229+dibarbet@users.noreply.github.com>

Author: Copilot

jest.config.ts

@@ -14,6 +14,7 @@ const config: Config = {
         '<rootDir>/test/razor/razorIntegrationTests/jest.config.ts',
         '<rootDir>/test/razor/razorTests/jest.config.ts',
         '<rootDir>/test/untrustedWorkspace/integrationTests/jest.config.ts',
+        '<rootDir>/test/tasks/jest.config.ts',
     ],
     // Reporters are a global jest configuration property and cannot be set in the project jest config.
     // This configuration will create a 'junit.xml' file in the output directory, no matter which test project is running.

tasks/snapTasks.ts

@@ -10,6 +10,7 @@ import * as os from 'os';
 import { exec } from 'child_process';
 import { promisify } from 'util';
 import { findTagsByVersion } from './gitTasks';
+import minimist from 'minimist';
 
 const execAsync = promisify(exec);
 
@@ -20,18 +21,51 @@ function logWarning(message: string, error?: unknown): void {
     }
 }
 
+/**
+ * Calculate the next release (stable) version from the current version.
+ * Rounds up the minor version to the next tens version.
+ * @param currentVersion The current version in "major.minor" format (e.g., "2.74")
+ * @returns The next stable release version (e.g., "2.80")
+ */
+export function getNextReleaseVersion(currentVersion: string): string {
+    const split = currentVersion.split('.');
+    const major = parseInt(split[0]);
+    const minor = parseInt(split[1]);
+
+    // Round up to the next tens version
+    const nextTensMinor = Math.ceil((minor + 1) / 10) * 10;
+
+    return `${major}.${nextTensMinor}`;
+}
+
 gulp.task('incrementVersion', async (): Promise<void> => {
+    const argv = minimist(process.argv.slice(2));
+    const isReleaseCandidate = argv['releaseCandidate'] === true || argv['releaseCandidate'] === 'true';
+
     // Get the current version from version.json
     const versionFilePath = path.join(path.resolve(__dirname, '..'), 'version.json');
     const file = fs.readFileSync(versionFilePath, 'utf8');
     const versionJson = JSON.parse(file);
 
-    // Increment the minor version
+    // Calculate new version
     const version = versionJson.version as string;
     const split = version.split('.');
-    const newVersion = `${split[0]}.${parseInt(split[1]) + 1}`;
-
-    console.log(`Updating ${version} to ${newVersion}`);
+    let newVersion: string;
+
+    if (isReleaseCandidate) {
+        // If this is a release candidate, increment to be higher than the next stable version
+        // e.g., if current is 2.74, next stable is 2.80, so main should be 2.81
+        const nextStableVersion = getNextReleaseVersion(version);
+        const stableSplit = nextStableVersion.split('.');
+        newVersion = `${stableSplit[0]}.${parseInt(stableSplit[1]) + 1}`;
+        console.log(
+            `Release candidate mode: Updating ${version} to ${newVersion} (next stable would be ${nextStableVersion})`
+        );
+    } else {
+        // Normal increment: just increment the minor version
+        newVersion = `${split[0]}.${parseInt(split[1]) + 1}`;
+        console.log(`Updating ${version} to ${newVersion}`);
+    }
 
     // Write the new version back to version.json
     versionJson.version = newVersion;
@@ -186,3 +220,27 @@ async function generatePRList(startSHA: string, endSHA: string): Promise<string[
         throw error;
     }
 }
+
+/**
+ * Update version.json to the next stable release version.
+ * This task is used when snapping from prerelease to release.
+ * It updates the version to round up to the next tens version (e.g., 2.74 -> 2.80).
+ */
+gulp.task('updateVersionForRelease', async (): Promise<void> => {
+    // Get the current version from version.json
+    const versionFilePath = path.join(path.resolve(__dirname, '..'), 'version.json');
+    const file = fs.readFileSync(versionFilePath, 'utf8');
+    const versionJson = JSON.parse(file);
+
+    const currentVersion = versionJson.version as string;
+    const releaseVersion = getNextReleaseVersion(currentVersion);
+
+    console.log(`Updating version from ${currentVersion} to stable release version ${releaseVersion}`);
+
+    // Write the new version back to version.json
+    versionJson.version = releaseVersion;
+    const newJson = JSON.stringify(versionJson, null, 4);
+    console.log(`New json: ${newJson}`);
+
+    fs.writeFileSync(versionFilePath, newJson);
+});

tasks/testTasks.ts

@@ -12,6 +12,7 @@ import { jestOmniSharpUnitTestProjectName } from '../test/omnisharp/omnisharpUni
 import { jestUnitTestProjectName } from '../test/lsptoolshost/unitTests/jest.config';
 import { razorTestProjectName } from '../test/razor/razorTests/jest.config';
 import { jestArtifactTestsProjectName } from '../test/lsptoolshost/artifactTests/jest.config';
+import { jestTasksTestProjectName } from '../test/tasks/jest.config';
 import {
     getJUnitFileName,
     integrationTestProjects,
@@ -46,7 +47,11 @@ function createUnitTestSubTasks() {
         await runJestTest(razorTestProjectName);
     });
 
-    gulp.task('test:unit', gulp.series('test:unit:csharp', 'test:unit:razor'));
+    gulp.task('test:unit:tasks', async () => {
+        await runJestTest(jestTasksTestProjectName);
+    });
+
+    gulp.task('test:unit', gulp.series('test:unit:csharp', 'test:unit:razor', 'test:unit:tasks'));
 }
 
 function createIntegrationTestSubTasks() {

test/tasks/jest.config.ts

@@ -0,0 +1,20 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import type { Config } from 'jest';
+import { baseProjectConfig } from '../../baseJestConfig';
+
+export const jestTasksTestProjectName = 'Tasks Unit Tests';
+
+/**
+ * Defines a jest project configuration for tasks unit tests.
+ */
+const tasksTestConfig: Config = {
+    ...baseProjectConfig,
+    displayName: jestTasksTestProjectName,
+    modulePathIgnorePatterns: ['out'],
+    roots: ['<rootDir>', '<rootDir>../../__mocks__'],
+};
+
+export default tasksTestConfig;

test/tasks/versionHelper.test.ts

@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { getNextReleaseVersion } from '../../tasks/snapTasks';
+import { describe, test, expect } from '@jest/globals';
+
+describe('getNextReleaseVersion', () => {
+    test('rounds up to next tens from single digit minor version', () => {
+        expect(getNextReleaseVersion('2.1')).toBe('2.10');
+        expect(getNextReleaseVersion('2.5')).toBe('2.10');
+        expect(getNextReleaseVersion('2.9')).toBe('2.10');
+    });
+
+    test('rounds up to next tens from teens minor version', () => {
+        expect(getNextReleaseVersion('2.10')).toBe('2.20');
+        expect(getNextReleaseVersion('2.15')).toBe('2.20');
+        expect(getNextReleaseVersion('2.19')).toBe('2.20');
+    });
+
+    test('rounds up to next tens from twenties minor version', () => {
+        expect(getNextReleaseVersion('2.20')).toBe('2.30');
+        expect(getNextReleaseVersion('2.25')).toBe('2.30');
+        expect(getNextReleaseVersion('2.29')).toBe('2.30');
+    });
+
+    test('rounds up from 74 to 80', () => {
+        expect(getNextReleaseVersion('2.74')).toBe('2.80');
+    });
+
+    test('rounds up from 75 to 80', () => {
+        expect(getNextReleaseVersion('2.75')).toBe('2.80');
+    });
+
+    test('rounds up from 79 to 80', () => {
+        expect(getNextReleaseVersion('2.79')).toBe('2.80');
+    });
+
+    test('rounds up from 80 to 90', () => {
+        expect(getNextReleaseVersion('2.80')).toBe('2.90');
+    });
+
+    test('rounds up from 90 to 100', () => {
+        expect(getNextReleaseVersion('2.90')).toBe('2.100');
+    });
+
+    test('works with different major versions', () => {
+        expect(getNextReleaseVersion('1.74')).toBe('1.80');
+        expect(getNextReleaseVersion('3.55')).toBe('3.60');
+        expect(getNextReleaseVersion('10.99')).toBe('10.100');
+    });
+
+    test('handles version at exactly tens boundary', () => {
+        expect(getNextReleaseVersion('2.10')).toBe('2.20');
+        expect(getNextReleaseVersion('2.20')).toBe('2.30');
+        expect(getNextReleaseVersion('2.30')).toBe('2.40');
+    });
+});