Merge pull request #278 from Crequency/dev=main

[Pull Request] A project level refactoring [Publish Packages][All]
Crequency · Feb 25, 2024 · 7a58da4 · 7a58da4
2 parents bdec9a5 + f67cfd1
commit 7a58da4
Show file tree

Hide file tree

Showing 34 changed files with 414 additions and 1,041 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -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
@@ -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
@@ -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
@@ -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 = 
@@ -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
@@ -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
diff --git a/ToolKits/Actions/check_new_commit.py → .github/scripts/check_new_commit.py b/ToolKits/Actions/check_new_commit.py → .github/scripts/check_new_commit.py
diff --git a/ToolKits/Actions/pr_format.py → .github/scripts/pr_format.py b/ToolKits/Actions/pr_format.py → .github/scripts/pr_format.py
diff --git a/.github/workflows/build-loaders.yml b/.github/workflows/build-loaders.yml
@@ -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 ".."

diff --git a/.github/workflows/build-plugins.yml b/.github/workflows/build-plugins.yml
@@ -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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -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"

diff --git a/.github/workflows/pr-auto-format.yml b/.github/workflows/pr-auto-format.yml
@@ -10,7 +10,7 @@ jobs:
         runs-on: ubuntu-latest
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
             - name: Comment on Pull Request
               run: |