Index: build/SonarQube/MSBuild.SonarQube.Runner.exe
===================================================================
diff -u -r90ec6a4d13baa05ce10a22c158f1cf976dfd3773 -r998e49dfa4ba978dce7b60ce55a981fa3034620d
Binary files differ
Index: build/SonarQube/Newtonsoft.Json.dll
===================================================================
diff -u -r90ec6a4d13baa05ce10a22c158f1cf976dfd3773 -r998e49dfa4ba978dce7b60ce55a981fa3034620d
Binary files differ
Index: build/SonarQube/SonarQube.Analysis.xml
===================================================================
diff -u -r90ec6a4d13baa05ce10a22c158f1cf976dfd3773 -r998e49dfa4ba978dce7b60ce55a981fa3034620d
--- build/SonarQube/SonarQube.Analysis.xml	(.../SonarQube.Analysis.xml)	(revision 90ec6a4d13baa05ce10a22c158f1cf976dfd3773)
+++ build/SonarQube/SonarQube.Analysis.xml	(.../SonarQube.Analysis.xml)	(revision 998e49dfa4ba978dce7b60ce55a981fa3034620d)
@@ -12,8 +12,8 @@
   - A property defined in the SonarQube User Interface at global level which can't override anything.
 
   Note that the following properties cannot be set through an MSBuild project file or an SonarQube.Analysis.xml file:
-  sonar.projectName, sonar.projectKey, sonar.projectVersion
-  The following flags need to be used to set their value: /n:[SonarQube Project Name] /k:[SonarQube Project Key] /v:[SonarQube Project Version]
+  sonar.projectName, sonar.projectKey, sonar.projectVersion, sonar.organization
+  The following flags need to be used to set their value: /n:[SonarQube Project Name] /k:[SonarQube Project Key] /v:[SonarQube Project Version] /o:[Sonar Project Organization]
 
 -->
 <SonarQubeAnalysisProperties  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.sonarsource.com/msbuild/integration/2015/1">
Index: build/SonarQube/SonarQube.Scanner.MSBuild.exe
===================================================================
diff -u -r90ec6a4d13baa05ce10a22c158f1cf976dfd3773 -r998e49dfa4ba978dce7b60ce55a981fa3034620d
Binary files differ
Index: build/SonarQube/SonarScanner.MSBuild.Common.dll
===================================================================
diff -u -r90ec6a4d13baa05ce10a22c158f1cf976dfd3773 -r998e49dfa4ba978dce7b60ce55a981fa3034620d
Binary files differ
Index: build/SonarQube/SonarScanner.MSBuild.PostProcessor.dll
===================================================================
diff -u -r90ec6a4d13baa05ce10a22c158f1cf976dfd3773 -r998e49dfa4ba978dce7b60ce55a981fa3034620d
Binary files differ
Index: build/SonarQube/SonarScanner.MSBuild.PreProcessor.dll
===================================================================
diff -u -r90ec6a4d13baa05ce10a22c158f1cf976dfd3773 -r998e49dfa4ba978dce7b60ce55a981fa3034620d
Binary files differ
Index: build/SonarQube/SonarScanner.MSBuild.Shim.dll
===================================================================
diff -u -r90ec6a4d13baa05ce10a22c158f1cf976dfd3773 -r998e49dfa4ba978dce7b60ce55a981fa3034620d
Binary files differ
Index: build/SonarQube/SonarScanner.MSBuild.TFS.Classic.dll
===================================================================
diff -u -r90ec6a4d13baa05ce10a22c158f1cf976dfd3773 -r998e49dfa4ba978dce7b60ce55a981fa3034620d
Binary files differ
Index: build/SonarQube/SonarScanner.MSBuild.TFS.dll
===================================================================
diff -u -r90ec6a4d13baa05ce10a22c158f1cf976dfd3773 -r998e49dfa4ba978dce7b60ce55a981fa3034620d
Binary files differ
Index: build/SonarQube/SonarScanner.MSBuild.TFSProcessor.exe
===================================================================
diff -u
Binary files differ
Index: build/SonarQube/SonarScanner.MSBuild.TFSProcessor.exe.config
===================================================================
diff -u
--- build/SonarQube/SonarScanner.MSBuild.TFSProcessor.exe.config	(revision 0)
+++ build/SonarQube/SonarScanner.MSBuild.TFSProcessor.exe.config	(revision 998e49dfa4ba978dce7b60ce55a981fa3034620d)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+  </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
Index: build/SonarQube/SonarScanner.MSBuild.Tasks.dll
===================================================================
diff -u -r90ec6a4d13baa05ce10a22c158f1cf976dfd3773 -r998e49dfa4ba978dce7b60ce55a981fa3034620d
Binary files differ
Index: build/SonarQube/SonarScanner.MSBuild.exe
===================================================================
diff -u -r90ec6a4d13baa05ce10a22c158f1cf976dfd3773 -r998e49dfa4ba978dce7b60ce55a981fa3034620d
Binary files differ
Index: build/SonarQube/SonarScanner.MSBuild.exe.config
===================================================================
diff -u
--- build/SonarQube/SonarScanner.MSBuild.exe.config	(revision 0)
+++ build/SonarQube/SonarScanner.MSBuild.exe.config	(revision 998e49dfa4ba978dce7b60ce55a981fa3034620d)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
+  </startup>
+</configuration>
\ No newline at end of file
Index: build/SonarQube/System.Net.Http.dll
===================================================================
diff -u
Binary files differ
Index: build/SonarQube/System.Runtime.InteropServices.RuntimeInformation.dll
===================================================================
diff -u
Binary files differ
Index: build/SonarQube/System.Security.Cryptography.Algorithms.dll
===================================================================
diff -u
Binary files differ
Index: build/SonarQube/System.Security.Cryptography.Encoding.dll
===================================================================
diff -u
Binary files differ
Index: build/SonarQube/System.Security.Cryptography.Primitives.dll
===================================================================
diff -u
Binary files differ
Index: build/SonarQube/System.Security.Cryptography.X509Certificates.dll
===================================================================
diff -u
Binary files differ
Index: build/SonarQube/System.ValueTuple.dll
===================================================================
diff -u -r90ec6a4d13baa05ce10a22c158f1cf976dfd3773 -r998e49dfa4ba978dce7b60ce55a981fa3034620d
Binary files differ
Index: build/SonarQube/Targets/SonarQube.Integration.ImportBefore.targets
===================================================================
diff -u -r90ec6a4d13baa05ce10a22c158f1cf976dfd3773 -r998e49dfa4ba978dce7b60ce55a981fa3034620d
--- build/SonarQube/Targets/SonarQube.Integration.ImportBefore.targets	(.../SonarQube.Integration.ImportBefore.targets)	(revision 90ec6a4d13baa05ce10a22c158f1cf976dfd3773)
+++ build/SonarQube/Targets/SonarQube.Integration.ImportBefore.targets	(.../SonarQube.Integration.ImportBefore.targets)	(revision 998e49dfa4ba978dce7b60ce55a981fa3034620d)
@@ -10,9 +10,7 @@
     <SonarQubeBuildDirectory Condition=" $(SonarQubeBuildDirectory) == '' ">$(AGENT_BUILDDIRECTORY)</SonarQubeBuildDirectory>
     <!-- Command line -->
     <SonarQubeBuildDirectory Condition=" $(SonarQubeBuildDirectory) == '' ">$(MSBuildStartupDirectory)</SonarQubeBuildDirectory>
-
     <SonarQubeTempPath Condition=" $(SonarQubeBuildDirectory) != '' AND Exists('$(SonarQubeBuildDirectory)\.sonarqube\conf\SonarQubeAnalysisConfig.xml') ">$(SonarQubeBuildDirectory)\.sonarqube</SonarQubeTempPath>
-
   </PropertyGroup>
 
   <!-- **************************************************************************** -->
@@ -31,36 +29,18 @@
   <Import Condition=" $(SonarQubeTargetsImported) != 'true' AND $(BuildingInsideVisualStudio) != 'true' AND Exists('$(SonarQubeTargetFilePath)') " Project="$(SonarQubeTargetFilePath)" />
 
   <!-- **************************************************************************** -->
-  <!-- Diagnostic/error-checking target
-
-        Causes the build to fail if the analysis properties are not correctly configured
-        i.e. if the user has requested a SonarQube analysis run, but the analysis targets
-        cannot be found.
-
-        Writes out diagnostic information to help with troubleshooting.  -->
+  <!-- Write out diagnostic information to help with troubleshooting.               -->
   <!-- **************************************************************************** -->
   <Target Name="SonarQubeImportBeforeInfo" Condition=" $(SonarQubeTempPath) != '' AND $(BuildingInsideVisualStudio) != 'true' " BeforeTargets="CoreCompile">
 
     <PropertyGroup>
       <AnalysisTargetsFileFound Condition=" Exists('$(SonarQubeTargetFilePath)') " >true</AnalysisTargetsFileFound>
-      <ReportAnalysisTargetsError Condition=" $(AnalysisTargetsFileFound) != 'true'">true</ReportAnalysisTargetsError>
     </PropertyGroup>
 
     <!-- Diagnostic messages for troubleshooting -->
-    <Message Importance="low" Text="SonarQube.Integration.ImportBefore.targets was loaded" />
-    <Message Importance="low" Text="SonarQube analysis targets file found: $(AnalysisTargetsFileFound)" />
-    <Message Importance="low" Text="SonarQube analysis targets imported: $(SonarQubeTargetsImported)" />
+    <Message Importance="normal" Text="Sonar: ($(MSBuildProjectName)) SonarQube.Integration.ImportBefore.targets was loaded" />
+    <Message Importance="low" Text="Sonar: ($(MSBuildProjectFile)) SonarQube analysis targets imported: $(SonarQubeTargetsImported)" />
+    <Message Condition=" $(AnalysisTargetsFileFound) != 'true'" Importance="high" Text="Sonar: ($(MSBuildProjectFile)) The analysis targets file not found: $(SonarQubeTargetFilePath)" />
 
-    <!-- Conditionally raise an error that will fail the build -->
-    <Message Condition=" $(ReportAnalysisTargetsError) == 'true'"
-      Importance="high"
-      Text="Calculated location for the analysis targets file: $(SonarQubeTargetFilePath)" />
-
-    <!-- We include name of the project being built in the error message as
-      it helps provide some context in TeamBuild scenarios when the error message
-      appears on the build summary page. -->
-    <Error Condition=" $(ReportAnalysisTargetsError) == 'true'"
-      Text="The build is configured to run SonarQube analysis but the SonarQube analysis targets could not be located. Project: $(MSBuildProjectFile)" />
-
   </Target>
 </Project>
Index: build/SonarQube/Targets/SonarQube.Integration.targets
===================================================================
diff -u -r90ec6a4d13baa05ce10a22c158f1cf976dfd3773 -r998e49dfa4ba978dce7b60ce55a981fa3034620d
--- build/SonarQube/Targets/SonarQube.Integration.targets	(.../SonarQube.Integration.targets)	(revision 90ec6a4d13baa05ce10a22c158f1cf976dfd3773)
+++ build/SonarQube/Targets/SonarQube.Integration.targets	(.../SonarQube.Integration.targets)	(revision 998e49dfa4ba978dce7b60ce55a981fa3034620d)
@@ -4,60 +4,47 @@
   <!--
     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:
+    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.
 
-    1) Projects whose full project file name matches the regular expression specified in
-        the analysis setting "sonar.msbuild.testProjectPattern" will be treated as test
-        projects. This setting is set via the SonarQube portal (set "Test project pattern"
-        in the per-project settings on the MSBuild tab for the C# plug-in).
+    Otherwise it is a Product project.
 
-        By default, any projects with "test" (case-insensitive) in the project name will
-        be treated as 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).
-
-    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")
-
     Supplying analysis setting in a project file
     ********************************************
     Project-level analysis settings can be specified in a project file using following
@@ -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
     **************************************************
 
@@ -87,6 +73,17 @@
 
     <SQAdditionalAnalysisFileItemTypes>MyCustomFileType1;MyCustomFileType</SQAdditionalAnalysisFileItemTypes>
 
+    Specific handling of Razor builds
+    **************************************************
+    During the compilation of an SDK-style MSBuild project with Razor, MSBuild executes 2 build targets:
+    CoreCompile to compile the main code and RazorCoreCompile to compile ".cshtml" view files.
+    Since it is not possible to execute one target more than once, there's a logic that prevents RazorCoreCompile
+    from overriding output files from CoreCompile step:
+      * CoreCompile produces output files in directory "X", where X represents project specific unique number.
+      * Directory "X" with CoreCompile results is renamed to "X.tmp" before RazorCoreCompile and new empty directory "X" is prepared.
+      * RazorCoreCompile produces its output to the current directory "X".
+      * Directory "X" with Razor output is renamed to "X.Razor".
+      * Directory "X.tmp" with original output is renamed back to "X".
 -->
 
   <!-- **************************************************************************** -->
@@ -109,7 +106,7 @@
     <SonarQubeOutputPath Condition=" $(SonarQubeOutputPath) == '' ">$(SonarQubeTempPath)\out</SonarQubeOutputPath>
 
     <!-- Specify the ItemGroups to be analyzed -->
-    <SQAnalysisFileItemTypes Condition=" $(SQAnalysisFileItemTypes) == '' ">AndroidEnvironment;AndroidJavaSource;AndroidResource;Build;ClCompile;ClInclude;Compile;Content;DeploymentExtensionConfiguration;EmbeddedResource;EntityDeploy;None;PostDeploy;PRIResource;PreDeploy;RefactorLog;Resource;Script;ScriptCode;TypeScriptCompile;$(SQAdditionalAnalysisFileItemTypes)</SQAnalysisFileItemTypes>
+    <SQAnalysisFileItemTypes Condition=" $(SQAnalysisFileItemTypes) == '' ">AndroidEnvironment;AndroidJavaSource;AndroidResource;ApplicationDefinition;Build;ClCompile;ClInclude;Compile;Content;DeploymentExtensionConfiguration;EmbeddedResource;EntityDeploy;None;Page;PostDeploy;PRIResource;PreDeploy;RefactorLog;Resource;Script;ScriptCode;TypeScriptCompile;$(SQAdditionalAnalysisFileItemTypes)</SQAnalysisFileItemTypes>
   </PropertyGroup>
 
   <!-- **************************************************************************** -->
@@ -123,10 +120,13 @@
 
   <!-- Unescape the paths to work around the issue "MSBuild 4.0 UsingTask cannot have a path with parentheses".
        See https://connect.microsoft.com/VisualStudio/feedback/details/713690/msbuild-4-0-usingtask-cannot-have-a-path-with-parentheses -->
+  <UsingTask TaskName="WriteProjectConfigFile" AssemblyFile="$([MSBUILD]::Unescape($(SonarQubeBuildTasksAssemblyFile)))" />
   <UsingTask TaskName="WriteProjectInfoFile" AssemblyFile="$([MSBUILD]::Unescape($(SonarQubeBuildTasksAssemblyFile)))" />
   <UsingTask TaskName="IsTestFileByName" AssemblyFile="$([MSBUILD]::Unescape($(SonarQubeBuildTasksAssemblyFile)))" />
+  <UsingTask TaskName="IsTestByReference" AssemblyFile="$([MSBUILD]::Unescape($(SonarQubeBuildTasksAssemblyFile)))" />
   <UsingTask TaskName="GetAnalyzerSettings" AssemblyFile="$([MSBUILD]::Unescape($(SonarQubeBuildTasksAssemblyFile)))" />
   <UsingTask TaskName="MakeUniqueDir" AssemblyFile="$([MSBUILD]::Unescape($(SonarQubeBuildTasksAssemblyFile)))" />
+  <UsingTask TaskName="WriteZeroLengthFiles" AssemblyFile="$([MSBUILD]::Unescape($(SonarQubeBuildTasksAssemblyFile)))" />
 
   <!-- **************************************************************************** -->
   <!-- **************************************************************************** -->
@@ -136,49 +136,62 @@
 
   <Target Name="SkippingSonarQubeAnalysis" BeforeTargets="Build"
           Condition=" $(SonarQubeTempPath) == '' ">
-    <Message Importance="high" Text="Skipping dumping compile outputs because SonarQubeTempPath has not been specified" />
+    <Message Importance="high" Text="Sonar: ($(MSBuildProjectFile)) Skipping dumping compile outputs because SonarQubeTempPath has not been specified" />
   </Target>
 
   <Target Name="FailIfLowerThanMSBuild14"
-          Condition=" $(SonarQubeTempPath) != '' AND $(MSBuildToolsVersion) != '14.0' AND $(MSBuildToolsVersion) != '15.0'"
+          Condition=" $(SonarQubeTempPath) != '' AND $(MSBuildToolsVersion) != '14.0' AND $(MSBuildToolsVersion) != '15.0' AND $(MSBuildToolsVersion) != 'Current'"
           BeforeTargets="Build">
-    <Error Text="SonarQube analysis is only supported with MSBuild 14 or MSBuild 15" />
+    <Message Importance="high" Text="Sonar: ($(MSBuildProjectFile)) Current MSBuildToolsVersion: $(MSBuildToolsVersion)" />
+    <Message Importance="high" Text="Sonar: ($(MSBuildProjectFile)) Current MSBuildAssemblyVersion: $(MSBuildAssemblyVersion)" />
+    <Error Text="SonarQube analysis is only supported with MSBuild 14 or later." />
   </Target>
 
+  <Target Name="SonarResolveReferencesMsBuild14"
+          AfterTargets="ResolveAssemblyReferences"
+          Condition=" $(SonarQubeTempPath) != '' AND $(MSBuildToolsVersion) == '14.0'">
+    <ItemGroup>
+      <SonarResolvedReferences Include="@(%(ReferencePath.FusionName))" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="SonarResolveReferences"
+          AfterTargets="FindReferenceAssembliesForReferences"
+          Condition=" $(SonarQubeTempPath) != '' AND $(MSBuildToolsVersion) != '14.0'">
+    <ItemGroup>
+      <SonarResolvedReferences Include="@(%(ReferencePathWithRefAssemblies.FusionName))" />
+    </ItemGroup>
+  </Target>
+
   <!-- **************************************************************************** -->
   <!-- Categorize as a product or test project -->
   <!-- **************************************************************************** -->
-  <!-- Work out if the project is a test or Fakes project. -->
-  <!-- Fakes projects are auto-generated. If a project is recognized as a Fakes
-       project then it will be marked as a test project and excluded.
-       For test projects, if it is explicitly marked then use that value, otherwise:
-          * check if the name matches the regular expression in the config file, or
-          * check if it has one of the expected project types guids.
-         If either is true then the project is a test project, 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.
-    -->
-  <Target Name="SonarQubeCategoriseProject"
+  <!-- This target is a utility target: it won't be executed unless a target that depends on it is executed. -->
+  <Target Name="SonarCategoriseProject"
+          DependsOnTargets="SonarResolveReferencesMsBuild14;SonarResolveReferences"
           Condition=" $(SonarQubeTempPath) != '' ">
 
+    <Message Text="Sonar: ($(MSBuildProjectFile)) Categorizing project as test or product code..." />
+    <Message Condition="$(SonarQubeTestProject) != ''" Importance="normal" Text="Sonar: ($(MSBuildProjectFile)) SonarQubeTestProject has been set explicitly to $(SonarQubeTestProject)." />
+
     <!-- Fakes detection -->
     <PropertyGroup>
       <IsFakesProject Condition="$(AssemblyName.EndsWith('.fakes', System.StringComparison.OrdinalIgnoreCase))">true</IsFakesProject>
     </PropertyGroup>
-    <PropertyGroup Condition="$(IsFakesProject) == 'true'">
-      <SonarQubeTestProject>true</SonarQubeTestProject>
+    <!-- Before deciding to exclude or tag as test such a project, make sure it is not a legitimate project that happens to be called something.fakes
+         In this case, we require from the user to explicitely state whether the project is to be analyzed/considered a test project -->
+    <PropertyGroup Condition="$(IsFakesProject) == 'true' and $(SonarQubeExclude) == ''">
       <SonarQubeExclude>true</SonarQubeExclude>
     </PropertyGroup>
+    <PropertyGroup Condition="$(IsFakesProject) == 'true' and $(SonarQubeTestProject) == ''">
+      <SonarQubeTestProject>true</SonarQubeTestProject>
+    </PropertyGroup>
+    <Message Condition="$(IsFakesProject) == 'true' and $(SonarQubeExclude) == 'true'" Importance="normal" Text="Sonar: ($(MSBuildProjectFile)) project is a temporary project generated by Microsoft Fakes and will be ignored." />
 
     <!-- Temporary project detection -->
-    <!-- Some kinds of project have logic to trigger additional special builds based on
-         the same project file e.g. WPF projects build a temporary assembly before
-         the main compilation takes place.
-         We only want to analyze the "normal" build of the project, so we should turn off analysis
-         for the known cases. -->
-
+    <!-- Some kinds of project have logic to trigger additional special builds based on the same project file
+         e.g. WPF projects build a temporary assembly before the main compilation takes place.
+         We only want to analyze the "normal" build of the project, so we should turn off analysis for the known cases. -->
     <PropertyGroup>
       <!-- Special case 1: WPF projects call the task Windows.GenerateTemporaryTargetAssembly in PresentationBuildTasks. -->
       <IsTempProject Condition="$(MSBuildProjectFile.EndsWith('.tmp_proj', System.StringComparison.OrdinalIgnoreCase))">true</IsTempProject>
@@ -189,20 +202,55 @@
     <PropertyGroup Condition="$(IsTempProject) == 'true' AND $(SonarQubeExclude)==''" >
       <SonarQubeExclude>true</SonarQubeExclude>
     </PropertyGroup>
+    <Message Condition="$(IsTempProject) == 'true' AND $(SonarQubeExclude)=='true'" Importance="normal" Text="Sonar: ($(MSBuildProjectFile)) project is a temporary project and will be excluded." />
 
     <PropertyGroup Condition=" $(SonarQubeTestProject) == '' ">
-      <!-- The MS Test project type guid-->
+      <!-- The MS Test project type guid -->
       <SonarQubeMsTestProjectTypeGuid>3AC096D0-A1C2-E12C-1390-A8335801FDAB</SonarQubeMsTestProjectTypeGuid>
-      <SonarQubeTestProject Condition=" $(ProjectTypeGuids.ToUpperInvariant().Contains('$(SonarQubeMsTestProjectTypeGuid)')) ">true</SonarQubeTestProject>
+      <tmpSonarHasMSTestProjectTypeGuid Condition=" $(ProjectTypeGuids.ToUpperInvariant().Contains('$(SonarQubeMsTestProjectTypeGuid)')) ">true</tmpSonarHasMSTestProjectTypeGuid>
+      <SonarQubeTestProject Condition=" $(tmpSonarHasMSTestProjectTypeGuid)=='true' ">true</SonarQubeTestProject>
     </PropertyGroup>
+    <Message Condition="$(tmpSonarHasMSTestProjectTypeGuid)=='true'" Importance="normal" Text="Sonar: ($(MSBuildProjectFile)) project has the MSTest project type guid -> test project." />
 
-    <!-- If we haven't already determined whether the project is a test project then check
-         its path/name against the regular expression in the config file -->
+    <PropertyGroup Condition=" $(SonarQubeTestProject) == '' ">
+      <!-- The legacy Service tag added by the Test Explorer window -->
+      <tmpSQServiceList>@(Service)</tmpSQServiceList>
+      <tmpSonarHasServiceTag Condition="$(tmpSQServiceList.ToUpperInvariant().Contains('{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}')) ">true</tmpSonarHasServiceTag>
+      <SonarQubeTestProject Condition="$(tmpSonarHasServiceTag)=='true'">true</SonarQubeTestProject>
+    </PropertyGroup>
+    <Message Condition="$(tmpSonarHasServiceTag)=='true'" Importance="normal" Text="Sonar: ($(MSBuildProjectFile)) project has the legacy Test Explorer Service tag {82A7F48D-3B50-4B1E-B82E-3ADA8210C358} -> test project." />
+
+    <PropertyGroup Condition=" $(SonarQubeTestProject) == '' ">
+      <!-- The ProjectCapability for test projects -->
+      <tmpSQProjectCapabilities>@(ProjectCapability)</tmpSQProjectCapabilities>
+      <tmpSonarHasTestContainerCapability Condition="$(tmpSQProjectCapabilities.ToUpperInvariant().Contains('TESTCONTAINER')) ">true</tmpSonarHasTestContainerCapability>
+      <SonarQubeTestProject Condition="$(tmpSonarHasTestContainerCapability)=='true'">true</SonarQubeTestProject>
+    </PropertyGroup>
+    <Message Condition="$(tmpSonarHasTestContainerCapability)=='true'" Importance="normal" Text="Sonar: ($(MSBuildProjectFile)) project has the ProjectCapability 'TestContainer' -> test project." />
+
+    <IsTestByReference Condition=" $(SonarQubeTestProject) == '' "
+        References="@(SonarResolvedReferences)">
+      <Output TaskParameter="TestReference" PropertyName="tmpSonarTestReferenceResult" />
+    </IsTestByReference>
+    <PropertyGroup Condition=" $(SonarQubeTestProject) == '' ">
+      <SonarQubeTestProject Condition="$(tmpSonarTestReferenceResult)!=''">true</SonarQubeTestProject>
+    </PropertyGroup>
+    <Message Condition="$(tmpSonarTestReferenceResult)!=''" Importance="normal" Text="Sonar: ($(MSBuildProjectFile)) project is evaluated as a test project based on the '$(tmpSonarTestReferenceResult)' reference." />
+
+    <!-- If we haven't already determined whether the project is a test project then check its path/name against the regular expression in the config file -->
     <IsTestFileByName Condition=" $(SonarQubeTestProject) == '' "
         AnalysisConfigDir="$(SonarQubeConfigPath)"
         FullFilePath="$(MSBuildProjectFullPath)">
-      <Output TaskParameter="IsTest" PropertyName="SonarQubeTestProject" />
+      <Output TaskParameter="IsTest" PropertyName="tmpSonarIsTestFileByNameResult" />
     </IsTestFileByName>
+
+    <PropertyGroup Condition=" $(SonarQubeTestProject) == '' ">
+      <SonarQubeTestProject>$(tmpSonarIsTestFileByNameResult)</SonarQubeTestProject>
+    </PropertyGroup>
+    <Message Condition="$(tmpSonarIsTestFileByNameResult)=='true'" Importance="normal" Text="Sonar: ($(MSBuildProjectFile)) project is evaluated as a test project based on the project name." />
+
+    <Message Importance="normal" Condition="$(SonarQubeTestProject)=='false'" Text="Sonar: ($(MSBuildProjectFile)) categorized as MAIN project (production code)." />
+    <Message Importance="normal" Condition="$(SonarQubeTestProject)=='true'"  Text="Sonar: ($(MSBuildProjectFile)) categorized as TEST project (test code)." />
   </Target>
 
   <!-- **************************************************************************** -->
@@ -211,7 +259,7 @@
   <!-- This target is a utility target: it won't be executed unless a target that
        depends on it is executed.
   -->
-  <Target Name="CalculateSonarQubeFilesToAnalyze"
+  <Target Name="SonarWriteFilesToAnalyze"
         Condition=" $(SonarQubeTempPath) != '' ">
 
     <!-- Include all of contents of the specified item groups, but exclude
@@ -239,9 +287,25 @@
       <!-- Set a property indicating whether there are any files to analyze -->
       <AnalysisFilesExist Condition=" @(SonarQubeAnalysisFiles) != '' ">true</AnalysisFilesExist>
     </PropertyGroup>
+
+    <!-- Write the list of files  -->
+    <PropertyGroup>
+      <!-- Set the file name for the list file -->
+      <AnalysisFileList>$(ProjectSpecificConfDir)\FilesToAnalyze.txt</AnalysisFileList>
+    </PropertyGroup>
+
+    <Message Condition="$(AnalysisFilesExist)!='true'" Importance="normal" Text="Sonar: ($(MSBuildProjectFile)) No files were found to analyse" />
+    <Message Condition="$(AnalysisFilesExist)=='true'" Importance="normal" Text="Sonar: ($(MSBuildProjectFile)) Number of files to analyse: @(SonarQubeAnalysisFiles->Count()). The list of files to be analyzed is in $(AnalysisFileList)." />
+
+    <!-- Write out a list of files to analyze that will be passed to the sonar-scanner -->
+    <WriteLinesToFile Condition=" $(AnalysisFilesExist) == 'true' "
+            File="$(AnalysisFileList)"
+            Lines="%(SonarQubeAnalysisFiles.FullPath)"
+            Overwrite="false"
+            Encoding="utf-8" />
   </Target>
 
-  <Target Name="CreateProjectSpecificDirs" BeforeTargets="OverrideRoslynCodeAnalysisProperties;WriteSonarQubeProjectData"  Condition=" $(SonarQubeTempPath) != '' ">
+  <Target Name="SonarCreateProjectSpecificDirs" BeforeTargets="OverrideRoslynCodeAnalysisProperties;SonarWriteProjectData;SonarWriteFilesToAnalyze"  Condition=" $(SonarQubeTempPath) != '' ">
     <!-- **************************************************************************** -->
     <!-- Create the project-specific directories for conf and out -->
 
@@ -257,40 +321,50 @@
     <MakeDir Directories="$(ProjectSpecificConfDir)" />
   </Target>
 
-  <!-- **************************************************************************** -->
-  <!-- Write the project info file for the current project.
-       Any targets which affect @(AnalysisResults) should be run before this target,
-       otherwise those results will not appear in the project info file.
-  -->
-  <!-- **************************************************************************** -->
-  <Target Name="WriteSonarQubeProjectData"
-          DependsOnTargets="SonarQubeCategoriseProject;CalculateSonarQubeFilesToAnalyze;CreateProjectSpecificDirs"
+  <!-- SonarWriteProjectData has to be invoked after the Build target, so it can pick up the results for C++ projects.  -->
+  <Target Name="InvokeSonarWriteProjectData_NonRazorProject"
+          DependsOnTargets="SonarCategoriseProject;SonarWriteFilesToAnalyze;SonarCreateProjectSpecificDirs"
           AfterTargets="Build"
-          Condition=" $(SonarQubeTempPath) != '' ">
+          Condition=" $(SonarQubeTempPath) != '' AND ('@(RazorCompile)'=='' OR ('@(RazorCompile)'!='' AND '$(UseRazorSourceGenerator)'=='true'))  ">
+    <CallTarget Targets="SonarWriteProjectData" />
+  </Target>
 
-    <!-- **************************************************************************** -->
-    <!-- Write of file lists -->
+  <Target Name="InvokeSonarWriteProjectData_RazorProject"
+          DependsOnTargets="SonarCategoriseProject;SonarWriteFilesToAnalyze;SonarCreateProjectSpecificDirs"
+          BeforeTargets="SonarPrepareRazorProjectCodeAnalysis"
+          AfterTargets="CoreCompile"
+          Condition=" $(SonarQubeTempPath) != '' AND '@(RazorCompile)'!='' AND ('$(UseRazorSourceGenerator)'=='' OR '$(UseRazorSourceGenerator)'=='false') ">
+    <CallTarget Targets="SonarWriteProjectData" />
+  </Target>
+
+  <Target Name="SonarWriteProjectData" >
     <PropertyGroup>
-      <!-- Set the file name for the list file -->
-      <AnalysisFileList>$(ProjectSpecificOutDir)\FilesToAnalyze.txt</AnalysisFileList>
+      <SonarErrorLogExists Condition=" $(SonarErrorLog) != '' AND  $([System.IO.File]::Exists($(SonarErrorLog))) == 'true' ">true</SonarErrorLogExists>
     </PropertyGroup>
 
-    <!-- Write out a list of files to analyze that will be passed to the sonar-scanner -->
-    <WriteLinesToFile Condition=" $(AnalysisFilesExist) == 'true' "
-            File="$(AnalysisFileList)"
-            Lines="%(SonarQubeAnalysisFiles.FullPath)"
-            Overwrite="false"
-            Encoding="Unicode" />
+    <ItemGroup>
+      <SonarReportFilePath Condition= "$(SonarErrorLogExists) == 'true'" Include="$(SonarErrorLog)" />
+    </ItemGroup>
 
+    <ItemGroup>
+      <SonarQubeSetting Include="sonar.$(SQLanguage).roslyn.reportFilePaths" Condition=" @(SonarReportFilePath) != '' ">
+        <!-- Join the paths with |  -->
+        <!-- This delimiter needs to be the same as PropertiesFileGenerator.RoslynReportPathsDelimiter -->
+        <Value>@(SonarReportFilePath->'%(identity)','|')</Value>
+      </SonarQubeSetting>
+      <SonarQubeSetting Include="sonar.$(SQLanguage).analyzer.projectOutPaths" Condition= "$(SonarErrorLogExists) == 'true'">
+        <Value>$(ProjectSpecificOutDir)</Value>
+      </SonarQubeSetting>
+    </ItemGroup>
+
     <!-- Record the list of files as an analysis result -->
     <ItemGroup Condition=" $(AnalysisFilesExist) == 'true' ">
       <AnalysisResults Include="$(AnalysisFileList)">
         <Id>FilesToAnalyze</Id>
       </AnalysisResults>
     </ItemGroup>
 
-    <Message Importance="low" Condition=" $(SonarQubeTestProject) == 'true' "
-             Text="SonarQube: project will be treated as a test project : $(MSBuildProjectName)" />
+    <CallTarget Targets="FixUpTestProjectOutputs" />
 
     <WriteProjectInfoFile ProjectName="$(MSBuildProjectName)"
        FullProjectPath="$(MSBuildProjectFullPath)"
@@ -306,8 +380,112 @@
        Configuration="$(Configuration)"
        Platform="$(Platform)"
        TargetFramework="$(TargetFramework)" />
+
+    <Message Importance="high" Text="Sonar: ($(MSBuildProjectFile)) Project processed successfully" />
   </Target>
 
+  <!--
+    Set the Razor specific error log properties.
+    Move the results of the core compilation to a temporary folder to prevent RazorCoreCompilation from overriding its content.
+    The contents will be moved back in SonarFinishRazorProjectCodeAnalysis target.
+  -->
+  <Target Name="SonarPrepareRazorProjectCodeAnalysis" BeforeTargets="RazorCoreCompile" AfterTargets="CoreCompile" Condition="'@(RazorCompile)'!='' AND ('$(UseRazorSourceGenerator)'=='' OR '$(UseRazorSourceGenerator)'=='false')" >
+    <PropertyGroup Condition=" $(SonarErrorLog) != '' ">
+      <!-- https://github.com/SonarSource/sonar-scanner-msbuild/issues/1015 Respect user-provided value. When set, users should provide unique path for each build (project and target framework). -->
+      <RazorSonarErrorLogName Condition=" $(RazorCompilationErrorLog) == '' ">Issues$(RazorTargetNameSuffix).json</RazorSonarErrorLogName>
+      <RazorCompilationErrorLog Condition=" $(RazorSonarErrorLogName) != '' ">$(ProjectSpecificOutDir)\$(RazorSonarErrorLogName)</RazorCompilationErrorLog>
+      <ErrorLog>$(RazorCompilationErrorLog)</ErrorLog>
+      <!-- Keep the path so that we could set SonarQubeSetting with sonar.language.roslyn.reportFilePaths -->
+      <RazorSonarErrorLog>$(RazorCompilationErrorLog)</RazorSonarErrorLog>
+    </PropertyGroup>
+    <PropertyGroup>
+      <SonarTemporaryProjectSpecificOutDir>$(ProjectSpecificOutDir).tmp</SonarTemporaryProjectSpecificOutDir>
+    </PropertyGroup>
+    <ItemGroup>
+      <CoreCompileOutFiles Include="$(ProjectSpecificOutDir)\**\*.*"/>
+    </ItemGroup>
+    <Move
+      SourceFiles="@(CoreCompileOutFiles)"
+      DestinationFolder="$(SonarTemporaryProjectSpecificOutDir)\%(RecursiveDir)" />
+    <Message Importance="high" Text="Sonar: Preparing for Razor compilation, moved files (@(CoreCompileOutFiles)) to $(SonarTemporaryProjectSpecificOutDir)." />
+  </Target>
+
+  <!-- In case of Razor compilation the output files generated during the core compilation step are already moved into a temporary folder.
+       This target renames output directories to their final state and creates the ProjectInfo.xml for them.
+  -->
+  <Target Name="SonarFinishRazorProjectCodeAnalysis" AfterTargets="RazorCoreCompile;InvokeSonarWriteProjectData_RazorProject" Condition=" $(SonarTemporaryProjectSpecificOutDir) != '' AND '@(RazorCompile)'!='' AND ('$(UseRazorSourceGenerator)'=='' OR '$(UseRazorSourceGenerator)'=='false') ">
+    <PropertyGroup>
+      <RazorSonarProjectSpecificOutDir>$(ProjectSpecificOutDir).Razor</RazorSonarProjectSpecificOutDir>
+      <RazorSonarProjectInfo>$(RazorSonarProjectSpecificOutDir)\ProjectInfo.xml</RazorSonarProjectInfo>
+    </PropertyGroup>
+    <ItemGroup>
+      <RazorCompilationOutFiles Include="$(ProjectSpecificOutDir)\**\*.*"/>
+      <SonarTempFiles Include="$(SonarTemporaryProjectSpecificOutDir)\**\*.*"/>
+    </ItemGroup>
+
+    <!-- Move main and Razor results to their final location. -->
+    <Move
+      SourceFiles="@(RazorCompilationOutFiles)"
+      DestinationFolder="$(RazorSonarProjectSpecificOutDir)\%(RecursiveDir)" />
+    <Message Importance="high" Text="Sonar: After Razor compilation, moved files (@(RazorCompilationOutFiles)) to $(RazorSonarProjectSpecificOutDir)." />
+
+    <Move
+      SourceFiles="@(SonarTempFiles)"
+      DestinationFolder="$(ProjectSpecificOutDir)\%(RecursiveDir)" />
+    <Message Importance="high" Text="Sonar: After Razor compilation, moved files (@(SonarTempFiles)) to $(ProjectSpecificOutDir) and will remove the temporary folder." />
+    <RemoveDir Directories="$(SonarTemporaryProjectSpecificOutDir)" />
+
+    <PropertyGroup>
+      <!-- This overwrites the previously set 'RazorSonarErrorLog' in 'SonarPrepareRazorProjectCodeAnalysis'
+           if 'RazorSonarErrorLogName' is set, which means 'RazorCompilationErrorLog' was null.
+           The condition is a bit difficult to follow, it would be easier to change it or also add "$(RazorSonarErrorLog) != ''" -->
+      <RazorSonarErrorLog Condition=" $(RazorSonarErrorLogName) != '' ">$(RazorSonarProjectSpecificOutDir)\$(RazorSonarErrorLogName)</RazorSonarErrorLog>
+      <RazorSonarErrorLogExists Condition=" $(RazorSonarErrorLog) != '' AND  $([System.IO.File]::Exists($(RazorSonarErrorLog))) == 'true' ">true</RazorSonarErrorLogExists>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <RazorSonarReportFilePath Condition= "$(RazorSonarErrorLogExists) == 'true'" Include="$(RazorSonarErrorLog)" />
+      <RazorSonarQubeSetting Include="sonar.$(SQLanguage).roslyn.reportFilePaths" Condition=" @(RazorSonarReportFilePath) != '' ">
+        <!-- Join the paths with |  -->
+        <!-- This delimiter needs to be the same as PropertiesFileGenerator.RoslynReportPathsDelimiter -->
+        <Value>@(RazorSonarReportFilePath->'%(identity)','|')</Value>
+      </RazorSonarQubeSetting>
+      <RazorSonarQubeSetting Include="sonar.$(SQLanguage).analyzer.projectOutPaths" Condition= "$(RazorSonarErrorLogExists) == 'true'">
+        <Value>$(RazorSonarProjectSpecificOutDir)</Value>
+      </RazorSonarQubeSetting>
+    </ItemGroup>
+
+    <!-- Create the ProjectInfo.xml for the Razor part. -->
+    <WriteProjectInfoFile ProjectName="$(MSBuildProjectName)"
+                          FullProjectPath="$(MSBuildProjectFullPath)"
+                          ProjectLanguage="$(Language)"
+                          ProjectGuid="$(ProjectGuid)"
+                          SolutionConfigurationContents="$(CurrentSolutionConfigurationContents)"
+                          IsTest="$(SonarQubeTestProject)"
+                          IsExcluded="$(SonarQubeExclude)"
+                          AnalysisResults="@(AnalysisResults)"
+                          AnalysisSettings="@(RazorSonarQubeSetting)"
+                          OutputFolder="$(RazorSonarProjectSpecificOutDir)"
+                          CodePage="$(CodePage)"
+                          Configuration="$(Configuration)"
+                          Platform="$(Platform)"
+                          TargetFramework="$(TargetFramework)" />
+  </Target>
+
+  <Target Name="FixUpTestProjectOutputs" Condition="$(SonarQubeTestProject)=='true'" >
+    <Message Importance="low" Text="Sonar: ($(MSBuildProjectFile)) Fixing up test project outputs..." />
+
+    <ItemGroup>
+      <!-- Select specific metrics files that should not be uploaded for test files.
+           Assumption: these files will be in a sub-folder under the project-specific output folder. -->
+      <SQTestMetricFiles Include="$(ProjectSpecificOutDir)\*\metrics.pb" />
+      <SQTestMetricFiles Include="$(ProjectSpecificOutDir)\*\token-cpd.pb" />
+    </ItemGroup>
+
+    <Message Importance="low" Text="Sonar: ($(MSBuildProjectFile)) Selected test metric file: @(SQTestMetricFiles)" />
+    <WriteZeroLengthFiles FullFilePaths="@(SQTestMetricFiles)" />
+  </Target>
+
   <!-- **************************************************************************** -->
   <!-- Code analysis -->
   <!-- **************************************************************************** -->
@@ -333,30 +511,38 @@
   <!-- **************************************************************************** -->
   <!-- Roslyn analysis section -->
   <!-- **************************************************************************** -->
+  <!-- Override VS2019 properties to make sure analysis runs in the scanner build.
+       We need to run before BeforeCompile that executes _ComputeSkipAnalyzers target.
+       We don't need to override this for excluded projects. -->
+  <Target Name="SonarOverrideRunAnalyzers"
+        Condition=" $(SonarQubeTempPath) != '' AND $(SonarQubeExclude) != 'true' "
+        BeforeTargets="BeforeCompile">
+
+    <PropertyGroup>
+      <RunAnalyzers>true</RunAnalyzers>
+      <RunAnalyzersDuringBuild>true</RunAnalyzersDuringBuild>
+    </PropertyGroup>
+  </Target>
+
   <!-- Set the properties required to run Roslyn analysis as part of the build.
-       Note: Roslyn analysis is run using the CSC task in MSBuild 14.0 onwards.
        Analysis is controlled by the following properties:
          ResolvedCodeAnalysisRuleSet - the full path to the ruleset to use
-         ErrorLog - the file path for the error reporting file
+         ErrorLog and RazorCompilationErrorLog - the file path for the error reporting file
 
-       We want to run after the core "ResolveCodeAnalysisRuleSet" target which
-       assigns a value to "ResolvedCodeAnalysisRuleSet".
+       We want to run after the core "ResolveCodeAnalysisRuleSet" target which assigns a value to "ResolvedCodeAnalysisRuleSet".
 
        Conditions:
-       * project is a test project -> turn off Roslyn analysis
        * project is excluded -> turn off Roslyn analysis
+       * project is a test project and parameter sonar.dotnet.excludeTestProjects=true -> run only metrics rules
        * otherwise, use the analyzer settings loaded from the config file (removing any existing analyzers)
    -->
   <Target Name="OverrideRoslynCodeAnalysisProperties"
         Condition=" $(SonarQubeTempPath) != '' "
-        DependsOnTargets="SonarQubeCategoriseProject"
+        DependsOnTargets="SonarCategoriseProject;SonarWriteFilesToAnalyze"
         AfterTargets="ResolveCodeAnalysisRuleSet"
         BeforeTargets="CoreCompile">
 
     <PropertyGroup>
-      <!-- Check whether to turn off code analysis logging -->
-      <SonarQubeDisableRoslynCodeAnalysis Condition="$(SonarQubeExclude) == 'true' OR $(SonarQubeTestProject) == 'true' ">true</SonarQubeDisableRoslynCodeAnalysis>
-
       <!-- Make sure no warnings are treated as errors -->
       <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
       <WarningsAsErrors></WarningsAsErrors>
@@ -366,13 +552,7 @@
       <WarningLevel>4</WarningLevel>
     </PropertyGroup>
 
-    <PropertyGroup Condition=" $(SonarQubeDisableRoslynCodeAnalysis) == 'true' ">
-      <ErrorLog></ErrorLog>
-      <!-- The ResolvedCodeAnalysisRuleSet property is not changed, which means the ruleset and the analyzers are not modified for test projects. -->
-    </PropertyGroup>
-    <!-- else -->
-    <CallTarget Targets="SetRoslynCodeAnalysisProperties"
-                Condition="$(SonarQubeDisableRoslynCodeAnalysis) != 'true'" />
+    <CallTarget Targets="SetRoslynCodeAnalysisProperties" Condition="$(SonarQubeExclude) != 'true'" />
   </Target>
 
   <Target Name="SetRoslynCodeAnalysisProperties">
@@ -384,31 +564,39 @@
                          OriginalAnalyzers="@(Analyzer)"
                          OriginalAdditionalFiles="@(AdditionalFiles)"
                          OriginalRulesetFilePath="$(ResolvedCodeAnalysisRuleset)"
-                         ProjectSpecificConfigDirectory="$(ProjectSpecificConfDir)">
+                         ProjectSpecificConfigDirectory="$(ProjectSpecificConfDir)"
+                         IsTestProject="$(SonarQubeTestProject)">
       <Output TaskParameter="RuleSetFilePath" PropertyName="SQRuleSetFilePath" />
       <Output TaskParameter="AnalyzerFilePaths" ItemName="SQAnalyzerFilePaths" />
       <Output TaskParameter="AdditionalFilePaths" ItemName="SQAdditionalFiles" />
     </GetAnalyzerSettings>
 
-    <PropertyGroup Condition=" $(ErrorLog) == '' ">
+    <PropertyGroup>
+      <!-- https://github.com/SonarSource/sonar-scanner-msbuild/issues/1015 Respect user-provided value. When set, users should provide unique path for each build (project and target framework). -->
+      <!-- https://jira.sonarsource.com/browse/SONARMSBRU-211 - the full path should be unique per project and target framework. -->
+      <ErrorLog Condition=" $(ErrorLog) == '' ">$(ProjectSpecificOutDir)\Issues.json</ErrorLog>
       <!-- Keep the path so that we could set SonarQubeSetting with sonar.language.roslyn.reportFilePaths -->
-      <!-- https://jira.sonarsource.com/browse/SONARMSBRU-211 - the name of the report should be unique
-      as the TargetDir can point to the same directory for multiple projects, leading to the report being overwritten.
-      This style of naming is consistent with how FxCop names its report.-->
-      <SonarCompileErrorLog>$(TargetDir)$(TargetFileName).RoslynCA.json</SonarCompileErrorLog>
-      <ErrorLog>$(SonarCompileErrorLog)</ErrorLog>
+      <SonarErrorLog>$(ErrorLog)</SonarErrorLog>
     </PropertyGroup>
 
     <PropertyGroup>
       <ResolvedCodeAnalysisRuleSet>$(SQRuleSetFilePath)</ResolvedCodeAnalysisRuleSet>
-      <ProjectConfFilePath>$(ProjectSpecificConfDir)\ProjectOutFolderPath.txt</ProjectConfFilePath>
+      <SonarProjectOutFolderFilePath>$(ProjectSpecificConfDir)\ProjectOutFolderPath.txt</SonarProjectOutFolderFilePath>
     </PropertyGroup>
 
-    <WriteLinesToFile File="$(ProjectConfFilePath)"
-                    Lines="$(ProjectSpecificOutDir)"
-                    Overwrite="true">
-    </WriteLinesToFile>
+    <!--SonarProjectOutFolderFilePath is generated only for backward compatibility with CSharp and VBNet analyzers before 8.20 -->
+    <WriteLinesToFile File="$(SonarProjectOutFolderFilePath)" Lines="$(ProjectSpecificOutDir)" Overwrite="true" />
 
+    <WriteProjectConfigFile ConfigDir="$(ProjectSpecificConfDir)"
+                            AnalysisConfigPath="$(SonarQubeConfigPath)\SonarQubeAnalysisConfig.xml"
+                            ProjectPath="$(MSBuildProjectFullPath)"
+                            FilesToAnalyzePath ="$(AnalysisFileList)"
+                            OutPath="$(ProjectSpecificOutDir)"
+                            IsTest="$(SonarQubeTestProject)"
+                            TargetFramework="$(TargetFramework)">
+      <Output TaskParameter="ProjectConfigFilePath" PropertyName="SonarProjectConfigFilePath" />
+    </WriteProjectConfigFile>
+
     <ItemGroup>
       <!-- Clear the original set of analyzers and additional files -->
       <Analyzer Remove="@(Analyzer)" />
@@ -417,42 +605,12 @@
       <!-- Use the set of analyzers and additional files calculated by the GetAnalyzerSettings task -->
       <Analyzer Include="@(SQAnalyzerFilePaths)" />
       <AdditionalFiles Include="@(SQAdditionalFiles)" />
-      <AdditionalFiles Include="$(ProjectConfFilePath)" />
+      <AdditionalFiles Include="$(SonarProjectConfigFilePath)" />
+      <AdditionalFiles Include="$(SonarProjectOutFolderFilePath)" />
     </ItemGroup>
 
+    <Message Importance="normal" Text="Sonar: ($(MSBuildProjectFile)) Analysis configured successfully with $(SonarProjectConfigFilePath)." />
   </Target>
-
-  <Target Name="SetRazorCodeAnalysisProperties" BeforeTargets="RazorCoreCompile" AfterTargets="CopyFilesToOutputDirectory">
-    <PropertyGroup Condition=" $(ErrorLog) == $(SonarCompileErrorLog) ">
-      <!-- Keep the path so that we could set SonarQubeSetting with sonar.language.roslyn.reportFilePaths -->
-      <RazorSonarCompileErrorLog>$(TargetDir)$(TargetName)$(RazorTargetNameSuffix)$(TargetExt).RoslynCA.json</RazorSonarCompileErrorLog>
-      <ErrorLog>$(RazorSonarCompileErrorLog)</ErrorLog>
-    </PropertyGroup>
-  </Target>
-
-  <Target Name="SetRoslynAnalysisResults"
-      Condition=" $(SonarQubeTempPath) != '' "
-      AfterTargets="Build;CreateProjectSpecificDirs"
-      BeforeTargets="WriteSonarQubeProjectData">
-
-    <ItemGroup>
-      <SonarReportFilePath Condition=" $(SonarCompileErrorLog) != '' AND  $([System.IO.File]::Exists($(SonarCompileErrorLog))) == 'true' " Include="$(SonarCompileErrorLog)" />
-      <SonarReportFilePath Condition=" $(RazorSonarCompileErrorLog) != '' AND  $([System.IO.File]::Exists($(RazorSonarCompileErrorLog))) == 'true' " Include="$(RazorSonarCompileErrorLog)" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <SonarQubeSetting Include="sonar.$(SQLanguage).roslyn.reportFilePath"
-         Condition=" @(SonarReportFilePath) != '' ">
-        <!-- Join the paths with |  -->
-        <!-- This delimiter needs to be the same as PropertiesFileGenerator.RoslynReportPathsDelimiter -->
-        <Value>@(SonarReportFilePath->'%(identity)','|')</Value>
-      </SonarQubeSetting>
-      <SonarQubeSetting Include="sonar.$(SQLanguage).analyzer.projectOutPath"
-         Condition=" $(SonarCompileErrorLog) != '' AND  $([System.IO.File]::Exists($(SonarCompileErrorLog))) == 'true' ">
-        <Value>$(ProjectSpecificOutDir)</Value>
-      </SonarQubeSetting>
-    </ItemGroup>
-  </Target>
   <!-- **************************************************************************** -->
   <!-- End of Roslyn analysis section-->
   <!-- **************************************************************************** -->
Index: build/SonarQube/hostfxr.dll
===================================================================
diff -u
Binary files differ
Index: build/SonarQube/hostpolicy.dll
===================================================================
diff -u
Binary files differ
Fisheye: Tag 998e49dfa4ba978dce7b60ce55a981fa3034620d refers to a dead (removed) revision in file `build/SonarQube/sonar-scanner-3.2.0.1227/bin/sonar-scanner'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 998e49dfa4ba978dce7b60ce55a981fa3034620d refers to a dead (removed) revision in file `build/SonarQube/sonar-scanner-3.2.0.1227/bin/sonar-scanner-debug'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 998e49dfa4ba978dce7b60ce55a981fa3034620d refers to a dead (removed) revision in file `build/SonarQube/sonar-scanner-3.2.0.1227/bin/sonar-scanner-debug.bat'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 998e49dfa4ba978dce7b60ce55a981fa3034620d refers to a dead (removed) revision in file `build/SonarQube/sonar-scanner-3.2.0.1227/bin/sonar-scanner.bat'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 998e49dfa4ba978dce7b60ce55a981fa3034620d refers to a dead (removed) revision in file `build/SonarQube/sonar-scanner-3.2.0.1227/conf/sonar-scanner.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: build/SonarQube/sonar-scanner-3.2.0.1227/lib/sonar-scanner-cli-3.2.0.1227.jar
===================================================================
diff -u -r90ec6a4d13baa05ce10a22c158f1cf976dfd3773 -r998e49dfa4ba978dce7b60ce55a981fa3034620d
Binary files differ
Index: build/SonarQube/sonar-scanner-4.6.2.2472/conf/sonar-scanner.properties
===================================================================
diff -u
--- build/SonarQube/sonar-scanner-4.6.2.2472/conf/sonar-scanner.properties	(revision 0)
+++ build/SonarQube/sonar-scanner-4.6.2.2472/conf/sonar-scanner.properties	(revision 998e49dfa4ba978dce7b60ce55a981fa3034620d)
@@ -0,0 +1,9 @@
+#Configure here general information about the environment, such as SonarQube server connection details for example
+#No information about specific project should appear here
+
+#----- Default SonarQube server
+#sonar.host.url=http://localhost:9000
+
+#----- Default source code encoding
+#sonar.sourceEncoding=UTF-8
+
Index: build/SonarQube/sonar-scanner-4.6.2.2472/lib/sonar-scanner-cli-4.6.2.2472.jar
===================================================================
diff -u
Binary files differ