From 320efd5ca44190b26c53bbcc607ad272db045a5a Mon Sep 17 00:00:00 2001 From: Matt Bishop Date: Thu, 14 Nov 2024 10:02:02 -0500 Subject: [PATCH 1/5] Ignore some stuff (#344) * Ignore some stuff * Format too --- .editorconfig | 121 +----------------- .github/renovate.json | 1 + .gitignore | 5 +- .../tests/fixtures/CalVer/.gitignore | 2 + .../tests/fixtures/SemVer/.gitignore | 2 + version-bump/tests/fixtures/.gitignore | 2 + 6 files changed, 12 insertions(+), 121 deletions(-) create mode 100644 release-version-check/tests/fixtures/CalVer/.gitignore create mode 100644 release-version-check/tests/fixtures/SemVer/.gitignore create mode 100644 version-bump/tests/fixtures/.gitignore diff --git a/.editorconfig b/.editorconfig index fefe1f96..0ad1a4ee 100644 --- a/.editorconfig +++ b/.editorconfig @@ -14,125 +14,6 @@ trim_trailing_whitespace = true insert_final_newline = true guidelines = 120 -# Code files -[*.{cs,csx,vb,vbx}] -indent_size = 4 - -# Xml project files -[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}] -indent_size = 2 - -# Xml config files -[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}] -indent_size = 2 - -# JSON files -[*.json] -indent_size = 2 - # JS files -[*.{js,ts,scss,html}] +[*.{json,yml}] indent_size = 2 - -[*.{ts}] -quote_type = single - -[*.{scss,yml,csproj}] -indent_size = 2 - -[*.sln] -indent_style = tab - -# Dotnet code style settings: -[*.{cs,vb}] -# Sort using and Import directives with System.* appearing first -dotnet_sort_system_directives_first = true -# Avoid "this." and "Me." if not necessary -dotnet_style_qualification_for_field = false:suggestion -dotnet_style_qualification_for_property = false:suggestion -dotnet_style_qualification_for_method = false:suggestion -dotnet_style_qualification_for_event = false:suggestion - -# Use language keywords instead of framework type names for type references -dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion -dotnet_style_predefined_type_for_member_access = true:suggestion - -# Suggest more modern language features when available -dotnet_style_object_initializer = true:suggestion -dotnet_style_collection_initializer = true:suggestion -dotnet_style_coalesce_expression = true:suggestion -dotnet_style_null_propagation = true:suggestion -dotnet_style_explicit_tuple_names = true:suggestion - -# Prefix private members with underscore -dotnet_naming_rule.private_members_with_underscore.symbols = private_fields -dotnet_naming_rule.private_members_with_underscore.style = prefix_underscore -dotnet_naming_rule.private_members_with_underscore.severity = suggestion - -dotnet_naming_symbols.private_fields.applicable_kinds = field -dotnet_naming_symbols.private_fields.applicable_accessibilities = private - -dotnet_naming_style.prefix_underscore.capitalization = camel_case -dotnet_naming_style.prefix_underscore.required_prefix = _ - -# Async methods should have "Async" suffix -dotnet_naming_rule.async_methods_end_in_async.symbols = any_async_methods -dotnet_naming_rule.async_methods_end_in_async.style = end_in_async -dotnet_naming_rule.async_methods_end_in_async.severity = suggestion - -dotnet_naming_symbols.any_async_methods.applicable_kinds = method -dotnet_naming_symbols.any_async_methods.applicable_accessibilities = * -dotnet_naming_symbols.any_async_methods.required_modifiers = async - -dotnet_naming_style.end_in_async.required_prefix = -dotnet_naming_style.end_in_async.required_suffix = Async -dotnet_naming_style.end_in_async.capitalization = pascal_case -dotnet_naming_style.end_in_async.word_separator = - -# Obsolete warnings, this should be removed or changed to warning once we address some of the obsolete items. -dotnet_diagnostic.CS0618.severity = suggestion - -# Obsolete warnings, this should be removed or changed to warning once we address some of the obsolete items. -dotnet_diagnostic.CS0612.severity = suggestion - -# Remove unnecessary using directives https://docs.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/ide0005 -dotnet_diagnostic.IDE0005.severity = warning - -# CSharp code style settings: -[*.cs] -# Prefer "var" everywhere -csharp_style_var_for_built_in_types = true:suggestion -csharp_style_var_when_type_is_apparent = true:suggestion -csharp_style_var_elsewhere = true:suggestion - -# Prefer method-like constructs to have a expression-body -csharp_style_expression_bodied_methods = true:none -csharp_style_expression_bodied_constructors = true:none -csharp_style_expression_bodied_operators = true:none - -# Prefer property-like constructs to have an expression-body -csharp_style_expression_bodied_properties = true:none -csharp_style_expression_bodied_indexers = true:none -csharp_style_expression_bodied_accessors = true:none - -# Suggest more modern language features when available -csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion -csharp_style_pattern_matching_over_as_with_null_check = true:suggestion -csharp_style_inlined_variable_declaration = true:suggestion -csharp_style_throw_expression = true:suggestion -csharp_style_conditional_delegate_call = true:suggestion - -# Newline settings -csharp_new_line_before_open_brace = all -csharp_new_line_before_else = true -csharp_new_line_before_catch = true -csharp_new_line_before_finally = true -csharp_new_line_before_members_in_object_initializers = true -csharp_new_line_before_members_in_anonymous_types = true - -# Namespace settings -csharp_style_namespace_declarations = file_scoped:warning - -# Switch expression -dotnet_diagnostic.CS8509.severity = error # missing switch case for named enum value -dotnet_diagnostic.CS8524.severity = none # missing switch case for unnamed enum value diff --git a/.github/renovate.json b/.github/renovate.json index 2c515df0..0364a956 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -2,6 +2,7 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": ["github>bitwarden/renovate-config"], "enabledManagers": ["dockerfile", "github-actions", "npm", "nuget", "pipenv"], + "ignorePaths": ["version-bump/tests/fixtures/**"], "packageRules": [ { "additionalBranchPrefix": "{{parentDir}}-", diff --git a/.gitignore b/.gitignore index bf47b5cd..5848ed33 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,9 @@ Thumbs.db node_modules npm-debug.log -#Python cache +# Python cache **/__pycache__/ **/.pytest_cache/ + +# Generated solution files +gh-actions.sln diff --git a/release-version-check/tests/fixtures/CalVer/.gitignore b/release-version-check/tests/fixtures/CalVer/.gitignore new file mode 100644 index 00000000..1746e326 --- /dev/null +++ b/release-version-check/tests/fixtures/CalVer/.gitignore @@ -0,0 +1,2 @@ +bin +obj diff --git a/release-version-check/tests/fixtures/SemVer/.gitignore b/release-version-check/tests/fixtures/SemVer/.gitignore new file mode 100644 index 00000000..1746e326 --- /dev/null +++ b/release-version-check/tests/fixtures/SemVer/.gitignore @@ -0,0 +1,2 @@ +bin +obj diff --git a/version-bump/tests/fixtures/.gitignore b/version-bump/tests/fixtures/.gitignore new file mode 100644 index 00000000..1746e326 --- /dev/null +++ b/version-bump/tests/fixtures/.gitignore @@ -0,0 +1,2 @@ +bin +obj From 094721205b6ea29f7619aa86be259cfbeb2e7698 Mon Sep 17 00:00:00 2001 From: Matt Bishop Date: Thu, 14 Nov 2024 11:23:54 -0500 Subject: [PATCH 2/5] Delete Renovate reference in dependency (#347) --- .prettierignore | 2 ++ .../node_modules/before-after-hook/package.json | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) create mode 100644 .prettierignore diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000..6c5f7604 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,2 @@ +# Dependencies +**/node_modules diff --git a/download-artifacts/node_modules/before-after-hook/package.json b/download-artifacts/node_modules/before-after-hook/package.json index 533a3ebe..17612e2b 100644 --- a/download-artifacts/node_modules/before-after-hook/package.json +++ b/download-artifacts/node_modules/before-after-hook/package.json @@ -62,10 +62,5 @@ "prerelease": true } ] - }, - "renovate": { - "extends": [ - "github>gr2m/.github" - ] } } From 864eee486b501fce8e932cccb12918dfb0b30b87 Mon Sep 17 00:00:00 2001 From: Matt Bishop Date: Thu, 14 Nov 2024 11:44:36 -0500 Subject: [PATCH 3/5] Ignore modules with Renovate too (#348) --- .github/renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/renovate.json b/.github/renovate.json index 0364a956..1f8c3612 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -2,7 +2,7 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": ["github>bitwarden/renovate-config"], "enabledManagers": ["dockerfile", "github-actions", "npm", "nuget", "pipenv"], - "ignorePaths": ["version-bump/tests/fixtures/**"], + "ignorePaths": ["version-bump/tests/fixtures/**", "**/node_modules/**"], "packageRules": [ { "additionalBranchPrefix": "{{parentDir}}-", From 59f1e79f0d982c46022597aeb573546027700abf Mon Sep 17 00:00:00 2001 From: Matt Bishop Date: Tue, 19 Nov 2024 15:29:04 -0500 Subject: [PATCH 4/5] Ignore and update some more references (#349) --- .github/renovate.json | 6 +++- version-bump/tests/fixtures/test.csproj | 48 ++++++++++++------------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 1f8c3612..36d34a29 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -2,7 +2,11 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": ["github>bitwarden/renovate-config"], "enabledManagers": ["dockerfile", "github-actions", "npm", "nuget", "pipenv"], - "ignorePaths": ["version-bump/tests/fixtures/**", "**/node_modules/**"], + "ignorePaths": [ + "release-version-check/tests/fixtures/**", + "version-bump/tests/fixtures/**", + "**/node_modules/**" + ], "packageRules": [ { "additionalBranchPrefix": "{{parentDir}}-", diff --git a/version-bump/tests/fixtures/test.csproj b/version-bump/tests/fixtures/test.csproj index a29e9030..2026d8d9 100644 --- a/version-bump/tests/fixtures/test.csproj +++ b/version-bump/tests/fixtures/test.csproj @@ -1,39 +1,39 @@ - net5.0 + net8.0 Bit.KeyConnector bitwarden-KeyConnector True - 2023.12.1 + 2024.11.0 - - - - - - - + + + + + + + - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - - - + + + + + + + + + + + + - \ No newline at end of file + From ced32288e40bb6cc9861c2f0e8116531f76bfc02 Mon Sep 17 00:00:00 2001 From: Amy Galles <9685081+AmyLGalles@users.noreply.github.com> Date: Tue, 3 Dec 2024 12:00:38 -0800 Subject: [PATCH 5/5] replacing ubuntu-latest with ubuntu-24.04 (#353) --- .github/workflows/test-lint-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-lint-workflow.yml b/.github/workflows/test-lint-workflow.yml index a9eb9722..cbf9ea00 100644 --- a/.github/workflows/test-lint-workflow.yml +++ b/.github/workflows/test-lint-workflow.yml @@ -11,7 +11,7 @@ on: jobs: test-lint-workflow: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout Branch uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2