Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SLVS-1720 Upgrade sonar-dotnet & sonar-dotnet-enterprise to 10.4.0.108396 #5932

Merged
merged 1 commit into from
Jan 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/DownloadDependencies/JarProcessing.targets
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@

<Target Name="UnzipEnterpriseSonarCSharp">
<Unzip SourceFiles="$(EnterpriseSonarCSharpPluginDownloadPath)" DestinationFolder="$(DotnetPluginsExtractDir)\$(EnterpriseSonarCSharpPluginFileNameWithoutExtension)" OverwriteReadOnlyFiles="true" />
<Unzip SourceFiles="$(DotnetPluginsExtractDir)\$(EnterpriseSonarCSharpPluginFileNameWithoutExtension)\static\SonarAnalyzer-$(EmbeddedSonarAnalyzerVersion).zip" DestinationFolder="$(EnterpriseDotnetAnalyzersExtractDir)" OverwriteReadOnlyFiles="true" />
<Unzip SourceFiles="$(DotnetPluginsExtractDir)\$(EnterpriseSonarCSharpPluginFileNameWithoutExtension)\static\SonarAnalyzer-csharpenterprise-$(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" />
<Unzip SourceFiles="$(DotnetPluginsExtractDir)\$(EnterpriseSonarVBNetPluginFileNameWithoutExtension)\static\SonarAnalyzer-vbnetenterprise-$(EmbeddedSonarAnalyzerVersion).zip" DestinationFolder="$(EnterpriseDotnetAnalyzersExtractDir)" OverwriteReadOnlyFiles="true" />
</Target>

<Target Name="WriteOutputFile">
Expand Down
2 changes: 1 addition & 1 deletion src/EmbeddedSonarAnalyzer.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
NB we assume that the SonarC# and SonarVB NuGet packages have the same version number. -->
<PropertyGroup>
<!-- Note: Guide on how to update the analyzers is on the xtranet! -->
<EmbeddedSonarAnalyzerVersion>10.3.0.106239</EmbeddedSonarAnalyzerVersion>
<EmbeddedSonarAnalyzerVersion>10.4.0.108396</EmbeddedSonarAnalyzerVersion>
<EmbeddedSonarCFamilyAnalyzerVersion>6.61.0.77816</EmbeddedSonarCFamilyAnalyzerVersion>
<EmbeddedSonarJSAnalyzerVersion>10.19.0.29100</EmbeddedSonarJSAnalyzerVersion>
<EmbeddedSonarSecretsJarVersion>2.20.0.5038</EmbeddedSonarSecretsJarVersion>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ private static ImmutableArray<SuppressionDescriptor> GetDescriptors()
// If the number of diagnostic ids changes significantly or decreases when the analysers are updated,
// investigate! There may be a problem with code generator.
// *************************************************************************************************
// Number of unique diagnostic ids (C# and VB.NET): 500
// Number of unique diagnostic ids (C# and VB.NET): 504
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These rules were added in 10.2, so I guess we forgot to re-generate the file back then

https://github.com/SonarSource/sonar-dotnet-enterprise/releases/tag/10.2.0.105762

CreateDescriptor("S100"),
CreateDescriptor("S1006"),
CreateDescriptor("S101"),
Expand Down Expand Up @@ -486,6 +486,7 @@ private static ImmutableArray<SuppressionDescriptor> GetDescriptors()
CreateDescriptor("S6146"),
CreateDescriptor("S6354"),
CreateDescriptor("S6377"),
CreateDescriptor("S6418"),
CreateDescriptor("S6419"),
CreateDescriptor("S6420"),
CreateDescriptor("S6421"),
Expand Down Expand Up @@ -545,6 +546,9 @@ private static ImmutableArray<SuppressionDescriptor> GetDescriptors()
CreateDescriptor("S6967"),
CreateDescriptor("S6968"),
CreateDescriptor("S7039"),
CreateDescriptor("S7130"),
CreateDescriptor("S7131"),
CreateDescriptor("S7133"),
CreateDescriptor("S818"),
CreateDescriptor("S881"),
CreateDescriptor("S907"),
Expand Down
Loading