Update StyleCop and fix warnings using "file" or "required" modifiers.

open-telemetry · Aug 10, 2023 · 65637b0 · 65637b0
1 parent 463e977
commit 65637b0
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 10 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -34,7 +34,7 @@ csharp_indent_switch_labels = true
 csharp_indent_labels = flush_left
 
 # Modifier preferences
-csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
+csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async:suggestion
 dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
 
 # this. preferences

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -81,7 +81,7 @@
     <PackageVersion Include="Moq" Version="[4.18.4,5.0)" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="[1.5.0,2.0)" />
     <PackageVersion Include="RabbitMQ.Client" Version="[6.5.0,7.0)" />
-    <PackageVersion Include="StyleCop.Analyzers" Version="[1.2.0-beta.435,2.0)" />
+    <PackageVersion Include="StyleCop.Analyzers" Version="[1.2.0-beta.507,2.0)" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="[6.4.0]" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="Testcontainers.MsSql" Version="3.3.0" />

diff --git a/src/OpenTelemetry.Api.ProviderBuilderExtensions/AssemblyInfo.cs b/src/OpenTelemetry.Api.ProviderBuilderExtensions/AssemblyInfo.cs
@@ -26,7 +26,6 @@
 #endif
 
 #if SIGNED
-#pragma warning disable SA1400 // Access modifier should be declared
 file static class AssemblyInfo
 {
     public const string PublicKey = ", PublicKey=002400000480000094000000060200000024000052534131000400000100010051C1562A090FB0C9F391012A32198B5E5D9A60E9B80FA2D7B434C9E5CCB7259BD606E66F9660676AFC6692B8CDC6793D190904551D2103B7B22FA636DCBB8208839785BA402EA08FC00C8F1500CCEF28BBF599AA64FFB1E1D5DC1BF3420A3777BADFE697856E9D52070A50C3EA5821C80BEF17CA3ACFFA28F89DD413F096F898";
@@ -38,5 +37,4 @@
     public const string PublicKey = "";
     public const string MoqPublicKey = "";
 }
-#pragma warning restore SA1400 // Access modifier should be declared
 #endif
diff --git a/src/OpenTelemetry.Api/AssemblyInfo.cs b/src/OpenTelemetry.Api/AssemblyInfo.cs
@@ -34,7 +34,6 @@
 #endif
 
 #if SIGNED
-#pragma warning disable SA1400 // Access modifier should be declared
 file static class AssemblyInfo
 {
     public const string PublicKey = ", PublicKey=002400000480000094000000060200000024000052534131000400000100010051C1562A090FB0C9F391012A32198B5E5D9A60E9B80FA2D7B434C9E5CCB7259BD606E66F9660676AFC6692B8CDC6793D190904551D2103B7B22FA636DCBB8208839785BA402EA08FC00C8F1500CCEF28BBF599AA64FFB1E1D5DC1BF3420A3777BADFE697856E9D52070A50C3EA5821C80BEF17CA3ACFFA28F89DD413F096F898";
@@ -46,5 +45,4 @@
     public const string PublicKey = "";
     public const string MoqPublicKey = "";
 }
-#pragma warning restore SA1400 // Access modifier should be declared
 #endif
diff --git a/src/OpenTelemetry.Extensions.Hosting/AssemblyInfo.cs b/src/OpenTelemetry.Extensions.Hosting/AssemblyInfo.cs
@@ -20,7 +20,6 @@
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2" + AssemblyInfo.MoqPublicKey)]
 
 #if SIGNED
-#pragma warning disable SA1400 // Access modifier should be declared
 file static class AssemblyInfo
 {
     public const string PublicKey = ", PublicKey=002400000480000094000000060200000024000052534131000400000100010051C1562A090FB0C9F391012A32198B5E5D9A60E9B80FA2D7B434C9E5CCB7259BD606E66F9660676AFC6692B8CDC6793D190904551D2103B7B22FA636DCBB8208839785BA402EA08FC00C8F1500CCEF28BBF599AA64FFB1E1D5DC1BF3420A3777BADFE697856E9D52070A50C3EA5821C80BEF17CA3ACFFA28F89DD413F096F898";
@@ -32,5 +31,4 @@
     public const string PublicKey = "";
     public const string MoqPublicKey = "";
 }
-#pragma warning restore SA1400 // Access modifier should be declared
 #endif
diff --git a/src/OpenTelemetry/AssemblyInfo.cs b/src/OpenTelemetry/AssemblyInfo.cs
@@ -33,7 +33,6 @@
 #endif
 
 #if SIGNED
-#pragma warning disable SA1400 // Access modifier should be declared
 file static class AssemblyInfo
 {
     public const string PublicKey = ", PublicKey=002400000480000094000000060200000024000052534131000400000100010051C1562A090FB0C9F391012A32198B5E5D9A60E9B80FA2D7B434C9E5CCB7259BD606E66F9660676AFC6692B8CDC6793D190904551D2103B7B22FA636DCBB8208839785BA402EA08FC00C8F1500CCEF28BBF599AA64FFB1E1D5DC1BF3420A3777BADFE697856E9D52070A50C3EA5821C80BEF17CA3ACFFA28F89DD413F096F898";
@@ -45,5 +44,4 @@
     public const string PublicKey = "";
     public const string MoqPublicKey = "";
 }
-#pragma warning restore SA1400 // Access modifier should be declared
 #endif