diff --git a/build/CopyDependencies/CopyDependencies.targets b/build/CopyDependencies/CopyDependencies.targets index 9c8a85e894..84a48e35e6 100644 --- a/build/CopyDependencies/CopyDependencies.targets +++ b/build/CopyDependencies/CopyDependencies.targets @@ -31,6 +31,7 @@ + diff --git a/build/DownloadDependencies/CommonProperties.props b/build/DownloadDependencies/CommonProperties.props index ae3e477110..5df4ba7004 100644 --- a/build/DownloadDependencies/CommonProperties.props +++ b/build/DownloadDependencies/CommonProperties.props @@ -47,6 +47,12 @@ https://repox.jfrog.io/artifactory/sonarsource/org/sonarsource/javascript/sonar-javascript-plugin/$(EmbeddedSonarJSAnalyzerVersion)/$(JavascriptPluginFileName) + + sonar-html-plugin-$(EmbeddedSonarHtmlAnalyzerVersion).jar + $(JarDownloadDir)\$(HtmlPluginFileName) + https://repox.jfrog.io/artifactory/sonarsource/org/sonarsource/html/sonar-html-plugin/$(EmbeddedSonarHtmlAnalyzerVersion)/$(HtmlPluginFileName) + + sonar-text-plugin-$(EmbeddedSonarSecretsJarVersion).jar $(JarDownloadDir)\$(SonarTextPluginFileName) diff --git a/build/DownloadDependencies/JarProcessing.targets b/build/DownloadDependencies/JarProcessing.targets index ccf822447c..bb8d33322b 100644 --- a/build/DownloadDependencies/JarProcessing.targets +++ b/build/DownloadDependencies/JarProcessing.targets @@ -49,6 +49,7 @@ + diff --git a/src/EmbeddedSonarAnalyzer.props b/src/EmbeddedSonarAnalyzer.props index eb8943b35b..61cb8de39c 100644 --- a/src/EmbeddedSonarAnalyzer.props +++ b/src/EmbeddedSonarAnalyzer.props @@ -7,6 +7,7 @@ 10.4.0.108396 6.62.0.78645 10.20.0.29356 + 3.18.0.5605 2.20.0.5038 10.13.0.79996 diff --git a/src/Integration/SLCore/SLCoreConstantsProvider.cs b/src/Integration/SLCore/SLCoreConstantsProvider.cs index b5f055f843..d23f1217a7 100644 --- a/src/Integration/SLCore/SLCoreConstantsProvider.cs +++ b/src/Integration/SLCore/SLCoreConstantsProvider.cs @@ -53,6 +53,7 @@ public SLCoreConstantsProvider(IVsInfoProvider vsInfoProvider) [ Language.JS, Language.TS, + Language.HTML, Language.CSS, Language.C, Language.CPP, @@ -65,6 +66,7 @@ public SLCoreConstantsProvider(IVsInfoProvider vsInfoProvider) [ Language.JS, Language.TS, + Language.HTML, Language.CSS, Language.C, Language.CPP, diff --git a/src/SLCore.IntegrationTests/DependencyLocator.cs b/src/SLCore.IntegrationTests/DependencyLocator.cs index b169bacdca..aa2b6a432a 100644 --- a/src/SLCore.IntegrationTests/DependencyLocator.cs +++ b/src/SLCore.IntegrationTests/DependencyLocator.cs @@ -47,6 +47,7 @@ private static void EnsurePluginsAreAvailable(string localAppData, XmlDocument d var roslynAnalyzerVersion = GetDependencyVersion("EmbeddedSonarAnalyzerVersion", dependencyProps); var cfamilyAnalyzerVersion = GetDependencyVersion("EmbeddedSonarCFamilyAnalyzerVersion", dependencyProps); var jstsAnalyzerVersion = GetDependencyVersion("EmbeddedSonarJSAnalyzerVersion", dependencyProps); + var htmlAnalyzerVersion = GetDependencyVersion("EmbeddedSonarHtmlAnalyzerVersion", dependencyProps); var secrestsAnalyzerVersion = GetDependencyVersion("EmbeddedSonarSecretsJarVersion", dependencyProps); AnalyzerPlugins = new List { @@ -54,6 +55,7 @@ private static void EnsurePluginsAreAvailable(string localAppData, XmlDocument d GetAnalyzerPath("sonar-vbnet-enterprise-plugin", roslynAnalyzerVersion, availablePluginJars), GetAnalyzerPath("sonar-cfamily-plugin", cfamilyAnalyzerVersion, availablePluginJars), GetAnalyzerPath("sonar-javascript-plugin", jstsAnalyzerVersion, availablePluginJars), + GetAnalyzerPath("sonar-html-plugin", htmlAnalyzerVersion, availablePluginJars), GetAnalyzerPath("sonar-text-plugin", secrestsAnalyzerVersion, availablePluginJars), }; }