Revert SCAN4NET-714 and set version to 10.4.1 (#2857)

Author: martin-strecker-sonarsource

AssemblyInfo.Shared.cs

@@ -22,9 +22,9 @@
 using System.Resources;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyVersion("11.0.0")]
-[assembly: AssemblyFileVersion("11.0.0.0")]
-[assembly: AssemblyInformationalVersion("Version:11.0.0.0 Branch:not-set Sha1:not-set")]
+[assembly: AssemblyVersion("10.4.1")]
+[assembly: AssemblyFileVersion("10.4.1.0")]
+[assembly: AssemblyInformationalVersion("Version:10.4.1.0 Branch:not-set Sha1:not-set")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("SonarSource")]
 [assembly: AssemblyCopyright("Copyright © SonarSource 2015-2025")]

Tests/SonarScanner.MSBuild.PreProcessor.Test/SonarQubeWebServerTest.cs

@@ -45,7 +45,7 @@ public void Ctor_LogsServerTypeAndVersion()
     [DataRow("7.9.0.5545")]
     [DataRow("8.0.0.18670")]
     [DataRow("8.8.9.999")]
-    public void IsServerVersionSupported_FailHard_LogError(string sqVersion)
+    public void IsServerVersionSupported_LessThan89_LogError(string sqVersion)
     {
         var context = new Context(sqVersion);
         context.Server.IsServerVersionSupported().Should().BeFalse();
@@ -56,22 +56,18 @@ public void IsServerVersionSupported_FailHard_LogError(string sqVersion)
     [DataRow("8.9.0.0")]
     [DataRow("9.0.0.1121")]
     [DataRow("9.8.9.999")]
-    [DataRow("9.9.0.0")]
-    [DataRow("10.15.0.1121")]
-    [DataRow("2024.12.0.100206")]
-    public void IsServerVersionSupported_OutOfSupport_LogWarning(string sqVersion)
+    public void IsServerVersionSupported_Between89And99_LogWarning(string sqVersion)
     {
         var context = new Context(sqVersion);
         context.Server.IsServerVersionSupported().Should().BeTrue();
-        context.Logger.AssertUIWarningLogged("You're using an unsupported version of SonarQube. The next major version release of SonarScanner for .NET will not work with this version. Please upgrade to a newer SonarQube version.");
+        context.Logger.AssertUIWarningLogged("Starting in January 2025, the SonarScanner for .NET will not support SonarQube versions below 9.9. Please upgrade to a newer version.");
         context.Logger.Should().HaveNoErrors();
     }
 
     [TestMethod]
-    [DataRow("2025.1.0.0")]
-    [DataRow("2025.1.0.102122")]
-    [DataRow("2026.1.0.0")]
-    public void IsServerVersionSupported_Supported_NoLogs(string sqVersion)
+    [DataRow("9.9.0.0")]
+    [DataRow("10.15.0.1121")]
+    public void IsServerVersionSupported_EqualOrGreaterThan99_NoLogs(string sqVersion)
     {
         var context = new Context(sqVersion);
         context.Server.IsServerVersionSupported().Should().BeTrue();

its/src/test/java/com/sonar/it/scanner/msbuild/sonarqube/SolutionKindTest.java

@@ -19,18 +19,14 @@
  */
 package com.sonar.it.scanner.msbuild.sonarqube;
 
-import com.sonar.it.scanner.msbuild.utils.AnalysisContext;
-import com.sonar.it.scanner.msbuild.utils.AnalysisResult;
-import com.sonar.it.scanner.msbuild.utils.ContextExtension;
-import com.sonar.it.scanner.msbuild.utils.MSBuildMinVersion;
-import com.sonar.it.scanner.msbuild.utils.TestUtils;
-import com.sonar.it.scanner.msbuild.utils.Workload;
-import com.sonar.it.scanner.msbuild.utils.WorkloadPrerequisite;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
+
+import com.sonar.it.scanner.msbuild.utils.*;
 import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledOnOs;
@@ -198,22 +194,17 @@ private void validateCSharpSdk(String folderName) {
   }
 
   private void assertUIWarnings(AnalysisResult result) {
-    // AnalysisWarningsSensor was implemented starting from analyzer version 8.39.0.47922, so it's available from SQ 9.9 onwards
+    // AnalysisWarningsSensor was implemented starting from analyzer version 8.39.0.47922 (https://github.com/SonarSource/sonar-dotnet-enterprise/commit/39baabb01799aa1945ac5c80d150f173e6ada45f)
+    // So it's available from SQ 9.9 onwards
     if (ORCHESTRATOR.getServer().version().isGreaterThanOrEquals(9, 9)) {
       var warnings = TestUtils.getAnalysisWarningsTask(ORCHESTRATOR, result.end());
       assertThat(warnings.getStatus()).isEqualTo(Ce.TaskStatus.SUCCESS);
-      if (ORCHESTRATOR.getServer().version().isGreaterThanOrEquals(2025, 1)) {
-        assertThat(warnings.getWarningsList()).isEmpty();
-      } else {
-        assertThat(warnings.getWarningsList()).containsExactlyInAnyOrder(
-          "You're using an unsupported version of SonarQube. The next major version release of SonarScanner for .NET will not work with this version. Please upgrade to a newer SonarQube version."
-        );
-      }
+      assertThat(warnings.getWarningsList()).isEmpty();
     }
   }
 
   private void assertProjectFileContains(AnalysisContext context, String textToLookFor) {
-    Path csProjPath = context.projectDir.resolve(Paths.get("RazorWebApplication", "RazorWebApplication.csproj"));
+    Path csProjPath = context.projectDir.resolve(Paths.get("RazorWebApplication","RazorWebApplication.csproj"));
     try {
       String str = FileUtils.readFileToString(csProjPath.toFile(), "utf-8");
       assertThat(str.indexOf(textToLookFor)).isPositive();
@@ -228,7 +219,7 @@ private void validateRazorProject(String project, String textToLookFor) {
     context.runAnalysis();
 
     List<Issue> issues = TestUtils.projectIssues(context.orchestrator, context.projectKey);
-    List<String> ruleKeys = issues.stream().map(Issue::getRule).toList();
+    List<String> ruleKeys = issues.stream().map(Issue::getRule).collect(Collectors.toList());
 
     assertThat(ruleKeys).containsAll(Arrays.asList(SONAR_RULES_PREFIX + "S1118", SONAR_RULES_PREFIX + "S1186"));
 

nuspec/netcoreglobaltool/dotnet-sonarscanner.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>dotnet-sonarscanner</id>
-    <version>11.0.0</version>
+    <version>10.4.1</version>
     <title>SonarScanner for .NET</title>
     <authors>SonarSource</authors>
     <projectUrl>https://redirect.sonarsource.com/doc/msbuild-sq-runner.html</projectUrl>

scripts/version/Version.props

@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <MainVersion>11.0.0</MainVersion>
+    <MainVersion>10.4.1</MainVersion>
     <BuildNumber>0</BuildNumber>
     <PrereleaseSuffix>
     </PrereleaseSuffix>

src/SonarScanner.MSBuild.PreProcessor/Resources.Designer.cs

@@ -507,8 +507,8 @@ If you already have a compatible Java version installed, please add either the p
   <data name="ERROR_SonarSourcesAndTestsNotSupported" xml:space="preserve">
     <value>The arguments 'sonar.sources' and 'sonar.tests' are not supported. Please remove them and invoke the scanner again.</value>
   </data>
-  <data name="WARN_UI_SonarQubeUnsupported" xml:space="preserve">
-    <value>You're using an unsupported version of SonarQube. The next major version release of SonarScanner for .NET will not work with this version. Please upgrade to a newer SonarQube version.</value>
+  <data name="WARN_UI_SonarQubeNearEndOfSupport" xml:space="preserve">
+    <value>Starting in January 2025, the SonarScanner for .NET will not support SonarQube versions below 9.9. Please upgrade to a newer version.</value>
   </data>
   <data name="WARN_SourcesAndTestsDeprecated" xml:space="preserve">
     <value>The sonar.sources and sonar.tests properties are not supported by the Scanner for .NET and are ignored. They are automatically computed based on your repository. You can fine-tune the analysis and exclude some files by using the sonar.exclusions, sonar.inclusions, sonar.test.exclusions, and sonar.test.inclusions properties.</value>

src/SonarScanner.MSBuild.PreProcessor/Resources.resx

@@ -28,11 +28,14 @@ namespace SonarScanner.MSBuild.PreProcessor.WebServer;
 
 internal class SonarQubeWebServer : SonarWebServer
 {
-    public override bool SupportsJreProvisioning => serverVersion >= new Version(10, 6);
+    public override bool SupportsJreProvisioning =>
+        serverVersion >= new Version(10, 6);
 
     public SonarQubeWebServer(IDownloader webDownloader, IDownloader apiDownloader, Version serverVersion, ILogger logger, string organization)
-        : base(webDownloader, apiDownloader, serverVersion, logger, organization) =>
+        : base(webDownloader, apiDownloader, serverVersion, logger, organization)
+    {
         logger.LogInfo(Resources.MSG_UsingSonarQube, serverVersion);
+    }
 
     public override bool IsServerVersionSupported()
     {
@@ -42,9 +45,9 @@ public override bool IsServerVersionSupported()
             logger.LogError(Resources.ERR_SonarQubeUnsupported);
             return false;
         }
-        else if (serverVersion.CompareTo(new Version(2025, 1)) < 0)
+        else if (serverVersion.CompareTo(new Version(9, 9)) < 0)
         {
-            logger.LogUIWarning(Resources.WARN_UI_SonarQubeUnsupported);
+            logger.LogUIWarning(Resources.WARN_UI_SonarQubeNearEndOfSupport);
         }
         return true;
     }