Infra: Update the UTs and ITs to be able to run on .NET 9 preview (#2166

)
SonarSource · Sep 4, 2024 · 951bb9f · 951bb9f
1 parent ebdc8b9
commit 951bb9f
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 19 deletions.
diff --git a/Tests/SonarScanner.MSBuild.Tasks.IntegrationTest/E2ETests/E2EAnalysisTests.cs b/Tests/SonarScanner.MSBuild.Tasks.IntegrationTest/E2ETests/E2EAnalysisTests.cs
@@ -826,7 +826,7 @@ public void E2E_TestProjects_ProtobufsUpdated()
         // Assert
         result.AssertTargetExecuted("FixUpTestProjectOutputs");
 
-        var protobufDir = Path.Combine(result.GetPropertyValue("ProjectSpecificOutDir"), "subdir1");
+        var protobufDir = Path.Combine(result.GetPropertyValue(TargetProperties.ProjectSpecificOutDir), "subdir1");
 
         AssertFilesExistsAndAreNotEmpty(protobufDir, "encoding.pb", "file-metadata.pb", "symrefs.pb", "token-type.pb");
         AssertFilesExistsAndAreEmpty(protobufDir, "metrics.pb", "token-cpd.pb");
@@ -841,7 +841,7 @@ public void E2E_NonTestProjects_ProtobufsNotUpdated()
         // Assert
         result.AssertTargetNotExecuted("FixUpTestProjectOutputs");
 
-        var protobufDir = Path.Combine(result.GetPropertyValue("ProjectSpecificOutDir"), "subdir2");
+        var protobufDir = Path.Combine(result.GetPropertyValue(TargetProperties.ProjectSpecificOutDir), "subdir2");
 
         // Protobufs should not changed for non-test project
         AssertFilesExistsAndAreNotEmpty(protobufDir, protobufFileNames);
@@ -899,7 +899,7 @@ but before the targets that modify the protobufs are executed -->
         // Sanity check that the above target was executed
         result.AssertTargetExecuted("CreateDummyProtobufFiles");
 
-        var projectSpecificOutputDir2 = result.GetPropertyValue("ProjectSpecificOutDir");
+        var projectSpecificOutputDir2 = result.GetPropertyValue(TargetProperties.ProjectSpecificOutDir);
         projectSpecificOutputDir2.Should().Be(actualStructure.ProjectSpecificOutputDir);
 
         AssertNoAdditionalFilesInFolder(actualStructure.ProjectSpecificOutputDir, protobufFileNames.Concat(new[] { ExpectedAnalysisFilesListFileName, ExpectedIssuesFileName, FileConstants.ProjectInfoFileName }).ToArray());

diff --git a/Tests/SonarScanner.MSBuild.Tasks.IntegrationTest/Infrastructure/TargetConstants.cs b/Tests/SonarScanner.MSBuild.Tasks.IntegrationTest/Infrastructure/TargetConstants.cs
@@ -121,8 +121,8 @@ internal static class TargetProperties
     public const string AdditionalFilesItemType = "AdditionalFiles";
 
     public const string SonarProjectOutFolderFilePath = "SonarProjectOutFolderFilePath";
-    public const string SonarProjectConfigFilePath = "SonarProjectConfigFilePath";
-    public const string ProjectSpecificOutDir = "ProjectSpecificOutDir";
+    public const string SonarProjectConfigFilePath = "SonarProjectConfigFilePath from parameter ProjectConfigFilePath"; // Issue in the MsBuild structured logger.
+    public const string ProjectSpecificOutDir = "ProjectSpecificOutDir from parameter UniquePath"; // Issue in the MsBuild structured logger.
     public const string ProjectSpecificConfDir = "ProjectSpecificConfDir";
 
     // Legacy TeamBuild environment variables (XAML Builds)

diff --git a/...arScanner.MSBuild.Tasks.IntegrationTest/SonarScanner.MSBuild.Tasks.IntegrationTest.csproj b/...arScanner.MSBuild.Tasks.IntegrationTest/SonarScanner.MSBuild.Tasks.IntegrationTest.csproj
@@ -17,7 +17,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Build.Framework" Version="17.8.3" />
-    <PackageReference Include="MSBuild.StructuredLogger" Version="2.2.243" />
+    <PackageReference Include="MSBuild.StructuredLogger" Version="2.2.291" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.5.0" />
     <PackageReference Include="MSTest.TestFramework" Version="3.5.0" />

diff --git a/Tests/SonarScanner.MSBuild.Tasks.IntegrationTest/TargetsTests/RoslynTargetsTests.cs b/Tests/SonarScanner.MSBuild.Tasks.IntegrationTest/TargetsTests/RoslynTargetsTests.cs
@@ -607,7 +607,7 @@ public void TargetExecutionOrder()
     private static void AssertErrorLogIsSetBySonarQubeTargets(BuildLog result)
     {
         var projectSpecificOutDir = result.GetPropertyValue(TargetProperties.ProjectSpecificOutDir);
-        AssertExpectedErrorLog(result, projectSpecificOutDir + @"\Issues.json");
+        AssertExpectedErrorLog(result, Path.Combine(projectSpecificOutDir, "Issues.json"));
     }
 
     private static void AssertExpectedErrorLog(BuildLog result, string expectedErrorLog) =>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -32,12 +32,6 @@ variables:
   # pipelines-yaml-templates/promote-stage.yml line 56
   - name: IS_RELEASE_BRANCH
     value: ${{ or(eq(variables['Build.SourceBranch'], 'refs/heads/master'), startsWith(variables['Build.SourceBranch'], 'refs/heads/branch-')) }}
-  - name: MSBUILD_15_PATH
-    value: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\MSBuild\\15.0\\Bin\\MSBuild.exe"
-  - name: MSBUILD_16_PATH
-    value: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\BuildTools\\MSBuild\\Current\\Bin\\MSBuild.exe"
-  - name: MSBUILD_17_PATH
-    value: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2022\\BuildTools\\MSBuild\\Current\\Bin\\MSBuild.exe"
   - name: BUILD_CONFIGURATION
     value: "Release"
   - name: BUILD_PLATFORM

diff --git a/...ojectTypeDetection/TestProjectWrongReferenceCasing/TestProjectWrongReferenceCasing.csproj b/...ojectTypeDetection/TestProjectWrongReferenceCasing/TestProjectWrongReferenceCasing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.1</TargetFramework>
+        <TargetFramework>net48</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/its/projects/ExcludedTest/Excluded/Excluded.csproj b/its/projects/ExcludedTest/Excluded/Excluded.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
     <SonarQubeExclude>true</SonarQubeExclude>
   </PropertyGroup>
 

diff --git a/its/projects/ExcludedTest/Normal/Normal.csproj b/its/projects/ExcludedTest/Normal/Normal.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/its/projects/ExcludedTest/Test/Test.csproj b/its/projects/ExcludedTest/Test/Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/its/projects/IncrementalPRAnalysis/IncrementalPRAnalysis/IncrementalPRAnalysis.csproj b/its/projects/IncrementalPRAnalysis/IncrementalPRAnalysis/IncrementalPRAnalysis.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net48</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/its/projects/XamarinApplication/XamarinApplication/XamarinApplication.csproj b/its/projects/XamarinApplication/XamarinApplication/XamarinApplication.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard1.6</TargetFramework>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
   </PropertyGroup>