From b49bd43966d58bf4bed150948b17b6e18c663bd1 Mon Sep 17 00:00:00 2001
From: Tim Pohlmann <tim.pohlmann@sonarsource.com>
Date: Tue, 9 Jul 2024 13:49:22 +0200
Subject: [PATCH] Review 1

---
 analyzers/its/Directory.Build.targets | 7 ++++---
 analyzers/its/regression-test.ps1     | 6 ++----
 analyzers/src/Directory.Build.targets | 4 +---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/analyzers/its/Directory.Build.targets b/analyzers/its/Directory.Build.targets
index 876d7844f53..a7b1aaaabcf 100644
--- a/analyzers/its/Directory.Build.targets
+++ b/analyzers/its/Directory.Build.targets
@@ -20,7 +20,8 @@
       <SonarProjectType Condition="$(SonarUnknownProjectType) == 'true'">Unknown</SonarProjectType>
     </PropertyGroup>
 
-    <Error Text="Could not find '$(BinariesFolder)\SonarAnalyzer.CSharp\SonarAnalyzer.dll'" Condition="!Exists('$(BinariesFolder)\SonarAnalyzer.CSharp\SonarAnalyzer.dll')" />
+    <Error Text="Could not find '$(BinariesFolder)\SonarAnalyzer.CSharp\SonarAnalyzer.CSharp.dll'" Condition="!Exists('$(BinariesFolder)\SonarAnalyzer.CSharp\SonarAnalyzer.CSharp.dll')" />
+    <Error Text="Could not find '$(BinariesFolder)\SonarAnalyzer.VisualBasic\SonarAnalyzer.VisualBasic.dll'" Condition="!Exists('$(BinariesFolder)\SonarAnalyzer.VisualBasic\SonarAnalyzer.VisualBasic.dll')" />
 
     <!-- This section builds content of SonarProjectConfig.xml additional file. We need to simulate S4MSB behavior to configure the analyzer. -->
     <ItemGroup>
@@ -52,8 +53,8 @@
       <!-- Remove all previously added analyzers, except built-in SourceGenerators -->
       <Analyzer Remove="@(Analyzer)" Condition="!$([System.Text.RegularExpressions.Regex]::IsMatch('%(Filename)', '(Generator|Generators|SourceGeneration|SourceGenerators)$'))"/>
       <!-- Add the SonarAnalyzer analyzer DLLs -->
-      <Analyzer Include="$(BinariesFolder)\SonarAnalyzer.*\SonarAnalyzer*.dll" />
-      <Analyzer Include="$(BinariesFolder)\SonarAnalyzer.*\Google.Protobuf.dll" />
+      <Analyzer Include="$(BinariesFolder)\SonarAnalyzer.CSharp\*.dll" />
+      <Analyzer Include="$(BinariesFolder)\SonarAnalyzer.VisualBasic\*.dll" />
       <AdditionalFiles Include="$(MSBuildStartupDirectory)\output\$(PROJECT)\SonarLint.xml" />
       <AdditionalFiles Include="$(SonarProjectConfigFilePath)" />
     </ItemGroup>
diff --git a/analyzers/its/regression-test.ps1 b/analyzers/its/regression-test.ps1
index e7a4cf0c7a1..ea983a463e1 100644
--- a/analyzers/its/regression-test.ps1
+++ b/analyzers/its/regression-test.ps1
@@ -230,10 +230,8 @@ function Invoke-JsonParser()
 try {
     . (Join-Path $PSScriptRoot "..\..\scripts\build\build-utils.ps1")
     Push-Location $PSScriptRoot
-    Test-FileExists "..\packaging\binaries\SonarAnalyzer.CSharp\SonarAnalyzer.dll"
-    Test-FileExists "..\packaging\binaries\SonarAnalyzer.CSharp\SonarAnalyzer.CFG.dll"
-    Test-FileExists "..\packaging\binaries\SonarAnalyzer.VisualBasic\SonarAnalyzer.dll"
-    Test-FileExists "..\packaging\binaries\SonarAnalyzer.VisualBasic\SonarAnalyzer.CFG.dll"
+    Test-FileExists "..\packaging\binaries\SonarAnalyzer.CSharp\SonarAnalyzer.CSharp.dll"
+    Test-FileExists "..\packaging\binaries\SonarAnalyzer.VisualBasic\SonarAnalyzer.VisualBasic.dll"
     Test-FileExists "..\packaging\binaries\ITs.JsonParser\ITs.JsonParser.exe"
 
     Write-Header "Initializing the environment"
diff --git a/analyzers/src/Directory.Build.targets b/analyzers/src/Directory.Build.targets
index c97ccba6782..e0d9e932911 100644
--- a/analyzers/src/Directory.Build.targets
+++ b/analyzers/src/Directory.Build.targets
@@ -3,12 +3,10 @@
   <Import Project="$(MSBuildThisFileDirectory)\..\Analyzers.targets" />
 
   <PropertyGroup>
-    <!-- `BinariesFolder` - binary files folder used by ITs and java packaging -->
+    <!-- `BinariesFolder` - binary files folder used by ITs, NuGet and java packaging -->
     <BinariesFolder>$(MSBuildThisFileDirectory)..\packaging\binaries\$(ProjectName)</BinariesFolder>
   </PropertyGroup>
 
-  <!-- The condition causes the target to only be executed once during the outer build step.
-       Without it, it will be executed multiple times, which can introduce race conditions. -->
   <Target Name="CleanBinaries" AfterTargets="Clean" Condition="Exists('$(BinariesFolder)')">
     <RemoveDir Directories="$(BinariesFolder)" />
   </Target>