From 2d696c55b26498a62de8310f8cba011d873a8d90 Mon Sep 17 00:00:00 2001 From: "internalautomation[bot]" <85681268+internalautomation[bot]@users.noreply.github.com> Date: Tue, 15 Jul 2025 17:51:33 +0000 Subject: [PATCH 1/6] GitHubSync update - release-5.11 --- .gitignore | 1 + src/.editorconfig | 39 ++++++++++++++++++++++++++++----------- 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 190ac12bc6..5bf25ccac6 100644 --- a/.gitignore +++ b/.gitignore @@ -67,6 +67,7 @@ build/ bld/ [Bb]in/ [Oo]bj/ +*.binlog # Roslyn cache directories *.ide/ diff --git a/src/.editorconfig b/src/.editorconfig index 6a0594940d..a751d64a60 100644 --- a/src/.editorconfig +++ b/src/.editorconfig @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 = From af06a52c44bf0284ff61f35c4b20c2a7dbe75094 Mon Sep 17 00:00:00 2001 From: David Boike Date: Tue, 15 Jul 2025 14:34:14 -0500 Subject: [PATCH 2/6] Updating runner images on workflows --- .github/workflows/build-containers.yml | 2 +- .github/workflows/build-db-container.yml | 2 +- .github/workflows/build-windows.yml | 2 +- .github/workflows/ci.yml | 6 +++--- .github/workflows/container-integration-test.yml | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index 049ed1848e..dfa80dd38e 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -2,7 +2,7 @@ on: workflow_call: jobs: containers: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest name: ${{ matrix.name }} defaults: run: diff --git a/.github/workflows/build-db-container.yml b/.github/workflows/build-db-container.yml index fa95306f37..ebb675892b 100644 --- a/.github/workflows/build-db-container.yml +++ b/.github/workflows/build-db-container.yml @@ -2,7 +2,7 @@ on: workflow_call: jobs: db-container: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest name: db-container defaults: run: diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 3f92b507f4..e5c1d28cc6 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -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: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 977d2a8663..fcff3de85f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,12 +20,12 @@ jobs: os: [windows-2022, ubuntu-22.04] 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: diff --git a/.github/workflows/container-integration-test.yml b/.github/workflows/container-integration-test.yml index fb9a48fc30..a2e055df88 100644 --- a/.github/workflows/container-integration-test.yml +++ b/.github/workflows/container-integration-test.yml @@ -3,7 +3,7 @@ on: workflow_call: jobs: container-test: - runs-on: ubuntu-22.04 + runs-on: ubuntu-latest name: ${{ matrix.name }} defaults: run: From 879ad4f24645a6eca22441fc0ee498f42138ba66 Mon Sep 17 00:00:00 2001 From: David Boike Date: Tue, 15 Jul 2025 14:36:46 -0500 Subject: [PATCH 3/6] Correct another locaiton of runners --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fcff3de85f..f8dadf2a4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ 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-latest From 0f9be87de6653eba92738b174dc58504feded5c4 Mon Sep 17 00:00:00 2001 From: David Boike Date: Wed, 16 Jul 2025 11:16:12 -0500 Subject: [PATCH 4/6] Update setup SQL action --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f8dadf2a4d..3d17434e07 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -68,7 +68,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 From 03236d1d61bce6062eebcd1f0762b0ab84c5e25e Mon Sep 17 00:00:00 2001 From: David Boike Date: Tue, 15 Jul 2025 16:02:43 -0500 Subject: [PATCH 5/6] Add pragma --- src/ServiceControl.Config/Xaml/Native/UnsafeNativeMethods.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ServiceControl.Config/Xaml/Native/UnsafeNativeMethods.cs b/src/ServiceControl.Config/Xaml/Native/UnsafeNativeMethods.cs index 44f45862ca..e0e62bf5b9 100644 --- a/src/ServiceControl.Config/Xaml/Native/UnsafeNativeMethods.cs +++ b/src/ServiceControl.Config/Xaml/Native/UnsafeNativeMethods.cs @@ -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; From 9cc116ad0427385f17a223f2ab5d0c1ad1011120 Mon Sep 17 00:00:00 2001 From: David Boike Date: Tue, 15 Jul 2025 16:21:31 -0500 Subject: [PATCH 6/6] Add setup-dotnet actions needed by ubuntu runners --- .github/workflows/build-containers.yml | 5 +++++ .github/workflows/build-db-container.yml | 5 +++++ .github/workflows/container-integration-test.yml | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index dfa80dd38e..bec17f00a6 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -30,6 +30,11 @@ jobs: uses: actions/checkout@v4.2.0 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 diff --git a/.github/workflows/build-db-container.yml b/.github/workflows/build-db-container.yml index ebb675892b..c36c81065e 100644 --- a/.github/workflows/build-db-container.yml +++ b/.github/workflows/build-db-container.yml @@ -17,6 +17,11 @@ jobs: uses: actions/checkout@v4.2.0 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 diff --git a/.github/workflows/container-integration-test.yml b/.github/workflows/container-integration-test.yml index a2e055df88..19da6c72e7 100644 --- a/.github/workflows/container-integration-test.yml +++ b/.github/workflows/container-integration-test.yml @@ -53,6 +53,11 @@ jobs: uses: actions/checkout@v4.2.0 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