Skip to content

Commit 65637b0

Browse files
committed
Update StyleCop and fix warnings using "file" or "required" modifiers.
1 parent 463e977 commit 65637b0

File tree

6 files changed

+2
-10
lines changed

6 files changed

+2
-10
lines changed

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ csharp_indent_switch_labels = true
3434
csharp_indent_labels = flush_left
3535

3636
# Modifier preferences
37-
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
37+
csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async:suggestion
3838
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
3939

4040
# this. preferences

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
<PackageVersion Include="Moq" Version="[4.18.4,5.0)" />
8282
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="[1.5.0,2.0)" />
8383
<PackageVersion Include="RabbitMQ.Client" Version="[6.5.0,7.0)" />
84-
<PackageVersion Include="StyleCop.Analyzers" Version="[1.2.0-beta.435,2.0)" />
84+
<PackageVersion Include="StyleCop.Analyzers" Version="[1.2.0-beta.507,2.0)" />
8585
<PackageVersion Include="Swashbuckle.AspNetCore" Version="[6.4.0]" />
8686
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
8787
<PackageVersion Include="Testcontainers.MsSql" Version="3.3.0" />

src/OpenTelemetry.Api.ProviderBuilderExtensions/AssemblyInfo.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#endif
2727

2828
#if SIGNED
29-
#pragma warning disable SA1400 // Access modifier should be declared
3029
file static class AssemblyInfo
3130
{
3231
public const string PublicKey = ", PublicKey=002400000480000094000000060200000024000052534131000400000100010051C1562A090FB0C9F391012A32198B5E5D9A60E9B80FA2D7B434C9E5CCB7259BD606E66F9660676AFC6692B8CDC6793D190904551D2103B7B22FA636DCBB8208839785BA402EA08FC00C8F1500CCEF28BBF599AA64FFB1E1D5DC1BF3420A3777BADFE697856E9D52070A50C3EA5821C80BEF17CA3ACFFA28F89DD413F096F898";
@@ -38,5 +37,4 @@ file static class AssemblyInfo
3837
public const string PublicKey = "";
3938
public const string MoqPublicKey = "";
4039
}
41-
#pragma warning restore SA1400 // Access modifier should be declared
4240
#endif

src/OpenTelemetry.Api/AssemblyInfo.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#endif
3535

3636
#if SIGNED
37-
#pragma warning disable SA1400 // Access modifier should be declared
3837
file static class AssemblyInfo
3938
{
4039
public const string PublicKey = ", PublicKey=002400000480000094000000060200000024000052534131000400000100010051C1562A090FB0C9F391012A32198B5E5D9A60E9B80FA2D7B434C9E5CCB7259BD606E66F9660676AFC6692B8CDC6793D190904551D2103B7B22FA636DCBB8208839785BA402EA08FC00C8F1500CCEF28BBF599AA64FFB1E1D5DC1BF3420A3777BADFE697856E9D52070A50C3EA5821C80BEF17CA3ACFFA28F89DD413F096F898";
@@ -46,5 +45,4 @@ file static class AssemblyInfo
4645
public const string PublicKey = "";
4746
public const string MoqPublicKey = "";
4847
}
49-
#pragma warning restore SA1400 // Access modifier should be declared
5048
#endif

src/OpenTelemetry.Extensions.Hosting/AssemblyInfo.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2" + AssemblyInfo.MoqPublicKey)]
2121

2222
#if SIGNED
23-
#pragma warning disable SA1400 // Access modifier should be declared
2423
file static class AssemblyInfo
2524
{
2625
public const string PublicKey = ", PublicKey=002400000480000094000000060200000024000052534131000400000100010051C1562A090FB0C9F391012A32198B5E5D9A60E9B80FA2D7B434C9E5CCB7259BD606E66F9660676AFC6692B8CDC6793D190904551D2103B7B22FA636DCBB8208839785BA402EA08FC00C8F1500CCEF28BBF599AA64FFB1E1D5DC1BF3420A3777BADFE697856E9D52070A50C3EA5821C80BEF17CA3ACFFA28F89DD413F096F898";
@@ -32,5 +31,4 @@ file static class AssemblyInfo
3231
public const string PublicKey = "";
3332
public const string MoqPublicKey = "";
3433
}
35-
#pragma warning restore SA1400 // Access modifier should be declared
3634
#endif

src/OpenTelemetry/AssemblyInfo.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
#endif
3434

3535
#if SIGNED
36-
#pragma warning disable SA1400 // Access modifier should be declared
3736
file static class AssemblyInfo
3837
{
3938
public const string PublicKey = ", PublicKey=002400000480000094000000060200000024000052534131000400000100010051C1562A090FB0C9F391012A32198B5E5D9A60E9B80FA2D7B434C9E5CCB7259BD606E66F9660676AFC6692B8CDC6793D190904551D2103B7B22FA636DCBB8208839785BA402EA08FC00C8F1500CCEF28BBF599AA64FFB1E1D5DC1BF3420A3777BADFE697856E9D52070A50C3EA5821C80BEF17CA3ACFFA28F89DD413F096F898";
@@ -45,5 +44,4 @@ file static class AssemblyInfo
4544
public const string PublicKey = "";
4645
public const string MoqPublicKey = "";
4746
}
48-
#pragma warning restore SA1400 // Access modifier should be declared
4947
#endif

0 commit comments

Comments
 (0)