Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Pull Request] A project level refactoring #278

Merged
merged 24 commits into from
Feb 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b0161a9
📝 Chore(Submodules): Remove.
Dynesshely Feb 7, 2024
9fca2d6
📝 Chore(Submodules): Import `KitX Standard` as submodule.
Dynesshely Feb 7, 2024
3cd9253
💾 Feat: Optimized.
Dynesshely Feb 7, 2024
e3a33ac
📦 Struct(Repo): Optimized.
Dynesshely Feb 8, 2024
da7f2b1
💾 Feat(Cheese): Move functions in publisher to Cheese.
Dynesshely Feb 8, 2024
2b96ec2
📝 Chore(Submodules): Sync.
Dynesshely Feb 8, 2024
fd0221f
📝 Chore(Submodules): Sync.
Dynesshely Feb 8, 2024
313f481
📝 Chore(Submodules): Sync.
Dynesshely Feb 8, 2024
702c86f
📝 Chore: Sync submodules.
Dynesshely Feb 16, 2024
eecbb4f
📝 Chore(Submodule): Import `CSharpell`.
Dynesshely Feb 17, 2024
5ce76dc
📝 Chore(Submodules): Sync.
Dynesshely Feb 17, 2024
c753f55
📝 Chore(Submodules): Sync.
Dynesshely Feb 19, 2024
9f3b5a0
📝 Chore(Submodules): Updated.
Dynesshely Feb 20, 2024
85be6ae
🔧 Fix(Actions): Paths.
Dynesshely Feb 20, 2024
c8bf5ea
📝 Chore(Submodules): Sync.
Dynesshely Feb 20, 2024
36d774b
📝 Chore(Submodules): Sync.
Dynesshely Feb 21, 2024
777a62e
📝 Chore(Submodules): Sync.
Dynesshely Feb 25, 2024
3a32122
📝 Chore(Submodules): Sync.
Dynesshely Feb 25, 2024
c01998a
📄 Docs(README): Updated.
Dynesshely Feb 25, 2024
c79d653
📝 Chore(Actions): Updated and corrected.
Dynesshely Feb 25, 2024
cc35ae5
📝 Chore(Actions): Fix sub-submodules' errors.
Dynesshely Feb 25, 2024
b3f8fa1
📝 Chore(Actions): Try to use `checkout` to run git command with defau…
Dynesshely Feb 25, 2024
f99b3dc
📝 Chore(Actions): Try to checkout sub-submodules standalone.
Dynesshely Feb 25, 2024
f67cfd1
📝 🔧 Chore, Fix(Actions): Also checkout Standard for other workflows.
Dynesshely Feb 25, 2024
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
87 changes: 46 additions & 41 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

锘�
file_header_template = Copyright (c) Crequency Studio. All Rights Reserved.\nLicense under the AGPL, Version 3.0.\nFile Name: {fileName}


[*]
end_of_line = crlf
end_of_line = lf
charset = utf-8-bom
trim_trailing_whitespace = true
insert_final_newline = true
Expand Down Expand Up @@ -41,12 +41,13 @@ dotnet_style_prefer_simplified_interpolation = true:suggestion
dotnet_style_namespace_match_folder = true:suggestion
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
dotnet_style_predefined_type_for_member_access = true:silent
dotnet_style_prefer_collection_expression = true:suggestion


[*.cs]
#### 命名样式 ####
#### 锟斤拷锟斤拷锟斤拷式 ####

# 命名规则
# 锟斤拷锟斤拷锟斤拷锟斤拷

dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
Expand All @@ -60,7 +61,7 @@ dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case

# 符号规范
# 锟斤拷锟脚规范

dotnet_naming_symbols.interface.applicable_kinds = interface
dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
Expand All @@ -74,7 +75,7 @@ dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, meth
dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
dotnet_naming_symbols.non_field_members.required_modifiers =

# 命名样式
# 锟斤拷锟斤拷锟斤拷式

dotnet_naming_style.begins_with_i.required_prefix = I
dotnet_naming_style.begins_with_i.required_suffix =
Expand All @@ -91,14 +92,14 @@ dotnet_naming_style.pascal_case.required_suffix =
dotnet_naming_style.pascal_case.word_separator =
dotnet_naming_style.pascal_case.capitalization = pascal_case
csharp_using_directive_placement = outside_namespace:silent
csharp_style_expression_bodied_methods = false:silent
csharp_style_expression_bodied_constructors = false:silent
csharp_style_expression_bodied_operators = false:silent
csharp_style_expression_bodied_methods = when_on_single_line:silent
csharp_style_expression_bodied_constructors = when_on_single_line:silent
csharp_style_expression_bodied_operators = true:silent
csharp_style_expression_bodied_properties = true:silent
csharp_style_expression_bodied_indexers = true:silent
csharp_style_expression_bodied_accessors = true:silent
csharp_style_expression_bodied_lambdas = true:silent
csharp_style_expression_bodied_local_functions = false:silent
csharp_style_expression_bodied_local_functions = when_on_single_line:silent
csharp_style_conditional_delegate_call = true:suggestion
csharp_style_var_for_built_in_types = false:silent
csharp_style_var_when_type_is_apparent = false:silent
Expand Down Expand Up @@ -134,51 +135,55 @@ csharp_style_deconstructed_variable_declaration = true:suggestion
csharp_style_unused_value_assignment_preference = discard_variable:suggestion
csharp_style_unused_value_expression_statement_preference = discard_variable:silent
csharp_style_prefer_readonly_struct = true:suggestion
csharp_style_prefer_primary_constructors = true:suggestion
csharp_style_prefer_readonly_struct_member = true:suggestion
csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:silent
csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent

[*.vb]
#### 命名样式 ####
#### 锟斤拷锟斤拷锟斤拷式 ####

# 命名规则
# 锟斤拷锟斤拷锟斤拷锟斤拷

dotnet_naming_rule.interface_should_be_以_i_开始.severity = suggestion
dotnet_naming_rule.interface_should_be_以_i_开始.symbols = interface
dotnet_naming_rule.interface_should_be_以_i_开始.style = 以_i_开始
dotnet_naming_rule.interface_should_be_锟斤拷_i_锟斤拷始.severity = suggestion
dotnet_naming_rule.interface_should_be_锟斤拷_i_锟斤拷始.symbols = interface
dotnet_naming_rule.interface_should_be_锟斤拷_i_锟斤拷始.style = 锟斤拷_i_锟斤拷始

dotnet_naming_rule.类型_should_be_帕斯卡拼写法.severity = suggestion
dotnet_naming_rule.类型_should_be_帕斯卡拼写法.symbols = 类型
dotnet_naming_rule.类型_should_be_帕斯卡拼写法.style = 帕斯卡拼写法
dotnet_naming_rule.锟斤拷锟斤拷_should_be_锟斤拷斯锟斤拷拼写锟斤拷.severity = suggestion
dotnet_naming_rule.锟斤拷锟斤拷_should_be_锟斤拷斯锟斤拷拼写锟斤拷.symbols = 锟斤拷锟斤拷
dotnet_naming_rule.锟斤拷锟斤拷_should_be_锟斤拷斯锟斤拷拼写锟斤拷.style = 锟斤拷斯锟斤拷拼写锟斤拷

dotnet_naming_rule.非字段成员_should_be_帕斯卡拼写法.severity = suggestion
dotnet_naming_rule.非字段成员_should_be_帕斯卡拼写法.symbols = 非字段成员
dotnet_naming_rule.非字段成员_should_be_帕斯卡拼写法.style = 帕斯卡拼写法
dotnet_naming_rule.锟斤拷锟街段筹拷员_should_be_锟斤拷斯锟斤拷拼写锟斤拷.severity = suggestion
dotnet_naming_rule.锟斤拷锟街段筹拷员_should_be_锟斤拷斯锟斤拷拼写锟斤拷.symbols = 锟斤拷锟街段筹拷员
dotnet_naming_rule.锟斤拷锟街段筹拷员_should_be_锟斤拷斯锟斤拷拼写锟斤拷.style = 锟斤拷斯锟斤拷拼写锟斤拷

# 符号规范
# 锟斤拷锟脚规范

dotnet_naming_symbols.interface.applicable_kinds = interface
dotnet_naming_symbols.interface.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
dotnet_naming_symbols.interface.required_modifiers =

dotnet_naming_symbols.类型.applicable_kinds = class, struct, interface, enum
dotnet_naming_symbols.类型.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
dotnet_naming_symbols.类型.required_modifiers =
dotnet_naming_symbols.锟斤拷锟斤拷.applicable_kinds = class, struct, interface, enum
dotnet_naming_symbols.锟斤拷锟斤拷.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
dotnet_naming_symbols.锟斤拷锟斤拷.required_modifiers =

dotnet_naming_symbols.非字段成员.applicable_kinds = property, event, method
dotnet_naming_symbols.非字段成员.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
dotnet_naming_symbols.非字段成员.required_modifiers =
dotnet_naming_symbols.锟斤拷锟街段筹拷员.applicable_kinds = property, event, method
dotnet_naming_symbols.锟斤拷锟街段筹拷员.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
dotnet_naming_symbols.锟斤拷锟街段筹拷员.required_modifiers =

# 命名样式
# 锟斤拷锟斤拷锟斤拷式

dotnet_naming_style.以_i_开始.required_prefix = I
dotnet_naming_style.以_i_开始.required_suffix =
dotnet_naming_style.以_i_开始.word_separator =
dotnet_naming_style.以_i_开始.capitalization = pascal_case
dotnet_naming_style.锟斤拷_i_锟斤拷始.required_prefix = I
dotnet_naming_style.锟斤拷_i_锟斤拷始.required_suffix =
dotnet_naming_style.锟斤拷_i_锟斤拷始.word_separator =
dotnet_naming_style.锟斤拷_i_锟斤拷始.capitalization = pascal_case

dotnet_naming_style.帕斯卡拼写法.required_prefix =
dotnet_naming_style.帕斯卡拼写法.required_suffix =
dotnet_naming_style.帕斯卡拼写法.word_separator =
dotnet_naming_style.帕斯卡拼写法.capitalization = pascal_case
dotnet_naming_style.锟斤拷斯锟斤拷拼写锟斤拷.required_prefix =
dotnet_naming_style.锟斤拷斯锟斤拷拼写锟斤拷.required_suffix =
dotnet_naming_style.锟斤拷斯锟斤拷拼写锟斤拷.word_separator =
dotnet_naming_style.锟斤拷斯锟斤拷拼写锟斤拷.capitalization = pascal_case

dotnet_naming_style.帕斯卡拼写法.required_prefix =
dotnet_naming_style.帕斯卡拼写法.required_suffix =
dotnet_naming_style.帕斯卡拼写法.word_separator =
dotnet_naming_style.帕斯卡拼写法.capitalization = pascal_case
dotnet_naming_style.锟斤拷斯锟斤拷拼写锟斤拷.required_prefix =
dotnet_naming_style.锟斤拷斯锟斤拷拼写锟斤拷.required_suffix =
dotnet_naming_style.锟斤拷斯锟斤拷拼写锟斤拷.word_separator =
dotnet_naming_style.锟斤拷斯锟斤拷拼写锟斤拷.capitalization = pascal_case
File renamed without changes.
30 changes: 25 additions & 5 deletions .github/workflows/build-loaders.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,40 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: dev=main
submodules: "true"

- name: Checkout KitX Standard
uses: actions/checkout@v4
with:
repository: "Crequency/KitX-Standard"
ref: "dev=main"
path: "KitX Standard"
submodules: "true"

- name: Checkout KitX SDK
uses: actions/checkout@v4
with:
repository: "Crequency/KitX-SDK"
ref: "dev=main"
path: "KitX SDK"
submodules: "true"

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.0.x
7.0.x
8.0.x

- name: Build Loaders
working-directory: "KitX Standard/KitX Loaders"
working-directory: "KitX SDK/KitX Loaders"
run: |
cd "KitX.Loader.CSharp"
dotnet build -c Release
cd ".."

cd "KitX.Loader.Winform.Core"
dotnet build -c Release
cd ".."
Expand Down
26 changes: 21 additions & 5 deletions .github/workflows/build-plugins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,35 @@ jobs:
runs-on: windows-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: dev=main
submodules: "true"

- name: Checkout KitX Standard
uses: actions/checkout@v4
with:
repository: "Crequency/KitX-Standard"
ref: "dev=main"
path: "KitX Standard"
submodules: "true"

- name: Checkout KitX SDK
uses: actions/checkout@v4
with:
repository: "Crequency/KitX-SDK"
ref: "dev=main"
path: "KitX SDK"
submodules: "true"

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.0.x
7.0.x
8.0.x

- name: Build Plugins
working-directory: "KitX Standard/KitX Plugins"
working-directory: "KitX SDK/KitX Plugins"
run: |
cd "TestPlugin.CSharp"
dotnet build -c Release
Expand Down
37 changes: 24 additions & 13 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,37 +25,48 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: dev=main
submodules: "true"

- name: Checkout KitX Standard
uses: actions/checkout@v4
with:
repository: "Crequency/KitX-Standard"
ref: "dev=main"
path: "KitX Standard"
submodules: "true"

- name: Checkout KitX SDK
uses: actions/checkout@v4
with:
repository: "Crequency/KitX-SDK"
ref: "dev=main"
path: "KitX SDK"
submodules: "true"

- name: Setup .NET
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.0.x
7.0.x
8.0.x

- name: Build Contracts
working-directory: "KitX Standard/KitX Contracts"
run: |
cd "KitX.Contract.CSharp"
dotnet build -c Release
cd ".."

- name: Build Rules
working-directory: "KitX Standard/KitX Rules"
- name: Build Shared
working-directory: "KitX Standard/KitX.Shared"
run: |
cd "KitX.Web.Rules"
dotnet build -c Release
cd ".."

- name: Build File Format Helper
working-directory: "KitX Standard/KitX File Formats"
- name: Build File Formats
working-directory: "KitX Standard/KitX.FileFormats"
run: |
cd "KitX.Formats.KXP"
dotnet build -c Release
cd ".."

- name: Build Dashboard
working-directory: "KitX Clients/KitX Dashboard/KitX Dashboard"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-auto-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Comment on Pull Request
run: |
Expand Down
Loading
Loading