Implement MSBuildMaxVersion

Author: alex-meseldzija-sonarsource

its/src/test/java/com/sonar/it/scanner/msbuild/utils/MSBuildMaxVersion.java

@@ -0,0 +1,34 @@
+/*
+ * SonarScanner for .NET
+ * Copyright (C) 2016-2025 SonarSource SA
+ * mailto:info AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package com.sonar.it.scanner.msbuild.utils;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD, ElementType.TYPE})
+@ExtendWith(MSBuildVersionCondition.class)
+public @interface MSBuildMaxVersion {
+  int value();
+}

its/src/test/java/com/sonar/it/scanner/msbuild/utils/MSBuildMinVersion.java

@@ -27,7 +27,7 @@
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.METHOD, ElementType.TYPE})
-@ExtendWith(MSBuildMinVersionCondition.class)
+@ExtendWith(MSBuildVersionCondition.class)
 public @interface MSBuildMinVersion {
   int value();
 }

its/src/test/java/com/sonar/it/scanner/msbuild/utils/MSBuildMinVersionCondition.java renamed to its/src/test/java/com/sonar/it/scanner/msbuild/utils/MSBuildVersionCondition.java

@@ -20,24 +20,42 @@
 package com.sonar.it.scanner.msbuild.utils;
 
 import java.nio.file.Path;
+import java.util.Optional;
+
 import org.junit.jupiter.api.extension.ConditionEvaluationResult;
 import org.junit.jupiter.api.extension.ExecutionCondition;
 import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.platform.commons.util.AnnotationUtils;
 
-public class MSBuildMinVersionCondition implements ExecutionCondition {
+public class MSBuildVersionCondition implements ExecutionCondition {
   private static int msbuildMajorVersion = -1;
 
   @Override
   public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext context) {
     if (OSPlatform.isWindows()) {
       final var method = context.getRequiredTestMethod();
-      final var annotation = method.getDeclaredAnnotation(MSBuildMinVersion.class);
-      if (annotation != null) {
+      Optional<MSBuildMinVersion> minAnnotation = AnnotationUtils.findAnnotation(method, MSBuildMinVersion.class);
+      Optional<MSBuildMaxVersion> maxAnnotation = AnnotationUtils.findAnnotation(method, MSBuildMaxVersion.class);
+
+      if (minAnnotation.isPresent() || maxAnnotation.isPresent()) {
         var currentVersion = getMSBuildMajorVersion();
-        var minVersion = annotation.value();
-        return currentVersion >= minVersion
-          ? ConditionEvaluationResult.enabled("MSBuild version is " + currentVersion + ", which is greater than or equal to " + minVersion)
-          : ConditionEvaluationResult.disabled("MSBuild version is " + currentVersion + ", which is less than " + minVersion);
+        int minVersion = minAnnotation.map(MSBuildMinVersion::value).orElse(Integer.MIN_VALUE);
+        int maxVersion = maxAnnotation.map(MSBuildMaxVersion::value).orElse(Integer.MAX_VALUE);
+
+        if (currentVersion >= minVersion && currentVersion <= maxVersion) {
+          return ConditionEvaluationResult.enabled(
+            String.format("MSBuild version %d satisfies constraints [min: %s, max: %s]",
+              currentVersion,
+              minAnnotation.isPresent() ? minVersion : "N/A",
+              maxAnnotation.isPresent() ? maxVersion : "N/A"));
+        }
+        else {
+          return ConditionEvaluationResult.disabled(
+          String.format("MSBuild version check failed: MsBuild Version %d [min: %s, max: %s]",
+            currentVersion,
+            minAnnotation.isPresent() ? String.valueOf(minVersion) : "N/A",
+            maxAnnotation.isPresent() ? String.valueOf(maxVersion) : "N/A"));
+        }
       }
     }
     return ConditionEvaluationResult.enabled("Test enabled");