Skip to content

Commit a3197f8

Browse files
committed
Fix (some) build warnings
CS1572 CS1573 CS0168 CS8073 CA2200 VSTHRD110 VSTHRD200 VSTHRD105 SYSLIB0013 CS8524
1 parent b079aa3 commit a3197f8

File tree

31 files changed

+225
-68
lines changed

31 files changed

+225
-68
lines changed

.editorconfig

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
2+
###############################
3+
# Core EditorConfig Options #
4+
###############################
5+
# All files
6+
[*]
7+
indent_style = space
8+
9+
# XML project files
10+
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,projitems,shproj}]
11+
indent_size = 2
12+
13+
# XML config files
14+
[*.{props,targets,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
15+
indent_size = 2
16+
17+
# Code files
18+
[*.{cs,csx,vb,vbx}]
19+
indent_size = 4
20+
insert_final_newline = true
21+
charset = utf-8-bom
22+
###############################
23+
# .NET Coding Conventions #
24+
###############################
25+
[*.{cs,vb}]
26+
# Organize usings
27+
dotnet_sort_system_directives_first = true
28+
# this. preferences
29+
dotnet_style_qualification_for_field = false:silent
30+
dotnet_style_qualification_for_property = false:silent
31+
dotnet_style_qualification_for_method = false:silent
32+
dotnet_style_qualification_for_event = false:silent
33+
# Language keywords vs BCL types preferences
34+
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
35+
dotnet_style_predefined_type_for_member_access = true:silent
36+
# Parentheses preferences
37+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
38+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
39+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
40+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
41+
# Modifier preferences
42+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
43+
dotnet_style_readonly_field = true:suggestion
44+
# Expression-level preferences
45+
dotnet_style_object_initializer = true:suggestion
46+
dotnet_style_collection_initializer = true:suggestion
47+
dotnet_style_explicit_tuple_names = true:suggestion
48+
dotnet_style_null_propagation = true:suggestion
49+
dotnet_style_coalesce_expression = true:suggestion
50+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
51+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
52+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
53+
dotnet_style_prefer_auto_properties = true:silent
54+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
55+
dotnet_style_prefer_conditional_expression_over_return = true:silent
56+
###############################
57+
# Naming Conventions #
58+
###############################
59+
# Style Definitions
60+
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
61+
# Use PascalCase for constant fields
62+
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
63+
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
64+
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
65+
dotnet_naming_symbols.constant_fields.applicable_kinds = field
66+
dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
67+
dotnet_naming_symbols.constant_fields.required_modifiers = const
68+
dotnet_style_operator_placement_when_wrapping = beginning_of_line
69+
tab_width = 2
70+
end_of_line = crlf
71+
dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
72+
dotnet_style_prefer_compound_assignment = true:suggestion
73+
dotnet_diagnostic.CA1416.severity = silent
74+
###############################
75+
# C# Coding Conventions #
76+
###############################
77+
[*.cs]
78+
dotnet_diagnostics.VSTHRD200.severity = none # VSTHRD200: Use "Async" suffix for async methods
79+
dotnet_analyzer_diagnostic.VSTHRD200.severity = none # VSTHRD200: Use "Async" suffix for async methods
80+
# var preferences
81+
csharp_style_var_for_built_in_types = true:silent
82+
csharp_style_var_when_type_is_apparent = true:silent
83+
csharp_style_var_elsewhere = true:silent
84+
# Expression-bodied members
85+
csharp_style_expression_bodied_methods = false:silent
86+
csharp_style_expression_bodied_constructors = false:silent
87+
csharp_style_expression_bodied_operators = false:silent
88+
csharp_style_expression_bodied_properties = true:silent
89+
csharp_style_expression_bodied_indexers = true:silent
90+
csharp_style_expression_bodied_accessors = true:silent
91+
# Pattern matching preferences
92+
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
93+
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
94+
# Null-checking preferences
95+
csharp_style_throw_expression = true:suggestion
96+
csharp_style_conditional_delegate_call = true:suggestion
97+
# Modifier preferences
98+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
99+
# Expression-level preferences
100+
csharp_prefer_braces = true:silent
101+
csharp_style_deconstructed_variable_declaration = true:suggestion
102+
csharp_prefer_simple_default_expression = true:suggestion
103+
csharp_style_pattern_local_over_anonymous_function = true:suggestion
104+
csharp_style_inlined_variable_declaration = true:suggestion
105+
###############################
106+
# C# Formatting Rules #
107+
###############################
108+
# New line preferences
109+
csharp_new_line_before_open_brace = all
110+
csharp_new_line_before_else = true
111+
csharp_new_line_before_catch = true
112+
csharp_new_line_before_finally = true
113+
csharp_new_line_before_members_in_object_initializers = true
114+
csharp_new_line_before_members_in_anonymous_types = true
115+
csharp_new_line_between_query_expression_clauses = true
116+
# Indentation preferences
117+
csharp_indent_case_contents = true
118+
csharp_indent_switch_labels = true
119+
csharp_indent_labels = flush_left
120+
# Space preferences
121+
csharp_space_after_cast = false
122+
csharp_space_after_keywords_in_control_flow_statements = true
123+
csharp_space_between_method_call_parameter_list_parentheses = false
124+
csharp_space_between_method_declaration_parameter_list_parentheses = false
125+
csharp_space_between_parentheses = false
126+
csharp_space_before_colon_in_inheritance_clause = true
127+
csharp_space_after_colon_in_inheritance_clause = true
128+
csharp_space_around_binary_operators = before_and_after
129+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
130+
csharp_space_between_method_call_name_and_opening_parenthesis = false
131+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
132+
# Wrapping preferences
133+
csharp_preserve_single_line_statements = true
134+
csharp_preserve_single_line_blocks = true
135+
csharp_using_directive_placement = outside_namespace:silent
136+
csharp_prefer_simple_using_statement = true:suggestion
137+
csharp_style_namespace_declarations = block_scoped:silent
138+
csharp_style_prefer_method_group_conversion = true:silent
139+
csharp_style_expression_bodied_lambdas = true:silent
140+
csharp_style_expression_bodied_local_functions = false:silent
141+
###############################
142+
# VB Coding Conventions #
143+
###############################
144+
[*.vb]
145+
# Modifier preferences
146+
visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

Flow.Launcher.Core/Configuration/Portable.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Microsoft.Win32;
1+
using Microsoft.Win32;
22
using Squirrel;
33
using System;
44
using System.IO;
@@ -127,7 +127,7 @@ public void CreateUninstallerEntry()
127127

128128
using (var portabilityUpdater = NewUpdateManager())
129129
{
130-
portabilityUpdater.CreateUninstallerRegistryEntry();
130+
_ = portabilityUpdater.CreateUninstallerRegistryEntry();
131131
}
132132
}
133133

Flow.Launcher.Core/Plugin/PluginsLoader.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Linq;
@@ -98,7 +98,7 @@ public static IEnumerable<PluginPair> DotNetPlugins(List<PluginMetadata> source)
9898
+ (erroredPlugins.Count > 1 ? "plugins have " : "plugin has ")
9999
+ "errored and cannot be loaded:";
100100

101-
Task.Run(() =>
101+
_ = Task.Run(() =>
102102
{
103103
MessageBox.Show($"{errorMessage}{Environment.NewLine}{Environment.NewLine}" +
104104
$"{errorPluginString}{Environment.NewLine}{Environment.NewLine}" +
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
using System.Runtime.CompilerServices;
22

3-
[assembly: InternalsVisibleTo("Flow.Launcher.Test")]
3+
[assembly: InternalsVisibleTo("Flow.Launcher.Test")]
4+
[assembly: System.Runtime.Versioning.SupportedOSPlatform("Windows10.0.19041.0")]

Flow.Launcher.Core/Resource/Theme.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Generic;
33
using System.IO;
44
using System.Linq;
@@ -99,7 +99,7 @@ public bool ChangeTheme(string theme)
9999

100100
SetBlurForWindow();
101101
}
102-
catch (DirectoryNotFoundException e)
102+
catch (DirectoryNotFoundException)
103103
{
104104
Log.Error($"|Theme.ChangeTheme|Theme <{theme}> path can't be found");
105105
if (theme != defaultTheme)
@@ -109,7 +109,7 @@ public bool ChangeTheme(string theme)
109109
}
110110
return false;
111111
}
112-
catch (XamlParseException e)
112+
catch (XamlParseException)
113113
{
114114
Log.Error($"|Theme.ChangeTheme|Theme <{theme}> fail to parse");
115115
if (theme != defaultTheme)

Flow.Launcher.Infrastructure/Exception/ExceptionFormatter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ private static List<string> GetFrameworkVersionFromRegistry()
166166
}
167167
return result;
168168
}
169-
catch (System.Exception e)
169+
catch
170170
{
171171
return new List<string>();
172172
}

Flow.Launcher.Infrastructure/Image/ImageLoader.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Concurrent;
33
using System.Collections.Generic;
44
using System.IO;
@@ -46,7 +46,7 @@ public static void Initialize()
4646
ImageCache[icon] = img;
4747
}
4848

49-
Task.Run(() =>
49+
_ = Task.Run(() =>
5050
{
5151
Stopwatch.Normal("|ImageLoader.Initialize|Preload images cost", () =>
5252
{

Flow.Launcher.Infrastructure/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22

33
[assembly: InternalsVisibleTo("Flow.Launcher")]
44
[assembly: InternalsVisibleTo("Flow.Launcher.Core")]
5-
[assembly: InternalsVisibleTo("Flow.Launcher.Test")]
5+
[assembly: InternalsVisibleTo("Flow.Launcher.Test")]
6+
[assembly: System.Runtime.Versioning.SupportedOSPlatform("Windows10.0.19041.0")]

Flow.Launcher.Plugin/Interfaces/IPublicAPI.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
using Flow.Launcher.Plugin.SharedModels;
1+
using Flow.Launcher.Plugin.SharedModels;
22
using JetBrains.Annotations;
33
using System;
44
using System.Collections.Generic;
5+
using System.ComponentModel;
56
using System.IO;
67
using System.Runtime.CompilerServices;
78
using System.Threading;
@@ -41,7 +42,7 @@ public interface IPublicAPI
4142
/// <summary>
4243
/// Copy Text to clipboard
4344
/// </summary>
44-
/// <param name="Text">Text to save on clipboard</param>
45+
/// <param name="text">Text to save on clipboard</param>
4546
public void CopyToClipboard(string text);
4647

4748
/// <summary>
@@ -163,6 +164,7 @@ public interface IPublicAPI
163164
/// Download the specific url to a cretain file path
164165
/// </summary>
165166
/// <param name="url">URL to download file</param>
167+
/// <param name="filePath">path to save downloaded file</param>
166168
/// <param name="token">place to store file</param>
167169
/// <returns>Task showing the progress</returns>
168170
Task HttpDownloadAsync([NotNull] string url, [NotNull] string filePath, CancellationToken token = default);
@@ -178,7 +180,7 @@ public interface IPublicAPI
178180
/// Remove ActionKeyword for specific plugin
179181
/// </summary>
180182
/// <param name="pluginId">ID for plugin that needs to remove action keyword</param>
181-
/// <param name="newActionKeyword">The actionkeyword that is supposed to be removed</param>
183+
/// <param name="oldActionKeyword">The actionkeyword that is supposed to be removed</param>
182184
void RemoveActionKeyword(string pluginId, string oldActionKeyword);
183185

184186
/// <summary>

Flow.Launcher.Plugin/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
[assembly: InternalsVisibleTo("Flow.Launcher")]
44
[assembly: InternalsVisibleTo("Flow.Launcher.Core")]
5-
[assembly: InternalsVisibleTo("Flow.Launcher.Test")]
5+
[assembly: InternalsVisibleTo("Flow.Launcher.Test")]

0 commit comments

Comments
 (0)