From 179aca2fd8f4ef01bf5ad7ef4dc2eab7e3f91f52 Mon Sep 17 00:00:00 2001
From: Georgii Borovinskikh
 <117642191+georgii-borovinskikh-sonarsource@users.noreply.github.com>
Date: Thu, 14 Dec 2023 14:33:26 +0100
Subject: [PATCH] Embed SonarC# 9.15.0.81779 and SonarVB 9.15.0.81779 (#5111)

Fixes #5087
---
 nuget.config                                  |  2 +-
 src/EmbeddedSonarAnalyzer.props               |  2 +-
 .../packages.lock.json                        |  6 +++---
 ...egration.Vsix_Baseline_WithStrongNames.txt | 20 +++++++++----------
 ...ation.Vsix_Baseline_WithoutStrongNames.txt | 20 +++++++++----------
 src/Integration.Vsix/packages.lock.json       | 12 +++++------
 .../Roslyn.Suppressions.csproj                |  1 +
 .../SupportedSuppressionBuilder.g.cs          |  7 ++++++-
 .../Roslyn.Suppressions/packages.lock.json    | 12 +++++------
 9 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/nuget.config b/nuget.config
index 4d9cdf6e93..9c2b44797d 100644
--- a/nuget.config
+++ b/nuget.config
@@ -27,7 +27,7 @@
     <clear />
     <author name="SonarSource">
       <!-- Sonar analyzer certificate -->
-      <certificate fingerprint="FC4D3F3F815C1B56A656F1A5D9456AF04B469267D945786057175049B15A62A0" hashAlgorithm="SHA256" allowUntrustedRoot="false" />
+      <certificate fingerprint="A943C46DBA193D99C1135FFE33D3337524E9B3F05B416B9314E168CD206EF427" hashAlgorithm="SHA256" allowUntrustedRoot="false" />
 
       <!-- Sonar.Secrets certificate -->
       <certificate fingerprint="81D07CE4BD2663E46CA83E7AC657896EFCBE0300D83A182F1A83CC75526A0286" hashAlgorithm="SHA256" allowUntrustedRoot="false" />
diff --git a/src/EmbeddedSonarAnalyzer.props b/src/EmbeddedSonarAnalyzer.props
index f9008b4588..82fb569b4f 100644
--- a/src/EmbeddedSonarAnalyzer.props
+++ b/src/EmbeddedSonarAnalyzer.props
@@ -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>9.12.0.78982</EmbeddedSonarAnalyzerVersion>
+    <EmbeddedSonarAnalyzerVersion>9.15.0.81779</EmbeddedSonarAnalyzerVersion>
     <EmbeddedSonarCFamilyAnalyzerVersion>6.50.0.64514</EmbeddedSonarCFamilyAnalyzerVersion>
     <EmbeddedSonarJSAnalyzerVersion>10.8.0.24207</EmbeddedSonarJSAnalyzerVersion>
     <!-- Secrets
diff --git a/src/Integration.Vsix.UnitTests/packages.lock.json b/src/Integration.Vsix.UnitTests/packages.lock.json
index 2d7ccfd5d5..d7ec22b777 100644
--- a/src/Integration.Vsix.UnitTests/packages.lock.json
+++ b/src/Integration.Vsix.UnitTests/packages.lock.json
@@ -74,9 +74,9 @@
       },
       "SonarAnalyzer.CSharp": {
         "type": "Direct",
-        "requested": "[9.12.0.78982, )",
-        "resolved": "9.12.0.78982",
-        "contentHash": "QxhfMFCNeZWP3gP/R8QM3MuDWm+Esj8Lt3oD61tid5TPuqsaKJtwMZNZWE2FOqqGuKlu3805o8MlkTWBL75skA=="
+        "requested": "[9.15.0.81779, )",
+        "resolved": "9.15.0.81779",
+        "contentHash": "Aln//O6aJLSuxGBgOign89w/+O8uuIC+0saU+q5vDZYeqQ1FkhT9Ua/TvjisBN4Br91lQ0sSzRsHik4cbXi08A=="
       },
       "System.IO.Abstractions": {
         "type": "Direct",
diff --git a/src/Integration.Vsix/AsmRef_Integration.Vsix_Baseline_WithStrongNames.txt b/src/Integration.Vsix/AsmRef_Integration.Vsix_Baseline_WithStrongNames.txt
index d7968c8a74..69d1ec3760 100644
--- a/src/Integration.Vsix/AsmRef_Integration.Vsix_Baseline_WithStrongNames.txt
+++ b/src/Integration.Vsix/AsmRef_Integration.Vsix_Baseline_WithStrongNames.txt
@@ -1,7 +1,7 @@
 ---
 ################################
 # Assembly references report
-# Report date/time: 2023-11-15T15:55:04.7526428Z
+# Report date/time: 2023-12-14T12:35:04.0683401Z
 ################################
 #
 # Generated by Devtility CheckAsmRefs v0.11.0.223
@@ -27,7 +27,7 @@ Exclude patterns:
 # Number of matches: 21
 
 ---
-Assembly: 'SonarAnalyzer.CFG, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+Assembly: 'SonarAnalyzer.CFG, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
 Relative path: 'SonarAnalyzer.CFG.dll'
 
 Referenced assemblies:
@@ -38,7 +38,7 @@ Referenced assemblies:
 # Number of references: 4
 
 ---
-Assembly: 'SonarAnalyzer.CSharp, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+Assembly: 'SonarAnalyzer.CSharp, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
 Relative path: 'SonarAnalyzer.CSharp.dll'
 
 Referenced assemblies:
@@ -46,13 +46,13 @@ Referenced assemblies:
 - 'Microsoft.CodeAnalysis.CSharp, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
 - 'Microsoft.CodeAnalysis.Workspaces, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
 - 'netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'
-- 'SonarAnalyzer, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
-- 'SonarAnalyzer.CFG, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+- 'SonarAnalyzer, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+- 'SonarAnalyzer.CFG, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
 - 'System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
 # Number of references: 7
 
 ---
-Assembly: 'SonarAnalyzer, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+Assembly: 'SonarAnalyzer, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
 Relative path: 'SonarAnalyzer.dll'
 
 Referenced assemblies:
@@ -61,12 +61,12 @@ Referenced assemblies:
 - 'Microsoft.CodeAnalysis.CSharp, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
 - 'Microsoft.CodeAnalysis.Workspaces, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
 - 'netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'
-- 'SonarAnalyzer.CFG, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+- 'SonarAnalyzer.CFG, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
 - 'System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
 # Number of references: 7
 
 ---
-Assembly: 'SonarAnalyzer.VisualBasic, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+Assembly: 'SonarAnalyzer.VisualBasic, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
 Relative path: 'SonarAnalyzer.VisualBasic.dll'
 
 Referenced assemblies:
@@ -75,8 +75,8 @@ Referenced assemblies:
 - 'Microsoft.CodeAnalysis.VisualBasic, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
 - 'Microsoft.CodeAnalysis.Workspaces, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
 - 'netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'
-- 'SonarAnalyzer, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
-- 'SonarAnalyzer.CFG, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+- 'SonarAnalyzer, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+- 'SonarAnalyzer.CFG, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
 - 'System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
 # Number of references: 8
 
diff --git a/src/Integration.Vsix/AsmRef_Integration.Vsix_Baseline_WithoutStrongNames.txt b/src/Integration.Vsix/AsmRef_Integration.Vsix_Baseline_WithoutStrongNames.txt
index b60520e476..b249ae89cb 100644
--- a/src/Integration.Vsix/AsmRef_Integration.Vsix_Baseline_WithoutStrongNames.txt
+++ b/src/Integration.Vsix/AsmRef_Integration.Vsix_Baseline_WithoutStrongNames.txt
@@ -1,7 +1,7 @@
 ---
 ################################
 # Assembly references report
-# Report date/time: 2023-11-15T15:55:04.7526428Z
+# Report date/time: 2023-12-14T12:35:04.0683401Z
 ################################
 #
 # Generated by Devtility CheckAsmRefs v0.11.0.223
@@ -27,7 +27,7 @@ Exclude patterns:
 # Number of matches: 21
 
 ---
-Assembly: 'SonarAnalyzer.CFG, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+Assembly: 'SonarAnalyzer.CFG, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
 Relative path: 'SonarAnalyzer.CFG.dll'
 
 Referenced assemblies:
@@ -38,7 +38,7 @@ Referenced assemblies:
 # Number of references: 4
 
 ---
-Assembly: 'SonarAnalyzer.CSharp, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+Assembly: 'SonarAnalyzer.CSharp, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
 Relative path: 'SonarAnalyzer.CSharp.dll'
 
 Referenced assemblies:
@@ -46,13 +46,13 @@ Referenced assemblies:
 - 'Microsoft.CodeAnalysis.CSharp, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
 - 'Microsoft.CodeAnalysis.Workspaces, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
 - 'netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'
-- 'SonarAnalyzer, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
-- 'SonarAnalyzer.CFG, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+- 'SonarAnalyzer, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+- 'SonarAnalyzer.CFG, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
 - 'System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
 # Number of references: 7
 
 ---
-Assembly: 'SonarAnalyzer, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+Assembly: 'SonarAnalyzer, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
 Relative path: 'SonarAnalyzer.dll'
 
 Referenced assemblies:
@@ -61,12 +61,12 @@ Referenced assemblies:
 - 'Microsoft.CodeAnalysis.CSharp, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
 - 'Microsoft.CodeAnalysis.Workspaces, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
 - 'netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'
-- 'SonarAnalyzer.CFG, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+- 'SonarAnalyzer.CFG, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
 - 'System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
 # Number of references: 7
 
 ---
-Assembly: 'SonarAnalyzer.VisualBasic, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+Assembly: 'SonarAnalyzer.VisualBasic, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
 Relative path: 'SonarAnalyzer.VisualBasic.dll'
 
 Referenced assemblies:
@@ -75,8 +75,8 @@ Referenced assemblies:
 - 'Microsoft.CodeAnalysis.VisualBasic, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
 - 'Microsoft.CodeAnalysis.Workspaces, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35'
 - 'netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'
-- 'SonarAnalyzer, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
-- 'SonarAnalyzer.CFG, Version=9.12.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+- 'SonarAnalyzer, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
+- 'SonarAnalyzer.CFG, Version=9.15.0.0, Culture=neutral, PublicKeyToken=c5b62af9de6d7244'
 - 'System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a'
 # Number of references: 8
 
diff --git a/src/Integration.Vsix/packages.lock.json b/src/Integration.Vsix/packages.lock.json
index 5d2287293c..3bdcbcb7c8 100644
--- a/src/Integration.Vsix/packages.lock.json
+++ b/src/Integration.Vsix/packages.lock.json
@@ -120,15 +120,15 @@
       },
       "SonarAnalyzer.CSharp": {
         "type": "Direct",
-        "requested": "[9.12.0.78982, )",
-        "resolved": "9.12.0.78982",
-        "contentHash": "QxhfMFCNeZWP3gP/R8QM3MuDWm+Esj8Lt3oD61tid5TPuqsaKJtwMZNZWE2FOqqGuKlu3805o8MlkTWBL75skA=="
+        "requested": "[9.15.0.81779, )",
+        "resolved": "9.15.0.81779",
+        "contentHash": "Aln//O6aJLSuxGBgOign89w/+O8uuIC+0saU+q5vDZYeqQ1FkhT9Ua/TvjisBN4Br91lQ0sSzRsHik4cbXi08A=="
       },
       "SonarAnalyzer.VisualBasic": {
         "type": "Direct",
-        "requested": "[9.12.0.78982, )",
-        "resolved": "9.12.0.78982",
-        "contentHash": "v/hQebfJRv2pIPxxhg9eVAdIwI3U6NBoU8q56RDDyAY21Qz/1578+DRtchRjQHi0KjTzm/J4XllDn/0sxf2q9g=="
+        "requested": "[9.15.0.81779, )",
+        "resolved": "9.15.0.81779",
+        "contentHash": "GV+IufX4JdMt/xtIdr7x17jclFloaVM4LT18j7Tuwcr7W5IQuqY/at2pxmmSC/4nOzcS8w7BayLxcOqHvsz5AA=="
       },
       "System.IO.Abstractions": {
         "type": "Direct",
diff --git a/src/Roslyn.Suppressions/Roslyn.Suppressions/Roslyn.Suppressions.csproj b/src/Roslyn.Suppressions/Roslyn.Suppressions/Roslyn.Suppressions.csproj
index acf52b72b9..5261268bf8 100644
--- a/src/Roslyn.Suppressions/Roslyn.Suppressions/Roslyn.Suppressions.csproj
+++ b/src/Roslyn.Suppressions/Roslyn.Suppressions/Roslyn.Suppressions.csproj
@@ -33,6 +33,7 @@
     <Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
     <Compile Update="SupportedSuppressionBuilder.g.cs">
       <DesignTime>True</DesignTime>
+      <DependentUpon>SupportedSuppressionBuilder.tt</DependentUpon>
     </Compile>
   </ItemGroup>
   
diff --git a/src/Roslyn.Suppressions/Roslyn.Suppressions/SupportedSuppressionBuilder.g.cs b/src/Roslyn.Suppressions/Roslyn.Suppressions/SupportedSuppressionBuilder.g.cs
index 8bff9fb566..5bef5021a3 100644
--- a/src/Roslyn.Suppressions/Roslyn.Suppressions/SupportedSuppressionBuilder.g.cs
+++ b/src/Roslyn.Suppressions/Roslyn.Suppressions/SupportedSuppressionBuilder.g.cs
@@ -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): 464
+                // Number of unique diagnostic ids (C# and VB.NET): 469
                 CreateDescriptor("S100"),
                 CreateDescriptor("S1006"),
                 CreateDescriptor("S101"),
@@ -509,6 +509,11 @@ private static ImmutableArray<SuppressionDescriptor> GetDescriptors()
                 CreateDescriptor("S6617"),
                 CreateDescriptor("S6618"),
                 CreateDescriptor("S6640"),
+                CreateDescriptor("S6797"),
+                CreateDescriptor("S6798"),
+                CreateDescriptor("S6800"),
+                CreateDescriptor("S6802"),
+                CreateDescriptor("S6803"),
                 CreateDescriptor("S818"),
                 CreateDescriptor("S881"),
                 CreateDescriptor("S907"),
diff --git a/src/Roslyn.Suppressions/Roslyn.Suppressions/packages.lock.json b/src/Roslyn.Suppressions/Roslyn.Suppressions/packages.lock.json
index ac43b410ec..0064535acc 100644
--- a/src/Roslyn.Suppressions/Roslyn.Suppressions/packages.lock.json
+++ b/src/Roslyn.Suppressions/Roslyn.Suppressions/packages.lock.json
@@ -106,15 +106,15 @@
       },
       "SonarAnalyzer.CSharp": {
         "type": "Direct",
-        "requested": "[9.12.0.78982, )",
-        "resolved": "9.12.0.78982",
-        "contentHash": "QxhfMFCNeZWP3gP/R8QM3MuDWm+Esj8Lt3oD61tid5TPuqsaKJtwMZNZWE2FOqqGuKlu3805o8MlkTWBL75skA=="
+        "requested": "[9.15.0.81779, )",
+        "resolved": "9.15.0.81779",
+        "contentHash": "Aln//O6aJLSuxGBgOign89w/+O8uuIC+0saU+q5vDZYeqQ1FkhT9Ua/TvjisBN4Br91lQ0sSzRsHik4cbXi08A=="
       },
       "SonarAnalyzer.VisualBasic": {
         "type": "Direct",
-        "requested": "[9.12.0.78982, )",
-        "resolved": "9.12.0.78982",
-        "contentHash": "v/hQebfJRv2pIPxxhg9eVAdIwI3U6NBoU8q56RDDyAY21Qz/1578+DRtchRjQHi0KjTzm/J4XllDn/0sxf2q9g=="
+        "requested": "[9.15.0.81779, )",
+        "resolved": "9.15.0.81779",
+        "contentHash": "GV+IufX4JdMt/xtIdr7x17jclFloaVM4LT18j7Tuwcr7W5IQuqY/at2pxmmSC/4nOzcS8w7BayLxcOqHvsz5AA=="
       },
       "System.Composition.AttributedModel": {
         "type": "Direct",