Skip to content

Commit

Permalink
V6.0.1.2 Support
Browse files Browse the repository at this point in the history
  • Loading branch information
yasathedog123 committed Mar 22, 2024
1 parent 160212d commit b2fe532
Show file tree
Hide file tree
Showing 978 changed files with 18,088 additions and 14,566 deletions.
36 changes: 31 additions & 5 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ root = true

[*]
charset = utf-8
#file_header_template = · _ _ _ ____ _ _____\n / \ _ __ ___ | |__ (_)/ ___| | |_ ___ __ _ _ __ ___ | ___|__ _ _ __ _ __ ___\n / _ \ | '__|/ __|| '_ \ | |\___ \ | __|/ _ \ / _` || '_ ` _ \ | |_ / _` || '__|| '_ ` _ \\n / ___ \ | | | (__ | | | || | ___) || |_| __/| (_| || | | | | || _|| (_| || | | | | | | |\n/_/ \_\|_| \___||_| |_||_||____/ \__|\___| \__,_||_| |_| |_||_| \__,_||_| |_| |_| |_|\n\nCopyright 2015-2021 Łukasz "JustArchi" Domeradzki\nContact: [email protected]\n\nLicensed under the Apache License, Version 2.0 (the "License")\nyou may not use this file except in compliance with the License.\nYou may obtain a copy of the License at\n\nhttp://www.apache.org/licenses/LICENSE-2.0\n\nUnless required by applicable law or agreed to in writing, software\ndistributed under the License is distributed on an "AS IS" BASIS,\nWITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\nSee the License for the specific language governing permissions and\nlimitations under the License.
indent_style = tab
insert_final_newline = true
trim_trailing_whitespace = true
Expand Down Expand Up @@ -35,7 +36,7 @@ csharp_prefer_simple_default_expression = true:warning
csharp_prefer_simple_using_statement = true:warning
csharp_prefer_static_local_function = true:warning

csharp_preferred_modifier_order = public, protected, internal, private, static, extern, new, virtual, abstract, sealed, override, readonly, unsafe, volatile, async:warning
csharp_preferred_modifier_order = public, protected, internal, private, file, static, extern, new, virtual, abstract, sealed, override, readonly, unsafe, required, volatile, async:warning

csharp_preserve_single_line_blocks = true
csharp_preserve_single_line_statements = false
Expand All @@ -60,7 +61,6 @@ csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_declaration_name_and_open_parenthesis = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = none
csharp_space_between_square_brackets = false

csharp_style_conditional_delegate_call = true:warning
Expand All @@ -78,15 +78,27 @@ csharp_style_expression_bodied_properties = true:warning
csharp_style_implicit_object_creation_when_type_is_apparent = true:warning
csharp_style_inlined_variable_declaration = true:warning

csharp_style_pattern_local_over_anonymous_function = true:warning
csharp_style_namespace_declarations = file_scoped:warning

csharp_style_pattern_matching_over_as_with_null_check = true:warning
csharp_style_pattern_matching_over_is_with_cast_check = true:warning

csharp_style_prefer_extended_property_pattern = true:warning
dotnet_style_prefer_foreach_explicit_cast_in_source = always:warning
csharp_style_prefer_index_operator = true:warning
csharp_style_prefer_local_over_anonymous_function = true:warning
csharp_style_prefer_method_group_conversion = true:warning
csharp_style_prefer_not_pattern = true:warning
csharp_style_prefer_null_check_over_type_check = true:warning
csharp_style_prefer_pattern_matching = true:warning
csharp_style_prefer_primary_constructors = true:warning
csharp_style_prefer_range_operator = true:warning
csharp_style_prefer_readonly_struct = true:warning
csharp_style_prefer_readonly_struct_member = true:warning
csharp_style_prefer_switch_expression = true:warning
csharp_style_prefer_top_level_statements = false:warning
csharp_style_prefer_tuple_swap = true:warning
csharp_style_prefer_utf8_string_literals = true:warning

csharp_style_throw_expression = true:warning

Expand All @@ -97,13 +109,12 @@ csharp_style_var_elsewhere = false:warning
csharp_style_var_for_built_in_types = false:warning
csharp_style_var_when_type_is_apparent = false:warning

csharp_using_directive_placement = outside_namespace
csharp_using_directive_placement = outside_namespace:warning

###############################
# .NET Coding Conventions #
###############################

[*.{cs,vb}]
dotnet_analyzer_diagnostic.severity = warning

dotnet_code_quality.ca3003.excluded_symbol_names = BotController
Expand All @@ -113,6 +124,7 @@ dotnet_code_quality_unused_parameters = all:warning

dotnet_diagnostic.ca1028.severity = silent
dotnet_diagnostic.ca1031.severity = silent
dotnet_diagnostic.ca1863.severity = silent

# Rule - almost everything
dotnet_naming_rule.almost_everything_must_be_pascal_case.severity = warning
Expand Down Expand Up @@ -184,6 +196,7 @@ dotnet_sort_system_directives_first = true
dotnet_style_coalesce_expression = true:warning
dotnet_style_collection_initializer = true:warning
dotnet_style_explicit_tuple_names = true:warning
dotnet_style_namespace_match_folder = true:warning
dotnet_style_null_propagation = true:warning
dotnet_style_object_initializer = true:warning

Expand Down Expand Up @@ -212,3 +225,16 @@ dotnet_style_qualification_for_property = false:warning

dotnet_style_readonly_field = true:warning
dotnet_style_require_accessibility_modifiers = always:warning

###############################
# JetBrains, IntelliJ/Rider #
###############################

[*.{csproj,props,resx,xml}]
ij_xml_keep_blank_lines = 1
ij_xml_keep_line_breaks = false
ij_xml_keep_line_breaks_in_text = false
ij_xml_space_inside_empty_tag = true

[*.{json,json5}]
ij_json_keep_line_breaks = false
13 changes: 13 additions & 0 deletions .idea/.idea.ASF-GetInventoryPlugin.dir/.idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/.idea.ASF-GetInventoryPlugin.dir/.idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/.idea.ASF-GetInventoryPlugin.dir/.idea/indexLayout.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/.idea.ASF-GetInventoryPlugin.dir/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 18 additions & 6 deletions ArchiSteamFarm/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ csharp_prefer_simple_default_expression = true:warning
csharp_prefer_simple_using_statement = true:warning
csharp_prefer_static_local_function = true:warning

csharp_preferred_modifier_order = public, protected, internal, private, static, extern, new, virtual, abstract, sealed, override, readonly, unsafe, volatile, async:warning
csharp_preferred_modifier_order = public, protected, internal, private, file, static, extern, new, virtual, abstract, sealed, override, readonly, unsafe, required, volatile, async:warning

csharp_preserve_single_line_blocks = true
csharp_preserve_single_line_statements = false
Expand All @@ -61,7 +61,6 @@ csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_between_method_declaration_name_and_open_parenthesis = false
csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_parentheses = none
csharp_space_between_square_brackets = false

csharp_style_conditional_delegate_call = true:warning
Expand All @@ -79,15 +78,27 @@ csharp_style_expression_bodied_properties = true:warning
csharp_style_implicit_object_creation_when_type_is_apparent = true:warning
csharp_style_inlined_variable_declaration = true:warning

csharp_style_pattern_local_over_anonymous_function = true:warning
csharp_style_namespace_declarations = file_scoped:warning

csharp_style_pattern_matching_over_as_with_null_check = true:warning
csharp_style_pattern_matching_over_is_with_cast_check = true:warning

csharp_style_prefer_extended_property_pattern = true:warning
dotnet_style_prefer_foreach_explicit_cast_in_source = always:warning
csharp_style_prefer_index_operator = true:warning
csharp_style_prefer_local_over_anonymous_function = true:warning
csharp_style_prefer_method_group_conversion = true:warning
csharp_style_prefer_not_pattern = true:warning
csharp_style_prefer_null_check_over_type_check = true:warning
csharp_style_prefer_pattern_matching = true:warning
csharp_style_prefer_primary_constructors = true:warning
csharp_style_prefer_range_operator = true:warning
csharp_style_prefer_readonly_struct = true:warning
csharp_style_prefer_readonly_struct_member = true:warning
csharp_style_prefer_switch_expression = true:warning
csharp_style_prefer_top_level_statements = false:warning
csharp_style_prefer_tuple_swap = true:warning
csharp_style_prefer_utf8_string_literals = true:warning

csharp_style_throw_expression = true:warning

Expand All @@ -98,13 +109,12 @@ csharp_style_var_elsewhere = false:warning
csharp_style_var_for_built_in_types = false:warning
csharp_style_var_when_type_is_apparent = false:warning

csharp_using_directive_placement = outside_namespace
csharp_using_directive_placement = outside_namespace:warning

###############################
# .NET Coding Conventions #
###############################

[*.{cs,vb}]
dotnet_analyzer_diagnostic.severity = warning

dotnet_code_quality.ca3003.excluded_symbol_names = BotController
Expand All @@ -114,6 +124,7 @@ dotnet_code_quality_unused_parameters = all:warning

dotnet_diagnostic.ca1028.severity = silent
dotnet_diagnostic.ca1031.severity = silent
dotnet_diagnostic.ca1863.severity = silent

# Rule - almost everything
dotnet_naming_rule.almost_everything_must_be_pascal_case.severity = warning
Expand Down Expand Up @@ -185,6 +196,7 @@ dotnet_sort_system_directives_first = true
dotnet_style_coalesce_expression = true:warning
dotnet_style_collection_initializer = true:warning
dotnet_style_explicit_tuple_names = true:warning
dotnet_style_namespace_match_folder = true:warning
dotnet_style_null_propagation = true:warning
dotnet_style_object_initializer = true:warning

Expand Down Expand Up @@ -218,7 +230,7 @@ dotnet_style_require_accessibility_modifiers = always:warning
# JetBrains, IntelliJ/Rider #
###############################

[*.{csproj,props,xml}]
[*.{csproj,props,resx,xml}]
ij_xml_keep_blank_lines = 1
ij_xml_keep_line_breaks = false
ij_xml_keep_line_breaks_in_text = false
Expand Down
8 changes: 5 additions & 3 deletions ArchiSteamFarm/ASF-ui/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on: [push, pull_request]
env:
NODE_JS_VERSION: 'lts/*'

permissions: {}

jobs:
build:
strategy:
Expand All @@ -21,7 +23,7 @@ jobs:
show-progress: false

- name: Setup Node.js with npm
uses: actions/[email protected].0
uses: actions/[email protected].2
with:
check-latest: true
node-version: ${{ env.NODE_JS_VERSION }}
Expand All @@ -43,15 +45,15 @@ jobs:

- name: Upload latest strings for translation on Crowdin
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' && startsWith(matrix.os, 'ubuntu-') }}
uses: crowdin/github-action@v1.14.1
uses: crowdin/github-action@v1.19.0
with:
crowdin_branch_name: main
config: '.github/crowdin.yml'
project_id: ${{ secrets.ASF_CROWDIN_PROJECT_ID }}
token: ${{ secrets.ASF_CROWDIN_API_TOKEN }}

- name: Upload ASF-ui
uses: actions/upload-artifact@v3.1.3
uses: actions/upload-artifact@v4.3.1
with:
name: ${{ matrix.os }}_ASF-ui
path: dist
12 changes: 11 additions & 1 deletion ArchiSteamFarm/ASF-ui/.github/workflows/lock-threads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,23 @@ name: ASF-ui-lock-threads
on:
schedule:
- cron: '0 1 * * *'
workflow_dispatch:

permissions:
discussions: write
issues: write
pull-requests: write

concurrency:
group: lock-threads

jobs:
lock:
runs-on: ubuntu-latest
steps:
- name: Lock inactive threads
uses: dessant/lock-threads@v4.0.1
uses: dessant/lock-threads@v5.0.1
with:
discussion-inactive-days: 90
issue-inactive-days: 30
pr-inactive-days: 30
7 changes: 5 additions & 2 deletions ArchiSteamFarm/ASF-ui/.github/workflows/translations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
schedule:
- cron: '0 2 * * *'

permissions:
contents: write

jobs:
update:
runs-on: ubuntu-latest
Expand All @@ -16,7 +19,7 @@ jobs:
token: ${{ secrets.ARCHIBOT_GITHUB_TOKEN }}

- name: Download latest translations from Crowdin
uses: crowdin/github-action@v1.14.1
uses: crowdin/github-action@v1.19.0
with:
upload_sources: false
download_translations: true
Expand All @@ -28,7 +31,7 @@ jobs:
token: ${{ secrets.ASF_CROWDIN_API_TOKEN }}

- name: Import GPG key
uses: crazy-max/ghaction-import-gpg@v6.0.0
uses: crazy-max/ghaction-import-gpg@v6.1.0
with:
gpg_private_key: ${{ secrets.ARCHIBOT_GPG_PRIVATE_KEY }}
git_user_signingkey: true
Expand Down
Loading

0 comments on commit b2fe532

Please sign in to comment.