From 89fbbbae771be984ba21fa21bf3ae0bc62b85e97 Mon Sep 17 00:00:00 2001
From: Pavel Mikula <pavel.mikula@sonarsource.com>
Date: Wed, 7 Apr 2021 18:05:11 +0200
Subject: [PATCH 1/3] Remove duplicate test categorization description

---
 .../Targets/SonarQube.Integration.targets     | 60 ++++++-------------
 1 file changed, 17 insertions(+), 43 deletions(-)

diff --git a/src/SonarScanner.MSBuild.Tasks/Targets/SonarQube.Integration.targets b/src/SonarScanner.MSBuild.Tasks/Targets/SonarQube.Integration.targets
index 8037de372..11802e559 100644
--- a/src/SonarScanner.MSBuild.Tasks/Targets/SonarQube.Integration.targets
+++ b/src/SonarScanner.MSBuild.Tasks/Targets/SonarQube.Integration.targets
@@ -4,59 +4,46 @@
   <!--
     This file contains targets to integrate SonarQube and MSBuild.
 
-    The targets will produce an output folder structure containing information required
-    by the sonar-scanner.
+    The targets will produce an output folder structure containing information required by the sonar-scanner.
 
     A subdirectory will be created for each MSBuild project. Information about the project
     will be written to a file called "ProjectInfo.xml". Additional files may also be written
     containing information required by different analyzers. In particular, a file will be written
     containing the list of files in the project that should be analyzed by the sonar-scanner.
 
-    The output will only be produced if the property $(SonarQubeTempPath) and
-    is specified. $(SonarQubeTempPath) is the root folder under which per-analysis output
-    should be written.
+    The output will only be produced if the property $(SonarQubeTempPath) and is specified.
+    $(SonarQubeTempPath) is the root folder under which per-analysis output should be written.
 
     Excluding projects and files from SonarQube analysis
     ****************************************************
-    Individual projects can excluded from SonarQube analysis by setting
-    the property $(SonarQubeExclude) e.g.
+    Individual projects can excluded from SonarQube analysis by setting the property $(SonarQubeExclude) e.g.
 
       <SonarQubeExclude>true</SonarQubeExclude>
 
-    Individual files can be excluded from analysis by setting the
-    <SonarQubeExclude> metadata item e.g.
+    Individual files can be excluded from analysis by setting the <SonarQubeExclude> metadata item e.g.
 
       <Compile Include="Logger.cs">
         <SonarQubeExclude>true</SonarQubeExclude>
       </Compile>
 
+    Project is also excluded if it's recognized as a Fakes or a Temp project. These projects are auto-generated.
+
     Test projects
     *************
-    The analysis performed by SonarQube varies depending on whether a project
-    is a test project or not.
+    The analysis performed by SonarQube varies depending on whether a project is a test project or not.
 
-    A project can be explicitly marked as being a test or product project by setting
-    the property $(SonarQubeTestProject) e.g.
+    A project can be explicitly marked as being a test or product project by setting the property $(SonarQubeTestProject) e.g.
 
       <SonarQubeTestProject>true</SonarQubeTestProject>
 
-    If $(SonarQubeTestProject) is not set explicitly then the targets will determine the project
-    type as follows:
-
-    1) Projects whose full project file name matches the regular expression specified in
-        the analysis setting "sonar.msbuild.testProjectPattern" (case sensitive)
-        will be treated as a test projects.
-
-        Note that the regular expression uses the .Net Regex format i.e. "+" is the
-        single character wildcard and "*" is the multi-character wildcard (zero to many).
+    If $(SonarQubeTestProject) is not set explicitly then the project is categorized as a Test project if:
+    * Is a Fakes or a Temp project explicitly marked as SonarQubeExclude=false
+    * Has one of the expected test project GUIDs ("3AC096D0-A1C2-E12C-1390-A8335801FDAB" or legacy "82A7F48D-3B50-4B1E-B82E-3ADA8210C358").
+    * Has a TestContainer project capability.
+    * References a known unit test related assembly.
+    * Deprecated: Project name matches "sonar.msbuild.testProjectPattern" parameter. Use SonarQubeTestProject=true instead.
 
-        This property was deprecated. Use SonarQubeTestProject property instead.
-
-    2) MSTest projects will be treated as test projects.
-        The $(ProjectTypeGuids) property of MS Test projects contains a specific guid
-        ("3AC096D0-A1C2-E12C-1390-A8335801FDAB" or legacy "82A7F48D-3B50-4B1E-B82E-3ADA8210C358")
-
-    3) SDK-style projects with ProjectCapability TestContainer will be treated as test projects.
+    Otherwise it is a Product project.
 
     Supplying analysis setting in a project file
     ********************************************
@@ -71,7 +58,6 @@
 
     Settings specified in the project file will override those specified on the SonarQube server.
 
-
     Specifying additional types of file to be analysed
     **************************************************
 
@@ -169,19 +155,7 @@
   <!-- **************************************************************************** -->
   <!-- Categorize as a product or test project -->
   <!-- **************************************************************************** -->
-  <!-- Project is excluded if it's recognized as a Fakes or a Temp project. These projects are auto-generated.
-       Project is categorized as a Test project if:
-        * Is explicitly marked with SonarQubeTestProject=true
-        * Is a Fakes or a Temp project explicitly marked as SonarQubeExclude=false
-        * Has one of the expected test project GUIDs.
-        * Has a TestContainer project capability.
-        * References a known unit test related assembly.
-        * Deprecated: Project name matches sonar.msbuild.testProjectPattern parameter. Use SonarQubeTestProject=true instead.
-
-       Otherwise it is a Product project.
-
-       This target is a utility target: it won't be executed unless a target that depends on it is executed.
-    -->
+  <!-- This target is a utility target: it won't be executed unless a target that depends on it is executed. -->
   <Target Name="SonarQubeCategoriseProject"
           DependsOnTargets="SonarResolveReferencesMsBuild14;SonarResolveReferences"
           Condition=" $(SonarQubeTempPath) != '' ">

From a4fce6c37d775c660c44bb3cad33cd09ebf67e52 Mon Sep 17 00:00:00 2001
From: Pavel Mikula <pavel.mikula@sonarsource.com>
Date: Wed, 7 Apr 2021 18:28:41 +0200
Subject: [PATCH 2/3] Remove unused class

---
 .../WellKnownProjectProperties.cs             | 164 ------------------
 1 file changed, 164 deletions(-)
 delete mode 100644 Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/Infrastructure/WellKnownProjectProperties.cs

diff --git a/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/Infrastructure/WellKnownProjectProperties.cs b/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/Infrastructure/WellKnownProjectProperties.cs
deleted file mode 100644
index a39dbbcec..000000000
--- a/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/Infrastructure/WellKnownProjectProperties.cs
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * SonarScanner for MSBuild
- * Copyright (C) 2016-2021 SonarSource SA
- * mailto:info AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-using System.Collections.Generic;
-
-namespace SonarScanner.MSBuild.Tasks.IntegrationTests
-{
-    /// <summary>
-    /// Dictionary with strongly-typed accessors for some well-known properties
-    /// </summary>
-    internal class WellKnownProjectProperties : Dictionary<string, string>
-    {
-        #region Public properties
-
-        public string SonarQubeExclude
-        {
-            get => GetValueOrNull(TargetProperties.SonarQubeExcludeMetadata);
-            set => this[TargetProperties.SonarQubeExcludeMetadata] = value;
-        }
-
-        public string SonarQubeTargetsPath
-        {
-            get => GetValueOrNull(TargetProperties.SonarQubeTargetsPath);
-            set => this[TargetProperties.SonarQubeTargetsPath] = value;
-        }
-
-        public string SonarQubeOutputPath
-        {
-            get => GetValueOrNull(TargetProperties.SonarQubeOutputPath);
-            set => this[TargetProperties.SonarQubeOutputPath] = value;
-        }
-
-        public string SonarQubeConfigPath
-        {
-            get => GetValueOrNull(TargetProperties.SonarQubeConfigPath);
-            set => this[TargetProperties.SonarQubeConfigPath] = value;
-        }
-
-        public string SonarQubeTempPath
-        {
-            get => GetValueOrNull(TargetProperties.SonarQubeTempPath);
-            set => this[TargetProperties.SonarQubeTempPath] = value;
-        }
-
-        public string RunCodeAnalysis
-        {
-            get => GetValueOrNull(TargetProperties.RunCodeAnalysis);
-            set => this[TargetProperties.RunCodeAnalysis] = value;
-        }
-
-        public string CodeAnalysisLogFile
-        {
-            get => GetValueOrNull(TargetProperties.CodeAnalysisLogFile);
-            set => this[TargetProperties.CodeAnalysisLogFile] = value;
-        }
-
-        public string CodeAnalysisRuleset
-        {
-            get => GetValueOrNull(TargetProperties.CodeAnalysisRuleset);
-            set => this[TargetProperties.CodeAnalysisRuleset] = value;
-        }
-
-        public string ResolvedCodeAnalysisRuleset
-        {
-            get => GetValueOrNull(TargetProperties.ResolvedCodeAnalysisRuleset);
-            set => this[TargetProperties.ResolvedCodeAnalysisRuleset] = value;
-        }
-
-        public string ErrorLog
-        {
-            get => GetValueOrNull(TargetProperties.ErrorLog);
-            set => this[TargetProperties.ErrorLog] = value;
-        }
-
-        public string WarningsAsErrors
-        {
-            get => GetValueOrNull(TargetProperties.WarningsAsErrors);
-            set => this[TargetProperties.WarningsAsErrors] = value;
-        }
-
-        public string TreatWarningsAsErrors
-        {
-            get => GetValueOrNull(TargetProperties.TreatWarningsAsErrors);
-            set => this[TargetProperties.TreatWarningsAsErrors] = value;
-        }
-
-        public string WarningLevel
-        {
-            get => GetValueOrNull(TargetProperties.WarningLevel);
-            set => this[TargetProperties.WarningLevel] = value;
-        }
-
-        public string AssemblyName
-        {
-            get => GetValueOrNull(TargetProperties.AssemblyName);
-            set => this[TargetProperties.AssemblyName] = value;
-        }
-
-        public string TeamBuildLegacyBuildDirectory
-        {
-            get => GetValueOrNull(TargetProperties.BuildDirectory_Legacy);
-            set => this[TargetProperties.BuildDirectory_Legacy] = value;
-        }
-
-        public string TeamBuild2105BuildDirectory
-        {
-            get => GetValueOrNull(TargetProperties.BuildDirectory_TFS2015);
-            set => this[TargetProperties.BuildDirectory_TFS2015] = value;
-        }
-
-        public string BuildingInsideVS
-        {
-            get => GetValueOrNull(TargetProperties.BuildingInsideVS);
-            set => this[TargetProperties.BuildingInsideVS] = value;
-        }
-
-        public string MSBuildExtensionsPath
-        {
-            get => GetValueOrNull(TargetProperties.MSBuildExtensionsPath);
-            set => this[TargetProperties.MSBuildExtensionsPath] = value;
-        }
-
-        public string SonarTestProject
-        {
-            get => GetValueOrNull(TargetProperties.SonarQubeTestProject);
-            set => this[TargetProperties.SonarQubeTestProject] = value;
-        }
-
-        public string ProjectTypeGuids
-        {
-            get => GetValueOrNull(TargetProperties.ProjectTypeGuids);
-            set => this[TargetProperties.ProjectTypeGuids] = value;
-        }
-
-        #endregion Public properties
-
-        #region Private methods
-
-        private string GetValueOrNull(string key)
-        {
-            TryGetValue(key, out string value);
-            return value;
-        }
-
-        #endregion Private methods
-    }
-}

From 7db430d2f4f5ec6e36792ef33c54387197fe8515 Mon Sep 17 00:00:00 2001
From: Pavel Mikula <pavel.mikula@sonarsource.com>
Date: Wed, 7 Apr 2021 18:38:52 +0200
Subject: [PATCH 3/3] Implement

---
 .../Infrastructure/TargetConstants.cs         |  2 ++
 .../CaptureDataTargetsFileTemplate.xml        |  2 ++
 ...nner.MSBuild.Tasks.IntegrationTests.csproj |  1 -
 .../TargetsTests/RoslynTargetsTests.cs        | 20 +++++++++++++++++++
 .../Targets/SonarQube.Integration.targets     |  4 ++++
 5 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/Infrastructure/TargetConstants.cs b/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/Infrastructure/TargetConstants.cs
index 4c0c979f4..34b3a478e 100644
--- a/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/Infrastructure/TargetConstants.cs
+++ b/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/Infrastructure/TargetConstants.cs
@@ -87,6 +87,8 @@ internal static class TargetProperties
 
         public const string AssemblyName = "AssemblyName";
 
+        public const string RunAnalyzers = "RunAnalyzers";
+        public const string RunAnalyzersDuringBuild = "RunAnalyzersDuringBuild";
         public const string TreatWarningsAsErrors = "TreatWarningsAsErrors";
         public const string WarningsAsErrors = "WarningsAsErrors";
         public const string WarningLevel = "WarningLevel";
diff --git a/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/Resources/CaptureDataTargetsFileTemplate.xml b/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/Resources/CaptureDataTargetsFileTemplate.xml
index b72472105..530295d73 100644
--- a/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/Resources/CaptureDataTargetsFileTemplate.xml
+++ b/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/Resources/CaptureDataTargetsFileTemplate.xml
@@ -11,6 +11,8 @@
     <Message Importance='high' Text='CAPTURE::PROPERTY::TreatWarningsAsErrors::$(TreatWarningsAsErrors)' />
     <Message Importance='high' Text='CAPTURE::PROPERTY::WarningsAsErrors::$(WarningsAsErrors)' />
     <Message Importance='high' Text='CAPTURE::PROPERTY::WarningLevel::$(WarningLevel)' />
+    <Message Importance='high' Text='CAPTURE::PROPERTY::RunAnalyzers::$(RunAnalyzers)' />
+    <Message Importance='high' Text='CAPTURE::PROPERTY::RunAnalyzersDuringBuild::$(RunAnalyzersDuringBuild)' />
     <Message Importance='high' Text='CAPTURE::PROPERTY::ProjectSpecificOutDir::$(ProjectSpecificOutDir)' />
     <Message Importance='high' Text='CAPTURE::PROPERTY::ProjectSpecificConfDir::$(ProjectSpecificConfDir)' />
 
diff --git a/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/SonarScanner.MSBuild.Tasks.IntegrationTests.csproj b/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/SonarScanner.MSBuild.Tasks.IntegrationTests.csproj
index d76fc54e9..ae02593ba 100644
--- a/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/SonarScanner.MSBuild.Tasks.IntegrationTests.csproj
+++ b/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/SonarScanner.MSBuild.Tasks.IntegrationTests.csproj
@@ -150,7 +150,6 @@
     <Compile Include="Infrastructure\BuildUtilities.cs" />
     <Compile Include="E2ETests\E2EAnalysisTests.cs" />
     <Compile Include="Infrastructure\TargetConstants.cs" />
-    <Compile Include="Infrastructure\WellKnownProjectProperties.cs" />
     <Compile Include="MSBuildExecution\SimpleXmlLogger.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
diff --git a/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/TargetsTests/RoslynTargetsTests.cs b/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/TargetsTests/RoslynTargetsTests.cs
index 3d909ebf7..b52c9fa72 100644
--- a/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/TargetsTests/RoslynTargetsTests.cs
+++ b/Tests/SonarScanner.MSBuild.Tasks.IntegrationTests/TargetsTests/RoslynTargetsTests.cs
@@ -158,6 +158,7 @@ public void Settings_ValidSetup_LegacyServer_Override_Analyzers()
             AssertExpectedAdditionalFiles(result, "should.not.be.removed.additional1.txt", "should.not.be.removed.additional2.txt");
             AssertExpectedAnalyzers(result, @"c:\data\new.analyzer1.dll", @"c:\new.analyzer2.dll");
             AssertWarningsAreNotTreatedAsErrorsNorIgnored(result);
+            AssertRunAnalyzersIsEnabled(result);
         }
 
         [TestMethod]
@@ -246,6 +247,7 @@ public void Settings_ValidSetup_NonLegacyServer_MergeSettings()
                 @"original\should.be.preserved\analyzer3.dll");
 
             AssertWarningsAreNotTreatedAsErrorsNorIgnored(result);
+            AssertRunAnalyzersIsEnabled(result);
         }
 
         [TestMethod]
@@ -356,6 +358,8 @@ public void Settings_TempFolderIsNotSet()
   <ResolvedCodeAnalysisRuleset>pre-existing.ruleset</ResolvedCodeAnalysisRuleset>
   <WarningsAsErrors>CS101</WarningsAsErrors>
   <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  <RunAnalyzers>false</RunAnalyzers>
+  <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
 
   <!-- This will override the value that was set earlier in the project file -->
   <SonarQubeTempPath />
@@ -377,8 +381,11 @@ public void Settings_TempFolderIsNotSet()
             result.AssertExpectedItemGroupCount(TargetProperties.AnalyzerItemType, 0);
             result.AssertExpectedItemGroupCount(TargetProperties.AdditionalFilesItemType, 0);
 
+            // Properties are not overriden
             result.AssertExpectedCapturedPropertyValue(TargetProperties.TreatWarningsAsErrors, "true");
             result.AssertExpectedCapturedPropertyValue(TargetProperties.WarningsAsErrors, "CS101");
+            result.AssertExpectedCapturedPropertyValue(TargetProperties.RunAnalyzers, "false");
+            result.AssertExpectedCapturedPropertyValue(TargetProperties.RunAnalyzersDuringBuild, "false");
         }
 
         [TestMethod]
@@ -661,6 +668,15 @@ private static void AssertWarningsAreNotTreatedAsErrorsNorIgnored(BuildLog actua
             actualResult.AssertExpectedCapturedPropertyValue(TargetProperties.WarningLevel, "4");
         }
 
+        /// <summary>
+        /// Checks that VS2019 properties are set to run the analysis.
+        /// </summary>
+        private static void AssertRunAnalyzersIsEnabled(BuildLog actualResult)
+        {
+            actualResult.AssertExpectedCapturedPropertyValue(TargetProperties.RunAnalyzers, "true");
+            actualResult.AssertExpectedCapturedPropertyValue(TargetProperties.RunAnalyzersDuringBuild, "true");
+        }
+
         /// <summary>
         /// Checks that a SonarQubeSetting does not exist
         /// </summary>
@@ -750,6 +766,9 @@ private BuildLog Execute_Settings_ValidSetup(string msBuildLanguage, bool isTest
     <Language>{msBuildLanguage}</Language>
     <SonarQubeTestProject>{isTestProject}</SonarQubeTestProject>
     <ResolvedCodeAnalysisRuleset>c:\should.be.overridden.ruleset</ResolvedCodeAnalysisRuleset>
+    <!-- These should be overriden by the targets file -->
+    <RunAnalyzers>false</RunAnalyzers>
+    <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
 </PropertyGroup>
 
 <ItemGroup>
@@ -773,6 +792,7 @@ private BuildLog Execute_Settings_ValidSetup(string msBuildLanguage, bool isTest
 
             AssertErrorLogIsSetBySonarQubeTargets(result);
             AssertWarningsAreNotTreatedAsErrorsNorIgnored(result);
+            AssertRunAnalyzersIsEnabled(result);
 
             var capturedProjectSpecificConfDir = result.GetCapturedPropertyValue(TargetProperties.ProjectSpecificConfDir);
             result.MessageLog.Should().Contain($@"Sonar: ({Path.GetFileName(filePath)}) Analysis configured successfully with {capturedProjectSpecificConfDir}\SonarProjectConfig.xml.");
diff --git a/src/SonarScanner.MSBuild.Tasks/Targets/SonarQube.Integration.targets b/src/SonarScanner.MSBuild.Tasks/Targets/SonarQube.Integration.targets
index 11802e559..bdb1a8b95 100644
--- a/src/SonarScanner.MSBuild.Tasks/Targets/SonarQube.Integration.targets
+++ b/src/SonarScanner.MSBuild.Tasks/Targets/SonarQube.Integration.targets
@@ -414,6 +414,10 @@
       <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
       <WarningsAsErrors></WarningsAsErrors>
 
+      <!-- Override VS2019 properties to make sure analysis runs in the scanner build. -->
+      <RunAnalyzers>true</RunAnalyzers>
+      <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
+
       <!-- The Roslyn analyzers output messages with different warning levels. This is tied to the diagnostic severity and currently
       is translated as follows - error: 0, warning: 1, info: 4. To avoid issues being missed override the warning level by setting it to max tolerance.-->
       <WarningLevel>4</WarningLevel>