MMF-4090 Feature/dotnet analyzer repackaging

.gitignore

@@ -54,6 +54,9 @@ UnitTestResults.html
 # Visual Studio temp directories
 .vs/
 
+# Rider temp directories
+.idea/
+
 # Visual C++ cache files
 ipch/
 *.aps
@@ -170,4 +173,5 @@ $RECYCLE.BIN/
 /**/launchSettings.json
 /src/Rules/Embedded
 /src/Integration.Vsix/DownloadedJars
-/src/Integration.Vsix/Sloop
+/src/Integration.Vsix/Sloop
+/src/Integration.Vsix/EmbeddedDotnetAnalyzerDLLs

THIRD-PARTY-NOTICES

@@ -11,6 +11,24 @@ https://github.com/SonarSource/sonarlint-visualstudio
 
 The attached notices are provided for information only.
 
+License notice for Sonar C# and VB .NET Enterprise Plugins
+----------------------------------------------------------
+
+Copyright (C) 2012-2024 SonarSource SA
+All rights reserved.
+mailto:info AT sonarsource DOT com
+
+This software includes the sonar-csharp-enterprise-plugin and sonar-vbnet-enterprise-plugin,
+a proprietary plugin owned by SonarSource SA. These plugins are embedded within this software
+and are only licensed for use as an integrated part of this application.
+
+Users of this software are granted a non-transferable, non-sublicensable, limited license
+to use the aforementioned plugins solely as part of this application. Any use, reproduction,
+distribution, or modification of the plugin outside the scope of this application is
+strictly prohibited.
+
+
+
 License notice for Visual Studio Image Library (used for the UI)
 ----------------------------------------------------------------
 

build/CopyDependencies/CopyDependencies.targets

@@ -4,11 +4,14 @@
   <Target Name="Build">
     <CallTarget Targets="ClearDirs" />
     <CallTarget Targets="CopyJars" />
+    <CallTarget Targets="CopyEnterpriseDotnet" />
     <CallTarget Targets="CopySloop" />
   </Target>
 
   <PropertyGroup>
     <VsixDir>..\..\src\Integration.Vsix</VsixDir>
+    <EnterpriseDotnetAnalyzersExtractDir>$(LOCALAPPDATA)\SLVS_Build_Dotnet\EnterpriseAnalyzerDlls-$(EmbeddedSonarAnalyzerVersion)</EnterpriseDotnetAnalyzersExtractDir>
+    <EmbeddedEnterpriseDotnetAnalyzersDir>$(VsixDir)\EmbeddedDotnetAnalyzerDLLs</EmbeddedEnterpriseDotnetAnalyzersDir>
     <JarDownloadDir>$(LOCALAPPDATA)\SLVS_Build_DownloadedJars</JarDownloadDir>
     <EmbeddedJarDir>$(VsixDir)\DownloadedJars</EmbeddedJarDir>
     <SloopDowloadDir>$(LOCALAPPDATA)\SLVS_Build_SLOOP\sonarlint-backend-cli-$(EmbeddedSloopVersion)-windows_x64</SloopDowloadDir>
@@ -19,18 +22,26 @@
   <Target Name="ClearDirs">
     <RemoveDir Directories="$(EmbeddedJarDir)" />
     <RemoveDir Directories="$(EmbeddedSloopDir)" />
+    <RemoveDir Directories="$(EmbeddedEnterpriseDotnetAnalyzersDir)" />
   </Target>
 
   <Target Name="CopyJars">
     <ItemGroup>
       <SourceJars Include="$(JarDownloadDir)\sonar-cfamily-plugin-$(EmbeddedSonarCFamilyAnalyzerVersion).jar" />
-      <SourceJars Include="$(JarDownloadDir)\sonar-csharp-plugin-$(EmbeddedSonarAnalyzerVersion).jar" />
-      <SourceJars Include="$(JarDownloadDir)\sonar-vbnet-plugin-$(EmbeddedSonarAnalyzerVersion).jar" />
+      <SourceJars Include="$(JarDownloadDir)\sonar-csharp-enterprise-plugin-$(EmbeddedSonarAnalyzerVersion).jar" />
+      <SourceJars Include="$(JarDownloadDir)\sonar-vbnet-enterprise-plugin-$(EmbeddedSonarAnalyzerVersion).jar" />
       <SourceJars Include="$(JarDownloadDir)\sonar-javascript-plugin-$(EmbeddedSonarJSAnalyzerVersion).jar" />
       <SourceJars Include="$(JarDownloadDir)\sonar-text-plugin-$(EmbeddedSonarSecretsJarVersion).jar" />
     </ItemGroup>
     <Copy SourceFiles ="@(SourceJars)" DestinationFolder="$(EmbeddedJarDir)" />
   </Target>
+
+  <Target Name="CopyEnterpriseDotnet">
+    <ItemGroup>
+      <EnterpriseDotnetSource Include="$(EnterpriseDotnetAnalyzersExtractDir)\*.dll" />
+    </ItemGroup>
+    <Copy SourceFiles="@(EnterpriseDotnetSource)" DestinationFolder="$(EmbeddedEnterpriseDotnetAnalyzersDir)"/>
+  </Target>
 
   <Target Name="CopySloop">
     <ItemGroup>

build/DownloadDependencies/CommonProperties.props

@@ -39,20 +39,6 @@
       <LanguageKey>c</LanguageKey>
       <RepoKey>c</RepoKey>
     </PluginJars>
-
-    <PluginJars Include="C#">
-      <JarName>sonar-csharp-plugin-$(EmbeddedSonarAnalyzerVersion).jar</JarName>
-      <URL>https://binaries.sonarsource.com/Distribution/sonar-csharp-plugin/%(JarName)</URL>
-      <LanguageKey>cs</LanguageKey>
-      <RepoKey>csharpsquid</RepoKey>
-    </PluginJars>
-
-    <PluginJars Include="VB.NET">
-      <JarName>sonar-vbnet-plugin-$(EmbeddedSonarAnalyzerVersion).jar</JarName>
-      <URL>https://binaries.sonarsource.com/Distribution/sonar-vbnet-plugin/%(JarName)</URL>
-      <LanguageKey>vbnet</LanguageKey>
-      <RepoKey>vbnet</RepoKey>
-    </PluginJars>
   </ItemGroup>
 
   <PropertyGroup>
@@ -66,4 +52,23 @@
     <SonarTextPluginDownloadPath>$(JarDownloadDir)\$(SonarTextPluginFileName)</SonarTextPluginDownloadPath>
     <SonarTextPluginRemoteUrl>https://repox.jfrog.io/artifactory/sonarsource/org/sonarsource/text/sonar-text-plugin/$(EmbeddedSonarSecretsJarVersion)/$(SonarTextPluginFileName)</SonarTextPluginRemoteUrl>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <DotnetPluginsExtractDir>$(LOCALAPPDATA)\SLVS_Build_Dotnet</DotnetPluginsExtractDir>
+    <EnterpriseDotnetAnalyzersExtractDir>$(LOCALAPPDATA)\SLVS_Build_Dotnet\EnterpriseAnalyzerDlls-$(EmbeddedSonarAnalyzerVersion)</EnterpriseDotnetAnalyzersExtractDir>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <EnterpriseSonarVBNetPluginFileNameWithoutExtension>sonar-vbnet-enterprise-plugin-$(EmbeddedSonarAnalyzerVersion)</EnterpriseSonarVBNetPluginFileNameWithoutExtension>
+    <EnterpriseSonarVBNetPluginFileName>$(EnterpriseSonarVBNetPluginFileNameWithoutExtension).jar</EnterpriseSonarVBNetPluginFileName>
+    <EnterpriseSonarVBNetPluginDownloadPath>$(JarDownloadDir)\$(EnterpriseSonarVBNetPluginFileName)</EnterpriseSonarVBNetPluginDownloadPath>
+    <EnterpriseSonarVBNetPluginRemoteUrl>https://repox.jfrog.io/artifactory/sonarsource/com/sonarsource/dotnet/sonar-vbnet-enterprise-plugin/$(EmbeddedSonarAnalyzerVersion)/$(EnterpriseSonarVBNetPluginFileName)</EnterpriseSonarVBNetPluginRemoteUrl>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <EnterpriseSonarCSharpPluginFileNameWithoutExtension>sonar-csharp-enterprise-plugin-$(EmbeddedSonarAnalyzerVersion)</EnterpriseSonarCSharpPluginFileNameWithoutExtension>
+    <EnterpriseSonarCSharpPluginFileName>$(EnterpriseSonarCSharpPluginFileNameWithoutExtension).jar</EnterpriseSonarCSharpPluginFileName>
+    <EnterpriseSonarCSharpPluginDownloadPath>$(JarDownloadDir)\$(EnterpriseSonarCSharpPluginFileName)</EnterpriseSonarCSharpPluginDownloadPath>
+    <EnterpriseSonarCSharpPluginRemoteUrl>https://repox.jfrog.io/artifactory/sonarsource/com/sonarsource/dotnet/sonar-csharp-enterprise-plugin/$(EmbeddedSonarAnalyzerVersion)/$(EnterpriseSonarCSharpPluginFileName)</EnterpriseSonarCSharpPluginRemoteUrl>
+  </PropertyGroup>
 </Project>

build/DownloadDependencies/JarProcessing.targets

@@ -27,6 +27,8 @@
     <CallTarget Targets="PrepareDirectories" />
     <CallTarget Targets="DownloadIndividualJars" />
     <CallTarget Targets="DownloadRepoxJars" />
+    <CallTarget Targets="UnzipEnterpriseSonarCSharp" />
+    <CallTarget Targets="UnzipEnterpriseSonarVBNet" />
     <CallTarget Targets="DownloadSloop" />
     <CallTarget Targets="UnzipSloop" />
     <CallTarget Targets="WriteOutputFile" />
@@ -48,6 +50,8 @@
   <Target Name="DownloadRepoxJars">
     <Exec Command="curl -u$(ARTIFACTORY_USER):$(ARTIFACTORY_PASSWORD) --ssl-no-revoke -C - --create-dirs --output $(JavaScriptPluginDownloadPath) --url $(JavascriptPluginRemoteUrl)" />
     <Exec Command="curl -u$(ARTIFACTORY_USER):$(ARTIFACTORY_PASSWORD) --ssl-no-revoke -C - --create-dirs --output $(SonarTextPluginDownloadPath) --url $(SonarTextPluginRemoteUrl)" />
+    <Exec Command="curl -u$(ARTIFACTORY_USER):$(ARTIFACTORY_PASSWORD) --ssl-no-revoke -C - --create-dirs --output $(EnterpriseSonarCSharpPluginDownloadPath) --url $(EnterpriseSonarCSharpPluginRemoteUrl)" />
+    <Exec Command="curl -u$(ARTIFACTORY_USER):$(ARTIFACTORY_PASSWORD) --ssl-no-revoke -C - --create-dirs --output $(EnterpriseSonarVBNetPluginDownloadPath) --url $(EnterpriseSonarVBNetPluginRemoteUrl)" />
   </Target>
 
   <Target Name ="DownloadSloop">
@@ -58,6 +62,16 @@
     <Unzip SourceFiles="$(SloopBinaryDownloadPath)" DestinationFolder="$(SloopExtractDir)" OverwriteReadOnlyFiles="true" />
   </Target>
 
+  <Target Name="UnzipEnterpriseSonarCSharp">
+    <Unzip SourceFiles="$(EnterpriseSonarCSharpPluginDownloadPath)" DestinationFolder="$(DotnetPluginsExtractDir)\$(EnterpriseSonarCSharpPluginFileNameWithoutExtension)" OverwriteReadOnlyFiles="true" />
+    <Unzip SourceFiles="$(DotnetPluginsExtractDir)\$(EnterpriseSonarCSharpPluginFileNameWithoutExtension)\static\SonarAnalyzer-$(EmbeddedSonarAnalyzerVersion).zip" DestinationFolder="$(EnterpriseDotnetAnalyzersExtractDir)" OverwriteReadOnlyFiles="true" />
+  </Target>
+
+  <Target Name="UnzipEnterpriseSonarVBNet">
+    <Unzip SourceFiles="$(EnterpriseSonarVBNetPluginDownloadPath)" DestinationFolder="$(DotnetPluginsExtractDir)\$(EnterpriseSonarVBNetPluginFileNameWithoutExtension)" OverwriteReadOnlyFiles="true" />
+    <Unzip SourceFiles="$(DotnetPluginsExtractDir)\$(EnterpriseSonarVBNetPluginFileNameWithoutExtension)\static\SonarAnalyzer-$(EmbeddedSonarAnalyzerVersion).zip" DestinationFolder="$(EnterpriseDotnetAnalyzersExtractDir)" OverwriteReadOnlyFiles="true" />
+  </Target>
+
   <Target Name="WriteOutputFile">
     <!-- The timestamp on the output file is used by MSBuild to decide whether to build this project or not.
          If the timestamp on the EmbeddedSonarAnalyzer.props file is later than that of the output file then