Skip to content

Commit b7dfcd6

Browse files
sergiyesergiye
committed
Merge branch 'dev'
2 parents b10d7a0 + e8f40a9 commit b7dfcd6

910 files changed

Lines changed: 79979 additions & 101270 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.editorconfig‎

Lines changed: 76 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,32 @@
1-
# top-most editorconfig file
1+
# editorconfig.org
2+
3+
# top-most EditorConfig file
24
root = true
35

6+
# Default settings:
7+
# A newline ending every file
8+
# Use 4 spaces as indentation
49
[*]
510
insert_final_newline = true
611
indent_style = space
7-
indent_size = 2
8-
tab_width = 2
12+
indent_size = 4
913
trim_trailing_whitespace = true
14+
end_of_line = lf
15+
16+
[project.json]
17+
indent_size = 2
1018

11-
[*.cs]
12-
# Recommended max_line_length = 100
19+
# C# files
20+
[*.{cs,vb}]
1321

1422
# New line preferences
15-
csharp_new_line_before_open_brace = none
16-
csharp_new_line_before_else = false
17-
csharp_new_line_before_catch = false
18-
csharp_new_line_before_finally = false
19-
csharp_new_line_before_members_in_object_initializers = false
20-
csharp_new_line_before_members_in_anonymous_types = false
21-
csharp_new_line_between_query_expression_clauses = false
23+
csharp_new_line_before_open_brace = all
24+
csharp_new_line_before_else = true
25+
csharp_new_line_before_catch = true
26+
csharp_new_line_before_finally = true
27+
csharp_new_line_before_members_in_object_initializers = true
28+
csharp_new_line_before_members_in_anonymous_types = true
29+
csharp_new_line_between_query_expression_clauses = true
2230

2331
# Indentation preferences
2432
csharp_indent_block_contents = true
@@ -31,8 +39,8 @@ csharp_indent_labels = one_less_than_current
3139
# Modifier preferences
3240
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
3341

34-
# Use of this., avoid except for fields
35-
dotnet_style_qualification_for_field = false:none
42+
# avoid this. unless absolutely necessary
43+
dotnet_style_qualification_for_field = false:suggestion
3644
dotnet_style_qualification_for_property = false:suggestion
3745
dotnet_style_qualification_for_method = false:suggestion
3846
dotnet_style_qualification_for_event = false:suggestion
@@ -44,27 +52,43 @@ csharp_style_var_elsewhere = false:suggestion
4452
dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
4553
dotnet_style_predefined_type_for_member_access = true:suggestion
4654

47-
# Name all constant fields using PascalCase
55+
# name all constant fields using PascalCase
4856
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
49-
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
57+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
5058
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
5159
dotnet_naming_symbols.constant_fields.applicable_kinds = field
5260
dotnet_naming_symbols.constant_fields.required_modifiers = const
5361
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
5462

63+
# static fields should have s_ prefix
64+
dotnet_naming_rule.static_fields_should_have_prefix.severity = suggestion
65+
dotnet_naming_rule.static_fields_should_have_prefix.symbols = static_fields
66+
dotnet_naming_rule.static_fields_should_have_prefix.style = static_prefix_style
67+
dotnet_naming_symbols.static_fields.applicable_kinds = field
68+
dotnet_naming_symbols.static_fields.required_modifiers = static
69+
dotnet_naming_symbols.static_fields.applicable_accessibilities = private, internal, private_protected
70+
dotnet_naming_style.static_prefix_style.required_prefix = _
71+
dotnet_naming_style.static_prefix_style.capitalization = camel_case
72+
73+
# internal and private fields should be _camelCase
74+
dotnet_naming_rule.camel_case_for_private_internal_fields.severity = suggestion
75+
dotnet_naming_rule.camel_case_for_private_internal_fields.symbols = private_internal_fields
76+
dotnet_naming_rule.camel_case_for_private_internal_fields.style = camel_case_underscore_style
77+
dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
78+
dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
79+
dotnet_naming_style.camel_case_underscore_style.required_prefix = _
80+
dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
81+
5582
# Code style defaults
5683
csharp_using_directive_placement = outside_namespace:suggestion
5784
dotnet_sort_system_directives_first = true
58-
csharp_prefer_braces = when_multiline:suggestion
85+
csharp_prefer_braces = true:silent
5986
csharp_preserve_single_line_blocks = true:none
6087
csharp_preserve_single_line_statements = false:none
6188
csharp_prefer_static_local_function = true:suggestion
6289
csharp_prefer_simple_using_statement = false:none
6390
csharp_style_prefer_switch_expression = true:suggestion
64-
65-
# Code quality
6691
dotnet_style_readonly_field = true:suggestion
67-
dotnet_code_quality_unused_parameters = non_public:suggestion
6892

6993
# Expression-level preferences
7094
dotnet_style_object_initializer = true:suggestion
@@ -76,19 +100,19 @@ dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggesti
76100
dotnet_style_prefer_inferred_tuple_names = true:suggestion
77101
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
78102
dotnet_style_prefer_auto_properties = true:suggestion
79-
dotnet_style_prefer_conditional_expression_over_assignment = true:refactoring
80-
dotnet_style_prefer_conditional_expression_over_return = true:refactoring
103+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
104+
dotnet_style_prefer_conditional_expression_over_return = true:silent
81105
csharp_prefer_simple_default_expression = true:suggestion
82106

83107
# Expression-bodied members
84-
csharp_style_expression_bodied_methods = true:refactoring
85-
csharp_style_expression_bodied_constructors = true:refactoring
86-
csharp_style_expression_bodied_operators = true:refactoring
87-
csharp_style_expression_bodied_properties = true:refactoring
88-
csharp_style_expression_bodied_indexers = true:refactoring
89-
csharp_style_expression_bodied_accessors = true:refactoring
90-
csharp_style_expression_bodied_lambdas = true:refactoring
91-
csharp_style_expression_bodied_local_functions = true:refactoring
108+
csharp_style_expression_bodied_methods = true:silent
109+
csharp_style_expression_bodied_constructors = true:silent
110+
csharp_style_expression_bodied_operators = true:silent
111+
csharp_style_expression_bodied_properties = true:silent
112+
csharp_style_expression_bodied_indexers = true:silent
113+
csharp_style_expression_bodied_accessors = true:silent
114+
csharp_style_expression_bodied_lambdas = true:silent
115+
csharp_style_expression_bodied_local_functions = true:silent
92116

93117
# Pattern matching
94118
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
@@ -130,3 +154,25 @@ csharp_space_between_square_brackets = false
130154

131155
# Analyzers
132156
dotnet_code_quality.ca1802.api_surface = private, internal
157+
158+
# CS1591: Missing XML comment for publicly visible type or member
159+
dotnet_diagnostic.CS1591.severity = suggestion
160+
161+
# Xml project files
162+
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
163+
indent_size = 2
164+
165+
[*.{csproj,vbproj,proj,nativeproj,locproj}]
166+
charset = utf-8
167+
168+
# Xml files
169+
[*.{xml,stylecop,resx,ruleset}]
170+
indent_size = 2
171+
172+
# Xml config files
173+
[*.{props,targets,config,nuspec}]
174+
indent_size = 2
175+
176+
# YAML config files
177+
[*.{yml,yaml}]
178+
indent_size = 2

.github/workflows/dev.yml renamed to .github/workflows/auto-build.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: dev
1+
name: Auto Build
22

33
on:
44
push:
@@ -27,12 +27,12 @@ jobs:
2727
- name: Build
2828
run: msbuild OpenHardwareMonitor.sln -p:Configuration=Release -m
2929

30-
- name: Publish build
31-
uses: actions/upload-artifact@v4
32-
with:
33-
name: OpenHardwareMonitor
34-
path: |
35-
bin/OpenHardwareMonitor
30+
# - name: Publish build
31+
# uses: actions/upload-artifact@v4
32+
# with:
33+
# name: OpenHardwareMonitor
34+
# path: |
35+
# bin/OpenHardwareMonitor
3636

3737
- name: Publish Lib build
3838
uses: actions/upload-artifact@v4

‎.gitignore‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
*.user
22
*.suo
3-
Bin/
4-
Obj/
5-
.vs/
3+
[Bb]in/
4+
[Oo]bj/
5+
.idea/
6+
.vs/
7+
packages/
8+
FodyWeavers.xsd

‎.vsls.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"gitignore": "exclude",
3+
"excludeFiles": [
4+
"*.md",
5+
"*.user",
6+
"*.bat",
7+
],
8+
"hideFiles": []
9+
}

‎Aga.Controls/Aga.Controls.csproj‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<ProductVersion>9.0.30729</ProductVersion>
4+
<TargetFramework>net472</TargetFramework>
5+
<AssemblyTitle>Aga.Controls</AssemblyTitle>
6+
<Description>http://sourceforge.net/projects/treeviewadv/</Description>
7+
<Copyright>Copyright © Andrey Gliznetsov 2006 - 2009</Copyright>
8+
<AssemblyVersion>1.7.0.0</AssemblyVersion>
9+
<FileVersion>1.7.0.0</FileVersion>
10+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
11+
<OutputPath>..\bin\</OutputPath>
12+
</PropertyGroup>
13+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
14+
<DebugType>full</DebugType>
15+
<DefineConstants>TRACE;DEBUG;PERF_TEST</DefineConstants>
16+
</PropertyGroup>
17+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
18+
<DebugType>pdbonly</DebugType>
19+
</PropertyGroup>
20+
<ItemGroup>
21+
<Reference Include="System.Design" />
22+
<Reference Include="System.Windows.Forms" />
23+
</ItemGroup>
24+
<ItemGroup>
25+
<Compile Update="Properties\Resources.Designer.cs">
26+
<AutoGen>True</AutoGen>
27+
<DesignTime>True</DesignTime>
28+
<DependentUpon>Resources.resx</DependentUpon>
29+
</Compile>
30+
<Compile Update="Tree\NodeControls\NodeIntegerTextBox.cs">
31+
<SubType>Component</SubType>
32+
</Compile>
33+
<Compile Update="Tree\NodeControls\NodeDecimalTextBox.cs">
34+
<SubType>Component</SubType>
35+
</Compile>
36+
<Compile Update="NumericTextBox.cs">
37+
<SubType>Component</SubType>
38+
</Compile>
39+
<Compile Update="Tree\NodeControls\ExpandingIcon.cs">
40+
<SubType>Component</SubType>
41+
</Compile>
42+
<Compile Update="Tree\NodeControls\InteractiveControl.cs">
43+
<SubType>Component</SubType>
44+
</Compile>
45+
<Compile Update="Tree\TreeViewAdv.Draw.cs">
46+
<SubType>Component</SubType>
47+
</Compile>
48+
<Compile Update="Tree\TreeViewAdv.Editor.cs">
49+
<SubType>Component</SubType>
50+
</Compile>
51+
<Compile Update="Tree\TreeViewAdv.Input.cs">
52+
<SubType>Component</SubType>
53+
</Compile>
54+
<Compile Update="Tree\NodeControls\NodeNumericUpDown.cs">
55+
<SubType>Component</SubType>
56+
</Compile>
57+
<Compile Update="Tree\TreeViewAdv.Properties.cs">
58+
<SubType>Component</SubType>
59+
</Compile>
60+
<Compile Update="Tree\NodeControls\BaseTextControl.cs">
61+
<SubType>Component</SubType>
62+
</Compile>
63+
<Compile Update="Tree\NodeControls\EditableControl.cs">
64+
<SubType>Component</SubType>
65+
</Compile>
66+
<Compile Update="Tree\NodeControls\NodeComboBox.cs">
67+
<SubType>Component</SubType>
68+
</Compile>
69+
<Compile Update="Tree\TreeColumn.cs">
70+
<SubType>Component</SubType>
71+
</Compile>
72+
<Compile Update="Tree\NodeControls\NodeControl.cs">
73+
<SubType>Component</SubType>
74+
</Compile>
75+
<Compile Update="Tree\NodeControls\BindableControl.cs">
76+
<SubType>Component</SubType>
77+
</Compile>
78+
<Compile Update="Tree\NodeControls\NodeCheckBox.cs">
79+
<SubType>Component</SubType>
80+
</Compile>
81+
<Compile Update="Tree\NodeControls\NodeIcon.cs">
82+
<SubType>Component</SubType>
83+
</Compile>
84+
<Compile Update="Tree\NodeControls\NodePlusMinus.cs">
85+
<SubType>Component</SubType>
86+
</Compile>
87+
<Compile Update="Tree\NodeControls\NodeTextBox.cs">
88+
<SubType>Component</SubType>
89+
</Compile>
90+
<Compile Update="Tree\NodeControls\NodeStateIcon.cs">
91+
<SubType>Component</SubType>
92+
</Compile>
93+
<Compile Update="Tree\TreeViewAdv.cs">
94+
<SubType>Component</SubType>
95+
</Compile>
96+
<Compile Update="Tree\TreeViewAdv.Designer.cs">
97+
<DependentUpon>TreeViewAdv.cs</DependentUpon>
98+
</Compile>
99+
</ItemGroup>
100+
<ItemGroup>
101+
<Content Include="Resources\**" />
102+
</ItemGroup>
103+
<ItemGroup>
104+
<EmbeddedResource Update="Properties\Resources.resx">
105+
<SubType>Designer</SubType>
106+
<Generator>ResXFileCodeGenerator</Generator>
107+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
108+
</EmbeddedResource>
109+
<EmbeddedResource Update="Tree\TreeViewAdv.resx">
110+
<DependentUpon>TreeViewAdv.cs</DependentUpon>
111+
</EmbeddedResource>
112+
</ItemGroup>
113+
<ItemGroup>
114+
<None Include="Tree\ClassDiagram.cd" />
115+
<None Include="Tree\NodeControls\ClassDiagram.cd" />
116+
</ItemGroup>
117+
<ItemGroup>
118+
<Compile Remove="Tree\ColumnCollection.cs" />
119+
<Compile Remove="Tree\NativeMethods.cs" />
120+
</ItemGroup>
121+
</Project>

‎Aga.Controls/Aga.Controls.sln‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 11.00
3+
# Visual Studio 2010
4+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aga.Controls", "Aga.Controls.csproj", "{E73BB233-D88B-44A7-A98F-D71EE158381D}"
5+
EndProject
6+
Global
7+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
8+
Debug|Any CPU = Debug|Any CPU
9+
Release|Any CPU = Release|Any CPU
10+
EndGlobalSection
11+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
12+
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
13+
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Debug|Any CPU.Build.0 = Debug|Any CPU
14+
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.ActiveCfg = Release|Any CPU
15+
{E73BB233-D88B-44A7-A98F-D71EE158381D}.Release|Any CPU.Build.0 = Release|Any CPU
16+
EndGlobalSection
17+
GlobalSection(SolutionProperties) = preSolution
18+
HideSolutionNode = FALSE
19+
EndGlobalSection
20+
EndGlobal

0 commit comments

Comments
 (0)