Merge pull request #765 from aws/update-codelyzer-ver

chore: update codelyzer version
aws · Jul 16, 2022 · 9573e8e · 9573e8e
2 parents 4008025 + c87c806
commit 9573e8e
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 54 deletions.
diff --git a/src/CTA.FeatureDetection.Common/packages.lock.json b/src/CTA.FeatureDetection.Common/packages.lock.json
@@ -54,12 +54,12 @@
       },
       "Codelyzer.Analysis": {
         "type": "Transitive",
-        "resolved": "2.4.72-alpha-g154f8975ce",
-        "contentHash": "5t+uGKQVjm85toghCUBsM69wUfTVBxhYT+eCuZLceMiK4TbJ7MJwfCEfai3Qj41mnJ8g4yPIsMyGkCAARF/F0g==",
+        "resolved": "2.4.94",
+        "contentHash": "etSQMGoTxqlVmjsOXWzJSyd4xtujg1nfD3SEtCU5xTwVltJZvfl7o8s8arXVlF+trFujsn+PU/+j3VlY3f/iow==",
         "dependencies": {
-          "Codelyzer.Analysis.Build": "2.4.72-alpha-g154f8975ce",
-          "Codelyzer.Analysis.CSharp": "2.4.72-alpha-g154f8975ce",
-          "Codelyzer.Analysis.VisualBasic": "2.4.72-alpha-g154f8975ce",
+          "Codelyzer.Analysis.Build": "2.4.94",
+          "Codelyzer.Analysis.CSharp": "2.4.94",
+          "Codelyzer.Analysis.VisualBasic": "2.4.94",
           "CommandLineParser": "2.8.0",
           "Microsoft.Build.Utilities.Core": "17.1.0",
           "Microsoft.Extensions.Logging.Console": "6.0.0",
@@ -69,41 +69,41 @@
       },
       "Codelyzer.Analysis.Build": {
         "type": "Transitive",
-        "resolved": "2.4.72-alpha-g154f8975ce",
-        "contentHash": "Ymx4lk0aILNUnjK/Ln7DvY84fV8rkeHbRjvXqmkMZvYgB35WtRSMw2qKMbmXUxeNP+evogviHgt6Cmcafn2n6Q==",
+        "resolved": "2.4.94",
+        "contentHash": "xNgGED9XCVX3Hwmij/FxaN7hvgzzulKtDu7uODWc4HwrJ3fl1dmku96fbl0x3zI0bY98G/j0r6Rb5etAOHtN0Q==",
         "dependencies": {
           "Buildalyzer": "4.1.4",
           "Buildalyzer.Logger": "4.1.4",
           "Buildalyzer.Workspaces": "4.1.4",
-          "Codelyzer.Analysis.Common": "2.4.72-alpha-g154f8975ce",
+          "Codelyzer.Analysis.Common": "2.4.94",
           "Microsoft.Extensions.Logging": "6.0.0",
           "NuGet.Packaging": "6.0.0"
         }
       },
       "Codelyzer.Analysis.Common": {
         "type": "Transitive",
-        "resolved": "2.4.72-alpha-g154f8975ce",
-        "contentHash": "PNRf7eXbink/4MpEzUorwPZqiw0oh/Ac3hML5Q3+peCsWq8SWxy0Xj8eHfoxlQjaJ9tqkhWz1wzTx15wfmMUPw==",
+        "resolved": "2.4.94",
+        "contentHash": "L/jfOakcoetxVqmHmZNMiRcvixd7q6rfYWdgI7z2aSE2BSlGl23vsBx0MNJdYdBYZ6d61ZQ9SxwS2PFE4T+e8w==",
         "dependencies": {
-          "Codelyzer.Analysis.Model": "2.4.72-alpha-g154f8975ce",
+          "Codelyzer.Analysis.Model": "2.4.94",
           "Microsoft.Build": "17.0.0",
           "Microsoft.VisualStudio.Setup.Configuration.Interop": "3.1.2196",
           "Newtonsoft.Json": "13.0.1"
         }
       },
       "Codelyzer.Analysis.CSharp": {
         "type": "Transitive",
-        "resolved": "2.4.72-alpha-g154f8975ce",
-        "contentHash": "EknM1pQWlGb0dCZaPTdl4dJ35OV9Np2CgZ98iXPWKSSGjk+0TdJSPikQ6skbJ2iiqogyOpuycfJ5CXv64gx0VA==",
+        "resolved": "2.4.94",
+        "contentHash": "cb/SRIiHIVqo7YOnQxI3ATctpWiKRavIuXimOBcv1vjC9hk8BoPwezIcjtuBt5KSxHEsprPykjg6NXIvMFX+AA==",
         "dependencies": {
-          "Codelyzer.Analysis.Common": "2.4.72-alpha-g154f8975ce",
-          "Codelyzer.Analysis.Model": "2.4.72-alpha-g154f8975ce"
+          "Codelyzer.Analysis.Common": "2.4.94",
+          "Codelyzer.Analysis.Model": "2.4.94"
         }
       },
       "Codelyzer.Analysis.Model": {
         "type": "Transitive",
-        "resolved": "2.4.72-alpha-g154f8975ce",
-        "contentHash": "rBpfp+QH75M5c4cOY/nMc1Kd7trfiDQfl86CZbS0nbe2fteK9F+V0t2wpEBKlitm/STD+NyBcED4jm013u8H8Q==",
+        "resolved": "2.4.94",
+        "contentHash": "IjGq1c21w5D58iMYe6Z1IryJHxgUgr7TnIySX5ileKNmq83KrnoYwaLqZ4Lu59WO6wA4WJv6bnUhtltBpXiZYA==",
         "dependencies": {
           "Microsoft.CodeAnalysis": "4.1.0",
           "Microsoft.CodeAnalysis.CSharp": "4.1.0",
@@ -114,11 +114,11 @@
       },
       "Codelyzer.Analysis.VisualBasic": {
         "type": "Transitive",
-        "resolved": "2.4.72-alpha-g154f8975ce",
-        "contentHash": "taucX8Bw2QpqMDJRhoRx0AhXq8n6WTNwtvz/FbxAgQszwV4FrcAnEl6yrngB0kYumaABHSsjy/vFjmd6vCwsGw==",
+        "resolved": "2.4.94",
+        "contentHash": "M35CNh0vSUZEpA8AKlgD6k89PChP+C+Cf/uB50cwYP9ugYBMUkltoyRpLJDlP6M9N215jIY60HPEZDemCrKyDw==",
         "dependencies": {
-          "Codelyzer.Analysis.Common": "2.4.72-alpha-g154f8975ce",
-          "Codelyzer.Analysis.Model": "2.4.72-alpha-g154f8975ce"
+          "Codelyzer.Analysis.Common": "2.4.94",
+          "Codelyzer.Analysis.Model": "2.4.94"
         }
       },
       "CommandLineParser": {
@@ -1711,8 +1711,8 @@
       "cta.rules.config": {
         "type": "Project",
         "dependencies": {
-          "Codelyzer.Analysis": "2.4.72-alpha-g154f8975ce",
-          "Codelyzer.Analysis.Model": "2.4.72-alpha-g154f8975ce",
+          "Codelyzer.Analysis": "2.4.94",
+          "Codelyzer.Analysis.Model": "2.4.94",
           "Microsoft.Extensions.Logging": "6.0.0",
           "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
           "Microsoft.Extensions.Logging.Console": "6.0.0",

diff --git a/src/CTA.Rules.Analysis/VisualBasicRulesAnalysis.cs b/src/CTA.Rules.Analysis/VisualBasicRulesAnalysis.cs
@@ -287,10 +287,7 @@ private bool AnalyzeChildren(FileActions fileAction, UstList<UstNode> children,
                     case IdConstants.AccessorBlockName:
                     {
                         var accessorType = (AccessorBlock)child;
-                        var name = string.Concat(
-                            accessorType.Reference != null
-                                ? string.Concat(accessorType.Reference.Namespace, ".")
-                                : string.Empty, accessorType.Identifier);
+                        var name = accessorType.Identifier;
                         var nameToken = new AccessorBlockToken { FullKey = name };
                         if (_visualBasicRootNodes.AccessorBlockTokens.TryGetValue(nameToken, out var token))
                         {

diff --git a/src/CTA.Rules.Config/CTA.Rules.Config.csproj b/src/CTA.Rules.Config/CTA.Rules.Config.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Codelyzer.Analysis" Version="2.4.72-alpha-g154f8975ce" />
-    <PackageReference Include="Codelyzer.Analysis.Model" Version="2.4.72-alpha-g154f8975ce" />
+    <PackageReference Include="Codelyzer.Analysis" Version="2.4.94" />
+    <PackageReference Include="Codelyzer.Analysis.Model" Version="2.4.94" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />

diff --git a/src/CTA.Rules.Models/packages.lock.json b/src/CTA.Rules.Models/packages.lock.json
@@ -60,12 +60,12 @@
       },
       "Codelyzer.Analysis": {
         "type": "Transitive",
-        "resolved": "2.4.72-alpha-g154f8975ce",
-        "contentHash": "5t+uGKQVjm85toghCUBsM69wUfTVBxhYT+eCuZLceMiK4TbJ7MJwfCEfai3Qj41mnJ8g4yPIsMyGkCAARF/F0g==",
+        "resolved": "2.4.94",
+        "contentHash": "etSQMGoTxqlVmjsOXWzJSyd4xtujg1nfD3SEtCU5xTwVltJZvfl7o8s8arXVlF+trFujsn+PU/+j3VlY3f/iow==",
         "dependencies": {
-          "Codelyzer.Analysis.Build": "2.4.72-alpha-g154f8975ce",
-          "Codelyzer.Analysis.CSharp": "2.4.72-alpha-g154f8975ce",
-          "Codelyzer.Analysis.VisualBasic": "2.4.72-alpha-g154f8975ce",
+          "Codelyzer.Analysis.Build": "2.4.94",
+          "Codelyzer.Analysis.CSharp": "2.4.94",
+          "Codelyzer.Analysis.VisualBasic": "2.4.94",
           "CommandLineParser": "2.8.0",
           "Microsoft.Build.Utilities.Core": "17.1.0",
           "Microsoft.Extensions.Logging.Console": "6.0.0",
@@ -75,41 +75,41 @@
       },
       "Codelyzer.Analysis.Build": {
         "type": "Transitive",
-        "resolved": "2.4.72-alpha-g154f8975ce",
-        "contentHash": "Ymx4lk0aILNUnjK/Ln7DvY84fV8rkeHbRjvXqmkMZvYgB35WtRSMw2qKMbmXUxeNP+evogviHgt6Cmcafn2n6Q==",
+        "resolved": "2.4.94",
+        "contentHash": "xNgGED9XCVX3Hwmij/FxaN7hvgzzulKtDu7uODWc4HwrJ3fl1dmku96fbl0x3zI0bY98G/j0r6Rb5etAOHtN0Q==",
         "dependencies": {
           "Buildalyzer": "4.1.4",
           "Buildalyzer.Logger": "4.1.4",
           "Buildalyzer.Workspaces": "4.1.4",
-          "Codelyzer.Analysis.Common": "2.4.72-alpha-g154f8975ce",
+          "Codelyzer.Analysis.Common": "2.4.94",
           "Microsoft.Extensions.Logging": "6.0.0",
           "NuGet.Packaging": "6.0.0"
         }
       },
       "Codelyzer.Analysis.Common": {
         "type": "Transitive",
-        "resolved": "2.4.72-alpha-g154f8975ce",
-        "contentHash": "PNRf7eXbink/4MpEzUorwPZqiw0oh/Ac3hML5Q3+peCsWq8SWxy0Xj8eHfoxlQjaJ9tqkhWz1wzTx15wfmMUPw==",
+        "resolved": "2.4.94",
+        "contentHash": "L/jfOakcoetxVqmHmZNMiRcvixd7q6rfYWdgI7z2aSE2BSlGl23vsBx0MNJdYdBYZ6d61ZQ9SxwS2PFE4T+e8w==",
         "dependencies": {
-          "Codelyzer.Analysis.Model": "2.4.72-alpha-g154f8975ce",
+          "Codelyzer.Analysis.Model": "2.4.94",
           "Microsoft.Build": "17.0.0",
           "Microsoft.VisualStudio.Setup.Configuration.Interop": "3.1.2196",
           "Newtonsoft.Json": "13.0.1"
         }
       },
       "Codelyzer.Analysis.CSharp": {
         "type": "Transitive",
-        "resolved": "2.4.72-alpha-g154f8975ce",
-        "contentHash": "EknM1pQWlGb0dCZaPTdl4dJ35OV9Np2CgZ98iXPWKSSGjk+0TdJSPikQ6skbJ2iiqogyOpuycfJ5CXv64gx0VA==",
+        "resolved": "2.4.94",
+        "contentHash": "cb/SRIiHIVqo7YOnQxI3ATctpWiKRavIuXimOBcv1vjC9hk8BoPwezIcjtuBt5KSxHEsprPykjg6NXIvMFX+AA==",
         "dependencies": {
-          "Codelyzer.Analysis.Common": "2.4.72-alpha-g154f8975ce",
-          "Codelyzer.Analysis.Model": "2.4.72-alpha-g154f8975ce"
+          "Codelyzer.Analysis.Common": "2.4.94",
+          "Codelyzer.Analysis.Model": "2.4.94"
         }
       },
       "Codelyzer.Analysis.Model": {
         "type": "Transitive",
-        "resolved": "2.4.72-alpha-g154f8975ce",
-        "contentHash": "rBpfp+QH75M5c4cOY/nMc1Kd7trfiDQfl86CZbS0nbe2fteK9F+V0t2wpEBKlitm/STD+NyBcED4jm013u8H8Q==",
+        "resolved": "2.4.94",
+        "contentHash": "IjGq1c21w5D58iMYe6Z1IryJHxgUgr7TnIySX5ileKNmq83KrnoYwaLqZ4Lu59WO6wA4WJv6bnUhtltBpXiZYA==",
         "dependencies": {
           "Microsoft.CodeAnalysis": "4.1.0",
           "Microsoft.CodeAnalysis.CSharp": "4.1.0",
@@ -120,11 +120,11 @@
       },
       "Codelyzer.Analysis.VisualBasic": {
         "type": "Transitive",
-        "resolved": "2.4.72-alpha-g154f8975ce",
-        "contentHash": "taucX8Bw2QpqMDJRhoRx0AhXq8n6WTNwtvz/FbxAgQszwV4FrcAnEl6yrngB0kYumaABHSsjy/vFjmd6vCwsGw==",
+        "resolved": "2.4.94",
+        "contentHash": "M35CNh0vSUZEpA8AKlgD6k89PChP+C+Cf/uB50cwYP9ugYBMUkltoyRpLJDlP6M9N215jIY60HPEZDemCrKyDw==",
         "dependencies": {
-          "Codelyzer.Analysis.Common": "2.4.72-alpha-g154f8975ce",
-          "Codelyzer.Analysis.Model": "2.4.72-alpha-g154f8975ce"
+          "Codelyzer.Analysis.Common": "2.4.94",
+          "Codelyzer.Analysis.Model": "2.4.94"
         }
       },
       "CommandLineParser": {
@@ -1717,8 +1717,8 @@
       "cta.rules.config": {
         "type": "Project",
         "dependencies": {
-          "Codelyzer.Analysis": "2.4.72-alpha-g154f8975ce",
-          "Codelyzer.Analysis.Model": "2.4.72-alpha-g154f8975ce",
+          "Codelyzer.Analysis": "2.4.94",
+          "Codelyzer.Analysis.Model": "2.4.94",
           "Microsoft.Extensions.Logging": "6.0.0",
           "Microsoft.Extensions.Logging.Abstractions": "6.0.0",
           "Microsoft.Extensions.Logging.Console": "6.0.0",

diff --git a/tst/CTA.Rules.Test/CTA.Rules.Test.csproj b/tst/CTA.Rules.Test/CTA.Rules.Test.csproj
@@ -30,7 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Remove="TempRules\npoi.json" />
+    <None Remove="TempRules\npoi.ss.usermodel.json" />
     <None Update="CTAFiles\vb.rules.test.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -77,7 +77,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Update="TempRules\npoi.json">
+    <Content Update="TempRules\npoi.ss.usermodel.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

diff --git a/tst/CTA.Rules.Test/TempRules/npoi.json → ...les.Test/TempRules/npoi.ss.usermodel.json b/tst/CTA.Rules.Test/TempRules/npoi.json → ...les.Test/TempRules/npoi.ss.usermodel.json