From 28b3018d57231b54b910a9149ef6c38d5ef1121a Mon Sep 17 00:00:00 2001 From: Poker Date: Fri, 27 Dec 2024 02:34:34 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E9=A1=B9=E7=9B=AE=20(#569)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 32 ++++++ CONTRIBUTING.md => .github/CONTRIBUTING.md | 0 .github/ISSUE_TEMPLATE/bug_report.yaml | 12 ++- .github/ISSUE_TEMPLATE/feature_request.yaml | 20 ++-- README.en.md => .github/README.en.md | 2 +- README.fr.md => .github/README.fr.md | 2 +- README.md => .github/README.md | 2 +- README.ru.md => .github/README.ru.md | 2 +- SECURITY.md => .github/SECURITY.md | 0 translation.md => .github/translation.md | 2 +- translation.ps1 => .github/translation.ps1 | 0 Pixeval.sln | 2 - Pixeval.sln.DotSettings | 14 --- Pixeval.slnx | 73 +++++++------- Pixeval_PublicKey.cer | Bin 810 -> 0 bytes src/Pixeval.Controls/Pixeval.Controls.csproj | 3 +- .../Pixeval.SourceGen.csproj | 38 +++---- src/Pixeval/Pixeval.csproj | 94 ++---------------- src/Pixeval/Properties/AssemblyInfo.cs | 0 19 files changed, 123 insertions(+), 175 deletions(-) rename CONTRIBUTING.md => .github/CONTRIBUTING.md (100%) rename README.en.md => .github/README.en.md (99%) rename README.fr.md => .github/README.fr.md (99%) rename README.md => .github/README.md (99%) rename README.ru.md => .github/README.ru.md (99%) rename SECURITY.md => .github/SECURITY.md (100%) rename translation.md => .github/translation.md (93%) rename translation.ps1 => .github/translation.ps1 (100%) delete mode 100644 Pixeval.sln.DotSettings delete mode 100644 Pixeval_PublicKey.cer delete mode 100644 src/Pixeval/Properties/AssemblyInfo.cs diff --git a/.editorconfig b/.editorconfig index ee3469c6..569ea398 100644 --- a/.editorconfig +++ b/.editorconfig @@ -190,6 +190,14 @@ dotnet_naming_rule.const_field_should_be_pascal_case.severity = suggestion dotnet_naming_rule.const_field_should_be_pascal_case.symbols = const_field dotnet_naming_rule.const_field_should_be_pascal_case.style = pascal_case +dotnet_naming_rule.private_static_field_should_be_pascal_begin_with__.severity = suggestion +dotnet_naming_rule.private_static_field_should_be_pascal_begin_with__.symbols = private_static_field +dotnet_naming_rule.private_static_field_should_be_pascal_begin_with__.style = pascal_begin_with__ + +dotnet_naming_rule.private_static_readonly_field_should_be_pascal_begin_with__.severity = suggestion +dotnet_naming_rule.private_static_readonly_field_should_be_pascal_begin_with__.symbols = private_static_readonly_field +dotnet_naming_rule.private_static_readonly_field_should_be_pascal_begin_with__.style = pascal_begin_with__ + dotnet_naming_rule.private_field_should_be_camel_begin_with__.severity = suggestion dotnet_naming_rule.private_field_should_be_camel_begin_with__.symbols = private_field dotnet_naming_rule.private_field_should_be_camel_begin_with__.style = camel_begin_with__ @@ -198,12 +206,15 @@ dotnet_naming_rule.private_field_should_be_camel_begin_with__.style = camel_begi dotnet_naming_symbols.interface.applicable_kinds = interface dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.required_modifiers = dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.required_modifiers = dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method 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_symbols.const_field.applicable_kinds = field dotnet_naming_symbols.const_field.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected @@ -211,20 +222,41 @@ dotnet_naming_symbols.const_field.required_modifiers = const dotnet_naming_symbols.visible_field.applicable_kinds = field dotnet_naming_symbols.visible_field.applicable_accessibilities = public, internal, protected_internal +dotnet_naming_symbols.visible_field.required_modifiers = dotnet_naming_symbols.private_field.applicable_kinds = field dotnet_naming_symbols.private_field.applicable_accessibilities = private +dotnet_naming_symbols.private_field.required_modifiers = + +dotnet_naming_symbols.private_static_field.applicable_kinds = field +dotnet_naming_symbols.private_static_field.applicable_accessibilities = private +dotnet_naming_symbols.private_static_field.required_modifiers = static + +dotnet_naming_symbols.private_static_readonly_field.applicable_kinds = field +dotnet_naming_symbols.private_static_readonly_field.applicable_accessibilities = private +dotnet_naming_symbols.private_static_readonly_field.required_modifiers = readonly, static # 命名样式 +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = dotnet_naming_style.pascal_case.capitalization = pascal_case dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = dotnet_naming_style.begins_with_i.capitalization = pascal_case dotnet_naming_style.camel_begin_with__.required_prefix = _ +dotnet_naming_style.camel_begin_with__.required_suffix = +dotnet_naming_style.camel_begin_with__.word_separator = dotnet_naming_style.camel_begin_with__.capitalization = camel_case +dotnet_naming_style.pascal_begin_with__.required_prefix = _ +dotnet_naming_style.pascal_begin_with__.required_suffix = +dotnet_naming_style.pascal_begin_with__.word_separator = +dotnet_naming_style.pascal_begin_with__.capitalization = pascal_case # ReSharper properties resharper_max_initializer_elements_on_line = 1 diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md similarity index 100% rename from CONTRIBUTING.md rename to .github/CONTRIBUTING.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 4ff7b3e7..a106a17e 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -10,12 +10,16 @@ body: 🚨 **请勿略过说明 / Please do not skip instructions** 🚨 1. 请确保在打开一个新议题之前，查找并确认不要与已有议题重复。 - 2. WPF版本已不再维护，除非重大BUG其他情况下都会直接关闭议题。 + + Please make sure to look for existing issues about the same problem before opening a new one. + + 2. WPF版本已不再维护，除非重大漏洞，其他情况下都会直接关闭议题。 + + The WPF version is no longer maintained and issues are simply closed unless there is a serious bug. + 3. 请尽可能多地提供信息，如果软件崩溃请一并提供崩溃日志。 - 1. Please make sure to look for existing issues about the same problem before opening a new one. - 2. The WPF version is no longer maintained and issues are simply closed unless there is a major bug. - 3. Please provide as much information as possible, and if the software crashes, please provide crash logs as well. + Please provide as much information as possible, and if the software crashes, please provide crash logs as well. - type: dropdown validations: required: true diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml index 698933a4..83deb7dd 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yaml +++ b/.github/ISSUE_TEMPLATE/feature_request.yaml @@ -10,25 +10,29 @@ body: 🚨 **请勿略过说明 / Please do not skip instructions** 🚨 1. 请确保在打开一个新议题之前，查找并确认不要与已有议题重复。 - 2. WPF版本已不再维护，除非重大BUG其他情况下都会直接关闭议题。 + + Please make sure to look for existing issues about the same problem before opening a new one. + + 2. WPF版本已不再维护，除非重大漏洞，其他情况下都会直接关闭议题。 + + The WPF version is no longer maintained and issues are simply closed unless there is a serious bug. + 3. 只支持Win10，而Win11不支持的功能建议，大概率不会被接受。 - 1. Please make sure to look for existing issues about the same problem before opening a new one. - 2. The WPF version is no longer maintained and issues are simply closed unless there is a major bug. - 3. Feature requests that only support Win10 and not Win11 will most likely not be accepted. + Feature requests that only support Win10 and not Win11 will most likely not be accepted. - type: dropdown validations: required: true attributes: - label: 建议类型 + label: 建议类型 / Type of request options: - - 新功能 - - 功能优化 + - 新功能 / New feature + - 功能优化 / Optimization of feature - type: dropdown validations: required: true attributes: - label: Pixeval的版本 + label: Pixeval的版本 / Pixeval's version options: - WinUI 3 - type: textarea diff --git a/README.en.md b/.github/README.en.md similarity index 99% rename from README.en.md rename to .github/README.en.md index 704242d6..d9e08c17 100644 --- a/README.en.md +++ b/.github/README.en.md @@ -1,6 +1,6 @@
-logo +logo # Pixeval diff --git a/README.fr.md b/.github/README.fr.md similarity index 99% rename from README.fr.md rename to .github/README.fr.md index 0802bb0f..e4a70645 100644 --- a/README.fr.md +++ b/.github/README.fr.md @@ -1,6 +1,6 @@
-logo +logo # Pixeval diff --git a/README.md b/.github/README.md similarity index 99% rename from README.md rename to .github/README.md index 7015c161..2253727b 100644 --- a/README.md +++ b/.github/README.md @@ -1,6 +1,6 @@
-logo +logo # Pixeval diff --git a/README.ru.md b/.github/README.ru.md similarity index 99% rename from README.ru.md rename to .github/README.ru.md index f10e1c1c..9d512c2d 100644 --- a/README.ru.md +++ b/.github/README.ru.md @@ -1,6 +1,6 @@
-logo +logo # Pixeval diff --git a/SECURITY.md b/.github/SECURITY.md similarity index 100% rename from SECURITY.md rename to .github/SECURITY.md diff --git a/translation.md b/.github/translation.md similarity index 93% rename from translation.md rename to .github/translation.md index edb938f1..03828d7e 100644 --- a/translation.md +++ b/.github/translation.md @@ -33,7 +33,7 @@ Welcome to the Pixeval project! We appreciate your help in translating the appli Here are some recommended tools for translating the `.resjson` files: - [Visual Studio Code](https://code.visualstudio.com/) - A powerful and customizable code editor. -- [Resource Cheker](https://github.com/Pixeval/ResourceChecker) - Our solution for verification and translation assistance +- [Resource Checker](https://github.com/Pixeval/ResourceChecker) - Our solution for verification and translation assistance ## Future Plans diff --git a/translation.ps1 b/.github/translation.ps1 similarity index 100% rename from translation.ps1 rename to .github/translation.ps1 diff --git a/Pixeval.sln b/Pixeval.sln index 85580c45..cc394737 100644 --- a/Pixeval.sln +++ b/Pixeval.sln @@ -25,9 +25,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ISSUE_TEMPLATE", "ISSUE_TEMPLATE", "{CF6471C8-02F1-4B25-9207-43312C206A45}" ProjectSection(SolutionItems) = preProject .github\ISSUE_TEMPLATE\bug_report.yaml = .github\ISSUE_TEMPLATE\bug_report.yaml - .github\ISSUE_TEMPLATE\bug_report_zh.yaml = .github\ISSUE_TEMPLATE\bug_report_zh.yaml .github\ISSUE_TEMPLATE\feature_request.yaml = .github\ISSUE_TEMPLATE\feature_request.yaml - .github\ISSUE_TEMPLATE\feature_request_zh.yaml = .github\ISSUE_TEMPLATE\feature_request_zh.yaml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{F041EE9B-A618-438D-A16D-1265421E22FC}" diff --git a/Pixeval.sln.DotSettings b/Pixeval.sln.DotSettings deleted file mode 100644 index 18329767..00000000 --- a/Pixeval.sln.DotSettings +++ /dev/null @@ -1,14 +0,0 @@ - - True - True - True - True - True - True - True - True - True - True - True - True - True diff --git a/Pixeval.slnx b/Pixeval.slnx index a7edfd9b..0a315e86 100644 --- a/Pixeval.slnx +++ b/Pixeval.slnx @@ -4,50 +4,53 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + - - - - + + + + + - - - - + + + + + - \ No newline at end of file + diff --git a/Pixeval_PublicKey.cer b/Pixeval_PublicKey.cer deleted file mode 100644 index 47fa0c8cd84a258002d9ceeff090c7468543e987..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 810 zcmXqLVpcO~V&YrC%*4pVB#<7l|47KR_8te@|8Eq9?%p%tW#iOp^Jx3d%gD&f%3z>k zC}6?nm;)1GhKm@;iSrs68X6gz8JZXy8<<6j^BP0BCLk`6rZh1s zAzRPL%D~*j$j@NV#K^_e#K_2SIQi}Ay#LJ+yY@{}KQ42PQF?;ZvHUcN3dc*AoT?ea zXLKlbtl6?+$6lS^&uVXJ^qrEqv9?EmL4fgL=fQU>+;3lX21IMc2|X)XAf5ksMf^^Q zc8P}B%h)nb{#hICbVog6?FK>O?8TR1xxhs{ydyd_$ch8LxFH-gCYF+;{PI%(X zD{Q)Ydf(&jO;{KZUYXu^GbmT^^ox$%Z?S8eSR?r5@5o(Ds5Vj78)g?>;?&|EDdyuFhRJ zD=2VzQ`k~D-%PF71`B(I)fY;M+Qh_~)D2R#}Jf{Qb7&oXZrqeUdhZ)=O1BTH%pB z<6!%PMLK;qF2#!;6509M!S2)d=`1>|3L?@oBtCjuIj*iysXV;p44df{r+ZTSL-~n&1&oB^SfV6Wlj!wZ{WpLC|ENmF!3ax eQ{WE&+*k6S+SyWXnLkRICZRpcslVQON(ca&J~!w9 diff --git a/src/Pixeval.Controls/Pixeval.Controls.csproj b/src/Pixeval.Controls/Pixeval.Controls.csproj index aad8c619..a427ebf6 100644 --- a/src/Pixeval.Controls/Pixeval.Controls.csproj +++ b/src/Pixeval.Controls/Pixeval.Controls.csproj @@ -2,7 +2,7 @@ net8.0-windows10.0.22621.0 10.0.19041.0 - Pixeval.Controls + Pixeval.Controls x86;x64;arm64 win-x86;win-x64;win-arm64 true @@ -12,6 +12,7 @@ true zh-cn true + false diff --git a/src/Pixeval.SourceGen/Pixeval.SourceGen.csproj b/src/Pixeval.SourceGen/Pixeval.SourceGen.csproj index a025f986..9d529149 100644 --- a/src/Pixeval.SourceGen/Pixeval.SourceGen.csproj +++ b/src/Pixeval.SourceGen/Pixeval.SourceGen.csproj @@ -1,21 +1,21 @@ - - netstandard2.0 - true - enable - true - Generated - true - Debug;Release - AnyCPU - latest - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + netstandard2.0 + true + enable + true + Generated + true + Debug;Release + AnyCPU + latest + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + \ No newline at end of file diff --git a/src/Pixeval/Pixeval.csproj b/src/Pixeval/Pixeval.csproj index 3d393a24..ee36cce2 100644 --- a/src/Pixeval/Pixeval.csproj +++ b/src/Pixeval/Pixeval.csproj @@ -3,10 +3,9 @@ WinExe net8.0-windows10.0.22621.0 10.0.19041.0 - Pixeval + Pixeval x86;x64;ARM64 - win-x86;win-x64;win-arm64 - win10-x86;win10-x64;win10-arm64 + win-x86;win-x64;win-arm64 app.manifest enable true @@ -17,9 +16,8 @@ Debug;Release true false - 10.0.22621.38 win-$(Platform).pubxml - MSIX + MSIX NU1904;$(NoWarn) @@ -95,6 +93,10 @@ "$([System.String]::Concat(%(Filename), '"').Replace('_', '/')) : "$([System.IO.File]::ReadAllText(%(FullPath)).Replace('\', '\\').Replace(' ', '\n').Replace('"', '\"'))" + + + + @@ -113,12 +115,6 @@ x86|x64|arm64 - - - - - - @@ -126,80 +122,4 @@ true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Pixeval/Properties/AssemblyInfo.cs b/src/Pixeval/Properties/AssemblyInfo.cs deleted file mode 100644 index e69de29b..00000000