SCAN4NET-175 Remove .NET 6 SDK related tests (#2273)

SonarSource · Nov 26, 2024 · c8d25c5 · c8d25c5
1 parent 413d9f7
commit c8d25c5
Show file tree

Hide file tree

Showing 29 changed files with 17 additions and 118 deletions.
diff --git a/Tests/SonarScanner.MSBuild.TFS.Test/Resources/Readme.md b/Tests/SonarScanner.MSBuild.TFS.Test/Resources/Readme.md
@@ -1,5 +1,5 @@
 The `Sample.coverage` file is an input file for the Conv_ConvertToXml_ToolConvertsSampleFile test. It was generated in the following way:
-* New .Net6.0 Console App called "ConsoleApp2"
+* New .Net9.0 Console App called "ConsoleApp2"
 * `Program.cs` looks like so:
 
 ```cs
@@ -17,7 +17,7 @@ namespace ConsoleApp2
 }
 ```
 
-* A second .Net6.0 MS Test project called "TestProject1" which references `ConsoleApp2.csproj`
+* A second .Net9.0 MS Test project called "TestProject1" which references `ConsoleApp2.csproj`
 * One test file `UnitTest1.cs`:
 
 ```cs

diff --git a/its/projects/CSharp.SDK.6/CSharp.SDK.6.sln b/its/projects/CSharp.SDK.6/CSharp.SDK.6.sln
diff --git a/its/projects/CSharp.SDK.6/Main/Common.cs b/its/projects/CSharp.SDK.6/Main/Common.cs
diff --git a/its/projects/CSharp.SDK.6/Main/Main.csproj b/its/projects/CSharp.SDK.6/Main/Main.csproj
diff --git a/its/projects/CSharp.SDK.6/UTs/CommonTest.cs b/its/projects/CSharp.SDK.6/UTs/CommonTest.cs
diff --git a/its/projects/CSharp.SDK.6/UTs/UTs.csproj b/its/projects/CSharp.SDK.6/UTs/UTs.csproj
diff --git a/its/projects/DuplicateAnalyzerReferences/global.json b/its/projects/DuplicateAnalyzerReferences/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.300",
+    "version": "9.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/its/projects/RazorWebApplication.net6.withoutSourceGenerators/global.json b/its/projects/RazorWebApplication.net6.withoutSourceGenerators/global.json
diff --git a/...Application.net6.withSourceGenerators.sln → ...orWebApplication.withSourceGenerators.sln b/...Application.net6.withSourceGenerators.sln → ...orWebApplication.withSourceGenerators.sln
diff --git a/...nerators/RazorWebApplication/Index.cshtml → ...nerators/RazorWebApplication/Index.cshtml b/...nerators/RazorWebApplication/Index.cshtml → ...nerators/RazorWebApplication/Index.cshtml
diff --git a/...Generators/RazorWebApplication/Program.cs → ...Generators/RazorWebApplication/Program.cs b/...Generators/RazorWebApplication/Program.cs → ...Generators/RazorWebApplication/Program.cs
diff --git a/...pplication/Properties/launchSettings.json → ...pplication/Properties/launchSettings.json b/...pplication/Properties/launchSettings.json → ...pplication/Properties/launchSettings.json
diff --git a/...WebApplication/RazorWebApplication.csproj → ...WebApplication/RazorWebApplication.csproj b/...WebApplication/RazorWebApplication.csproj → ...WebApplication/RazorWebApplication.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/...Generators/RazorWebApplication/Startup.cs → ...Generators/RazorWebApplication/Startup.cs b/...Generators/RazorWebApplication/Startup.cs → ...Generators/RazorWebApplication/Startup.cs
diff --git a/its/projects/CSharp.SDK.6/global.json → ...ion.net9.withSourceGenerators/global.json b/its/projects/CSharp.SDK.6/global.json → ...ion.net9.withSourceGenerators/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.0",
+    "version": "9.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/...lication.net6.withoutSourceGenerators.sln → ...ebApplication.withoutSourceGenerators.sln b/...lication.net6.withoutSourceGenerators.sln → ...ebApplication.withoutSourceGenerators.sln
diff --git a/...nerators/RazorWebApplication/Index.cshtml → ...nerators/RazorWebApplication/Index.cshtml b/...nerators/RazorWebApplication/Index.cshtml → ...nerators/RazorWebApplication/Index.cshtml
diff --git a/...Generators/RazorWebApplication/Program.cs → ...Generators/RazorWebApplication/Program.cs b/...Generators/RazorWebApplication/Program.cs → ...Generators/RazorWebApplication/Program.cs
diff --git a/...pplication/Properties/launchSettings.json → ...pplication/Properties/launchSettings.json b/...pplication/Properties/launchSettings.json → ...pplication/Properties/launchSettings.json
diff --git a/...WebApplication/RazorWebApplication.csproj → ...WebApplication/RazorWebApplication.csproj b/...WebApplication/RazorWebApplication.csproj → ...WebApplication/RazorWebApplication.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/...Generators/RazorWebApplication/Startup.cs → ...Generators/RazorWebApplication/Startup.cs b/...Generators/RazorWebApplication/Startup.cs → ...Generators/RazorWebApplication/Startup.cs
diff --git a/...ion.net6.withSourceGenerators/global.json → ....net9.withoutSourceGenerators/global.json b/...ion.net6.withSourceGenerators/global.json → ....net9.withoutSourceGenerators/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.0",
+    "version": "9.0.100",
     "rollForward": "latestFeature"
   }
 }
diff --git a/its/projects/TwoDrivesThreeProjects/DefaultDrive/DefaultDriveFirstProject.csproj b/its/projects/TwoDrivesThreeProjects/DefaultDrive/DefaultDriveFirstProject.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/...rojects/TwoDrivesThreeProjects/DefaultDriveSecondProject/DefaultDriveSecondProject.vbproj b/...rojects/TwoDrivesThreeProjects/DefaultDriveSecondProject/DefaultDriveSecondProject.vbproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <RootNamespace>DefaultDriveSecondProject</RootNamespace>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/its/projects/TwoDrivesThreeProjects/DriveY/Subfolder/DriveY.csproj b/its/projects/TwoDrivesThreeProjects/DriveY/Subfolder/DriveY.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/its/projects/TwoDrivesTwoProjects/DefaultDrive/DefaultDrive.csproj b/its/projects/TwoDrivesTwoProjects/DefaultDrive/DefaultDrive.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/its/projects/TwoDrivesTwoProjects/DriveZ/Subfolder/DriveZ.csproj b/its/projects/TwoDrivesTwoProjects/DriveZ/Subfolder/DriveZ.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/its/projects/VueWithAspBackend/AspBackend/AspBackend.csproj b/its/projects/VueWithAspBackend/AspBackend/AspBackend.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

diff --git a/its/src/test/java/com/sonar/it/scanner/msbuild/sonarqube/ScannerMSBuildTest.java b/its/src/test/java/com/sonar/it/scanner/msbuild/sonarqube/ScannerMSBuildTest.java
@@ -606,17 +606,17 @@ void testXamlCompilation() throws IOException {
   }
 
   @Test
-  void testRazorCompilationNet6WithoutSourceGenerators() throws IOException {
+  void testRazorCompilationNet9WithoutSourceGenerators() throws IOException {
     assumeTrue(TestUtils.getMsBuildPath(ORCHESTRATOR).toString().contains("2022")); // We can't build without MsBuild17
-    String projectName = "RazorWebApplication.net6.withoutSourceGenerators";
+    String projectName = "RazorWebApplication.net9.withoutSourceGenerators";
     assertProjectFileContains(projectName, "<UseRazorSourceGenerator>false</UseRazorSourceGenerator>");
     validateRazorProject(projectName);
   }
 
   @Test
-  void testRazorCompilationNet6WithSourceGenerators() throws IOException {
+  void testRazorCompilationNet9WithSourceGenerators() throws IOException {
     assumeTrue(TestUtils.getMsBuildPath(ORCHESTRATOR).toString().contains("2022")); // We can't build without MsBuild17
-    String projectName = "RazorWebApplication.net6.withSourceGenerators";
+    String projectName = "RazorWebApplication.net9.withSourceGenerators";
     assertProjectFileContains(projectName, "<UseRazorSourceGenerator>true</UseRazorSourceGenerator>");
     validateRazorProject(projectName);
   }
@@ -782,23 +782,6 @@ void testCSharpFramework48() throws IOException {
     }
   }
 
-  @Test
-  void testCSharpSdk6() throws IOException {
-    validateCSharpSdk("CSharp.SDK.6");
-  }
-
-  @Test
-  void testScannerNet6NoAnalysisWarnings() throws IOException {
-    // dotnet sdk tests should run only on VS 2022
-    assumeTrue(TestUtils.getMsBuildPath(ORCHESTRATOR).toString().contains("2022"));
-
-    Path projectDir = TestUtils.projectDir(basePath, "CSharp.SDK.6");
-    BuildResult buildResult = runNetCoreBeginBuildAndEnd(projectDir, ScannerClassifier.NET);
-
-    assertThat(buildResult.getLogs()).doesNotContain("Failed to parse properties from the environment variable 'SONARQUBE_SCANNER_PARAMS'");
-    assertUIWarnings(buildResult);
-  }
-
   @Test
   void testCSharpSdk8() throws IOException {
     validateCSharpSdk("CSharp.SDK.8");