Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/build-containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ permissions:
packages: write
jobs:
containers:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
name: ${{ matrix.name }}
defaults:
run:
Expand Down Expand Up @@ -35,6 +35,11 @@ jobs:
uses: actions/checkout@v4.2.2
with:
fetch-depth: 0
- name: Setup .NET SDK
uses: actions/setup-dotnet@v4.3.1
with:
global-json-file: global.json
dotnet-version: 8.0.x
- name: Run MinVer
uses: Particular/run-minver-action@v1.0.0
- name: Validate build version
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/build-db-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ permissions:
packages: write
jobs:
db-container:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
name: db-container
defaults:
run:
Expand All @@ -19,6 +19,11 @@ jobs:
uses: actions/checkout@v4.2.2
with:
fetch-depth: 0
- name: Setup .NET SDK
uses: actions/setup-dotnet@v4.3.1
with:
global-json-file: global.json
dotnet-version: 8.0.x
- name: Run MinVer
uses: Particular/run-minver-action@v1.0.0
- name: Validate build version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ defaults:
jobs:
build:
if: ${{ github.actor != 'dependabot[bot]' }}
runs-on: windows-2022
runs-on: windows-latest
steps:
- name: Check for secrets
env:
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-2022, ubuntu-22.04]
os: [windows-latest, ubuntu-latest]
test-category: [ Default, SqlServer, AzureServiceBus, RabbitMQ, AzureStorageQueues, MSMQ, SQS, PrimaryRavenAcceptance, PrimaryRavenPersistence, PostgreSQL ]
include:
- os: windows-2022
- os: windows-latest
os-name: Windows
- os: ubuntu-22.04
- os: ubuntu-latest
os-name: Linux
exclude:
- os: ubuntu-22.04
- os: ubuntu-latest
test-category: MSMQ
fail-fast: false
steps:
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
with:
creds: ${{ secrets.AZURE_ACI_CREDENTIALS }}
- name: Setup SQL Server
uses: Particular/install-sql-server-action@v1.2.0
uses: Particular/install-sql-server-action@v1.3.0
if: matrix.test-category == 'SqlServer'
with:
connection-string-env-var: ServiceControl_TransportTests_SQL_ConnectionString
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/container-integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
workflow_call:
jobs:
container-test:
runs-on: ubuntu-22.04
runs-on: ubuntu-latest
name: ${{ matrix.name }}
defaults:
run:
Expand Down Expand Up @@ -53,6 +53,11 @@ jobs:
uses: actions/checkout@v4.2.2
with:
fetch-depth: 0
- name: Setup .NET SDK
uses: actions/setup-dotnet@v4.3.1
with:
global-json-file: global.json
dotnet-version: 8.0.x
- name: Run MinVer
uses: Particular/run-minver-action@v1.0.0
- name: Log in to GitHub container registry
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ build/
bld/
[Bb]in/
[Oo]bj/
*.binlog

# Roslyn cache directories
*.ide/
Expand Down
39 changes: 28 additions & 11 deletions src/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,17 @@ dotnet_style_qualification_for_field = false:error
dotnet_style_qualification_for_method = false:error
dotnet_style_qualification_for_property = false:error

# Namespace/folder matching
dotnet_style_namespace_match_folder = false

# Language keywords vs BCL types preferences
dotnet_diagnostic.IDE0049.severity = error
dotnet_style_predefined_type_for_locals_parameters_members = true:error
dotnet_style_predefined_type_for_member_access = true:error

# Modifier preferences
dotnet_diagnostic.IDE0040.severity = error
dotnet_style_require_accessibility_modifiers = omit_if_default:error
dotnet_diagnostic.IDE0040.severity = warning
dotnet_style_require_accessibility_modifiers = omit_if_default:warning

# TODO: Change to error
dotnet_diagnostic.IDE0044.severity = suggestion
Expand All @@ -63,8 +66,8 @@ dotnet_style_parentheses_in_other_operators = never_if_unnecessary:error
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:error

# Expression-level preferences
dotnet_diagnostic.IDE0017.severity = error
dotnet_style_object_initializer = true:error
dotnet_diagnostic.IDE0017.severity = warning
dotnet_style_object_initializer = true:warning

dotnet_diagnostic.IDE0028.severity = error
dotnet_style_collection_initializer = true:error
Expand Down Expand Up @@ -223,22 +226,22 @@ file_header_template = unset
dotnet_diagnostic.IDE0001.severity = error
dotnet_diagnostic.IDE0002.severity = error
dotnet_diagnostic.IDE0004.severity = error
dotnet_diagnostic.IDE0005.severity = error
dotnet_diagnostic.IDE0005.severity = warning
dotnet_diagnostic.IDE0035.severity = error
dotnet_diagnostic.IDE0051.severity = error
dotnet_diagnostic.IDE0052.severity = error
dotnet_diagnostic.IDE0051.severity = warning
dotnet_diagnostic.IDE0052.severity = warning

# TODO: Change to error
dotnet_diagnostic.IDE0058.severity = suggestion
csharp_style_unused_value_expression_statement_preference = discard_variable

dotnet_diagnostic.IDE0059.severity = error
dotnet_diagnostic.IDE0059.severity = warning
csharp_style_unused_value_assignment_preference = discard_variable

dotnet_diagnostic.IDE0060.severity = error
dotnet_diagnostic.IDE0060.severity = warning
dotnet_code_quality_unused_parameters = non_public

dotnet_diagnostic.IDE0079.severity = error
dotnet_diagnostic.IDE0079.severity = error # Diagnostic does not fail build
dotnet_remove_unnecessary_suppression_exclusions = none

dotnet_diagnostic.IDE0080.severity = error
Expand All @@ -249,7 +252,7 @@ dotnet_diagnostic.IDE0110.severity = error

#### Formatting Rules ####

dotnet_diagnostic.IDE0055.severity = error
dotnet_diagnostic.IDE0055.severity = warning

# New line preferences
csharp_new_line_before_catch = true
Expand Down Expand Up @@ -322,6 +325,14 @@ dotnet_naming_rule.fields.style = camel_case
dotnet_naming_rule.fields.symbols = fields
dotnet_naming_rule.fields.severity = none

dotnet_naming_rule.local_constants.severity = none
dotnet_naming_rule.local_constants.symbols = local_constants
dotnet_naming_rule.local_constants.style = camel_case

dotnet_naming_rule.local_variables.severity = suggestion
dotnet_naming_rule.local_variables.symbols = local_variables
dotnet_naming_rule.local_variables.style = camel_case

# Symbol specifications
dotnet_naming_symbols.interface.applicable_kinds = interface
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
Expand All @@ -339,6 +350,12 @@ dotnet_naming_symbols.fields.applicable_kinds = field
dotnet_naming_symbols.fields.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.fields.required_modifiers =

dotnet_naming_symbols.local_constants.applicable_kinds = local
dotnet_naming_symbols.local_constants.required_modifiers = const

dotnet_naming_symbols.local_variables.applicable_kinds = local
dotnet_naming_symbols.local_variables.required_modifiers =

# Naming styles
dotnet_naming_style.pascal_case.required_prefix =
dotnet_naming_style.pascal_case.required_suffix =
Expand Down
3 changes: 2 additions & 1 deletion src/ServiceControl.Config/Xaml/Native/UnsafeNativeMethods.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
namespace ServiceControl.Config.Xaml.Native
#pragma warning disable IDE1006 // Disable naming convention for lowercase variables in methods due to native code interop
namespace ServiceControl.Config.Xaml.Native
{
using System;
using System.Runtime.InteropServices;
Expand Down