Skip to content

Commit 39ce383

Browse files
authored
Merge pull request #4526 from Particular/GitHubSync-20241011-195546
GitHubSync update - release-4.33
2 parents d9341f3 + 03a62b9 commit 39ce383

File tree

7 files changed

+43
-2
lines changed

7 files changed

+43
-2
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# Auto detect text files and perform LF normalization
22
* text=auto
3+
*.sh text eol=lf

src/.editorconfig

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
[*.{csproj,props,targets,xml}]
55
indent_style = space
66
indent_size = 2
7+
xml_space_inside_empty_tag = true
78

89
[*.cs]
910

@@ -317,6 +318,10 @@ dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = error
317318
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
318319
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
319320

321+
dotnet_naming_rule.fields.style = camel_case
322+
dotnet_naming_rule.fields.symbols = fields
323+
dotnet_naming_rule.fields.severity = none
324+
320325
# Symbol specifications
321326
dotnet_naming_symbols.interface.applicable_kinds = interface
322327
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
@@ -330,6 +335,10 @@ dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, meth
330335
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
331336
dotnet_naming_symbols.non_field_members.required_modifiers =
332337

338+
dotnet_naming_symbols.fields.applicable_kinds = field
339+
dotnet_naming_symbols.fields.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
340+
dotnet_naming_symbols.fields.required_modifiers =
341+
333342
# Naming styles
334343
dotnet_naming_style.pascal_case.required_prefix =
335344
dotnet_naming_style.pascal_case.required_suffix =
@@ -340,3 +349,8 @@ dotnet_naming_style.begins_with_i.required_prefix = I
340349
dotnet_naming_style.begins_with_i.required_suffix =
341350
dotnet_naming_style.begins_with_i.word_separator =
342351
dotnet_naming_style.begins_with_i.capitalization = pascal_case
352+
353+
dotnet_naming_style.camel_case.required_prefix =
354+
dotnet_naming_style.camel_case.required_suffix =
355+
dotnet_naming_style.camel_case.word_separator =
356+
dotnet_naming_style.camel_case.capitalization = camel_case

src/Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@
4646
<PackageVersion Include="NServiceBus.Metrics.ServiceControl" Version="3.0.6" />
4747
<PackageVersion Include="NServiceBus.Metrics.ServiceControl.Msmq" Version="3.0.1" />
4848
<PackageVersion Include="NServiceBus.RabbitMQ" Version="7.0.7" />
49+
<PackageVersion Include="NServiceBus.Raw" Version="3.2.5" />
4950
<PackageVersion Include="NServiceBus.SagaAudit" Version="3.0.1" />
5051
<PackageVersion Include="NServiceBus.Testing" Version="7.4.2" />
5152
<PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="2.0.6" />
5253
<PackageVersion Include="NServiceBus.Transport.AzureStorageQueues" Version="10.0.4" />
5354
<PackageVersion Include="NServiceBus.Transport.Msmq" Version="1.2.4" />
5455
<PackageVersion Include="NServiceBus.Transport.SqlServer" Version="6.3.4" />
55-
<PackageVersion Include="NServiceBus.Raw" Version="3.2.5" />
5656
<PackageVersion Include="NUnit" Version="3.13.3" />
5757
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
5858
<PackageVersion Include="OwinHttpMessageHandler" Version="2.0.2" />
@@ -71,7 +71,7 @@
7171
<PackageVersion Include="System.IO.Compression" Version="4.3.0" />
7272
<PackageVersion Include="System.Management" Version="7.0.2" />
7373
<PackageVersion Include="System.Reflection.MetadataLoadContext" Version="7.0.0" />
74-
<PackageVersion Include="System.Text.Json" Version="8.0.4" />
74+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
7575
<PackageVersion Include="System.Threading.Channels" Version="7.0.0" />
7676
<PackageVersion Include="Validar.Fody" Version="1.9.0" />
7777
<PackageVersion Include="Windows7APICodePack-Shell" Version="1.1.0" />
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[*.cs]
2+
3+
# Justification: Test project
4+
dotnet_diagnostic.CA2007.severity = none
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[*.cs]
2+
3+
# Justification: Test project
4+
dotnet_diagnostic.CA2007.severity = none
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[*.cs]
2+
3+
# Justification: Test project
4+
dotnet_diagnostic.CA2007.severity = none
5+
dotnet_diagnostic.PS0004.severity = none # A parameter of type CancellationToken on a private delegate or method should be required
6+
dotnet_diagnostic.PS0018.severity = none # Add a CancellationToken parameter
7+
8+
# Justification: Tests don't support cancellation and don't need to forward IMessageHandlerContext.CancellationToken
9+
dotnet_diagnostic.NSB0002.severity = suggestion
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[*.cs]
2+
3+
# Justification: Test project
4+
dotnet_diagnostic.CA2007.severity = none
5+
dotnet_diagnostic.PS0004.severity = none # A parameter of type CancellationToken on a private delegate or method should be required
6+
dotnet_diagnostic.PS0018.severity = none # Add a CancellationToken parameter
7+
8+
# Justification: Tests don't support cancellation and don't need to forward IMessageHandlerContext.CancellationToken
9+
dotnet_diagnostic.NSB0002.severity = suggestion

0 commit comments

Comments
 (0)