SCAN4NET-126 ITs: Cleanup AssemblyAttribute project (#2235)

SonarSource · Oct 18, 2024 · f3b58af · f3b58af
1 parent 3aa7d56
commit f3b58af
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 111 deletions.
diff --git a/...ects/AssemblyAttribute/ConsoleApp2017.sln → ...projects/AssemblyAttribute/ConsoleApp.sln b/...ects/AssemblyAttribute/ConsoleApp2017.sln → ...projects/AssemblyAttribute/ConsoleApp.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26228.9
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp2017", "ConsoleApp2017\ConsoleApp2017.csproj", "{65D38D80-1C32-43DA-9CB0-3EEF6DB221FF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp", "ConsoleApp\ConsoleApp.csproj", "{65D38D80-1C32-43DA-9CB0-3EEF6DB221FF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/its/projects/AssemblyAttribute/ConsoleApp/ConsoleApp.csproj b/its/projects/AssemblyAttribute/ConsoleApp/ConsoleApp.csproj
@@ -0,0 +1,10 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net48</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>disable</Nullable>
+    <LangVersion>default</LangVersion>
+  </PropertyGroup>
+
+</Project>
diff --git a/its/projects/AssemblyAttribute/ConsoleApp/Program.cs b/its/projects/AssemblyAttribute/ConsoleApp/Program.cs
@@ -0,0 +1,9 @@
+namespace ConsoleApp2017
+{
+    class Program
+    {
+        static void Main()
+        {
+        }
+    }
+}
diff --git a/its/projects/AssemblyAttribute/ConsoleApp2017/App.config b/its/projects/AssemblyAttribute/ConsoleApp2017/App.config
diff --git a/its/projects/AssemblyAttribute/ConsoleApp2017/ConsoleApp2017.csproj b/its/projects/AssemblyAttribute/ConsoleApp2017/ConsoleApp2017.csproj
diff --git a/its/projects/AssemblyAttribute/ConsoleApp2017/Program.cs b/its/projects/AssemblyAttribute/ConsoleApp2017/Program.cs
diff --git a/its/projects/AssemblyAttribute/ConsoleApp2017/Properties/AssemblyInfo.cs b/its/projects/AssemblyAttribute/ConsoleApp2017/Properties/AssemblyInfo.cs
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
@@ -475,7 +475,7 @@ void excludeAssemblyAttribute() throws Exception {
     String token = TestUtils.getNewToken(ORCHESTRATOR);
 
     ORCHESTRATOR.executeBuild(TestUtils.newScannerBegin(ORCHESTRATOR, localProjectKey, projectDir, token, ScannerClassifier.NET_FRAMEWORK));
-    TestUtils.runMSBuild(ORCHESTRATOR, projectDir, "/t:Rebuild");
+    TestUtils.runMSBuild(ORCHESTRATOR, projectDir, "/t:Restore,Rebuild");
     BuildResult result = TestUtils.executeEndStepAndDumpResults(ORCHESTRATOR, projectDir, localProjectKey, token);
 
     assertThat(result.getLogs()).doesNotContain("File is not under the project directory and cannot currently be analysed by SonarQube");