diff --git a/its/projects/CSharp.SDK.6/CSharp.SDK.6.sln b/its/projects/CSharp.SDK.6/CSharp.SDK.6.sln deleted file mode 100644 index d656bb5d8..000000000 --- a/its/projects/CSharp.SDK.6/CSharp.SDK.6.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.7.34031.279 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Main", "Main\Main.csproj", "{30024C57-CF88-4890-AD9F-7C2A640F670A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UTs", "UTs\UTs.csproj", "{3E56B4AA-38B0-4255-B2A2-83334132DB21}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {30024C57-CF88-4890-AD9F-7C2A640F670A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30024C57-CF88-4890-AD9F-7C2A640F670A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30024C57-CF88-4890-AD9F-7C2A640F670A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30024C57-CF88-4890-AD9F-7C2A640F670A}.Release|Any CPU.Build.0 = Release|Any CPU - {3E56B4AA-38B0-4255-B2A2-83334132DB21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3E56B4AA-38B0-4255-B2A2-83334132DB21}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3E56B4AA-38B0-4255-B2A2-83334132DB21}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3E56B4AA-38B0-4255-B2A2-83334132DB21}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {520789E0-F9D1-4836-9674-59D399848716} - EndGlobalSection -EndGlobal diff --git a/its/projects/CSharp.SDK.6/Main/Common.cs b/its/projects/CSharp.SDK.6/Main/Common.cs deleted file mode 100644 index ab68c8f9e..000000000 --- a/its/projects/CSharp.SDK.6/Main/Common.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace CSharp.SDKs -{ - public class Common - { - // FIXME: This line contains S1134 warning - } -} diff --git a/its/projects/CSharp.SDK.6/Main/Main.csproj b/its/projects/CSharp.SDK.6/Main/Main.csproj deleted file mode 100644 index 862da5021..000000000 --- a/its/projects/CSharp.SDK.6/Main/Main.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - net6.0 - - - false - - diff --git a/its/projects/CSharp.SDK.6/UTs/CommonTest.cs b/its/projects/CSharp.SDK.6/UTs/CommonTest.cs deleted file mode 100644 index ef41a6578..000000000 --- a/its/projects/CSharp.SDK.6/UTs/CommonTest.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Microsoft.VisualStudio.TestTools.UnitTesting; - -namespace CSharp.SDKs.Test -{ - [TestClass] - public class CommonTest - { - // FIXME: This line contains S1134 warning in SL, but not in S4NET context due to current test-code support - - [TestMethod] - public void TestMethodWithNoAssertion() // S2699: Add at least one assertion to this test case. This rule has test-only scope. - { - var sut = new Common(); - sut.ToString(); - } - } -} diff --git a/its/projects/CSharp.SDK.6/UTs/UTs.csproj b/its/projects/CSharp.SDK.6/UTs/UTs.csproj deleted file mode 100644 index 744e6db67..000000000 --- a/its/projects/CSharp.SDK.6/UTs/UTs.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - net6.0 - - - false - - - - - - - - - diff --git a/its/projects/CSharp.SDK.6/global.json b/its/projects/CSharp.SDK.6/global.json deleted file mode 100644 index 778f056e6..000000000 --- a/its/projects/CSharp.SDK.6/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "sdk": { - "version": "6.0.0", - "rollForward": "latestFeature" - } -} \ No newline at end of file diff --git a/its/projects/DuplicateAnalyzerReferences/global.json b/its/projects/DuplicateAnalyzerReferences/global.json index 68eeba67e..d5bf446d0 100644 --- 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" } } \ No newline at end of file diff --git a/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication.net6.withSourceGenerators.sln b/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication.net6.withSourceGenerators.sln deleted file mode 100644 index 92375aa35..000000000 --- a/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication.net6.withSourceGenerators.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28306.52 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RazorWebApplication", "RazorWebApplication\RazorWebApplication.csproj", "{BB99160E-4919-4A09-8054-6B94C5EEEC6B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BB99160E-4919-4A09-8054-6B94C5EEEC6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB99160E-4919-4A09-8054-6B94C5EEEC6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB99160E-4919-4A09-8054-6B94C5EEEC6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB99160E-4919-4A09-8054-6B94C5EEEC6B}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {581E43D6-85A5-47EF-99F3-2D075FD87054} - EndGlobalSection -EndGlobal diff --git a/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication/Index.cshtml b/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication/Index.cshtml deleted file mode 100644 index e1dd794fd..000000000 --- a/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication/Index.cshtml +++ /dev/null @@ -1,5 +0,0 @@ -@* - For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 -*@ -@{ -} diff --git a/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication/Program.cs b/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication/Program.cs deleted file mode 100644 index cb46d52f0..000000000 --- a/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication/Program.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Hosting; - -namespace RazorWebApplication -{ - public class Program - { - public static void Main(string[] args) - { - CreateWebHostBuilder(args).Build().Run(); - } - - public static IWebHostBuilder CreateWebHostBuilder(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup(); - } -} diff --git a/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication/Properties/launchSettings.json b/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication/Properties/launchSettings.json deleted file mode 100644 index bb5282a48..000000000 --- a/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication/Properties/launchSettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:55439", - "sslPort": 44370 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "RazorWebApplication": { - "commandName": "Project", - "launchBrowser": true, - "applicationUrl": "https://localhost:5001;http://localhost:5000", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} \ No newline at end of file diff --git a/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication/RazorWebApplication.csproj b/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication/RazorWebApplication.csproj deleted file mode 100644 index 84a2257ff..000000000 --- a/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication/RazorWebApplication.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - net6.0 - - - - true - - - diff --git a/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication/Startup.cs b/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication/Startup.cs deleted file mode 100644 index 6eb34c8e4..000000000 --- a/its/projects/RazorWebApplication.net6.withSourceGenerators/RazorWebApplication/Startup.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.DependencyInjection; - -namespace RazorWebApplication -{ - public class Startup - { - // This method gets called by the runtime. Use this method to add services to the container. - // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 - public void ConfigureServices(IServiceCollection services) - { - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - - app.Run(async (context) => - { - await context.Response.WriteAsync("Hello World!"); - }); - } - } -} diff --git a/its/projects/RazorWebApplication.net6.withSourceGenerators/global.json b/its/projects/RazorWebApplication.net6.withSourceGenerators/global.json deleted file mode 100644 index 778f056e6..000000000 --- a/its/projects/RazorWebApplication.net6.withSourceGenerators/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "sdk": { - "version": "6.0.0", - "rollForward": "latestFeature" - } -} \ No newline at end of file diff --git a/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication.net6.withoutSourceGenerators.sln b/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication.net6.withoutSourceGenerators.sln deleted file mode 100644 index 92375aa35..000000000 --- a/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication.net6.withoutSourceGenerators.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28306.52 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RazorWebApplication", "RazorWebApplication\RazorWebApplication.csproj", "{BB99160E-4919-4A09-8054-6B94C5EEEC6B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BB99160E-4919-4A09-8054-6B94C5EEEC6B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BB99160E-4919-4A09-8054-6B94C5EEEC6B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BB99160E-4919-4A09-8054-6B94C5EEEC6B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BB99160E-4919-4A09-8054-6B94C5EEEC6B}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {581E43D6-85A5-47EF-99F3-2D075FD87054} - EndGlobalSection -EndGlobal diff --git a/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication/Index.cshtml b/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication/Index.cshtml deleted file mode 100644 index e1dd794fd..000000000 --- a/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication/Index.cshtml +++ /dev/null @@ -1,5 +0,0 @@ -@* - For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 -*@ -@{ -} diff --git a/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication/Program.cs b/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication/Program.cs deleted file mode 100644 index cb46d52f0..000000000 --- a/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication/Program.cs +++ /dev/null @@ -1,17 +0,0 @@ -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Hosting; - -namespace RazorWebApplication -{ - public class Program - { - public static void Main(string[] args) - { - CreateWebHostBuilder(args).Build().Run(); - } - - public static IWebHostBuilder CreateWebHostBuilder(string[] args) => - WebHost.CreateDefaultBuilder(args) - .UseStartup(); - } -} diff --git a/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication/Properties/launchSettings.json b/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication/Properties/launchSettings.json deleted file mode 100644 index bb5282a48..000000000 --- a/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication/Properties/launchSettings.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:55439", - "sslPort": 44370 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "RazorWebApplication": { - "commandName": "Project", - "launchBrowser": true, - "applicationUrl": "https://localhost:5001;http://localhost:5000", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} \ No newline at end of file diff --git a/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication/RazorWebApplication.csproj b/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication/RazorWebApplication.csproj deleted file mode 100644 index 9eef9c97f..000000000 --- a/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication/RazorWebApplication.csproj +++ /dev/null @@ -1,11 +0,0 @@ - - - - net6.0 - - - - false - - - diff --git a/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication/Startup.cs b/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication/Startup.cs deleted file mode 100644 index 6eb34c8e4..000000000 --- a/its/projects/RazorWebApplication.net6.withoutSourceGenerators/RazorWebApplication/Startup.cs +++ /dev/null @@ -1,30 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.DependencyInjection; - -namespace RazorWebApplication -{ - public class Startup - { - // This method gets called by the runtime. Use this method to add services to the container. - // For more information on how to configure your application, visit https://go.microsoft.com/fwlink/?LinkID=398940 - public void ConfigureServices(IServiceCollection services) - { - } - - // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env) - { - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - - app.Run(async (context) => - { - await context.Response.WriteAsync("Hello World!"); - }); - } - } -} diff --git a/its/projects/RazorWebApplication.net6.withoutSourceGenerators/global.json b/its/projects/RazorWebApplication.net6.withoutSourceGenerators/global.json deleted file mode 100644 index 778f056e6..000000000 --- a/its/projects/RazorWebApplication.net6.withoutSourceGenerators/global.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "sdk": { - "version": "6.0.0", - "rollForward": "latestFeature" - } -} \ No newline at end of file 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 index 8965f17f6..a1ba0f277 100644 --- 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 @@ -605,22 +605,6 @@ void testXamlCompilation() throws IOException { assertThat(TestUtils.getMeasureAsInteger("XamarinApplication:XamarinApplication", "lines", ORCHESTRATOR)).isEqualTo(52); } - @Test - void testRazorCompilationNet6WithoutSourceGenerators() throws IOException { - assumeTrue(TestUtils.getMsBuildPath(ORCHESTRATOR).toString().contains("2022")); // We can't build without MsBuild17 - String projectName = "RazorWebApplication.net6.withoutSourceGenerators"; - assertProjectFileContains(projectName, "false"); - validateRazorProject(projectName); - } - - @Test - void testRazorCompilationNet6WithSourceGenerators() throws IOException { - assumeTrue(TestUtils.getMsBuildPath(ORCHESTRATOR).toString().contains("2022")); // We can't build without MsBuild17 - String projectName = "RazorWebApplication.net6.withSourceGenerators"; - assertProjectFileContains(projectName, "true"); - validateRazorProject(projectName); - } - @Test void testEsprojVueWithBackend() throws IOException { // SonarQube 10.8 changed the way the numbers are reported. @@ -782,23 +766,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");