Skip to content

Commit 3713b7e

Browse files
authored
Merge pull request #1629 from Particular/GitHubSync-20250715-174639
GitHubSync update - release-8.0
2 parents af35186 + 608e1fd commit 3713b7e

File tree

5 files changed

+34
-16
lines changed

5 files changed

+34
-16
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
strategy:
1919
matrix:
2020
include:
21-
- os: windows-2019
21+
- os: windows-latest
2222
name: Windows
23-
- os: ubuntu-22.04
23+
- os: ubuntu-latest
2424
name: Linux
2525
fail-fast: false
2626
steps:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ defaults:
1111
shell: pwsh
1212
jobs:
1313
release:
14-
runs-on: ubuntu-22.04
14+
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout
1717
uses: actions/checkout@v4.2.2

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ build/
6767
bld/
6868
[Bb]in/
6969
[Oo]bj/
70+
*.binlog
7071

7172
# Roslyn cache directories
7273
*.ide/

src/.editorconfig

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,17 @@ dotnet_style_qualification_for_field = false:error
4141
dotnet_style_qualification_for_method = false:error
4242
dotnet_style_qualification_for_property = false:error
4343

44+
# Namespace/folder matching
45+
dotnet_style_namespace_match_folder = false
46+
4447
# Language keywords vs BCL types preferences
4548
dotnet_diagnostic.IDE0049.severity = error
4649
dotnet_style_predefined_type_for_locals_parameters_members = true:error
4750
dotnet_style_predefined_type_for_member_access = true:error
4851

4952
# Modifier preferences
50-
dotnet_diagnostic.IDE0040.severity = error
51-
dotnet_style_require_accessibility_modifiers = omit_if_default:error
53+
dotnet_diagnostic.IDE0040.severity = warning
54+
dotnet_style_require_accessibility_modifiers = omit_if_default:warning
5255

5356
# TODO: Change to error
5457
dotnet_diagnostic.IDE0044.severity = suggestion
@@ -63,8 +66,8 @@ dotnet_style_parentheses_in_other_operators = never_if_unnecessary:error
6366
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:error
6467

6568
# Expression-level preferences
66-
dotnet_diagnostic.IDE0017.severity = error
67-
dotnet_style_object_initializer = true:error
69+
dotnet_diagnostic.IDE0017.severity = warning
70+
dotnet_style_object_initializer = true:warning
6871

6972
dotnet_diagnostic.IDE0028.severity = error
7073
dotnet_style_collection_initializer = true:error
@@ -223,22 +226,22 @@ file_header_template = unset
223226
dotnet_diagnostic.IDE0001.severity = error
224227
dotnet_diagnostic.IDE0002.severity = error
225228
dotnet_diagnostic.IDE0004.severity = error
226-
dotnet_diagnostic.IDE0005.severity = error
229+
dotnet_diagnostic.IDE0005.severity = warning
227230
dotnet_diagnostic.IDE0035.severity = error
228-
dotnet_diagnostic.IDE0051.severity = error
229-
dotnet_diagnostic.IDE0052.severity = error
231+
dotnet_diagnostic.IDE0051.severity = warning
232+
dotnet_diagnostic.IDE0052.severity = warning
230233

231234
# TODO: Change to error
232235
dotnet_diagnostic.IDE0058.severity = suggestion
233236
csharp_style_unused_value_expression_statement_preference = discard_variable
234237

235-
dotnet_diagnostic.IDE0059.severity = error
238+
dotnet_diagnostic.IDE0059.severity = warning
236239
csharp_style_unused_value_assignment_preference = discard_variable
237240

238-
dotnet_diagnostic.IDE0060.severity = error
241+
dotnet_diagnostic.IDE0060.severity = warning
239242
dotnet_code_quality_unused_parameters = non_public
240243

241-
dotnet_diagnostic.IDE0079.severity = error
244+
dotnet_diagnostic.IDE0079.severity = error # Diagnostic does not fail build
242245
dotnet_remove_unnecessary_suppression_exclusions = none
243246

244247
dotnet_diagnostic.IDE0080.severity = error
@@ -249,7 +252,7 @@ dotnet_diagnostic.IDE0110.severity = error
249252

250253
#### Formatting Rules ####
251254

252-
dotnet_diagnostic.IDE0055.severity = error
255+
dotnet_diagnostic.IDE0055.severity = warning
253256

254257
# New line preferences
255258
csharp_new_line_before_catch = true
@@ -322,6 +325,14 @@ dotnet_naming_rule.fields.style = camel_case
322325
dotnet_naming_rule.fields.symbols = fields
323326
dotnet_naming_rule.fields.severity = none
324327

328+
dotnet_naming_rule.local_constants.severity = none
329+
dotnet_naming_rule.local_constants.symbols = local_constants
330+
dotnet_naming_rule.local_constants.style = camel_case
331+
332+
dotnet_naming_rule.local_variables.severity = suggestion
333+
dotnet_naming_rule.local_variables.symbols = local_variables
334+
dotnet_naming_rule.local_variables.style = camel_case
335+
325336
# Symbol specifications
326337
dotnet_naming_symbols.interface.applicable_kinds = interface
327338
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
@@ -339,6 +350,12 @@ dotnet_naming_symbols.fields.applicable_kinds = field
339350
dotnet_naming_symbols.fields.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
340351
dotnet_naming_symbols.fields.required_modifiers =
341352

353+
dotnet_naming_symbols.local_constants.applicable_kinds = local
354+
dotnet_naming_symbols.local_constants.required_modifiers = const
355+
356+
dotnet_naming_symbols.local_variables.applicable_kinds = local
357+
dotnet_naming_symbols.local_variables.required_modifiers =
358+
342359
# Naming styles
343360
dotnet_naming_style.pascal_case.required_prefix =
344361
dotnet_naming_style.pascal_case.required_suffix =

src/targets/Targets.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

@@ -13,4 +13,4 @@
1313
<Compile Include="..\NServiceBus.Transport.RabbitMQ\Configuration\ConnectionConfiguration.cs" />
1414
</ItemGroup>
1515

16-
</Project>
16+
</Project>

0 commit comments

Comments
 (0)