From c4fe953456f49d0b9321b0ad0f1a9903be8f6e14 Mon Sep 17 00:00:00 2001
From: Antonio Aversa <antonio.aversa@sonarsource.com>
Date: Mon, 11 Dec 2023 15:33:02 +0100
Subject: [PATCH] Bump Scanner for .NET to 6.0.0.81631 for ITs (#8439)

Co-authored-by: Costin Zaharia <costin.zaharia@sonarsource.com>
---
 its/pom.xml                                   | 37 +------------------
 .../java/com/sonar/it/shared/TestUtils.java   |  2 +-
 2 files changed, 2 insertions(+), 37 deletions(-)

diff --git a/its/pom.xml b/its/pom.xml
index 526d24c42cb..5036d8a8298 100644
--- a/its/pom.xml
+++ b/its/pom.xml
@@ -20,7 +20,6 @@
   </organization>
 
   <properties>
-    <scannerMsbuild.version>5.15.0.80890</scannerMsbuild.version>
     <surefire.argLine>-server</surefire.argLine>
   </properties>
 
@@ -28,14 +27,7 @@
     <dependency>
       <groupId>org.sonarsource.orchestrator</groupId>
       <artifactId>sonar-orchestrator-junit5</artifactId>
-      <version>4.4.0.1640</version>
-    </dependency>
-    <dependency>
-      <groupId>org.sonarsource.scanner.msbuild</groupId>
-      <artifactId>sonar-scanner-msbuild</artifactId>
-      <version>${scannerMsbuild.version}</version>
-      <type>zip</type>
-      <classifier>net46</classifier>
+      <version>4.6.0.1748</version>
     </dependency>
     <dependency>
       <groupId>org.sonarsource.sonarqube</groupId>
@@ -70,36 +62,9 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>3.2.2</version>
-          <configuration>
-            <systemProperties>
-              <scannerMsbuild.version>${scannerMsbuild.version}</scannerMsbuild.version>
-            </systemProperties>
-          </configuration>
         </plugin>
       </plugins>
     </pluginManagement>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <version>3.6.1</version>
-        <executions>
-          <execution>
-            <id>get-scanner-2.1</id>
-            <phase>initialize</phase>
-            <goals>
-              <goal>get</goal>
-            </goals>
-            <configuration>
-              <artifactId>sonar-scanner-msbuild</artifactId>
-              <groupId>org.sonarsource.scanner.msbuild</groupId>
-              <packaging>zip</packaging>
-              <version>2.1.0.0</version>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
   </build>
 
 </project>
diff --git a/its/src/test/java/com/sonar/it/shared/TestUtils.java b/its/src/test/java/com/sonar/it/shared/TestUtils.java
index 1e1457a72fe..b615c1a5744 100644
--- a/its/src/test/java/com/sonar/it/shared/TestUtils.java
+++ b/its/src/test/java/com/sonar/it/shared/TestUtils.java
@@ -156,7 +156,7 @@ private static String getProjectBaseDir(Path projectDir, String subProjectName)
   private static Build<ScannerForMSBuild> newScanner(Path projectDir) {
     // We need to set the fallback version to run from inside the IDE when the property isn't set
     return ScannerForMSBuild.create(projectDir.toFile())
-      .setScannerVersion(System.getProperty("scannerMsbuild.version", "5.15.0.80890"))
+      .setScannerVersion(ScannerForMSBuild.LATEST_RELEASE)
 
       // In order to be able to run tests on Azure pipelines, the AGENT_BUILDDIRECTORY environment variable
       // needs to be set to the analyzed project directory.