VSTS-298 fix version comparison

commonv5/ts/__tests__/prepare-task-test.ts

@@ -36,6 +36,31 @@ it("should display warning for dedicated extension for Sonarcloud", async () =>
   );
 });
 
+describe("branchFeatureSupported", () => {
+  it.each([
+    [new Endpoint(EndpointType.SonarCloud, { url: "https://sonarcloud.io" }), "SC", "1.2.3", true],
+    [new Endpoint(EndpointType.SonarQube, { url: "https://localhost" }), "SQ", "7.1.0", false],
+    [new Endpoint(EndpointType.SonarQube, { url: "https://localhost" }), "SQ", "9.9.0", true],
+    [new Endpoint(EndpointType.SonarQube, { url: "https://localhost" }), "SQ", "10.0.0", true],
+    [new Endpoint(EndpointType.SonarQube, { url: "https://localhost" }), "SQ", "10.1.0", true],
+    [new Endpoint(EndpointType.SonarQube, { url: "https://localhost" }), "SQ", "11.0.0", true],
+    [new Endpoint(EndpointType.SonarQube, { url: "https://localhost" }), "SQ", "12.0.0", true],
+  ])(
+    "branch feature is supported for %p %p %p",
+    async (
+      endpoint: Endpoint,
+      product: string,
+      version: string,
+      expectedBranchSupported: Boolean
+    ) => {
+      tl.debug(`${product} ${version}`);
+      jest.spyOn(request, "getServerVersion").mockResolvedValue(new SemVer(version));
+      const actual = await prept.branchFeatureSupported(endpoint);
+      expect(actual).toBe(expectedBranchSupported);
+    }
+  );
+});
+
 it("should build report task path from variables", () => {
   const reportDirectory = path.join("C:", "temp", "dir");
   const sonarSubDirectory = "sonar";

commonv5/ts/prepare-task.ts

@@ -57,12 +57,12 @@ export default async function prepareTask(endpoint: Endpoint, rootPath: string)
   await scanner.runPrepare();
 }
 
-async function branchFeatureSupported(endpoint) {
+export async function branchFeatureSupported(endpoint) {
   if (endpoint.type === EndpointType.SonarCloud) {
     return true;
   }
   const serverVersion = await getServerVersion(endpoint);
-  return serverVersion >= semver.parse("7.2.0");
+  return semver.satisfies(serverVersion, ">=7.2.0");
 }
 
 export async function populateBranchAndPrProps(props: { [key: string]: string }) {

extensions/sonarqube/tasks/prepare/v5/task.json

@@ -12,7 +12,7 @@
   "version": {
     "Major": 5,
     "Minor": 11,
-    "Patch": 0
+    "Patch": 1
   },
   "releaseNotes": "* __Support non MSBuild projects:__ This task can be used to configure analysis also for non MSBuild projects.",
   "minimumAgentVersion": "2.144.0",

extensions/sonarqube/vss-extension.json

@@ -2,7 +2,7 @@
   "manifestVersion": 1,
   "id": "sonarqube",
   "name": "SonarQube",
-  "version": "5.11.0",
+  "version": "5.11.1",
   "branding": {
     "color": "rgb(67, 157, 210)",
     "theme": "dark"