From 457fea504c3975ed9a7c6486cb7c391034af407b Mon Sep 17 00:00:00 2001 From: kingsznhone <35349300+kingsznhone@users.noreply.github.com> Date: Fri, 24 Mar 2023 07:56:52 +0800 Subject: [PATCH] v4.1 --- .editorconfig | 119 +++++++++++++++++ Electrical Weathering.sln | 5 - Electrical Weathering/App.config | 4 +- Electrical Weathering/App.xaml | 3 +- Electrical Weathering/App.xaml.cs | 2 +- .../Electrical Weathering.csproj | 126 +++++------------- Electrical Weathering/MainWindow.xaml | 108 +++++++-------- Electrical Weathering/MainWindow.xaml.cs | 53 ++++---- .../Properties/AssemblyInfo.cs | 10 +- .../Properties/Settings.Designer.cs | 26 ---- .../Properties/Settings.settings | 7 - Electrical Weathering/Resources/Test.bmp | Bin 0 -> 630 bytes Electrical Weathering/WeatheringMachine.cs | 77 +++++++---- README.md | 19 ++- WeatheringCV.png | Bin 0 -> 360912 bytes WeatheringSkia.png | Bin 0 -> 374965 bytes 16 files changed, 309 insertions(+), 250 deletions(-) delete mode 100644 Electrical Weathering/Properties/Settings.Designer.cs delete mode 100644 Electrical Weathering/Properties/Settings.settings create mode 100644 Electrical Weathering/Resources/Test.bmp create mode 100644 WeatheringCV.png create mode 100644 WeatheringSkia.png diff --git a/.editorconfig b/.editorconfig index afdb1f3..9965a8a 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,3 +2,122 @@ # CA1416: 验证平台兼容性 dotnet_diagnostic.CA1416.severity = none + +[*.cs] +#### 命名样式 #### + +# 命名规则 + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i + +dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +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 +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_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.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.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 +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_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_conditional_delegate_call = true:suggestion +csharp_style_var_for_built_in_types = false:silent +csharp_space_around_binary_operators = before_and_after +csharp_indent_labels = one_less_than_current + +[*.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.类型_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 = 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.帕斯卡拼写法.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 + +[*.{cs,vb}] +end_of_line = crlf +dotnet_style_qualification_for_field = false:silent +dotnet_style_qualification_for_property = false:silent +dotnet_style_qualification_for_method = false:silent +dotnet_style_qualification_for_event = false:silent +tab_width = 4 +indent_size = 4 +dotnet_style_operator_placement_when_wrapping = beginning_of_line \ No newline at end of file diff --git a/Electrical Weathering.sln b/Electrical Weathering.sln index 9611e95..6f3b005 100644 --- a/Electrical Weathering.sln +++ b/Electrical Weathering.sln @@ -5,11 +5,6 @@ VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Electrical Weathering", "Electrical Weathering\Electrical Weathering.csproj", "{8A23BF79-FD70-4942-85F3-61839911616F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{78D47EC2-309B-45A8-A103-7E7EAABAA745}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 diff --git a/Electrical Weathering/App.config b/Electrical Weathering/App.config index bcb2ae2..aa7ac40 100644 --- a/Electrical Weathering/App.config +++ b/Electrical Weathering/App.config @@ -1,6 +1,6 @@  - + @@ -11,4 +11,4 @@ - + \ No newline at end of file diff --git a/Electrical Weathering/App.xaml b/Electrical Weathering/App.xaml index 18fd9c7..15ac3dc 100644 --- a/Electrical Weathering/App.xaml +++ b/Electrical Weathering/App.xaml @@ -3,6 +3,5 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" StartupUri="MainWindow.xaml"> - - + \ No newline at end of file diff --git a/Electrical Weathering/App.xaml.cs b/Electrical Weathering/App.xaml.cs index 1d9a7a0..3a7b710 100644 --- a/Electrical Weathering/App.xaml.cs +++ b/Electrical Weathering/App.xaml.cs @@ -8,4 +8,4 @@ namespace Electrical_Weathering public partial class App : Application { } -} +} \ No newline at end of file diff --git a/Electrical Weathering/Electrical Weathering.csproj b/Electrical Weathering/Electrical Weathering.csproj index 414be34..dcb59e4 100644 --- a/Electrical Weathering/Electrical Weathering.csproj +++ b/Electrical Weathering/Electrical Weathering.csproj @@ -1,6 +1,6 @@  - net6.0-windows7.0 + net6.0-windows10.0.19041.0 WinExe false publish\ @@ -13,9 +13,9 @@ false false true - 4.0.0.0 + 4.1.0.0 0 - 4.0.0.%2a + 4.1.0.%2a false true false @@ -24,111 +24,57 @@ x64 zh-Hans AnyCPU + app.manifest + 10.0.19041.0 + full + + + zh-CN + true + AppIcon.ico + bin\x64\Debug\ true + bin\x64\Release\ true - - app.manifest - 7.0 - full - - - zh-CN - true - - - True - 4096 - - - True - 4096 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False - Microsoft .NET Framework 4.8 %28x86 和 x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - + - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - + + - - - - - True - True - Settings.settings - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - + \ No newline at end of file diff --git a/Electrical Weathering/MainWindow.xaml b/Electrical Weathering/MainWindow.xaml index 060a707..542b921 100644 --- a/Electrical Weathering/MainWindow.xaml +++ b/Electrical Weathering/MainWindow.xaml @@ -3,29 +3,27 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" - xmlns:local="clr-namespace:Electrical_Weathering" + xmlns:local="clr-namespace:Electrical_Weathering" mc:Ignorable="d" - Title="Electrical Weathering" - Height="720" Width="1280" - WindowStyle="ThreeDBorderWindow" - Icon="Weathering.bmp" - - DataContext="{Binding RelativeSource={RelativeSource Self}}" MinWidth="1280" MinHeight="720" FontSize="18" - > + Title="Electrical Weathering" + Height="720" Width="1280" + WindowStyle="ThreeDBorderWindow" + Icon="Weathering.bmp" - + DataContext="{Binding RelativeSource={RelativeSource Self}}" MinWidth="1280" MinHeight="720" FontSize="18"> + + - - + + - - + + - @@ -35,53 +33,51 @@ - - - - - + + + + - - + + - -