Skip to content

Commit c79f55f

Browse files
GitHubSync update - release-6.7 (#5092)
* GitHubSync update - release-6.7 * Updating runner images on workflows * Correct another locaiton of runners * Add pragma * Add setup-dotnet actions needed by ubuntu runners * Update setup SQL action --------- Co-authored-by: internalautomation[bot] <85681268+internalautomation[bot]@users.noreply.github.com> Co-authored-by: David Boike <[email protected]>
1 parent 94a0a33 commit c79f55f

File tree

8 files changed

+55
-21
lines changed

8 files changed

+55
-21
lines changed

.github/workflows/build-containers.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ permissions:
44
packages: write
55
jobs:
66
containers:
7-
runs-on: ubuntu-22.04
7+
runs-on: ubuntu-latest
88
name: ${{ matrix.name }}
99
defaults:
1010
run:
@@ -35,6 +35,11 @@ jobs:
3535
uses: actions/[email protected]
3636
with:
3737
fetch-depth: 0
38+
- name: Setup .NET SDK
39+
uses: actions/[email protected]
40+
with:
41+
global-json-file: global.json
42+
dotnet-version: 8.0.x
3843
- name: Run MinVer
3944
uses: Particular/[email protected]
4045
- name: Validate build version

.github/workflows/build-db-container.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ permissions:
44
packages: write
55
jobs:
66
db-container:
7-
runs-on: ubuntu-22.04
7+
runs-on: ubuntu-latest
88
name: db-container
99
defaults:
1010
run:
@@ -19,6 +19,11 @@ jobs:
1919
uses: actions/[email protected]
2020
with:
2121
fetch-depth: 0
22+
- name: Setup .NET SDK
23+
uses: actions/[email protected]
24+
with:
25+
global-json-file: global.json
26+
dotnet-version: 8.0.x
2227
- name: Run MinVer
2328
uses: Particular/[email protected]
2429
- name: Validate build version

.github/workflows/build-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ defaults:
66
jobs:
77
build:
88
if: ${{ github.actor != 'dependabot[bot]' }}
9-
runs-on: windows-2022
9+
runs-on: windows-latest
1010
steps:
1111
- name: Check for secrets
1212
env:

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ jobs:
1717
runs-on: ${{ matrix.os }}
1818
strategy:
1919
matrix:
20-
os: [windows-2022, ubuntu-22.04]
20+
os: [windows-latest, ubuntu-latest]
2121
test-category: [ Default, SqlServer, AzureServiceBus, RabbitMQ, AzureStorageQueues, MSMQ, SQS, PrimaryRavenAcceptance, PrimaryRavenPersistence, PostgreSQL ]
2222
include:
23-
- os: windows-2022
23+
- os: windows-latest
2424
os-name: Windows
25-
- os: ubuntu-22.04
25+
- os: ubuntu-latest
2626
os-name: Linux
2727
exclude:
28-
- os: ubuntu-22.04
28+
- os: ubuntu-latest
2929
test-category: MSMQ
3030
fail-fast: false
3131
steps:
@@ -69,7 +69,7 @@ jobs:
6969
with:
7070
creds: ${{ secrets.AZURE_ACI_CREDENTIALS }}
7171
- name: Setup SQL Server
72-
uses: Particular/install-sql-server-action@v1.2.0
72+
uses: Particular/install-sql-server-action@v1.3.0
7373
if: matrix.test-category == 'SqlServer'
7474
with:
7575
connection-string-env-var: ServiceControl_TransportTests_SQL_ConnectionString

.github/workflows/container-integration-test.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
workflow_call:
44
jobs:
55
container-test:
6-
runs-on: ubuntu-22.04
6+
runs-on: ubuntu-latest
77
name: ${{ matrix.name }}
88
defaults:
99
run:
@@ -53,6 +53,11 @@ jobs:
5353
uses: actions/[email protected]
5454
with:
5555
fetch-depth: 0
56+
- name: Setup .NET SDK
57+
uses: actions/[email protected]
58+
with:
59+
global-json-file: global.json
60+
dotnet-version: 8.0.x
5661
- name: Run MinVer
5762
uses: Particular/[email protected]
5863
- name: Log in to GitHub container registry

.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/ServiceControl.Config/Xaml/Native/UnsafeNativeMethods.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
namespace ServiceControl.Config.Xaml.Native
1+
#pragma warning disable IDE1006 // Disable naming convention for lowercase variables in methods due to native code interop
2+
namespace ServiceControl.Config.Xaml.Native
23
{
34
using System;
45
using System.Runtime.InteropServices;

0 commit comments

Comments
 (0)