yea I think that's most everything

src/modules/cmdpal/.editorconfig

@@ -1,209 +1,583 @@
-# Rules in this file were initially inferred by Visual Studio IntelliCode from the Template Studio codebase.
-# You can modify the rules from these initially generated values to suit your own policies.
-# You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference.
+# editorconfig: http://editorconfig.org/
+# Help developers standardize spaces, tabs, encoding, end-line characters across editors
 
-[*.cs]
+# top-most .editorconfig file
+root = true
+
+# defaults for all files
+[*]
+charset = utf-8
+end_of_line = crlf
+tab_width = 4
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
 
 file_header_template = Copyright (c) Microsoft Corporation\r\nThe Microsoft Corporation licenses this file to you under the MIT license.\r\nSee the LICENSE file in the project root for more information.
 
-#Core editorconfig formatting - indentation
+# markdown, diff overrides
+# two trailing spaces are required for <br/> and hard line-breaks in markdown files
+# see: (https://daringfireball.net/projects/markdown/syntax#p) and (http://spec.commonmark.org/0.27/#hard-line-break)
+[*.{md,diff}]
+trim_trailing_whitespace = false
 
-#use soft tabs (spaces) for indentation
-indent_style = space
+[*.{md,xml,xsd,gprops,man,natvis}]
+indent_size = 2
 
-#Formatting - new line options
+# manifest validation tool requires BOM
+[*.man]
+charset = utf-8-bom
 
-#place else statements on a new line
+# XML-based MSBuild and Visual Studio files
+[*.{props,targets,settings,*proj,vcxitems,filters,ruleset,config,nuspec,resx,vsixmanifest,vsct}]
+indent_size = 2
+
+# Exceptions to the above *proj wildcard
+[*.vdproj]
+indent_size = 4
+
+# Visual Studio uses hard tabs for SLN files, so don't fight it
+[*.sln]
+indent_style = tab
+
+# Visual Studio removes the last empty line, so don't fight it
+[*.{vcxproj}]
+insert_final_newline = false
+
+# YAML overrides
+[*.{yml,yaml}]
+indent_size = 2
+
+# package.json overrides
+# Updating package.json with NPM will revert indentation to 2 spaces so to
+# reduce churn, let's align to NPM and specify indent size 2
+[package.json]
+indent_size = 2
+
+# HTML5 content (*.html, *.js) included in the AppX package should properly encoded with the UTF-8 byte order mark (BOM) as this is a Store requirement.
+[*.{html,js,css}]
+charset = utf-8-bom
+
+# JSON formats
+[{*.{json,testlist,testpasses,testenv,pluginlist},testmd.definition}]
+indent_size = 2
+
+[*.{rc,rc2}]
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{c,w}]
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{c++,cc,cpp,cppm,cxx,h,h++,hh,hpp,hxx,inl,ipp,ixx,tlh,tli,idl}]
+trim_trailing_whitespace = true
+insert_final_newline = true
+cpp_indent_braces = false
+cpp_indent_multi_line_relative_to = innermost_parenthesis
+cpp_indent_within_parentheses = indent
+cpp_indent_preserve_within_parentheses = true
+cpp_indent_case_contents = true
+cpp_indent_case_labels = false
+cpp_indent_case_contents_when_block = false
+cpp_indent_lambda_braces_when_parameter = false
+cpp_indent_goto_labels = one_left
+cpp_indent_preprocessor = leftmost_column
+cpp_indent_access_specifiers = false
+cpp_indent_namespace_contents = true
+cpp_indent_preserve_comments = false
+cpp_new_line_before_open_brace_namespace = ignore
+cpp_new_line_before_open_brace_type = ignore
+cpp_new_line_before_open_brace_function = new_line
+cpp_new_line_before_open_brace_block = new_line
+cpp_new_line_before_open_brace_lambda = new_line
+cpp_new_line_scope_braces_on_separate_lines = true
+cpp_new_line_close_brace_same_line_empty_type = false
+cpp_new_line_close_brace_same_line_empty_function = false
+cpp_new_line_before_catch = true
+cpp_new_line_before_else = true
+cpp_new_line_before_while_in_do_while = true
+cpp_space_before_function_open_parenthesis = remove
+cpp_space_within_parameter_list_parentheses = false
+cpp_space_between_empty_parameter_list_parentheses = false
+cpp_space_after_keywords_in_control_flow_statements = true
+cpp_space_within_control_flow_statement_parentheses = false
+cpp_space_before_lambda_open_parenthesis = false
+cpp_space_within_cast_parentheses = false
+cpp_space_after_cast_close_parenthesis = false
+cpp_space_within_expression_parentheses = false
+cpp_space_before_block_open_brace = true
+cpp_space_between_empty_braces = false
+cpp_space_before_initializer_list_open_brace = false
+cpp_space_within_initializer_list_braces = true
+cpp_space_preserve_in_initializer_list = true
+cpp_space_before_open_square_bracket = false
+cpp_space_within_square_brackets = false
+cpp_space_before_empty_square_brackets = false
+cpp_space_between_empty_square_brackets = false
+cpp_space_group_square_brackets = true
+cpp_space_within_lambda_brackets = false
+cpp_space_between_empty_lambda_brackets = false
+cpp_space_before_comma = false
+cpp_space_after_comma = true
+cpp_space_remove_around_member_operators = true
+cpp_space_before_inheritance_colon = true
+cpp_space_before_constructor_colon = true
+cpp_space_remove_before_semicolon = true
+cpp_space_after_semicolon = true
+cpp_space_remove_around_unary_operator = true
+cpp_space_around_binary_operator = insert
+cpp_space_around_assignment_operator = insert
+cpp_space_pointer_reference_alignment = left
+cpp_space_around_ternary_operator = insert
+cpp_wrap_preserve_blocks = one_liners
+
+# C# overrides
+# Rules explanation: https://kent-boogaart.com/blog/editorconfig-reference-for-c-developers
+[*.cs]
+
+# 'using' directive preferences
+csharp_using_directive_placement = outside_namespace:silent
+
+# Indent settings
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_indent_case_contents_when_block = false
+csharp_indent_labels = one_less_than_current
+
+# Newline settings
+csharp_new_line_before_catch = true
 csharp_new_line_before_else = true
-#require braces to be on a new line for lambdas, methods, control_blocks, types, properties, and accessors (also known as "Allman" style)
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_before_members_in_object_initializers = true
 csharp_new_line_before_open_brace = all
+csharp_new_line_between_query_expression_clauses = true
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:silent
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true:silent
+csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent
 
-#Formatting - organize using options
+# Braces settings
+csharp_prefer_braces = when_multiline:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = false
 
-#sort System.* using directives alphabetically, and place them before other usings
+# Space settings
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = do_not_ignore
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false
+
+# Code-block preferences
+csharp_prefer_simple_using_statement = true:silent
+csharp_style_namespace_declarations = file_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_primary_constructors = true:silent
+csharp_style_prefer_top_level_statements = false:silent
+
+# Expression-level preferences
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_style_implicit_object_creation_when_type_is_apparent = true:silent
+csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_prefer_index_operator = true:suggestion
+csharp_style_prefer_local_over_anonymous_function = true:suggestion
+csharp_style_prefer_null_check_over_type_check = true:suggestion
+csharp_style_prefer_range_operator = true:silent
+csharp_style_prefer_tuple_swap = true:suggestion
+csharp_style_prefer_utf8_string_literals = true:suggestion
+csharp_style_unused_value_assignment_preference = discard_variable:silent
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+
+# Suggest more modern language features when available
+csharp_style_conditional_delegate_call = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_throw_expression = true:suggestion
+csharp_style_prefer_extended_property_pattern = true:suggestion
+csharp_style_prefer_not_pattern = true:suggestion
+csharp_style_prefer_pattern_matching = true:silent
+csharp_style_prefer_switch_expression = true:suggestion
+csharp_prefer_static_anonymous_function = true:suggestion
+
+# Prefer property-like constructs to have an expression-body
+csharp_style_expression_bodied_accessors = when_on_single_line:suggestion
+csharp_style_expression_bodied_indexers = when_on_single_line:suggestion
+csharp_style_expression_bodied_properties = when_on_single_line:suggestion
+csharp_style_expression_bodied_lambdas = when_on_single_line:silent
+csharp_style_expression_bodied_constructors = when_on_single_line:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_style_expression_bodied_methods = when_on_single_line:silent
+csharp_style_expression_bodied_operators = when_on_single_line:silent
+
+# Don't suggest "var" when type is apparent, as "new()" is better
+csharp_style_var_when_type_is_apparent = false:silent
+csharp_style_var_elsewhere = false:silent
+csharp_style_var_for_built_in_types = false:silent
+
+# Modifier preferences
+csharp_prefer_static_local_function = true:suggestion
+csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
+csharp_style_prefer_readonly_struct = true:suggestion
+csharp_style_prefer_readonly_struct_member = true:suggestion
+
+### dotnet ###
+
+# Sort using directives with System.* appearing first
 dotnet_sort_system_directives_first = true
 
-#Formatting - spacing options
+# Suggest more modern language features when available
+dotnet_style_coalesce_expression = true:silent
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_object_initializer = true:suggestion
 
-#require NO space between a cast and the value
-csharp_space_after_cast = false
-#require a space before the colon for bases or interfaces in a type declaration
-csharp_space_after_colon_in_inheritance_clause = true
-#require a space after a keyword in a control flow statement such as a for loop
-csharp_space_after_keywords_in_control_flow_statements = true
-#require a space before the colon for bases or interfaces in a type declaration
-csharp_space_before_colon_in_inheritance_clause = true
-#remove space within empty argument list parentheses
-csharp_space_between_method_call_empty_parameter_list_parentheses = false
-#remove space between method call name and opening parenthesis
-csharp_space_between_method_call_name_and_opening_parenthesis = false
-#do not place space characters after the opening parenthesis and before the closing parenthesis of a method call
-csharp_space_between_method_call_parameter_list_parentheses = false
-#remove space within empty parameter list parentheses for a method declaration
-csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
-#place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list.
-csharp_space_between_method_declaration_parameter_list_parentheses = false
-
-#Formatting - wrapping options
-
-#leave code block on separate lines
-csharp_preserve_single_line_blocks = true
-
-#Style - Code block preferences
-
-#prefer curly braces even for one line of code
-csharp_prefer_braces = true:suggestion
-
-#Style - expression bodied member options
-
-#prefer expression bodies for accessors
-csharp_style_expression_bodied_accessors = true:warning
-#prefer block bodies for constructors
-csharp_style_expression_bodied_constructors = false:suggestion
-#prefer expression bodies for methods
-csharp_style_expression_bodied_methods = when_on_single_line:silent
-#prefer expression-bodied members for properties
-csharp_style_expression_bodied_properties = true:warning
-
-#Style - expression level options
-
-#prefer out variables to be declared before the method call
-csharp_style_inlined_variable_declaration = false:suggestion
-#prefer the language keyword for member access expressions, instead of the type name, for types that have a keyword to represent them
+# Use language keywords instead of framework type names for type references
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
 dotnet_style_predefined_type_for_member_access = true:suggestion
 
-#Style - Expression-level  preferences
-
-#prefer default over default(T)
-csharp_prefer_simple_default_expression = true:suggestion
-#prefer objects to be initialized using object initializers when possible
-dotnet_style_object_initializer = true:suggestion
-
-#Style - implicit and explicit types
-
-#prefer var over explicit type in all cases, unless overridden by another code style rule
-csharp_style_var_elsewhere = true:suggestion
-#prefer var is used to declare variables with built-in system types such as int
-csharp_style_var_for_built_in_types = true:suggestion
-#prefer var when the type is already mentioned on the right-hand side of a declaration expression
-csharp_style_var_when_type_is_apparent = true:suggestion
-
-#Style - language keyword and framework type options
-
-#prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them
-dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
-
-#Style - Language rules
-csharp_style_implicit_object_creation_when_type_is_apparent = true:warning
-csharp_style_var_for_built_in_types = true:warning
-
-#Style - modifier options
-
-#prefer accessibility modifiers to be declared except for public interface members. This will currently not differ from always and will act as future proofing for if C# adds default interface methods.
-dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
-
-#Style - Modifier preferences
-
-#when this rule is set to a list of modifiers, prefer the specified ordering.
-csharp_preferred_modifier_order = public,private,protected,internal,static,async,readonly,override,sealed,abstract,virtual:warning
-dotnet_style_readonly_field = true:warning
-
-#Style - Pattern matching
-
-#prefer pattern matching instead of is expression with type casts
-csharp_style_pattern_matching_over_as_with_null_check = true:warning
-
-#Style - qualification options
-
-#prefer events not to be prefaced with this. or Me. in Visual Basic
-dotnet_style_qualification_for_event = false:suggestion
-#prefer fields not to be prefaced with this. or Me. in Visual Basic
-dotnet_style_qualification_for_field = false:suggestion
-#prefer methods not to be prefaced with this. or Me. in Visual Basic
-dotnet_style_qualification_for_method = false:suggestion
-#prefer properties not to be prefaced with this. or Me. in Visual Basic
-dotnet_style_qualification_for_property = false:suggestion
-csharp_indent_labels = one_less_than_current
-csharp_using_directive_placement = outside_namespace:silent
-csharp_prefer_simple_using_statement = true:warning
-csharp_style_namespace_declarations = file_scoped:warning
-csharp_style_expression_bodied_operators = false:silent
-csharp_style_expression_bodied_indexers = true:silent
-csharp_style_expression_bodied_lambdas = true:silent
-csharp_style_expression_bodied_local_functions = false:silent
-
-[*.{cs,vb}]
+# Other style
 dotnet_style_operator_placement_when_wrapping = beginning_of_line
-tab_width = 4
-indent_size = 4
-end_of_line = crlf
-dotnet_style_coalesce_expression = true:suggestion
-dotnet_style_null_propagation = true:suggestion
-dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
-dotnet_style_prefer_auto_properties = true:silent
-dotnet_style_object_initializer = true:suggestion
-dotnet_style_collection_initializer = true:suggestion
+dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+dotnet_style_prefer_auto_properties = false:silent
 dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
 dotnet_style_prefer_conditional_expression_over_assignment = true:silent
 dotnet_style_prefer_conditional_expression_over_return = true:silent
-[*.{cs,vb}]
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_collection_expression = never
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_style_namespace_match_folder = true:silent
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
+dotnet_style_allow_multiple_blank_lines_experimental = false:suggestion
+dotnet_style_allow_statement_immediately_after_block_experimental = true:silent
+dotnet_code_quality_unused_parameters = all:suggestion
 
-#Style - Unnecessary code rules
-csharp_style_unused_value_assignment_preference = discard_variable:warning
+# Field preferences
+dotnet_style_readonly_field = true:suggestion
+
+# Suppression preferences
+dotnet_remove_unnecessary_suppression_exclusions = none
+
+# Avoid "this."
+dotnet_style_qualification_for_event = false:silent
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_property = false:silent
+
+# Parentheses preferences
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
 
 #### Naming styles ####
 
 # Naming rules
 
-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.const_variables_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.const_variables_should_be_pascal_case.symbols = const_variables
+dotnet_naming_rule.const_variables_should_be_pascal_case.style = pascal_case
 
-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.static_readonly_field_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.static_readonly_field_should_be_pascal_case.symbols = static_readonly_field
+dotnet_naming_rule.static_readonly_field_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_rule.fields__locals__params_should_be_camelcase.severity = suggestion
+dotnet_naming_rule.fields__locals__params_should_be_camelcase.symbols = fields__locals__params
+dotnet_naming_rule.fields__locals__params_should_be_camelcase.style = camelcase
+
+dotnet_naming_rule.type_parameter_should_be_type_parameter.severity = suggestion
+dotnet_naming_rule.type_parameter_should_be_type_parameter.symbols = type_parameter
+dotnet_naming_rule.type_parameter_should_be_type_parameter.style = type_parameter
+
+dotnet_naming_rule.all_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.all_should_be_pascal_case.symbols = all
+dotnet_naming_rule.all_should_be_pascal_case.style = pascal_case
 
 # Symbol specifications
 
-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.fields__locals__params.applicable_kinds = field, parameter, local
+dotnet_naming_symbols.fields__locals__params.applicable_accessibilities = *
+dotnet_naming_symbols.fields__locals__params.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.type_parameter.applicable_kinds = type_parameter
+dotnet_naming_symbols.type_parameter.applicable_accessibilities = *
+dotnet_naming_symbols.type_parameter.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_variables.applicable_kinds = field, local
+dotnet_naming_symbols.const_variables.applicable_accessibilities = *
+dotnet_naming_symbols.const_variables.required_modifiers = const
+
+dotnet_naming_symbols.all.applicable_kinds = *
+dotnet_naming_symbols.all.applicable_accessibilities = *
+dotnet_naming_symbols.all.required_modifiers = 
+
+dotnet_naming_symbols.static_readonly_field.applicable_kinds = field
+dotnet_naming_symbols.static_readonly_field.applicable_accessibilities = *
+dotnet_naming_symbols.static_readonly_field.required_modifiers = readonly, static
 
 # Naming styles
 
-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.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
-dotnet_style_explicit_tuple_names = true:suggestion
-dotnet_style_prefer_inferred_tuple_names = true:suggestion
-dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
-dotnet_style_prefer_compound_assignment = true:warning
-dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_naming_style.camelcase.required_prefix = 
+dotnet_naming_style.camelcase.required_suffix = 
+dotnet_naming_style.camelcase.word_separator = 
+dotnet_naming_style.camelcase.capitalization = camel_case
 
-# Diagnostic configuration
+dotnet_naming_style.type_parameter.required_prefix = T
+dotnet_naming_style.type_parameter.required_suffix = 
+dotnet_naming_style.type_parameter.word_separator = 
+dotnet_naming_style.type_parameter.capitalization = pascal_case
+
+### Dotnet diagnostics ###
+# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/categories
+
+# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/configuration-options#severity-level
+# The rule for assigning severity is:
+#   error (build break) - this is always incorrect code; e.g., recursively assigning a property to itself
+#   warning (build break) - this is possibly correct, but too error-prone to be used without calling it out; e.g., testing for NaN correctly, or hidden perf costs
+#   suggestion (IDE squiggles and IDE message) - this violates (or is very very very likely to violate) a CoreGuideline 
+#   silent (no squiggles or message, but refactoring may be avaliable) - this violates a CoreGuideline, but with a non-neglagable but not large false-positive rate
+#   none (no user notification) - this violates a CoreGuideline, but with high false-positive rate; is inconsistent with the CoreGuidelines; or is otherwise incorrect
+
+# Default diagnostics
+# https://github.com/dotnet/roslyn-analyzers/blob/main/src/NetAnalyzers/Core/AnalyzerReleases.Shipped.md
+# Note that in this list "info" = suggestion, "hidden" = silent, and "disabled" = none in terms of the severity field:
+# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/configuration-options
+# We can only enable the "Default" set of diagnostics automatically and not the "Recommended" set, 
+# as we'd get warnings for non-breaking issues, so we have to manually adjust a bunch of severities.
+# "hidden" issues still may appear in IDE refactorings, so a rule must be disabled with "none" explicitly if not needed.
+
+# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/design-warnings
+dotnet_diagnostic.CA1001.severity = warning
+dotnet_diagnostic.CA1003.severity = suggestion
+dotnet_diagnostic.CA1005.severity = suggestion
+dotnet_diagnostic.CA1008.severity = suggestion
+dotnet_diagnostic.CA1010.severity = suggestion
+dotnet_diagnostic.CA1012.severity = warning
+dotnet_diagnostic.CA1016.severity = none
+dotnet_diagnostic.CA1019.severity = suggestion
+dotnet_diagnostic.CA1024.severity = suggestion
+dotnet_diagnostic.CA1027.severity = suggestion
+dotnet_diagnostic.CA1028.severity = suggestion
+dotnet_diagnostic.CA1030.severity = suggestion
+dotnet_diagnostic.CA1032.severity = suggestion
+dotnet_diagnostic.CA1033.severity = suggestion
+dotnet_diagnostic.CA1034.severity = silent
+dotnet_diagnostic.CA1036.severity = suggestion
+dotnet_diagnostic.CA1040.severity = suggestion
+dotnet_diagnostic.CA1052.severity = suggestion
+dotnet_diagnostic.CA1054.severity = suggestion
+dotnet_diagnostic.CA1055.severity = suggestion
+dotnet_diagnostic.CA1056.severity = suggestion
+dotnet_diagnostic.CA1058.severity = warning
+dotnet_diagnostic.CA1060.severity = silent
+dotnet_diagnostic.CA1063.severity = suggestion
+dotnet_diagnostic.CA1064.severity = suggestion
+dotnet_diagnostic.CA1065.severity = suggestion
+dotnet_diagnostic.CA1066.severity = suggestion
+
+# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/globalization-warnings
+dotnet_diagnostic.CA1303.severity = suggestion
+dotnet_diagnostic.CA1307.severity = suggestion
+dotnet_diagnostic.CA1308.severity = suggestion
+dotnet_diagnostic.CA1309.severity = suggestion
+dotnet_diagnostic.CA1310.severity = suggestion
+dotnet_diagnostic.CA1311.severity = suggestion
+
+# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/interoperability-warnings
+dotnet_diagnostic.CA1419.severity = warning
+dotnet_diagnostic.CA1421.severity = warning
+
+# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/maintainability-warnings
+dotnet_diagnostic.CA1501.severity = suggestion
+dotnet_diagnostic.CA1502.severity = suggestion
+dotnet_diagnostic.CA1505.severity = suggestion
+dotnet_diagnostic.CA1506.severity = suggestion
+dotnet_diagnostic.CA1508.severity = suggestion
+dotnet_diagnostic.CA1509.severity = suggestion
+
+# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/naming-warnings
+dotnet_diagnostic.CA1700.severity = suggestion
+dotnet_diagnostic.CA1707.severity = suggestion
+dotnet_diagnostic.CA1710.severity = suggestion
+dotnet_diagnostic.CA1711.severity = suggestion
+dotnet_diagnostic.CA1712.severity = suggestion
+dotnet_diagnostic.CA1713.severity = suggestion
+dotnet_diagnostic.CA1715.severity = suggestion
+dotnet_diagnostic.CA1716.severity = warning
+dotnet_diagnostic.CA1721.severity = suggestion
+
+# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/performance-warnings
+dotnet_diagnostic.CA1802.severity = suggestion
+dotnet_diagnostic.CA1805.severity = suggestion
+dotnet_diagnostic.CA1806.severity = warning
+# Flag any accidental use of static Equals without checking the return value, scenarios like "StringAssert.Equals" are falling through to a method
+# that doesn't do what the caller expects.
+dotnet_code_quality.CA1806.additional_use_results_methods = Equals
+dotnet_diagnostic.CA1810.severity = suggestion
+dotnet_diagnostic.CA1812.severity = suggestion
+dotnet_diagnostic.CA1813.severity = suggestion
+dotnet_diagnostic.CA1815.severity = suggestion
+dotnet_diagnostic.CA1820.severity = suggestion
+dotnet_diagnostic.CA1823.severity = suggestion
+dotnet_diagnostic.CA1838.severity = suggestion
+dotnet_diagnostic.CA1849.severity = suggestion
+dotnet_diagnostic.CA1851.severity = suggestion
+dotnet_diagnostic.CA1852.severity = suggestion
+dotnet_diagnostic.CA1867.severity = suggestion
+
+# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/reliability-warnings
+dotnet_diagnostic.CA2000.severity = warning
+dotnet_diagnostic.CA2002.severity = warning
+dotnet_diagnostic.CA2008.severity = warning
+dotnet_diagnostic.CA2011.severity = warning
+dotnet_diagnostic.CA2012.severity = warning
+dotnet_diagnostic.CA2019.severity = warning
+
+# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/security-warnings
+dotnet_diagnostic.CA2100.severity = warning
+dotnet_diagnostic.CA2119.severity = warning
+dotnet_diagnostic.CA2153.severity = warning
+dotnet_diagnostic.CA2300.severity = warning
+dotnet_diagnostic.CA2301.severity = warning
+dotnet_diagnostic.CA2302.severity = warning
+dotnet_diagnostic.CA2305.severity = warning
+dotnet_diagnostic.CA2310.severity = warning
+dotnet_diagnostic.CA2311.severity = warning
+dotnet_diagnostic.CA2312.severity = warning
+dotnet_diagnostic.CA2315.severity = warning
+dotnet_diagnostic.CA2321.severity = warning
+dotnet_diagnostic.CA2322.severity = warning
+dotnet_diagnostic.CA2326.severity = warning
+dotnet_diagnostic.CA2327.severity = warning
+dotnet_diagnostic.CA2328.severity = warning
+dotnet_diagnostic.CA2329.severity = warning
+dotnet_diagnostic.CA2330.severity = warning
+dotnet_diagnostic.CA2350.severity = warning
+dotnet_diagnostic.CA2351.severity = warning
+dotnet_diagnostic.CA2352.severity = warning
+dotnet_diagnostic.CA2353.severity = warning
+dotnet_diagnostic.CA2354.severity = warning
+dotnet_diagnostic.CA2355.severity = warning
+dotnet_diagnostic.CA2356.severity = warning
+dotnet_diagnostic.CA2361.severity = warning
+dotnet_diagnostic.CA2362.severity = warning
+dotnet_diagnostic.CA3001.severity = warning
+dotnet_diagnostic.CA3002.severity = warning
+dotnet_diagnostic.CA3003.severity = warning
+dotnet_diagnostic.CA3004.severity = warning
+dotnet_diagnostic.CA3005.severity = warning
+dotnet_diagnostic.CA3006.severity = warning
+dotnet_diagnostic.CA3007.severity = warning
+dotnet_diagnostic.CA3008.severity = warning
+dotnet_diagnostic.CA3009.severity = warning
+dotnet_diagnostic.CA3010.severity = warning
+dotnet_diagnostic.CA3011.severity = warning
+dotnet_diagnostic.CA3012.severity = warning
+dotnet_diagnostic.CA3061.severity = warning
+dotnet_diagnostic.CA3075.severity = warning
+dotnet_diagnostic.CA3076.severity = warning
+dotnet_diagnostic.CA3077.severity = warning
+dotnet_diagnostic.CA3147.severity = warning
+dotnet_diagnostic.CA5350.severity = warning
+dotnet_diagnostic.CA5351.severity = warning
+dotnet_diagnostic.CA5358.severity = warning
+dotnet_diagnostic.CA5359.severity = warning
+dotnet_diagnostic.CA5360.severity = warning
+dotnet_diagnostic.CA5361.severity = warning
+dotnet_diagnostic.CA5362.severity = warning
+dotnet_diagnostic.CA5363.severity = warning
+dotnet_diagnostic.CA5364.severity = warning
+dotnet_diagnostic.CA5365.severity = warning
+dotnet_diagnostic.CA5366.severity = warning
+dotnet_diagnostic.CA5367.severity = warning
+dotnet_diagnostic.CA5368.severity = warning
+dotnet_diagnostic.CA5369.severity = warning
+dotnet_diagnostic.CA5370.severity = warning
+dotnet_diagnostic.CA5371.severity = warning
+dotnet_diagnostic.CA5372.severity = warning
+dotnet_diagnostic.CA5373.severity = warning
+dotnet_diagnostic.CA5374.severity = warning
+dotnet_diagnostic.CA5375.severity = warning
+dotnet_diagnostic.CA5376.severity = warning
+dotnet_diagnostic.CA5377.severity = warning
+dotnet_diagnostic.CA5378.severity = warning
+dotnet_diagnostic.CA5379.severity = warning
+dotnet_diagnostic.CA5380.severity = warning
+dotnet_diagnostic.CA5381.severity = warning
+dotnet_diagnostic.CA5382.severity = warning
+dotnet_diagnostic.CA5383.severity = warning
+dotnet_diagnostic.CA5384.severity = warning
+dotnet_diagnostic.CA5385.severity = warning
+dotnet_diagnostic.CA5386.severity = warning
+dotnet_diagnostic.CA5387.severity = warning
+dotnet_diagnostic.CA5388.severity = warning
+dotnet_diagnostic.CA5389.severity = warning
+dotnet_diagnostic.CA5390.severity = warning
+dotnet_diagnostic.CA5391.severity = warning
+dotnet_diagnostic.CA5392.severity = silent
+dotnet_diagnostic.CA5393.severity = warning
+dotnet_diagnostic.CA5394.severity = warning
+dotnet_diagnostic.CA5395.severity = warning
+dotnet_diagnostic.CA5396.severity = warning
+dotnet_diagnostic.CA5397.severity = warning
+dotnet_diagnostic.CA5398.severity = warning
+dotnet_diagnostic.CA5399.severity = warning
+dotnet_diagnostic.CA5400.severity = warning
+dotnet_diagnostic.CA5401.severity = warning
+dotnet_diagnostic.CA5402.severity = warning
+dotnet_diagnostic.CA5403.severity = warning
+dotnet_diagnostic.CA5404.severity = warning
+dotnet_diagnostic.CA5405.severity = warning
+
+# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/quality-rules/usage-warnings
+dotnet_diagnostic.CA2201.severity = warning
+dotnet_diagnostic.CA2207.severity = suggestion
+dotnet_diagnostic.CA2211.severity = warning
+dotnet_diagnostic.CA2213.severity = warning
+dotnet_diagnostic.CA2215.severity = suggestion
+dotnet_diagnostic.CA2217.severity = warning
+dotnet_diagnostic.CA2219.severity = warning
+dotnet_diagnostic.CA2226.severity = suggestion
+dotnet_diagnostic.CA2234.severity = suggestion
+dotnet_diagnostic.CA2242.severity = warning
+dotnet_diagnostic.CA2243.severity = suggestion
+dotnet_diagnostic.CA2245.severity = warning
+dotnet_diagnostic.CA2251.severity = suggestion
+
+# https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/style-rules/
+# required by CELA
+dotnet_diagnostic.IDE0073.severity = suggestion
 
-# CS8305: Type is for evaluation purposes only and is subject to change or removal in future updates.
-dotnet_diagnostic.CS8305.severity = suggestion

src/modules/cmdpal/Microsoft.CmdPal.Common/Helpers/NativeEventWaiter.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -13,10 +13,10 @@ public static partial class NativeEventWaiter
 {
     public static void WaitForEventLoop(string eventName, Action callback)
     {
-        var dispatcherQueue = DispatcherQueue.GetForCurrentThread();
-        var t = new Thread(() =>
+        DispatcherQueue dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+        Thread t = new Thread(() =>
         {
-            var eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, eventName);
+            EventWaitHandle eventHandle = new EventWaitHandle(false, EventResetMode.AutoReset, eventName);
             while (true)
             {
                 if (eventHandle.WaitOne())
@@ -24,9 +24,10 @@ public static partial class NativeEventWaiter
                     dispatcherQueue.TryEnqueue(() => callback());
                 }
             }
-        });
-
-        t.IsBackground = true;
+        })
+        {
+            IsBackground = true,
+        };
         t.Start();
     }
 }

src/modules/cmdpal/Microsoft.CmdPal.Common/Messages/HideWindowMessage.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 

src/modules/cmdpal/Microsoft.CmdPal.Common/Services/IExtensionWrapper.cs

@@ -55,7 +55,7 @@ public interface IExtensionWrapper
     /// <summary>
     /// Gets the Unique Id for the extension
     /// </summary>
-    public string ExtensionUniqueId { get; }
+    string ExtensionUniqueId { get; }
 
     /// <summary>
     /// Checks whether we have a reference to the extension process and we are able to call methods on the interface.

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/AppExtensionHost.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -79,7 +79,7 @@ public abstract partial class AppExtensionHost : IExtensionHost
             {
                 try
                 {
-                    var vm = StatusMessages.Where(messageVM => messageVM.Model.Unsafe == message).FirstOrDefault();
+                    StatusMessageViewModel? vm = StatusMessages.Where(messageVM => messageVM.Model.Unsafe == message).FirstOrDefault();
                     if (vm != null)
                     {
                         StatusMessages.Remove(vm);
@@ -96,7 +96,7 @@ public abstract partial class AppExtensionHost : IExtensionHost
 
     public void ProcessLogMessage(ILogMessage message)
     {
-        var vm = new LogMessageViewModel(message, _globalLogPageContext);
+        LogMessageViewModel vm = new LogMessageViewModel(message, _globalLogPageContext);
         vm.SafeInitializePropertiesSynchronous();
 
         Task.Factory.StartNew(
@@ -112,7 +112,7 @@ public abstract partial class AppExtensionHost : IExtensionHost
     public void ProcessStatusMessage(IStatusMessage message, StatusContext context)
     {
         // If this message is already in the list of messages, just bring it to the top
-        var oldVm = StatusMessages.Where(messageVM => messageVM.Model.Unsafe == message).FirstOrDefault();
+        StatusMessageViewModel? oldVm = StatusMessages.Where(messageVM => messageVM.Model.Unsafe == message).FirstOrDefault();
         if (oldVm != null)
         {
             Task.Factory.StartNew(
@@ -127,7 +127,7 @@ public abstract partial class AppExtensionHost : IExtensionHost
             return;
         }
 
-        var vm = new StatusMessageViewModel(message, new(_globalLogPageContext));
+        StatusMessageViewModel vm = new StatusMessageViewModel(message, new(_globalLogPageContext));
         vm.SafeInitializePropertiesSynchronous();
 
         Task.Factory.StartNew(

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandBarViewModel.cs

@@ -2,7 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Collections.ObjectModel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
@@ -126,12 +125,12 @@ public partial class CommandBarViewModel : ObservableObject,
 
     public ContextKeybindingResult CheckKeybinding(bool ctrl, bool alt, bool shift, bool win, VirtualKey key)
     {
-        var keybindings = SelectedItem?.Keybindings();
+        Dictionary<CommandPalette.Extensions.KeyChord, CommandContextItemViewModel>? keybindings = SelectedItem?.Keybindings();
         if (keybindings != null)
         {
             // Does the pressed key match any of the keybindings?
-            var pressedKeyChord = KeyChordHelpers.FromModifiers(ctrl, alt, shift, win, key, 0);
-            if (keybindings.TryGetValue(pressedKeyChord, out var matchedItem))
+            CommandPalette.Extensions.KeyChord pressedKeyChord = KeyChordHelpers.FromModifiers(ctrl, alt, shift, win, key, 0);
+            if (keybindings.TryGetValue(pressedKeyChord, out CommandContextItemViewModel? matchedItem))
             {
                 return matchedItem != null ? PerformCommand(matchedItem) : ContextKeybindingResult.Unhandled;
             }

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandContextItemViewModel.cs

@@ -28,7 +28,7 @@ public partial class CommandContextItemViewModel(ICommandContextItem contextItem
 
         base.InitializeProperties();
 
-        var contextItem = Model.Unsafe;
+        ICommandContextItem? contextItem = Model.Unsafe;
         if (contextItem == null)
         {
             return; // throw?

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandItemViewModel.cs

@@ -97,7 +97,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
             return;
         }
 
-        var model = _commandItemModel.Unsafe;
+        ICommandItem? model = _commandItemModel.Unsafe;
         if (model == null)
         {
             return;
@@ -125,7 +125,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
             FastInitializeProperties();
         }
 
-        var model = _commandItemModel.Unsafe;
+        ICommandItem? model = _commandItemModel.Unsafe;
         if (model == null)
         {
             return;
@@ -133,7 +133,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
 
         Command.InitializeProperties();
 
-        var listIcon = model.Icon;
+        IIconInfo listIcon = model.Icon;
         if (listIcon != null)
         {
             _listItemIcon = new(listIcon);
@@ -169,25 +169,25 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
             InitializeProperties();
         }
 
-        var model = _commandItemModel.Unsafe;
+        ICommandItem? model = _commandItemModel.Unsafe;
         if (model == null)
         {
             return;
         }
 
-        var more = model.MoreCommands;
+        IContextItem[] more = model.MoreCommands;
         if (more != null)
         {
             MoreCommands = more
-                .Select(item =>
+                .Select<IContextItem, IContextItemViewModel>(item =>
                 {
                     if (item is ICommandContextItem contextItem)
                     {
-                        return new CommandContextItemViewModel(contextItem, PageContext) as IContextItemViewModel;
+                        return new CommandContextItemViewModel(contextItem, PageContext);
                     }
                     else
                     {
-                        return new SeparatorContextItemViewModel() as IContextItemViewModel;
+                        return new SeparatorContextItemViewModel();
                     }
                 })
                 .ToList();
@@ -297,7 +297,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
 
     protected virtual void FetchProperty(string propertyName)
     {
-        var model = this._commandItemModel.Unsafe;
+        ICommandItem? model = this._commandItemModel.Unsafe;
         if (model == null)
         {
             return; // throw?
@@ -332,19 +332,19 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
                 break;
 
             case nameof(model.MoreCommands):
-                var more = model.MoreCommands;
+                IContextItem[] more = model.MoreCommands;
                 if (more != null)
                 {
-                    var newContextMenu = more
-                        .Select(item =>
+                    List<IContextItemViewModel> newContextMenu = more
+                        .Select<IContextItem, IContextItemViewModel>(item =>
                         {
                             if (item is CommandContextItem contextItem)
                             {
-                                return new CommandContextItemViewModel(contextItem, PageContext) as IContextItemViewModel;
+                                return new CommandContextItemViewModel(contextItem, PageContext);
                             }
                             else
                             {
-                                return new SeparatorContextItemViewModel() as IContextItemViewModel;
+                                return new SeparatorContextItemViewModel();
                             }
                         })
                         .ToList();
@@ -381,7 +381,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
 
     private void Command_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
     {
-        var propertyName = e.PropertyName;
+        string? propertyName = e.PropertyName;
         switch (propertyName)
         {
             case nameof(Command.Name):
@@ -415,7 +415,7 @@ public partial class CommandItemViewModel : ExtensionObjectViewModel, ICommandBa
         Command.PropertyChanged -= Command_PropertyChanged;
         Command.SafeCleanup();
 
-        var model = _commandItemModel.Unsafe;
+        ICommandItem? model = _commandItemModel.Unsafe;
         if (model != null)
         {
             model.PropChanged -= Model_PropChanged;

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/CommandViewModel.cs

@@ -43,7 +43,7 @@ public partial class CommandViewModel : ExtensionObjectViewModel
             return;
         }
 
-        var model = Model.Unsafe;
+        ICommand? model = Model.Unsafe;
         if (model == null)
         {
             return;
@@ -66,13 +66,13 @@ public partial class CommandViewModel : ExtensionObjectViewModel
             FastInitializeProperties();
         }
 
-        var model = Model.Unsafe;
+        ICommand? model = Model.Unsafe;
         if (model == null)
         {
             return;
         }
 
-        var ico = model.Icon;
+        IIconInfo ico = model.Icon;
         if (ico != null)
         {
             Icon = new(ico);
@@ -97,7 +97,7 @@ public partial class CommandViewModel : ExtensionObjectViewModel
 
     protected void FetchProperty(string propertyName)
     {
-        var model = Model.Unsafe;
+        ICommand? model = Model.Unsafe;
         if (model == null)
         {
             return; // throw?
@@ -109,7 +109,7 @@ public partial class CommandViewModel : ExtensionObjectViewModel
                 Name = model.Name;
                 break;
             case nameof(Icon):
-                var iconInfo = model.Icon;
+                IIconInfo iconInfo = model.Icon;
                 Icon = new(iconInfo);
                 Icon.InitializeProperties();
                 break;
@@ -124,7 +124,7 @@ public partial class CommandViewModel : ExtensionObjectViewModel
 
         Icon = new(null); // necessary?
 
-        var model = Model.Unsafe;
+        ICommand? model = Model.Unsafe;
         if (model != null)
         {
             model.PropChanged -= Model_PropChanged;

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ConfirmResultViewModel.cs

@@ -24,7 +24,7 @@ public partial class ConfirmResultViewModel(IConfirmationArgs _args, WeakReferen
 
     public override void InitializeProperties()
     {
-        var model = Model.Unsafe;
+        IConfirmationArgs? model = Model.Unsafe;
         if (model == null)
         {
             return;

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContentPageViewModel.cs

@@ -62,11 +62,11 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
         List<ContentViewModel> newContent = [];
         try
         {
-            var newItems = _model.Unsafe!.GetContent();
+            IContent[] newItems = _model.Unsafe!.GetContent();
 
-            foreach (var item in newItems)
+            foreach (IContent? item in newItems)
             {
-                var viewModel = ViewModelFromContent(item, PageContext);
+                ContentViewModel? viewModel = ViewModelFromContent(item, PageContext);
                 if (viewModel != null)
                 {
                     viewModel.InitializeProperties();
@@ -80,7 +80,7 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
             throw;
         }
 
-        var oneContent = newContent.Count == 1;
+        bool oneContent = newContent.Count == 1;
         newContent.ForEach(c => c.OnlyControlOnPage = oneContent);
 
         // Now, back to a UI thread to update the observable collection
@@ -103,7 +103,7 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
     {
         base.InitializeProperties();
 
-        var model = _model.Unsafe;
+        IContentPage? model = _model.Unsafe;
         if (model == null)
         {
             return; // throw?
@@ -132,7 +132,7 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
                 contextItem.InitializeProperties();
             });
 
-        var extensionDetails = model.Details;
+        IDetails extensionDetails = model.Details;
         if (extensionDetails != null)
         {
             Details = new(extensionDetails, PageContext);
@@ -155,7 +155,7 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
     {
         base.FetchProperty(propertyName);
 
-        var model = this._model.Unsafe;
+        IContentPage? model = this._model.Unsafe;
         if (model == null)
         {
             return; // throw?
@@ -165,10 +165,10 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
         {
             case nameof(Commands):
 
-                var more = model.Commands;
+                IContextItem[] more = model.Commands;
                 if (more != null)
                 {
-                    var newContextMenu = more
+                    List<IContextItemViewModel> newContextMenu = more
                             .ToList()
                             .Select(item =>
                             {
@@ -215,7 +215,7 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
 
                 break;
             case nameof(Details):
-                var extensionDetails = model.Details;
+                IDetails extensionDetails = model.Details;
                 Details = extensionDetails != null ? new(extensionDetails, PageContext) : null;
                 UpdateDetails();
                 break;
@@ -277,14 +277,14 @@ public partial class ContentPageViewModel : PageViewModel, ICommandBarContext
 
         Commands.Clear();
 
-        foreach (var item in Content)
+        foreach (ContentViewModel item in Content)
         {
             item.SafeCleanup();
         }
 
         Content.Clear();
 
-        var model = _model.Unsafe;
+        IContentPage? model = _model.Unsafe;
         if (model != null)
         {
             model.ItemsChanged -= Model_ItemsChanged;

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ContextMenuViewModel.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -8,7 +8,6 @@ using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.CmdPal.Core.ViewModels.Messages;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using Microsoft.Diagnostics.Utilities;
 using Windows.System;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
@@ -99,11 +98,11 @@ public partial class ContextMenuViewModel : ObservableObject,
             return;
         }
 
-        var commands = CurrentContextMenu
+        IEnumerable<CommandContextItemViewModel> commands = CurrentContextMenu
                             .OfType<CommandContextItemViewModel>()
                             .Where(c => c.ShouldBeVisible);
 
-        var newResults = ListHelpers.FilterList<CommandContextItemViewModel>(commands, searchText, ScoreContextCommand);
+        IEnumerable<CommandContextItemViewModel> newResults = ListHelpers.FilterList<CommandContextItemViewModel>(commands, searchText, ScoreContextCommand);
         ListHelpers.InPlaceUpdateList(FilteredItems, newResults);
     }
 
@@ -119,9 +118,9 @@ public partial class ContextMenuViewModel : ObservableObject,
             return 0;
         }
 
-        var nameMatch = StringMatcher.FuzzySearch(query, item.Title);
+        MatchResult nameMatch = StringMatcher.FuzzySearch(query, item.Title);
 
-        var descriptionMatch = StringMatcher.FuzzySearch(query, item.Subtitle);
+        MatchResult descriptionMatch = StringMatcher.FuzzySearch(query, item.Subtitle);
 
         return new[] { nameMatch.Score, (descriptionMatch.Score - 4) / 2, 0 }.Max();
     }
@@ -151,12 +150,12 @@ public partial class ContextMenuViewModel : ObservableObject,
 
     public ContextKeybindingResult? CheckKeybinding(bool ctrl, bool alt, bool shift, bool win, VirtualKey key)
     {
-        var keybindings = Keybindings();
+        Dictionary<KeyChord, CommandContextItemViewModel> keybindings = Keybindings();
         if (keybindings != null)
         {
             // Does the pressed key match any of the keybindings?
-            var pressedKeyChord = KeyChordHelpers.FromModifiers(ctrl, alt, shift, win, key, 0);
-            if (keybindings.TryGetValue(pressedKeyChord, out var item))
+            KeyChord pressedKeyChord = KeyChordHelpers.FromModifiers(ctrl, alt, shift, win, key, 0);
+            if (keybindings.TryGetValue(pressedKeyChord, out CommandContextItemViewModel? item))
             {
                 return InvokeCommand(item);
             }

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsCommandsViewModel.cs

@@ -21,7 +21,7 @@ public partial class DetailsCommandsViewModel(
     public override void InitializeProperties()
     {
         base.InitializeProperties();
-        var model = _dataModel.Unsafe;
+        IDetailsCommands? model = _dataModel.Unsafe;
         if (model == null)
         {
             return;
@@ -31,7 +31,7 @@ public partial class DetailsCommandsViewModel(
             .Commands?
             .Select(c =>
             {
-                var vm = new CommandViewModel(c, PageContext);
+                CommandViewModel vm = new CommandViewModel(c, PageContext);
                 vm.InitializeProperties();
                 return vm;
             })

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsDataViewModel.cs

@@ -2,9 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Core.ViewModels.Models;
-using Microsoft.CommandPalette.Extensions;
-
 namespace Microsoft.CmdPal.Core.ViewModels;
 
 public abstract partial class DetailsDataViewModel(IPageContext context) : ExtensionObjectViewModel(context)

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsElementViewModel.cs

@@ -15,7 +15,7 @@ public abstract partial class DetailsElementViewModel(IDetailsElement _detailsEl
 
     public override void InitializeProperties()
     {
-        var model = _model.Unsafe;
+        IDetailsElement? model = _model.Unsafe;
         if (model == null)
         {
             return;

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsLinkViewModel.cs

@@ -25,7 +25,7 @@ public partial class DetailsLinkViewModel(
     public override void InitializeProperties()
     {
         base.InitializeProperties();
-        var model = _dataModel.Unsafe;
+        IDetailsLink? model = _dataModel.Unsafe;
         if (model == null)
         {
             return;

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsSeparatorViewModel.cs

@@ -2,7 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Core.ViewModels.Models;
 using Microsoft.CommandPalette.Extensions;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
@@ -11,9 +10,6 @@ public partial class DetailsSeparatorViewModel(
     IDetailsElement _detailsElement,
     WeakReference<IPageContext> context) : DetailsElementViewModel(_detailsElement, context)
 {
-    private readonly ExtensionObject<IDetailsSeparator> _dataModel =
-        new(_detailsElement.Data as IDetailsSeparator);
-
     public override void InitializeProperties()
     {
         base.InitializeProperties();

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsTagsViewModel.cs

@@ -21,7 +21,7 @@ public partial class DetailsTagsViewModel(
     public override void InitializeProperties()
     {
         base.InitializeProperties();
-        var model = _dataModel.Unsafe;
+        IDetailsTags? model = _dataModel.Unsafe;
         if (model == null)
         {
             return;
@@ -31,7 +31,7 @@ public partial class DetailsTagsViewModel(
             .Tags?
             .Select(t =>
         {
-            var vm = new TagViewModel(t, PageContext);
+            TagViewModel vm = new TagViewModel(t, PageContext);
             vm.InitializeProperties();
             return vm;
         })

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/DetailsViewModel.cs

@@ -25,7 +25,7 @@ public partial class DetailsViewModel(IDetails _details, WeakReference<IPageCont
 
     public override void InitializeProperties()
     {
-        var model = _detailsModel.Unsafe;
+        IDetails? model = _detailsModel.Unsafe;
         if (model == null)
         {
             return;
@@ -40,10 +40,10 @@ public partial class DetailsViewModel(IDetails _details, WeakReference<IPageCont
         UpdateProperty(nameof(Body));
         UpdateProperty(nameof(HeroImage));
 
-        var meta = model.Metadata;
+        IDetailsElement[] meta = model.Metadata;
         if (meta != null)
         {
-            foreach (var element in meta)
+            foreach (IDetailsElement? element in meta)
             {
                 DetailsElementViewModel? vm = element.Data switch
                 {

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ExtensionObjectViewModel.cs

@@ -11,20 +11,20 @@ public abstract partial class ExtensionObjectViewModel : ObservableObject
 {
     public WeakReference<IPageContext> PageContext { get; set; }
 
-    public ExtensionObjectViewModel(IPageContext? context)
+    protected ExtensionObjectViewModel(IPageContext? context)
     {
-        var realContext = context ?? (this is IPageContext c ? c : throw new ArgumentException("You need to pass in an IErrorContext"));
+        IPageContext realContext = context ?? (this is IPageContext c ? c : throw new ArgumentException("You need to pass in an IErrorContext"));
         PageContext = new(realContext);
     }
 
-    public ExtensionObjectViewModel(WeakReference<IPageContext> context)
+    protected ExtensionObjectViewModel(WeakReference<IPageContext> context)
     {
         PageContext = context;
     }
 
-    public async virtual Task InitializePropertiesAsync()
+    public virtual async Task InitializePropertiesAsync()
     {
-        var t = new Task(() =>
+        Task t = new Task(() =>
         {
             SafeInitializePropertiesSynchronous();
         });
@@ -53,7 +53,7 @@ public abstract partial class ExtensionObjectViewModel : ObservableObject
 
     protected void ShowException(Exception ex, string? extensionHint = null)
     {
-        if (PageContext.TryGetTarget(out var pageContext))
+        if (PageContext.TryGetTarget(out IPageContext? pageContext))
         {
             pageContext.ShowException(ex, extensionHint);
         }
@@ -61,7 +61,7 @@ public abstract partial class ExtensionObjectViewModel : ObservableObject
 
     protected void DoOnUiThread(Action action)
     {
-        if (PageContext.TryGetTarget(out var pageContext))
+        if (PageContext.TryGetTarget(out IPageContext? pageContext))
         {
             Task.Factory.StartNew(
                 action,

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/GlobalLogPageContext.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IContextItemViewModel.cs

@@ -1,13 +1,7 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
 namespace Microsoft.CmdPal.Core.ViewModels;
 
 public interface IContextItemViewModel

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IconDataViewModel.cs

@@ -35,7 +35,7 @@ public partial class IconDataViewModel : ObservableObject, IIconData
     // Unsafe, needs to be called on BG thread
     public void InitializeProperties()
     {
-        var model = _model.Unsafe;
+        IIconData? model = _model.Unsafe;
         if (model == null)
         {
             return;

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/IconInfoViewModel.cs

@@ -42,7 +42,7 @@ public partial class IconInfoViewModel : ObservableObject, IIconInfo
     // Unsafe, needs to be called on BG thread
     public void InitializeProperties()
     {
-        var model = _model.Unsafe;
+        IIconInfo? model = _model.Unsafe;
         if (model == null)
         {
             return;

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListItemViewModel.cs

@@ -39,7 +39,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
         // This sets IsInitialized = true
         base.InitializeProperties();
 
-        var li = Model.Unsafe;
+        IListItem? li = Model.Unsafe;
         if (li == null)
         {
             return; // throw?
@@ -49,7 +49,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
 
         TextToSuggest = li.TextToSuggest;
         Section = li.Section ?? string.Empty;
-        var extensionDetails = li.Details;
+        IDetails extensionDetails = li.Details;
         if (extensionDetails != null)
         {
             Details = new(extensionDetails, PageContext);
@@ -66,7 +66,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
     {
         base.FetchProperty(propertyName);
 
-        var model = this.Model.Unsafe;
+        IListItem? model = this.Model.Unsafe;
         if (model == null)
         {
             return; // throw?
@@ -84,7 +84,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
                 this.Section = model.Section ?? string.Empty;
                 break;
             case nameof(Details):
-                var extensionDetails = model.Details;
+                IDetails extensionDetails = model.Details;
                 Details = extensionDetails != null ? new(extensionDetails, PageContext) : null;
                 Details?.InitializeProperties();
                 UpdateProperty(nameof(Details));
@@ -107,9 +107,9 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
 
     private void UpdateTags(ITag[]? newTagsFromModel)
     {
-        var newTags = newTagsFromModel?.Select(t =>
+        List<TagViewModel> newTags = newTagsFromModel?.Select(t =>
         {
-            var vm = new TagViewModel(t, PageContext);
+            TagViewModel vm = new TagViewModel(t, PageContext);
             vm.InitializeProperties();
             return vm;
         })
@@ -135,7 +135,7 @@ public partial class ListItemViewModel(IListItem model, WeakReference<IPageConte
         Tags?.ForEach(t => t.SafeCleanup());
         Details?.SafeCleanup();
 
-        var model = Model.Unsafe;
+        IListItem? model = Model.Unsafe;
         if (model != null)
         {
             // We don't need to revoke the PropChanged event handler here,

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ListViewModel.cs

@@ -134,7 +134,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
         try
         {
-            var newItems = _model.Unsafe!.GetItems();
+            IListItem[] newItems = _model.Unsafe!.GetItems();
 
             // Collect all the items into new viewmodels
             Collection<ListItemViewModel> newViewModels = [];
@@ -142,7 +142,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
             // TODO we can probably further optimize this by also keeping a
             // HashSet of every ExtensionObject we currently have, and only
             // building new viewmodels for the ones we haven't already built.
-            foreach (var item in newItems)
+            foreach (IListItem? item in newItems)
             {
                 ListItemViewModel viewModel = new(item, new(this));
 
@@ -153,8 +153,8 @@ public partial class ListViewModel : PageViewModel, IDisposable
                 }
             }
 
-            var firstTwenty = newViewModels.Take(20);
-            foreach (var item in firstTwenty)
+            IEnumerable<ListItemViewModel> firstTwenty = newViewModels.Take(20);
+            foreach (ListItemViewModel? item in firstTwenty)
             {
                 item?.SafeInitializeProperties();
             }
@@ -236,7 +236,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
             iterable = Items.ToArray();
         }
 
-        foreach (var item in iterable)
+        foreach (ListItemViewModel item in iterable)
         {
             ct.ThrowIfCancellationRequested();
 
@@ -269,8 +269,8 @@ public partial class ListViewModel : PageViewModel, IDisposable
             return 1;
         }
 
-        var nameMatch = StringMatcher.FuzzySearch(query, listItem.Title);
-        var descriptionMatch = StringMatcher.FuzzySearch(query, listItem.Subtitle);
+        MatchResult nameMatch = StringMatcher.FuzzySearch(query, listItem.Title);
+        MatchResult descriptionMatch = StringMatcher.FuzzySearch(query, listItem.Subtitle);
         return new[] { nameMatch.Score, (descriptionMatch.Score - 4) / 2, 0 }.Max();
     }
 
@@ -283,7 +283,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
     // Similarly stolen from ListHelpers.FilterList
     public static IEnumerable<ListItemViewModel> FilterList(IEnumerable<ListItemViewModel> items, string query)
     {
-        var scores = items
+        IOrderedEnumerable<ScoredListItemViewModel> scores = items
             .Where(i => !i.IsInErrorState)
             .Select(li => new ScoredListItemViewModel() { ViewModel = li, Score = ScoreListItem(query, li) })
             .Where(score => score.Score > 0)
@@ -381,7 +381,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
     private void SelectedItemPropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
     {
-        var item = _lastSelectedItem;
+        ListItemViewModel? item = _lastSelectedItem;
         if (item == null)
         {
             return;
@@ -436,7 +436,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
     {
         base.InitializeProperties();
 
-        var model = _model.Unsafe;
+        IListPage? model = _model.Unsafe;
         if (model == null)
         {
             return; // throw?
@@ -463,7 +463,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
     public void LoadMoreIfNeeded()
     {
-        var model = this._model.Unsafe;
+        IListPage? model = this._model.Unsafe;
         if (model == null)
         {
             return;
@@ -490,7 +490,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
     {
         base.FetchProperty(propertyName);
 
-        var model = this._model.Unsafe;
+        IListPage? model = this._model.Unsafe;
         if (model == null)
         {
             return; // throw?
@@ -555,13 +555,13 @@ public partial class ListViewModel : PageViewModel, IDisposable
 
         lock (_listLock)
         {
-            foreach (var item in Items)
+            foreach (ListItemViewModel item in Items)
             {
                 item.SafeCleanup();
             }
 
             Items.Clear();
-            foreach (var item in FilteredItems)
+            foreach (ListItemViewModel item in FilteredItems)
             {
                 item.SafeCleanup();
             }
@@ -569,7 +569,7 @@ public partial class ListViewModel : PageViewModel, IDisposable
             FilteredItems.Clear();
         }
 
-        var model = _model.Unsafe;
+        IListPage? model = _model.Unsafe;
         if (model != null)
         {
             model.ItemsChanged -= Model_ItemsChanged;

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/LogMessageViewModel.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -21,7 +21,7 @@ public partial class LogMessageViewModel : ExtensionObjectViewModel
 
     public override void InitializeProperties()
     {
-        var model = _model.Unsafe;
+        ILogMessage? model = _model.Unsafe;
         if (model == null)
         {
             return; // throw?

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/CloseContextMenuMessage.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/HideDetailsMessage.cs

@@ -2,9 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Core.ViewModels.Models;
-using Microsoft.CommandPalette.Extensions;
-
 namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 
 public record HideDetailsMessage()

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/LaunchUriMessage.cs

@@ -2,9 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Core.ViewModels.Models;
-using Microsoft.CommandPalette.Extensions;
-
 namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 
 public record LaunchUriMessage(Uri Uri)

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/ShowDetailsMessage.cs

@@ -2,9 +2,6 @@
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Core.ViewModels.Models;
-using Microsoft.CommandPalette.Extensions;
-
 namespace Microsoft.CmdPal.Core.ViewModels.Messages;
 
 public record ShowDetailsMessage(DetailsViewModel Details)

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateCommandBarMessage.cs

@@ -16,11 +16,11 @@ public record UpdateCommandBarMessage(ICommandBarContext? ViewModel)
 
 public interface IContextMenuContext : INotifyPropertyChanged
 {
-    public IEnumerable<IContextItemViewModel> MoreCommands { get; }
+    IEnumerable<IContextItemViewModel> MoreCommands { get; }
 
-    public bool HasMoreCommands { get; }
+    bool HasMoreCommands { get; }
 
-    public List<IContextItemViewModel> AllCommands { get; }
+    List<IContextItemViewModel> AllCommands { get; }
 
     /// <summary>
     /// Generates a mapping of key -> command item for this particular item's
@@ -30,7 +30,7 @@ public interface IContextMenuContext : INotifyPropertyChanged
     /// </summary>
     /// <returns>a dictionary of KeyChord -> Context commands, for all commands
     /// that have a shortcut key set.</returns>
-    public Dictionary<KeyChord, CommandContextItemViewModel> Keybindings()
+    Dictionary<KeyChord, CommandContextItemViewModel> Keybindings()
     {
         return MoreCommands
             .OfType<CommandContextItemViewModel>()
@@ -48,9 +48,9 @@ public interface IContextMenuContext : INotifyPropertyChanged
 // the two things with sub-commands.
 public interface ICommandBarContext : IContextMenuContext
 {
-    public string SecondaryCommandName { get; }
+    string SecondaryCommandName { get; }
 
-    public CommandItemViewModel? PrimaryCommand { get; }
+    CommandItemViewModel? PrimaryCommand { get; }
 
-    public CommandItemViewModel? SecondaryCommand { get; }
+    CommandItemViewModel? SecondaryCommand { get; }
 }

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Messages/UpdateSuggestionMessage.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/Microsoft.CmdPal.Core.ViewModels.csproj

@@ -45,16 +45,4 @@
     </Compile>
   </ItemGroup>
 
-
-  <!-- Just mark it as AOT compatible. Do not publish with AOT now. We need fully test before we really publish it as AOT enabled-->
-  <!--<PropertyGroup>
-    <SelfContained>true</SelfContained>
-    <WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
-    <PublishTrimmed>true</PublishTrimmed>
-    <PublishSingleFile>true</PublishSingleFile>
-    --><!-- <DisableRuntimeMarshalling>true</DisableRuntimeMarshalling> --><!--
-    <PublishAot>true</PublishAot>
-	<EnableMsixTooling>true</EnableMsixTooling>
-  </PropertyGroup>-->
-
 </Project>

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/PageViewModel.cs

@@ -88,7 +88,7 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
     {
         if (ExtensionHost.StatusMessages.Any())
         {
-            var last = ExtensionHost.StatusMessages.Last();
+            StatusMessageViewModel last = ExtensionHost.StatusMessages.Last();
             MostRecentStatusMessage = last;
         }
         else
@@ -131,7 +131,7 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
 
     public override void InitializeProperties()
     {
-        var page = _pageModel.Unsafe;
+        IPage? page = _pageModel.Unsafe;
         if (page == null)
         {
             return; // throw?
@@ -157,7 +157,7 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
     {
         try
         {
-            var propName = args.PropertyName;
+            string propName = args.PropertyName;
             FetchProperty(propName);
         }
         catch (Exception ex)
@@ -176,13 +176,13 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
 
     protected virtual void FetchProperty(string propertyName)
     {
-        var model = this._pageModel.Unsafe;
+        IPage? model = this._pageModel.Unsafe;
         if (model == null)
         {
             return; // throw?
         }
 
-        var updateProperty = true;
+        bool updateProperty = true;
         switch (propertyName)
         {
             case nameof(Name):
@@ -239,7 +239,7 @@ public partial class PageViewModel : ExtensionObjectViewModel, IPageContext
 
         ExtensionHost.StatusMessages.CollectionChanged -= StatusMessages_CollectionChanged;
 
-        var model = _pageModel.Unsafe;
+        IPage? model = _pageModel.Unsafe;
         if (model != null)
         {
             model.PropChanged -= Model_PropChanged;

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ProgressViewModel.cs

@@ -23,7 +23,7 @@ public partial class ProgressViewModel : ExtensionObjectViewModel
 
     public override void InitializeProperties()
     {
-        var model = Model.Unsafe;
+        IProgressState? model = Model.Unsafe;
         if (model == null)
         {
             return; // throw?
@@ -49,7 +49,7 @@ public partial class ProgressViewModel : ExtensionObjectViewModel
 
     protected virtual void FetchProperty(string propertyName)
     {
-        var model = this.Model.Unsafe;
+        IProgressState? model = this.Model.Unsafe;
         if (model == null)
         {
             return; // throw?

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/SeparatorContextItemViewModel.cs

@@ -1,8 +1,7 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.CommandPalette.Extensions;
 
 namespace Microsoft.CmdPal.Core.ViewModels;

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ShellViewModel.cs

@@ -38,7 +38,7 @@ public partial class ShellViewModel : ObservableObject,
         get => _currentPage;
         set
         {
-            var oldValue = _currentPage;
+            PageViewModel oldValue = _currentPage;
             if (SetProperty(ref _currentPage, value))
             {
                 if (oldValue is IDisposable disposable)
@@ -60,7 +60,7 @@ public partial class ShellViewModel : ObservableObject,
 
     private bool _isNested;
 
-    public bool IsNested { get => _isNested; }
+    public bool IsNested => _isNested;
 
     public ShellViewModel(
         TaskScheduler scheduler,
@@ -182,13 +182,13 @@ public partial class ShellViewModel : ObservableObject,
 
     private void PerformCommand(PerformCommandMessage message)
     {
-        var command = message.Command.Unsafe;
+        ICommand? command = message.Command.Unsafe;
         if (command == null)
         {
             return;
         }
 
-        var host = _appHostService.GetHostForCommand(message.Context, CurrentPage.ExtensionHost);
+        AppExtensionHost host = _appHostService.GetHostForCommand(message.Context, CurrentPage.ExtensionHost);
 
         _rootPageService.OnPerformCommand(message.Context, !CurrentPage.IsNested, host);
 
@@ -198,11 +198,11 @@ public partial class ShellViewModel : ObservableObject,
             {
                 Logger.LogDebug($"Navigating to page");
 
-                var isMainPage = command == _rootPage;
+                bool isMainPage = command == _rootPage;
                 _isNested = !isMainPage;
 
                 // Construct our ViewModel of the appropriate type and pass it the UI Thread context.
-                var pageViewModel = _pageViewModelFactory.TryCreatePageViewModel(page, _isNested, host);
+                PageViewModel? pageViewModel = _pageViewModelFactory.TryCreatePageViewModel(page, _isNested, host);
                 if (pageViewModel == null)
                 {
                     Logger.LogError($"Failed to create ViewModel for page {page.GetType().Name}");
@@ -259,7 +259,7 @@ public partial class ShellViewModel : ObservableObject,
             // Call out to extension process.
             // * May fail!
             // * May never return!
-            var result = invokable.Invoke(message.Context);
+            ICommandResult result = invokable.Invoke(message.Context);
 
             // But if it did succeed, we need to handle the result.
             UnsafeHandleCommandResult(result);
@@ -284,66 +284,66 @@ public partial class ShellViewModel : ObservableObject,
             return;
         }
 
-        var kind = result.Kind;
+        CommandResultKind kind = result.Kind;
         Logger.LogDebug($"handling {kind.ToString()}");
 
         WeakReferenceMessenger.Default.Send<CmdPalInvokeResultMessage>(new(kind));
         switch (kind)
         {
             case CommandResultKind.Dismiss:
-                {
-                    // Reset the palette to the main page and dismiss
-                    GoHome(withAnimation: false, focusSearch: false);
-                    WeakReferenceMessenger.Default.Send<DismissMessage>();
-                    break;
-                }
+            {
+                // Reset the palette to the main page and dismiss
+                GoHome(withAnimation: false, focusSearch: false);
+                WeakReferenceMessenger.Default.Send<DismissMessage>();
+                break;
+            }
 
             case CommandResultKind.GoHome:
-                {
-                    // Go back to the main page, but keep it open
-                    GoHome();
-                    break;
-                }
+            {
+                // Go back to the main page, but keep it open
+                GoHome();
+                break;
+            }
 
             case CommandResultKind.GoBack:
-                {
-                    GoBack();
-                    break;
-                }
+            {
+                GoBack();
+                break;
+            }
 
             case CommandResultKind.Hide:
-                {
-                    // Keep this page open, but hide the palette.
-                    WeakReferenceMessenger.Default.Send<DismissMessage>();
-                    break;
-                }
+            {
+                // Keep this page open, but hide the palette.
+                WeakReferenceMessenger.Default.Send<DismissMessage>();
+                break;
+            }
 
             case CommandResultKind.KeepOpen:
-                {
-                    // Do nothing.
-                    break;
-                }
+            {
+                // Do nothing.
+                break;
+            }
 
             case CommandResultKind.Confirm:
+            {
+                if (result.Args is IConfirmationArgs a)
                 {
-                    if (result.Args is IConfirmationArgs a)
-                    {
-                        WeakReferenceMessenger.Default.Send<ShowConfirmationMessage>(new(a));
-                    }
-
-                    break;
+                    WeakReferenceMessenger.Default.Send<ShowConfirmationMessage>(new(a));
                 }
 
+                break;
+            }
+
             case CommandResultKind.ShowToast:
+            {
+                if (result.Args is IToastArgs a)
                 {
-                    if (result.Args is IToastArgs a)
-                    {
-                        WeakReferenceMessenger.Default.Send<ShowToastMessage>(new(a.Message));
-                        UnsafeHandleCommandResult(a.Result);
-                    }
-
-                    break;
+                    WeakReferenceMessenger.Default.Send<ShowToastMessage>(new(a.Message));
+                    UnsafeHandleCommandResult(a.Result);
                 }
+
+                break;
+            }
         }
     }
 

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/StatusMessageViewModel.cs

@@ -27,7 +27,7 @@ public partial class StatusMessageViewModel : ExtensionObjectViewModel
 
     public override void InitializeProperties()
     {
-        var model = Model.Unsafe;
+        IStatusMessage? model = Model.Unsafe;
         if (model == null)
         {
             return; // throw?
@@ -35,7 +35,7 @@ public partial class StatusMessageViewModel : ExtensionObjectViewModel
 
         Message = model.Message;
         State = model.State;
-        var modelProgress = model.Progress;
+        IProgressState modelProgress = model.Progress;
         if (modelProgress != null)
         {
             Progress = new(modelProgress, this.PageContext);
@@ -60,7 +60,7 @@ public partial class StatusMessageViewModel : ExtensionObjectViewModel
 
     protected virtual void FetchProperty(string propertyName)
     {
-        var model = this.Model.Unsafe;
+        IStatusMessage? model = this.Model.Unsafe;
         if (model == null)
         {
             return; // throw?
@@ -75,7 +75,7 @@ public partial class StatusMessageViewModel : ExtensionObjectViewModel
                 this.State = model.State;
                 break;
             case nameof(Progress):
-                var modelProgress = model.Progress;
+                IProgressState modelProgress = model.Progress;
                 if (modelProgress != null)
                 {
                     Progress = new(modelProgress, this.PageContext);

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/TagViewModel.cs

@@ -27,7 +27,7 @@ public partial class TagViewModel(ITag _tag, WeakReference<IPageContext> context
 
     public override void InitializeProperties()
     {
-        var model = _tagModel.Unsafe;
+        ITag? model = _tagModel.Unsafe;
         if (model == null)
         {
             return;

src/modules/cmdpal/Microsoft.CmdPal.Core.ViewModels/ToastViewModel.cs

@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for more information.
 
 using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.CmdPal.Core.ViewModels.Messages;
 
 namespace Microsoft.CmdPal.Core.ViewModels;
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/AliasManager.cs

@@ -30,11 +30,11 @@ public partial class AliasManager : ObservableObject
 
     public bool CheckAlias(string searchText)
     {
-        if (_aliases.TryGetValue(searchText, out var alias))
+        if (_aliases.TryGetValue(searchText, out CommandAlias? alias))
         {
             try
             {
-                var topLevelCommand = _topLevelCommandManager.LookupCommand(alias.CommandId);
+                TopLevelViewModel? topLevelCommand = _topLevelCommandManager.LookupCommand(alias.CommandId);
                 if (topLevelCommand != null)
                 {
                     WeakReferenceMessenger.Default.Send<ClearSearchMessage>();
@@ -89,7 +89,7 @@ public partial class AliasManager : ObservableObject
 
         // If we already have _this exact alias_, do nothing
         if (newAlias != null &&
-            _aliases.TryGetValue(newAlias.SearchPrefix, out var existingAlias))
+            _aliases.TryGetValue(newAlias.SearchPrefix, out CommandAlias? existingAlias))
         {
             if (existingAlias.CommandId == commandId)
             {
@@ -99,7 +99,7 @@ public partial class AliasManager : ObservableObject
 
         // Look for the old alias, and remove it
         List<CommandAlias> toRemove = [];
-        foreach (var kv in _aliases)
+        foreach (KeyValuePair<string, CommandAlias> kv in _aliases)
         {
             if (kv.Value.CommandId == commandId)
             {
@@ -107,7 +107,7 @@ public partial class AliasManager : ObservableObject
             }
         }
 
-        foreach (var alias in toRemove)
+        foreach (CommandAlias alias in toRemove)
         {
             // REMEMBER, SearchPrefix is what we use as keys
             _aliases.Remove(alias.SearchPrefix);

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/AppStateModel.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -51,9 +51,9 @@ public partial class AppStateModel : ObservableObject
         try
         {
             // Read the JSON content from the file
-            var jsonContent = File.ReadAllText(FilePath);
+            string jsonContent = File.ReadAllText(FilePath);
 
-            var loaded = JsonSerializer.Deserialize<AppStateModel>(jsonContent, JsonSerializationContext.Default.AppStateModel);
+            AppStateModel? loaded = JsonSerializer.Deserialize<AppStateModel>(jsonContent, JsonSerializationContext.Default.AppStateModel);
 
             Debug.WriteLine(loaded != null ? "Loaded settings file" : "Failed to parse");
 
@@ -77,23 +77,23 @@ public partial class AppStateModel : ObservableObject
         try
         {
             // Serialize the main dictionary to JSON and save it to the file
-            var settingsJson = JsonSerializer.Serialize(model, JsonSerializationContext.Default.AppStateModel);
+            string settingsJson = JsonSerializer.Serialize(model, JsonSerializationContext.Default.AppStateModel);
 
             // Is it valid JSON?
             if (JsonNode.Parse(settingsJson) is JsonObject newSettings)
             {
                 // Now, read the existing content from the file
-                var oldContent = File.Exists(FilePath) ? File.ReadAllText(FilePath) : "{}";
+                string oldContent = File.Exists(FilePath) ? File.ReadAllText(FilePath) : "{}";
 
                 // Is it valid JSON?
                 if (JsonNode.Parse(oldContent) is JsonObject savedSettings)
                 {
-                    foreach (var item in newSettings)
+                    foreach (KeyValuePair<string, JsonNode?> item in newSettings)
                     {
                         savedSettings[item.Key] = item.Value?.DeepClone();
                     }
 
-                    var serialized = savedSettings.ToJsonString(JsonSerializationContext.Default.AppStateModel.Options);
+                    string serialized = savedSettings.ToJsonString(JsonSerializationContext.Default.AppStateModel.Options);
                     File.WriteAllText(FilePath, serialized);
 
                     // TODO: Instead of just raising the event here, we should
@@ -119,7 +119,7 @@ public partial class AppStateModel : ObservableObject
 
     internal static string StateJsonPath()
     {
-        var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
+        string directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
         Directory.CreateDirectory(directory);
 
         // now, the settings is just next to the exe

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandAlias.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -31,8 +31,8 @@ public class CommandAlias
 
     public static CommandAlias FromSearchText(string text, string commandId)
     {
-        var trailingSpace = text.EndsWith(' ');
-        var realAlias = trailingSpace ? text.Substring(0, text.Length - 1) : text;
+        bool trailingSpace = text.EndsWith(' ');
+        string realAlias = trailingSpace ? text.Substring(0, text.Length - 1) : text;
         return new CommandAlias(realAlias, commandId, !trailingSpace);
     }
 }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandProviderWrapper.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -43,13 +43,7 @@ public sealed class CommandProviderWrapper
 
     public bool IsActive { get; private set; }
 
-    public string ProviderId
-    {
-        get
-        {
-            return string.IsNullOrEmpty(Extension?.ExtensionUniqueId) ? Id : Extension.ExtensionUniqueId;
-        }
-    }
+    public string ProviderId => string.IsNullOrEmpty(Extension?.ExtensionUniqueId) ? Id : Extension.ExtensionUniqueId;
 
     public CommandProviderWrapper(ICommandProvider provider, TaskScheduler mainThread)
     {
@@ -87,8 +81,8 @@ public sealed class CommandProviderWrapper
             throw new ArgumentException("You forgot to start the extension. This is a CmdPal error - we need to make sure to call StartExtensionAsync");
         }
 
-        var extensionImpl = extension.GetExtensionObject();
-        var providerObject = extensionImpl?.GetProvider(ProviderType.Commands);
+        IExtension? extensionImpl = extension.GetExtensionObject();
+        object? providerObject = extensionImpl?.GetProvider(ProviderType.Commands);
         if (providerObject is not ICommandProvider provider)
         {
             throw new ArgumentException("extension didn't actually implement ICommandProvider");
@@ -98,7 +92,7 @@ public sealed class CommandProviderWrapper
 
         try
         {
-            var model = _commandProvider.Unsafe!;
+            ICommandProvider model = _commandProvider.Unsafe!;
 
             // Hook the extension back into us
             model.InitializeWithHost(ExtensionHost);
@@ -131,7 +125,7 @@ public sealed class CommandProviderWrapper
             return;
         }
 
-        var settings = serviceProvider.GetService<SettingsModel>()!;
+        SettingsModel settings = serviceProvider.GetService<SettingsModel>()!;
 
         IsActive = GetProviderSettings(settings).IsEnabled;
         if (!IsActive)
@@ -144,7 +138,7 @@ public sealed class CommandProviderWrapper
 
         try
         {
-            var model = _commandProvider.Unsafe!;
+            ICommandProvider model = _commandProvider.Unsafe!;
 
             Task<ICommandItem[]> t = new(model.TopLevelCommands);
             t.Start();
@@ -177,28 +171,29 @@ public sealed class CommandProviderWrapper
 
     private void InitializeCommands(ICommandItem[] commands, IFallbackCommandItem[] fallbacks, IServiceProvider serviceProvider, WeakReference<IPageContext> pageContext)
     {
-        var settings = serviceProvider.GetService<SettingsModel>()!;
-        var providerSettings = GetProviderSettings(settings);
+        SettingsModel settings = serviceProvider.GetService<SettingsModel>()!;
+        ProviderSettings providerSettings = GetProviderSettings(settings);
 
-        Func<ICommandItem?, bool, TopLevelViewModel> makeAndAdd = (ICommandItem? i, bool fallback) =>
+        TopLevelViewModel MakeAndAdd(ICommandItem? i, bool fallback)
         {
             CommandItemViewModel commandItemViewModel = new(new(i), pageContext);
             TopLevelViewModel topLevelViewModel = new(commandItemViewModel, fallback, ExtensionHost, ProviderId, settings, providerSettings, serviceProvider);
             topLevelViewModel.InitializeProperties();
 
             return topLevelViewModel;
-        };
+        }
+
         if (commands != null)
         {
             TopLevelItems = commands
-                .Select(c => makeAndAdd(c, false))
+                .Select(c => MakeAndAdd(c, false))
                 .ToArray();
         }
 
         if (fallbacks != null)
         {
             FallbackItems = fallbacks
-                .Select(c => makeAndAdd(c, true))
+                .Select(c => MakeAndAdd(c, true))
                 .ToArray();
         }
     }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/CommandSettingsViewModel.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -23,7 +23,7 @@ public partial class CommandSettingsViewModel(ICommandSettings? _unsafeSettings,
 
     private void UnsafeInitializeProperties()
     {
-        var model = _model.Unsafe;
+        ICommandSettings? model = _model.Unsafe;
         if (model == null)
         {
             return;

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltInsCommandProvider.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/BuiltinsExtensionHost.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/CreatedExtensionForm.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -13,13 +13,13 @@ internal sealed partial class CreatedExtensionForm : NewExtensionFormBase
 {
     public CreatedExtensionForm(string name, string displayName, string path)
     {
-        var serializeString = (string? s) => JsonSerializer.Serialize(s, JsonSerializationContext.Default.String);
+        static string SerializeString(string? s) => JsonSerializer.Serialize(s, JsonSerializationContext.Default.String);
         TemplateJson = CardTemplate;
         DataJson = $$"""
 {
-    "name": {{serializeString(name)}},
-    "directory": {{serializeString(path)}},
-    "displayName": {{serializeString(displayName)}}
+    "name": {{SerializeString(name)}},
+    "directory": {{SerializeString(path)}},
+    "displayName": {{SerializeString(displayName)}}
 }
 """;
         _name = name;
@@ -29,13 +29,13 @@ internal sealed partial class CreatedExtensionForm : NewExtensionFormBase
 
     public override ICommandResult SubmitForm(string inputs, string data)
     {
-        var dataInput = JsonNode.Parse(data)?.AsObject();
+        JsonObject? dataInput = JsonNode.Parse(data)?.AsObject();
         if (dataInput == null)
         {
             return CommandResult.KeepOpen();
         }
 
-        var verb = dataInput["x"]?.AsValue()?.ToString() ?? string.Empty;
+        string verb = dataInput["x"]?.AsValue()?.ToString() ?? string.Empty;
         return verb switch
         {
             "sln" => OpenSolution(),
@@ -45,23 +45,23 @@ internal sealed partial class CreatedExtensionForm : NewExtensionFormBase
         };
     }
 
-    private ICommandResult OpenSolution()
+    private CommandResult OpenSolution()
     {
         string[] parts = [_path, _name, $"{_name}.sln"];
-        var pathToSolution = Path.Combine(parts);
+        string pathToSolution = Path.Combine(parts);
         ShellHelpers.OpenInShell(pathToSolution);
         return CommandResult.Hide();
     }
 
-    private ICommandResult OpenDirectory()
+    private CommandResult OpenDirectory()
     {
         string[] parts = [_path, _name];
-        var pathToDir = Path.Combine(parts);
+        string pathToDir = Path.Combine(parts);
         ShellHelpers.OpenInShell(pathToDir);
         return CommandResult.Hide();
     }
 
-    private ICommandResult CreateNew()
+    private CommandResult CreateNew()
     {
         RaiseFormSubmit(null);
         return CommandResult.KeepOpen();

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/FallbackLogItem.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/FallbackReloadItem.cs

@@ -1,8 +1,7 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 
 namespace Microsoft.CmdPal.UI.ViewModels.BuiltinCommands;

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/LogMessagesPage.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -25,11 +25,11 @@ public partial class LogMessagesPage : ListPage
     {
         if (e.Action == NotifyCollectionChangedAction.Add && e.NewItems != null)
         {
-            foreach (var item in e.NewItems)
+            foreach (object? item in e.NewItems)
             {
                 if (item is LogMessageViewModel logMessageViewModel)
                 {
-                    var li = new ListItem(new NoOpCommand())
+                    ListItem li = new ListItem(new NoOpCommand())
                     {
                         Title = logMessageViewModel.Message,
                     };

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/MainListPage.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -40,7 +40,7 @@ public partial class MainListPage : DynamicListPage,
 
         // The all apps page will kick off a BG thread to start loading apps.
         // We just want to know when it is done.
-        var allApps = AllAppsCommandProvider.Page;
+        AllAppsPage allApps = AllAppsCommandProvider.Page;
         allApps.PropChanged += (s, p) =>
         {
             if (p.PropertyName == nameof(allApps.IsLoading))
@@ -52,7 +52,7 @@ public partial class MainListPage : DynamicListPage,
         WeakReferenceMessenger.Default.Register<ClearSearchMessage>(this);
         WeakReferenceMessenger.Default.Register<UpdateFallbackItemsMessage>(this);
 
-        var settings = _serviceProvider.GetService<SettingsModel>()!;
+        SettingsModel settings = _serviceProvider.GetService<SettingsModel>()!;
         settings.SettingsChanged += SettingsChangedHandler;
         HotReloadSettings(settings);
 
@@ -86,7 +86,7 @@ public partial class MainListPage : DynamicListPage,
         {
             try
             {
-                var currentSearchText = SearchText;
+                string currentSearchText = SearchText;
                 UpdateSearchText(currentSearchText, currentSearchText);
             }
             catch (Exception e)
@@ -122,14 +122,14 @@ public partial class MainListPage : DynamicListPage,
         // Handle changes to the filter text here
         if (!string.IsNullOrEmpty(SearchText))
         {
-            var aliases = _serviceProvider.GetService<AliasManager>()!;
+            AliasManager aliases = _serviceProvider.GetService<AliasManager>()!;
             if (aliases.CheckAlias(newSearch))
             {
                 return;
             }
         }
 
-        var commands = _tlcManager.TopLevelCommands;
+        System.Collections.ObjectModel.ObservableCollection<TopLevelViewModel> commands = _tlcManager.TopLevelCommands;
         lock (commands)
         {
             UpdateFallbacks(newSearch, commands.ToImmutableArray());
@@ -179,11 +179,11 @@ public partial class MainListPage : DynamicListPage,
         // fire and forget
         _ = Task.Run(() =>
         {
-            var needsToUpdate = false;
+            bool needsToUpdate = false;
 
-            foreach (var command in commands)
+            foreach (TopLevelViewModel command in commands)
             {
-                var changedVisibility = command.SafeUpdateFallbackTextSynchronous(newSearch);
+                bool changedVisibility = command.SafeUpdateFallbackTextSynchronous(newSearch);
                 needsToUpdate = needsToUpdate || changedVisibility;
             }
 
@@ -196,8 +196,8 @@ public partial class MainListPage : DynamicListPage,
 
     private bool ActuallyLoading()
     {
-        var tlcManager = _serviceProvider.GetService<TopLevelCommandManager>()!;
-        var allApps = AllAppsCommandProvider.Page;
+        TopLevelCommandManager tlcManager = _serviceProvider.GetService<TopLevelCommandManager>()!;
+        AllAppsPage allApps = AllAppsCommandProvider.Page;
         return allApps.IsLoading || tlcManager.IsLoading;
     }
 
@@ -206,26 +206,26 @@ public partial class MainListPage : DynamicListPage,
     // _always_ show up first.
     private int ScoreTopLevelItem(string query, IListItem topLevelOrAppItem)
     {
-        var title = topLevelOrAppItem.Title;
+        string title = topLevelOrAppItem.Title;
         if (string.IsNullOrWhiteSpace(title))
         {
             return 0;
         }
 
-        var isWhiteSpace = string.IsNullOrWhiteSpace(query);
+        bool isWhiteSpace = string.IsNullOrWhiteSpace(query);
 
-        var isFallback = false;
-        var isAliasSubstringMatch = false;
-        var isAliasMatch = false;
-        var id = IdForTopLevelOrAppItem(topLevelOrAppItem);
+        bool isFallback = false;
+        bool isAliasSubstringMatch = false;
+        bool isAliasMatch = false;
+        string id = IdForTopLevelOrAppItem(topLevelOrAppItem);
 
-        var extensionDisplayName = string.Empty;
+        string extensionDisplayName = string.Empty;
         if (topLevelOrAppItem is TopLevelViewModel topLevel)
         {
             isFallback = topLevel.IsFallback;
             if (topLevel.HasAlias)
             {
-                var alias = topLevel.AliasText;
+                string alias = topLevel.AliasText;
                 isAliasMatch = alias == query;
                 isAliasSubstringMatch = isAliasMatch || alias.StartsWith(query, StringComparison.CurrentCultureIgnoreCase);
             }
@@ -243,48 +243,48 @@ public partial class MainListPage : DynamicListPage,
         // Title:
         // * whitespace query: 1 point
         // * otherwise full weight match
-        var nameMatch = isWhiteSpace ?
+        int nameMatch = isWhiteSpace ?
             (title.Contains(query) ? 1 : 0) :
             StringMatcher.FuzzySearch(query, title).Score;
 
         // Subtitle:
         // * whitespace query: 1/2 point
         // * otherwise ~half weight match. Minus a bit, because subtitles tend to be longer
-        var descriptionMatch = isWhiteSpace ?
+        double descriptionMatch = isWhiteSpace ?
             (topLevelOrAppItem.Subtitle.Contains(query) ? .5 : 0) :
             (StringMatcher.FuzzySearch(query, topLevelOrAppItem.Subtitle).Score - 4) / 2.0;
 
         // Extension title: despite not being visible, give the extension name itself some weight
         // * whitespace query: 0 points
         // * otherwise more weight than a subtitle, but not much
-        var extensionTitleMatch = isWhiteSpace ? 0 : StringMatcher.FuzzySearch(query, extensionDisplayName).Score / 1.5;
+        double extensionTitleMatch = isWhiteSpace ? 0 : StringMatcher.FuzzySearch(query, extensionDisplayName).Score / 1.5;
 
-        var scores = new[]
+        double[] scores = new[]
         {
              nameMatch,
              descriptionMatch,
              isFallback ? 1 : 0, // Always give fallbacks a chance
         };
-        var max = scores.Max();
+        double max = scores.Max();
 
         // _Add_ the extension name. This will bubble items that match both
         // title and extension name up above ones that just match title.
         // e.g. "git" will up-weight "GitHub searches" from the GitHub extension
         // above "git" from "whatever"
-        max = max + extensionTitleMatch;
+        max += extensionTitleMatch;
 
-        var matchSomething = max
+        double matchSomething = max
             + (isAliasMatch ? 9001 : (isAliasSubstringMatch ? 1 : 0));
 
         // If we matched title, subtitle, or alias (something real), then
         // here we add the recent command weight boost
         //
         // Otherwise something like `x` will still match everything you've run before
-        var finalScore = matchSomething;
+        double finalScore = matchSomething;
         if (matchSomething > 0)
         {
-            var history = _serviceProvider.GetService<AppStateModel>()!.RecentCommands;
-            var recentWeightBoost = history.GetCommandHistoryWeight(id);
+            RecentCommandsManager history = _serviceProvider.GetService<AppStateModel>()!.RecentCommands;
+            int recentWeightBoost = history.GetCommandHistoryWeight(id);
             finalScore += recentWeightBoost;
         }
 
@@ -293,9 +293,9 @@ public partial class MainListPage : DynamicListPage,
 
     public void UpdateHistory(IListItem topLevelOrAppItem)
     {
-        var id = IdForTopLevelOrAppItem(topLevelOrAppItem);
-        var state = _serviceProvider.GetService<AppStateModel>()!;
-        var history = state.RecentCommands;
+        string id = IdForTopLevelOrAppItem(topLevelOrAppItem);
+        AppStateModel state = _serviceProvider.GetService<AppStateModel>()!;
+        RecentCommandsManager history = state.RecentCommands;
         history.AddHistoryItem(id);
         AppStateModel.SaveState(state);
     }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/NewExtensionForm.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -97,15 +97,15 @@ internal sealed partial class NewExtensionForm : NewExtensionFormBase
 
     public override CommandResult SubmitForm(string payload)
     {
-        var formInput = JsonNode.Parse(payload)?.AsObject();
+        JsonObject? formInput = JsonNode.Parse(payload)?.AsObject();
         if (formInput == null)
         {
             return CommandResult.KeepOpen();
         }
 
-        var extensionName = formInput["ExtensionName"]?.AsValue()?.ToString() ?? string.Empty;
-        var displayName = formInput["DisplayName"]?.AsValue()?.ToString() ?? string.Empty;
-        var outputPath = formInput["OutputPath"]?.AsValue()?.ToString() ?? string.Empty;
+        string extensionName = formInput["ExtensionName"]?.AsValue()?.ToString() ?? string.Empty;
+        string displayName = formInput["DisplayName"]?.AsValue()?.ToString() ?? string.Empty;
+        string outputPath = formInput["OutputPath"]?.AsValue()?.ToString() ?? string.Empty;
 
         _creatingMessage.State = MessageState.Info;
         _creatingMessage.Message = _creatingText;
@@ -133,10 +133,10 @@ internal sealed partial class NewExtensionForm : NewExtensionFormBase
 
     private void CreateExtension(string extensionName, string newDisplayName, string outputPath)
     {
-        var newGuid = Guid.NewGuid().ToString();
+        string newGuid = Guid.NewGuid().ToString();
 
         // Unzip `template.zip` to a temp dir:
-        var tempDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
+        string tempDir = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName());
 
         // Does the output path exist?
         if (!Directory.Exists(outputPath))
@@ -144,13 +144,13 @@ internal sealed partial class NewExtensionForm : NewExtensionFormBase
             Directory.CreateDirectory(outputPath);
         }
 
-        var assetsPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory.ToString(), "Microsoft.CmdPal.UI.ViewModels\\Assets\\template.zip");
+        string assetsPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory.ToString(), "Microsoft.CmdPal.UI.ViewModels\\Assets\\template.zip");
         ZipFile.ExtractToDirectory(assetsPath, tempDir);
 
-        var files = Directory.GetFiles(tempDir, "*", SearchOption.AllDirectories);
-        foreach (var file in files)
+        string[] files = Directory.GetFiles(tempDir, "*", SearchOption.AllDirectories);
+        foreach (string file in files)
         {
-            var text = File.ReadAllText(file);
+            string text = File.ReadAllText(file);
 
             // Replace all the instances of `FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF` with a new random guid:
             text = text.Replace("FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF", newGuid);
@@ -162,9 +162,9 @@ internal sealed partial class NewExtensionForm : NewExtensionFormBase
             text = text.Replace("TemplateDisplayName", newDisplayName);
 
             // We're going to write the file to the same relative location in the output path
-            var relativePath = Path.GetRelativePath(tempDir, file);
+            string relativePath = Path.GetRelativePath(tempDir, file);
 
-            var newFileName = Path.Combine(outputPath, relativePath);
+            string newFileName = Path.Combine(outputPath, relativePath);
 
             // if the file name had `TemplateCmdPalExtension` in it, replace it with `extensionName`
             newFileName = newFileName.Replace("TemplateCmdPalExtension", extensionName);

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/NewExtensionFormBase.cs

@@ -1,13 +1,7 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Diagnostics.CodeAnalysis;
-using System.IO.Compression;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using Microsoft.CmdPal.Core.ViewModels.Messages;
-using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
 using Windows.Foundation;
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/NewExtensionPage.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/OpenSettingsCommand.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/QuitAction.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Commands/ReloadExtensionsCommand.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentFormViewModel.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -44,8 +44,8 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag
 
         try
         {
-            var template = new AdaptiveCardTemplate(templateJson);
-            var cardJson = template.Expand(dataJson);
+            AdaptiveCardTemplate template = new AdaptiveCardTemplate(templateJson);
+            string cardJson = template.Expand(dataJson);
             card = AdaptiveCard.FromJsonString(cardJson);
             return true;
         }
@@ -59,7 +59,7 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag
 
     public override void InitializeProperties()
     {
-        var model = _formModel.Unsafe;
+        IFormContent? model = _formModel.Unsafe;
         if (model is null)
         {
             return;
@@ -69,14 +69,14 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag
         StateJson = model.StateJson;
         DataJson = model.DataJson;
 
-        if (TryBuildCard(TemplateJson, DataJson, out var builtCard, out var renderingError))
+        if (TryBuildCard(TemplateJson, DataJson, out AdaptiveCardParseResult? builtCard, out Exception? renderingError))
         {
             Card = builtCard;
             UpdateProperty(nameof(Card));
             return;
         }
 
-        var errorPayload = $$"""
+        string errorPayload = $$"""
     {
         "error_message": {{Serialize(renderingError!.Message)}},
         "error_stack":   {{Serialize(renderingError.StackTrace)}},
@@ -86,7 +86,7 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag
     }
     """;
 
-        if (TryBuildCard(ErrorCardJson, errorPayload, out var errorCard, out var _))
+        if (TryBuildCard(ErrorCardJson, errorPayload, out AdaptiveCardParseResult? errorCard, out Exception? _))
         {
             Card = errorCard;
             UpdateProperty(nameof(Card));
@@ -107,17 +107,17 @@ public partial class ContentFormViewModel(IFormContent _form, WeakReference<IPag
         if (action is AdaptiveSubmitAction or AdaptiveExecuteAction)
         {
             // Get the data and inputs
-            var dataString = (action as AdaptiveSubmitAction)?.DataJson.Stringify() ?? string.Empty;
-            var inputString = inputs.Stringify();
+            string dataString = (action as AdaptiveSubmitAction)?.DataJson.Stringify() ?? string.Empty;
+            string inputString = inputs.Stringify();
 
             _ = Task.Run(() =>
             {
                 try
                 {
-                    var model = _formModel.Unsafe!;
+                    IFormContent model = _formModel.Unsafe!;
                     if (model != null)
                     {
-                        var result = model.SubmitForm(inputString, dataString);
+                        ICommandResult result = model.SubmitForm(inputString, dataString);
                         WeakReferenceMessenger.Default.Send<HandleCommandResultMessage>(new(new(result)));
                     }
                 }

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentMarkdownViewModel.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -19,7 +19,7 @@ public partial class ContentMarkdownViewModel(IMarkdownContent _markdown, WeakRe
 
     public override void InitializeProperties()
     {
-        var model = Model.Unsafe;
+        IMarkdownContent? model = Model.Unsafe;
         if (model == null)
         {
             return;
@@ -35,7 +35,7 @@ public partial class ContentMarkdownViewModel(IMarkdownContent _markdown, WeakRe
     {
         try
         {
-            var propName = args.PropertyName;
+            string propName = args.PropertyName;
             FetchProperty(propName);
         }
         catch (Exception ex)
@@ -46,7 +46,7 @@ public partial class ContentMarkdownViewModel(IMarkdownContent _markdown, WeakRe
 
     protected void FetchProperty(string propertyName)
     {
-        var model = Model.Unsafe;
+        IMarkdownContent? model = Model.Unsafe;
         if (model == null)
         {
             return; // throw?
@@ -65,7 +65,7 @@ public partial class ContentMarkdownViewModel(IMarkdownContent _markdown, WeakRe
     protected override void UnsafeCleanup()
     {
         base.UnsafeCleanup();
-        var model = Model.Unsafe;
+        IMarkdownContent? model = Model.Unsafe;
         if (model != null)
         {
             model.PropChanged -= Model_PropChanged;

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ContentTreeViewModel.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -29,13 +29,13 @@ public partial class ContentTreeViewModel(ITreeContent _tree, WeakReference<IPag
 
     public override void InitializeProperties()
     {
-        var model = Model.Unsafe;
+        ITreeContent? model = Model.Unsafe;
         if (model == null)
         {
             return;
         }
 
-        var root = model.RootContent;
+        IContent root = model.RootContent;
         if (root != null)
         {
             RootContent = ViewModelFromContent(root, PageContext);
@@ -70,7 +70,7 @@ public partial class ContentTreeViewModel(ITreeContent _tree, WeakReference<IPag
     {
         try
         {
-            var propName = args.PropertyName;
+            string propName = args.PropertyName;
             FetchProperty(propName);
         }
         catch (Exception ex)
@@ -81,7 +81,7 @@ public partial class ContentTreeViewModel(ITreeContent _tree, WeakReference<IPag
 
     protected void FetchProperty(string propertyName)
     {
-        var model = Model.Unsafe;
+        ITreeContent? model = Model.Unsafe;
         if (model == null)
         {
             return; // throw?
@@ -90,7 +90,7 @@ public partial class ContentTreeViewModel(ITreeContent _tree, WeakReference<IPag
         switch (propertyName)
         {
             case nameof(RootContent):
-                var root = model.RootContent;
+                IContent? root = model.RootContent;
                 if (root != null)
                 {
                     RootContent = ViewModelFromContent(root, PageContext);
@@ -114,11 +114,11 @@ public partial class ContentTreeViewModel(ITreeContent _tree, WeakReference<IPag
         List<ContentViewModel> newContent = [];
         try
         {
-            var newItems = Model.Unsafe!.GetChildren();
+            IContent[] newItems = Model.Unsafe!.GetChildren();
 
-            foreach (var item in newItems)
+            foreach (IContent? item in newItems)
             {
-                var viewModel = ViewModelFromContent(item, PageContext);
+                ContentViewModel? viewModel = ViewModelFromContent(item, PageContext);
                 if (viewModel != null)
                 {
                     viewModel.InitializeProperties();
@@ -146,13 +146,13 @@ public partial class ContentTreeViewModel(ITreeContent _tree, WeakReference<IPag
     {
         base.UnsafeCleanup();
         RootContent?.SafeCleanup();
-        foreach (var item in Children)
+        foreach (ContentViewModel item in Children)
         {
             item.SafeCleanup();
         }
 
         Children.Clear();
-        var model = Model.Unsafe;
+        ITreeContent? model = Model.Unsafe;
         if (model != null)
         {
             model.PropChanged -= Model_PropChanged;

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/HistoryItem.cs

@@ -1,9 +1,7 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using CommunityToolkit.Mvvm.ComponentModel;
-
 namespace Microsoft.CmdPal.UI.ViewModels;
 
 public record HistoryItem

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/HotkeyManager.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -21,7 +21,7 @@ public partial class HotkeyManager : ObservableObject
     public void UpdateHotkey(string commandId, HotkeySettings? hotkey)
     {
         // If any of the commands were already bound to this hotkey, remove that
-        foreach (var item in _commandHotkeys)
+        foreach (TopLevelHotkey item in _commandHotkeys)
         {
             if (item.Hotkey == hotkey)
             {
@@ -31,7 +31,7 @@ public partial class HotkeyManager : ObservableObject
 
         _commandHotkeys.RemoveAll(item => item.Hotkey == null);
 
-        foreach (var item in _commandHotkeys)
+        foreach (TopLevelHotkey item in _commandHotkeys)
         {
             if (item.CommandId == commandId)
             {

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionService.cs

@@ -83,12 +83,12 @@ public partial class ExtensionService : IExtensionService, IDisposable
 
     private void InstallPackageUnderLock(Package package)
     {
-        var isCmdPalExtensionResult = Task.Run(() =>
+        IsExtensionResult isCmdPalExtensionResult = Task.Run(() =>
         {
             return IsValidCmdPalExtension(package);
         }).Result;
-        var isExtension = isCmdPalExtensionResult.IsExtension;
-        var extension = isCmdPalExtensionResult.Extension;
+        bool isExtension = isCmdPalExtensionResult.IsExtension;
+        AppExtension? extension = isCmdPalExtensionResult.Extension;
         if (isExtension && extension != null)
         {
             CommandPaletteHost.Instance.DebugLog($"Installed new extension app {extension.DisplayName}");
@@ -98,7 +98,7 @@ public partial class ExtensionService : IExtensionService, IDisposable
                 await _getInstalledExtensionsLock.WaitAsync();
                 try
                 {
-                    var wrappers = await CreateWrappersForExtension(extension);
+                    List<ExtensionWrapper> wrappers = await CreateWrappersForExtension(extension);
 
                     UpdateExtensionsListsFromWrappers(wrappers);
 
@@ -115,7 +115,7 @@ public partial class ExtensionService : IExtensionService, IDisposable
     private void UninstallPackageUnderLock(Package package)
     {
         List<IExtensionWrapper> removedExtensions = [];
-        foreach (var extension in _installedExtensions)
+        foreach (IExtensionWrapper extension in _installedExtensions)
         {
             if (extension.PackageFullName == package.Id.FullName)
             {
@@ -144,12 +144,12 @@ public partial class ExtensionService : IExtensionService, IDisposable
 
     private static async Task<IsExtensionResult> IsValidCmdPalExtension(Package package)
     {
-        var extensions = await AppExtensionCatalog.Open("com.microsoft.commandpalette").FindAllAsync();
-        foreach (var extension in extensions)
+        IReadOnlyList<AppExtension> extensions = await AppExtensionCatalog.Open("com.microsoft.commandpalette").FindAllAsync();
+        foreach (AppExtension? extension in extensions)
         {
             if (package.Id?.FullName == extension.Package?.Id?.FullName)
             {
-                var (cmdPalProvider, classId) = await GetCmdPalExtensionPropertiesAsync(extension);
+                (IPropertySet? cmdPalProvider, List<string> classId) = await GetCmdPalExtensionPropertiesAsync(extension);
 
                 return new(cmdPalProvider != null && classId.Count != 0, extension);
             }
@@ -160,21 +160,21 @@ public partial class ExtensionService : IExtensionService, IDisposable
 
     private static async Task<(IPropertySet? CmdPalProvider, List<string> ClassIds)> GetCmdPalExtensionPropertiesAsync(AppExtension extension)
     {
-        var classIds = new List<string>();
-        var properties = await extension.GetExtensionPropertiesAsync();
+        List<string> classIds = new List<string>();
+        IPropertySet? properties = await extension.GetExtensionPropertiesAsync();
 
         if (properties is null)
         {
             return (null, classIds);
         }
 
-        var cmdPalProvider = GetSubPropertySet(properties, "CmdPalProvider");
+        IPropertySet? cmdPalProvider = GetSubPropertySet(properties, "CmdPalProvider");
         if (cmdPalProvider is null)
         {
             return (null, classIds);
         }
 
-        var activation = GetSubPropertySet(cmdPalProvider, "Activation");
+        IPropertySet? activation = GetSubPropertySet(cmdPalProvider, "Activation");
         if (activation is null)
         {
             return (cmdPalProvider, classIds);
@@ -195,10 +195,10 @@ public partial class ExtensionService : IExtensionService, IDisposable
         {
             if (_installedExtensions.Count == 0)
             {
-                var extensions = await GetInstalledAppExtensionsAsync();
-                foreach (var extension in extensions)
+                IEnumerable<AppExtension> extensions = await GetInstalledAppExtensionsAsync();
+                foreach (AppExtension extension in extensions)
                 {
-                    var wrappers = await CreateWrappersForExtension(extension);
+                    List<ExtensionWrapper> wrappers = await CreateWrappersForExtension(extension);
                     UpdateExtensionsListsFromWrappers(wrappers);
                 }
             }
@@ -213,11 +213,11 @@ public partial class ExtensionService : IExtensionService, IDisposable
 
     private static void UpdateExtensionsListsFromWrappers(List<ExtensionWrapper> wrappers)
     {
-        foreach (var extensionWrapper in wrappers)
+        foreach (ExtensionWrapper extensionWrapper in wrappers)
         {
             // var localSettingsService = Application.Current.GetService<ILocalSettingsService>();
-            var extensionUniqueId = extensionWrapper.ExtensionUniqueId;
-            var isExtensionDisabled = false; // await localSettingsService.ReadSettingAsync<bool>(extensionUniqueId + "-ExtensionDisabled");
+            string extensionUniqueId = extensionWrapper.ExtensionUniqueId;
+            bool isExtensionDisabled = false; // await localSettingsService.ReadSettingAsync<bool>(extensionUniqueId + "-ExtensionDisabled");
 
             _installedExtensions.Add(extensionWrapper);
             if (!isExtensionDisabled)
@@ -234,7 +234,7 @@ public partial class ExtensionService : IExtensionService, IDisposable
 
     private static async Task<List<ExtensionWrapper>> CreateWrappersForExtension(AppExtension extension)
     {
-        var (cmdPalProvider, classIds) = await GetCmdPalExtensionPropertiesAsync(extension);
+        (IPropertySet? cmdPalProvider, List<string> classIds) = await GetCmdPalExtensionPropertiesAsync(extension);
 
         if (cmdPalProvider == null || classIds.Count == 0)
         {
@@ -242,9 +242,9 @@ public partial class ExtensionService : IExtensionService, IDisposable
         }
 
         List<ExtensionWrapper> wrappers = [];
-        foreach (var classId in classIds)
+        foreach (string classId in classIds)
         {
-            var extensionWrapper = CreateExtensionWrapper(extension, cmdPalProvider, classId);
+            ExtensionWrapper extensionWrapper = CreateExtensionWrapper(extension, cmdPalProvider, classId);
             wrappers.Add(extensionWrapper);
         }
 
@@ -253,15 +253,14 @@ public partial class ExtensionService : IExtensionService, IDisposable
 
     private static ExtensionWrapper CreateExtensionWrapper(AppExtension extension, IPropertySet cmdPalProvider, string classId)
     {
-        var extensionWrapper = new ExtensionWrapper(extension, classId);
+        ExtensionWrapper extensionWrapper = new ExtensionWrapper(extension, classId);
 
-        var supportedInterfaces = GetSubPropertySet(cmdPalProvider, "SupportedInterfaces");
+        IPropertySet? supportedInterfaces = GetSubPropertySet(cmdPalProvider, "SupportedInterfaces");
         if (supportedInterfaces is not null)
         {
-            foreach (var supportedInterface in supportedInterfaces)
+            foreach (KeyValuePair<string, object> supportedInterface in supportedInterfaces)
             {
-                ProviderType pt;
-                if (Enum.TryParse(supportedInterface.Key, out pt))
+                if (Enum.TryParse(supportedInterface.Key, out ProviderType pt))
                 {
                     extensionWrapper.AddProviderType(pt);
                 }
@@ -278,14 +277,14 @@ public partial class ExtensionService : IExtensionService, IDisposable
 
     public IExtensionWrapper? GetInstalledExtension(string extensionUniqueId)
     {
-        var extension = _installedExtensions.Where(extension => extension.ExtensionUniqueId.Equals(extensionUniqueId, StringComparison.Ordinal));
+        IEnumerable<IExtensionWrapper> extension = _installedExtensions.Where(extension => extension.ExtensionUniqueId.Equals(extensionUniqueId, StringComparison.Ordinal));
         return extension.FirstOrDefault();
     }
 
     public async Task SignalStopExtensionsAsync()
     {
-        var installedExtensions = await GetInstalledExtensionsAsync();
-        foreach (var installedExtension in installedExtensions)
+        IEnumerable<IExtensionWrapper> installedExtensions = await GetInstalledExtensionsAsync();
+        foreach (IExtensionWrapper installedExtension in installedExtensions)
         {
             if (installedExtension.IsRunning())
             {
@@ -296,10 +295,10 @@ public partial class ExtensionService : IExtensionService, IDisposable
 
     public async Task<IEnumerable<IExtensionWrapper>> GetInstalledExtensionsAsync(ProviderType providerType, bool includeDisabledExtensions = false)
     {
-        var installedExtensions = await GetInstalledExtensionsAsync(includeDisabledExtensions);
+        IEnumerable<IExtensionWrapper> installedExtensions = await GetInstalledExtensionsAsync(includeDisabledExtensions);
 
         List<IExtensionWrapper> filteredExtensions = [];
-        foreach (var installedExtension in installedExtensions)
+        foreach (IExtensionWrapper installedExtension in installedExtensions)
         {
             if (installedExtension.HasProviderType(providerType))
             {
@@ -330,9 +329,9 @@ public partial class ExtensionService : IExtensionService, IDisposable
         }
     }
 
-    private static IPropertySet? GetSubPropertySet(IPropertySet propSet, string name) => propSet.TryGetValue(name, out var value) ? value as IPropertySet : null;
+    private static IPropertySet? GetSubPropertySet(IPropertySet propSet, string name) => propSet.TryGetValue(name, out object? value) ? value as IPropertySet : null;
 
-    private static object[]? GetSubPropertySetArray(IPropertySet propSet, string name) => propSet.TryGetValue(name, out var value) ? value as object[] : null;
+    private static object[]? GetSubPropertySetArray(IPropertySet propSet, string name) => propSet.TryGetValue(name, out object? value) ? value as object[] : null;
 
     /// <summary>
     /// There are cases where the extension creates multiple COM instances.
@@ -341,11 +340,11 @@ public partial class ExtensionService : IExtensionService, IDisposable
     /// <returns>List of ClassId strings associated with the activation property</returns>
     private static List<string> GetCreateInstanceList(IPropertySet activationPropSet)
     {
-        var propSetList = new List<string>();
-        var singlePropertySet = GetSubPropertySet(activationPropSet, CreateInstanceProperty);
+        List<string> propSetList = new List<string>();
+        IPropertySet? singlePropertySet = GetSubPropertySet(activationPropSet, CreateInstanceProperty);
         if (singlePropertySet != null)
         {
-            var classId = GetProperty(singlePropertySet, ClassIdProperty);
+            string? classId = GetProperty(singlePropertySet, ClassIdProperty);
 
             // If the instance has a classId as a single string, then it's only supporting a single instance.
             if (classId != null)
@@ -355,17 +354,17 @@ public partial class ExtensionService : IExtensionService, IDisposable
         }
         else
         {
-            var propertySetArray = GetSubPropertySetArray(activationPropSet, CreateInstanceProperty);
+            object[]? propertySetArray = GetSubPropertySetArray(activationPropSet, CreateInstanceProperty);
             if (propertySetArray != null)
             {
-                foreach (var prop in propertySetArray)
+                foreach (object prop in propertySetArray)
                 {
                     if (prop is not IPropertySet propertySet)
                     {
                         continue;
                     }
 
-                    var classId = GetProperty(propertySet, ClassIdProperty);
+                    string? classId = GetProperty(propertySet, ClassIdProperty);
                     if (classId != null)
                     {
                         propSetList.Add(classId);
@@ -381,13 +380,13 @@ public partial class ExtensionService : IExtensionService, IDisposable
 
     public void EnableExtension(string extensionUniqueId)
     {
-        var extension = _installedExtensions.Where(extension => extension.ExtensionUniqueId.Equals(extensionUniqueId, StringComparison.Ordinal));
+        IEnumerable<IExtensionWrapper> extension = _installedExtensions.Where(extension => extension.ExtensionUniqueId.Equals(extensionUniqueId, StringComparison.Ordinal));
         _enabledExtensions.Add(extension.First());
     }
 
     public void DisableExtension(string extensionUniqueId)
     {
-        var extension = _enabledExtensions.Where(extension => extension.ExtensionUniqueId.Equals(extensionUniqueId, StringComparison.Ordinal));
+        IEnumerable<IExtensionWrapper> extension = _enabledExtensions.Where(extension => extension.ExtensionUniqueId.Equals(extensionUniqueId, StringComparison.Ordinal));
         _enabledExtensions.Remove(extension.First());
     }
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Models/ExtensionWrapper.cs

@@ -108,15 +108,15 @@ public class ExtensionWrapper : IExtensionWrapper
 
                     unsafe
                     {
-                        var extensionPtr = (void*)nint.Zero;
+                        void* extensionPtr = (void*)nint.Zero;
                         try
                         {
                             // -2147024809: E_INVALIDARG
                             // -2147467262: E_NOINTERFACE
                             // -2147024893: E_PATH_NOT_FOUND
-                            var guid = typeof(IExtension).GUID;
+                            Guid guid = typeof(IExtension).GUID;
 
-                            var hr = PInvoke.CoCreateInstance(Guid.Parse(ExtensionClassId), null, CLSCTX.CLSCTX_LOCAL_SERVER, guid, out extensionPtr);
+                            global::Windows.Win32.Foundation.HRESULT hr = PInvoke.CoCreateInstance(Guid.Parse(ExtensionClassId), null, CLSCTX.CLSCTX_LOCAL_SERVER, guid, out extensionPtr);
 
                             if (hr.Value == -2147024893)
                             {
@@ -181,7 +181,7 @@ public class ExtensionWrapper : IExtensionWrapper
     {
         await StartExtensionAsync();
 
-        var supportedProviders = GetExtensionObject()?.GetProvider(_providerTypeMap[typeof(T)]);
+        object? supportedProviders = GetExtensionObject()?.GetProvider(_providerTypeMap[typeof(T)]);
         if (supportedProviders is IEnumerable<T> multipleProvidersSupported)
         {
             return multipleProvidersSupported;

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ProviderSettings.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -47,7 +47,7 @@ public class ProviderSettings
 
     public bool IsFallbackEnabled(TopLevelViewModel command)
     {
-        return FallbackCommands.TryGetValue(command.Id, out var enabled) ? enabled : true;
+        return !FallbackCommands.TryGetValue(command.Id, out bool enabled) || enabled;
     }
 
     public void SetFallbackEnabled(TopLevelViewModel command, bool enabled)

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/ProviderSettingsViewModel.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -126,10 +126,7 @@ public partial class ProviderSettingsViewModel(
     {
         get
         {
-            if (field == null)
-            {
-                field = BuildTopLevelViewModels();
-            }
+            field ??= BuildTopLevelViewModels();
 
             return field;
         }
@@ -137,8 +134,8 @@ public partial class ProviderSettingsViewModel(
 
     private List<TopLevelViewModel> BuildTopLevelViewModels()
     {
-        var thisProvider = _provider;
-        var providersCommands = thisProvider.TopLevelItems;
+        CommandProviderWrapper thisProvider = _provider;
+        TopLevelViewModel[] providersCommands = thisProvider.TopLevelItems;
 
         // Remember! This comes in on the UI thread!
         return [.. providersCommands];
@@ -149,10 +146,7 @@ public partial class ProviderSettingsViewModel(
     {
         get
         {
-            if (field == null)
-            {
-                field = BuildFallbackViewModels();
-            }
+            field ??= BuildFallbackViewModels();
 
             return field;
         }
@@ -162,8 +156,8 @@ public partial class ProviderSettingsViewModel(
 
     private List<TopLevelViewModel> BuildFallbackViewModels()
     {
-        var thisProvider = _provider;
-        var providersCommands = thisProvider.FallbackItems;
+        CommandProviderWrapper thisProvider = _provider;
+        TopLevelViewModel[] providersCommands = thisProvider.FallbackItems;
 
         // Remember! This comes in on the UI thread!
         return [.. providersCommands];

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/RecentCommandsManager.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -22,7 +22,7 @@ public partial class RecentCommandsManager : ObservableObject
     {
         lock (_lock)
         {
-            var entry = History
+            (int Index, HistoryItem Item) entry = History
             .Index()
             .Where(item => item.Item.CommandId == commandId)
             .FirstOrDefault();
@@ -32,10 +32,10 @@ public partial class RecentCommandsManager : ObservableObject
             // Usually it has a weight of 84, compared to 109 for the VS cmd prompt
             if (entry.Item != null)
             {
-                var index = entry.Index;
+                int index = entry.Index;
 
                 // First, add some weight based on how early in the list this appears
-                var bucket = index switch
+                int bucket = index switch
                 {
                     var i when index <= 2 => 35,
                     var i when index <= 10 => 25,
@@ -45,7 +45,7 @@ public partial class RecentCommandsManager : ObservableObject
                 };
 
                 // Then, add weight for how often this is used, but cap the weight from usage.
-                var uses = Math.Min(entry.Item.Uses * 5, 35);
+                int uses = Math.Min(entry.Item.Uses * 5, 35);
 
                 return bucket + uses;
             }
@@ -58,12 +58,12 @@ public partial class RecentCommandsManager : ObservableObject
     {
         lock (_lock)
         {
-            var entry = History
+            HistoryItem? entry = History
             .Where(item => item.CommandId == commandId)
             .FirstOrDefault();
             if (entry == null)
             {
-                var newitem = new HistoryItem() { CommandId = commandId, Uses = 1 };
+                HistoryItem newitem = new HistoryItem() { CommandId = commandId, Uses = 1 };
                 History.Insert(0, newitem);
             }
             else

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Settings/Helper.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/Settings/HotkeySettings.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -60,7 +60,7 @@ public record HotkeySettings// : ICmdLineRepresentable
 
     public override string ToString()
     {
-        var output = new StringBuilder();
+        StringBuilder output = new StringBuilder();
 
         if (Win)
         {
@@ -84,7 +84,7 @@ public record HotkeySettings// : ICmdLineRepresentable
 
         if (Code > 0)
         {
-            var localKey = Helper.GetKeyName((uint)Code);
+            string localKey = Helper.GetKeyName((uint)Code);
             output.Append(localKey);
         }
         else if (output.Length >= 2)
@@ -97,7 +97,7 @@ public record HotkeySettings// : ICmdLineRepresentable
 
     public List<object> GetKeysList()
     {
-        var shortcutList = new List<object>();
+        List<object> shortcutList = new List<object>();
 
         if (Win)
         {
@@ -135,7 +135,7 @@ public record HotkeySettings// : ICmdLineRepresentable
                     shortcutList.Add(Code);
                     break;
                 default:
-                    var localKey = Helper.GetKeyName((uint)Code);
+                    string localKey = Helper.GetKeyName((uint)Code);
                     shortcutList.Add(localKey);
                     break;
             }
@@ -146,7 +146,7 @@ public record HotkeySettings// : ICmdLineRepresentable
 
     public bool IsValid()
     {
-        return IsAccessibleShortcut() ? false : (Alt || Ctrl || Win || Shift) && Code != 0;
+        return !IsAccessibleShortcut() && (Alt || Ctrl || Win || Shift) && Code != 0;
     }
 
     public bool IsEmpty()
@@ -164,10 +164,10 @@ public record HotkeySettings// : ICmdLineRepresentable
     public static bool TryParseFromCmd(string cmd, out object? result)
     {
         bool win = false, ctrl = false, alt = false, shift = false;
-        var code = 0;
+        int code = 0;
 
-        var parts = cmd.Split('+');
-        foreach (var part in parts)
+        string[] parts = cmd.Split('+');
+        foreach (string part in parts)
         {
             switch (part.Trim().ToLower(CultureInfo.InvariantCulture))
             {

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsModel.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -60,8 +60,7 @@ public partial class SettingsModel : ObservableObject
 
     public ProviderSettings GetProviderSettings(CommandProviderWrapper provider)
     {
-        ProviderSettings? settings;
-        if (!ProviderSettings.TryGetValue(provider.ProviderId, out settings))
+        if (!ProviderSettings.TryGetValue(provider.ProviderId, out ProviderSettings? settings))
         {
             settings = new ProviderSettings(provider);
             settings.Connect(provider);
@@ -91,9 +90,9 @@ public partial class SettingsModel : ObservableObject
         try
         {
             // Read the JSON content from the file
-            var jsonContent = File.ReadAllText(FilePath);
+            string jsonContent = File.ReadAllText(FilePath);
 
-            var loaded = JsonSerializer.Deserialize<SettingsModel>(jsonContent, JsonSerializationContext.Default.SettingsModel);
+            SettingsModel? loaded = JsonSerializer.Deserialize<SettingsModel>(jsonContent, JsonSerializationContext.Default.SettingsModel);
 
             Debug.WriteLine(loaded != null ? "Loaded settings file" : "Failed to parse");
 
@@ -117,23 +116,23 @@ public partial class SettingsModel : ObservableObject
         try
         {
             // Serialize the main dictionary to JSON and save it to the file
-            var settingsJson = JsonSerializer.Serialize(model, JsonSerializationContext.Default.SettingsModel);
+            string settingsJson = JsonSerializer.Serialize(model, JsonSerializationContext.Default.SettingsModel);
 
             // Is it valid JSON?
             if (JsonNode.Parse(settingsJson) is JsonObject newSettings)
             {
                 // Now, read the existing content from the file
-                var oldContent = File.Exists(FilePath) ? File.ReadAllText(FilePath) : "{}";
+                string oldContent = File.Exists(FilePath) ? File.ReadAllText(FilePath) : "{}";
 
                 // Is it valid JSON?
                 if (JsonNode.Parse(oldContent) is JsonObject savedSettings)
                 {
-                    foreach (var item in newSettings)
+                    foreach (KeyValuePair<string, JsonNode?> item in newSettings)
                     {
                         savedSettings[item.Key] = item.Value?.DeepClone();
                     }
 
-                    var serialized = savedSettings.ToJsonString(JsonSerializationContext.Default.Options);
+                    string serialized = savedSettings.ToJsonString(JsonSerializationContext.Default.Options);
                     File.WriteAllText(FilePath, serialized);
 
                     // TODO: Instead of just raising the event here, we should
@@ -159,7 +158,7 @@ public partial class SettingsModel : ObservableObject
 
     internal static string SettingsJsonPath()
     {
-        var directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
+        string directory = Utilities.BaseSettingsPath("Microsoft.CmdPal");
         Directory.CreateDirectory(directory);
 
         // now, the settings is just next to the exe

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/SettingsViewModel.cs

@@ -125,22 +125,22 @@ public partial class SettingsViewModel : INotifyPropertyChanged
         _settings = settings;
         _serviceProvider = serviceProvider;
 
-        var activeProviders = GetCommandProviders();
-        var allProviderSettings = _settings.ProviderSettings;
+        IEnumerable<CommandProviderWrapper> activeProviders = GetCommandProviders();
+        Dictionary<string, ProviderSettings> allProviderSettings = _settings.ProviderSettings;
 
-        foreach (var item in activeProviders)
+        foreach (CommandProviderWrapper item in activeProviders)
         {
-            var providerSettings = settings.GetProviderSettings(item);
+            ProviderSettings providerSettings = settings.GetProviderSettings(item);
 
-            var settingsModel = new ProviderSettingsViewModel(item, providerSettings, _serviceProvider);
+            ProviderSettingsViewModel settingsModel = new ProviderSettingsViewModel(item, providerSettings, _serviceProvider);
             CommandProviders.Add(settingsModel);
         }
     }
 
     private IEnumerable<CommandProviderWrapper> GetCommandProviders()
     {
-        var manager = _serviceProvider.GetService<TopLevelCommandManager>()!;
-        var allProviders = manager.CommandProviders;
+        TopLevelCommandManager manager = _serviceProvider.GetService<TopLevelCommandManager>()!;
+        IEnumerable<CommandProviderWrapper> allProviders = manager.CommandProviders;
         return allProviders;
     }
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelCommandManager.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -56,7 +56,7 @@ public partial class TopLevelCommandManager : ObservableObject,
 
     public async Task<bool> LoadBuiltinsAsync()
     {
-        var s = new Stopwatch();
+        Stopwatch s = new Stopwatch();
         s.Start();
 
         lock (_commandProvidersLock)
@@ -66,8 +66,8 @@ public partial class TopLevelCommandManager : ObservableObject,
 
         // Load built-In commands first. These are all in-proc, and
         // owned by our ServiceProvider.
-        var builtInCommands = _serviceProvider.GetServices<ICommandProvider>();
-        foreach (var provider in builtInCommands)
+        IEnumerable<ICommandProvider> builtInCommands = _serviceProvider.GetServices<ICommandProvider>();
+        foreach (ICommandProvider provider in builtInCommands)
         {
             CommandProviderWrapper wrapper = new(provider, _taskScheduler);
             lock (_commandProvidersLock)
@@ -75,10 +75,10 @@ public partial class TopLevelCommandManager : ObservableObject,
                 _builtInCommands.Add(wrapper);
             }
 
-            var commands = await LoadTopLevelCommandsFromProvider(wrapper);
+            IEnumerable<TopLevelViewModel> commands = await LoadTopLevelCommandsFromProvider(wrapper);
             lock (TopLevelCommands)
             {
-                foreach (var c in commands)
+                foreach (TopLevelViewModel c in commands)
                 {
                     TopLevelCommands.Add(c);
                 }
@@ -99,16 +99,16 @@ public partial class TopLevelCommandManager : ObservableObject,
 
         await commandProvider.LoadTopLevelCommands(_serviceProvider, weakSelf);
 
-        var commands = await Task.Factory.StartNew(
+        List<TopLevelViewModel> commands = await Task.Factory.StartNew(
             () =>
             {
                 List<TopLevelViewModel> commands = [];
-                foreach (var item in commandProvider.TopLevelItems)
+                foreach (TopLevelViewModel item in commandProvider.TopLevelItems)
                 {
                     commands.Add(item);
                 }
 
-                foreach (var item in commandProvider.FallbackItems)
+                foreach (TopLevelViewModel item in commandProvider.FallbackItems)
                 {
                     if (item.IsEnabled)
                     {
@@ -148,19 +148,19 @@ public partial class TopLevelCommandManager : ObservableObject,
         // update to the actual observable list at the end
         List<TopLevelViewModel> clone = [.. TopLevelCommands];
         List<TopLevelViewModel> newItems = [];
-        var startIndex = -1;
-        var firstCommand = sender.TopLevelItems[0];
-        var commandsToRemove = sender.TopLevelItems.Length + sender.FallbackItems.Length;
+        int startIndex = -1;
+        TopLevelViewModel firstCommand = sender.TopLevelItems[0];
+        int commandsToRemove = sender.TopLevelItems.Length + sender.FallbackItems.Length;
 
         // Tricky: all Commands from a single provider get added to the
         // top-level list all together, in a row. So if we find just the first
         // one, we can slice it out and insert the new ones there.
-        for (var i = 0; i < clone.Count; i++)
+        for (int i = 0; i < clone.Count; i++)
         {
-            var wrapper = clone[i];
+            TopLevelViewModel wrapper = clone[i];
             try
             {
-                var isTheSame = wrapper == firstCommand;
+                bool isTheSame = wrapper == firstCommand;
                 if (isTheSame)
                 {
                     startIndex = i;
@@ -177,14 +177,14 @@ public partial class TopLevelCommandManager : ObservableObject,
         // Fetch the new items
         await sender.LoadTopLevelCommands(_serviceProvider, weakSelf);
 
-        var settings = _serviceProvider.GetService<SettingsModel>()!;
+        SettingsModel settings = _serviceProvider.GetService<SettingsModel>()!;
 
-        foreach (var i in sender.TopLevelItems)
+        foreach (TopLevelViewModel i in sender.TopLevelItems)
         {
             newItems.Add(i);
         }
 
-        foreach (var i in sender.FallbackItems)
+        foreach (TopLevelViewModel i in sender.FallbackItems)
         {
             if (i.IsEnabled)
             {
@@ -213,7 +213,7 @@ public partial class TopLevelCommandManager : ObservableObject,
     public async Task ReloadAllCommandsAsync()
     {
         IsLoading = true;
-        var extensionService = _serviceProvider.GetService<IExtensionService>()!;
+        IExtensionService extensionService = _serviceProvider.GetService<IExtensionService>()!;
         await extensionService.SignalStopExtensionsAsync();
 
         lock (TopLevelCommands)
@@ -235,12 +235,12 @@ public partial class TopLevelCommandManager : ObservableObject,
     [RelayCommand]
     public async Task<bool> LoadExtensionsAsync()
     {
-        var extensionService = _serviceProvider.GetService<IExtensionService>()!;
+        IExtensionService extensionService = _serviceProvider.GetService<IExtensionService>()!;
 
         extensionService.OnExtensionAdded -= ExtensionService_OnExtensionAdded;
         extensionService.OnExtensionRemoved -= ExtensionService_OnExtensionRemoved;
 
-        var extensions = (await extensionService.GetInstalledExtensionsAsync()).ToImmutableList();
+        ImmutableList<IExtensionWrapper> extensions = (await extensionService.GetInstalledExtensionsAsync()).ToImmutableList();
         lock (_commandProvidersLock)
         {
             _extensionCommandProviders.Clear();
@@ -273,14 +273,14 @@ public partial class TopLevelCommandManager : ObservableObject,
 
     private async Task StartExtensionsAndGetCommands(IEnumerable<IExtensionWrapper> extensions)
     {
-        var timer = new Stopwatch();
+        Stopwatch timer = new Stopwatch();
         timer.Start();
 
         // Start all extensions in parallel
-        var startTasks = extensions.Select(StartExtensionWithTimeoutAsync);
+        IEnumerable<Task<CommandProviderWrapper?>> startTasks = extensions.Select(StartExtensionWithTimeoutAsync);
 
         // Wait for all extensions to start
-        var wrappers = (await Task.WhenAll(startTasks)).Where(wrapper => wrapper != null).Select(w => w!).ToList();
+        List<CommandProviderWrapper> wrappers = (await Task.WhenAll(startTasks)).Where(wrapper => wrapper != null).Select(w => w!).ToList();
 
         lock (_commandProvidersLock)
         {
@@ -288,15 +288,15 @@ public partial class TopLevelCommandManager : ObservableObject,
         }
 
         // Load the commands from the providers in parallel
-        var loadTasks = wrappers.Select(LoadCommandsWithTimeoutAsync);
+        IEnumerable<Task<IEnumerable<TopLevelViewModel>?>> loadTasks = wrappers.Select(LoadCommandsWithTimeoutAsync);
 
-        var commandSets = (await Task.WhenAll(loadTasks)).Where(results => results != null).Select(r => r!).ToList();
+        List<IEnumerable<TopLevelViewModel>> commandSets = (await Task.WhenAll(loadTasks)).Where(results => results != null).Select(r => r!).ToList();
 
         lock (TopLevelCommands)
         {
-            foreach (var commands in commandSets)
+            foreach (IEnumerable<TopLevelViewModel>? commands in commandSets)
             {
-                foreach (var c in commands)
+                foreach (TopLevelViewModel? c in commands)
                 {
                     TopLevelCommands.Add(c);
                 }
@@ -350,11 +350,11 @@ public partial class TopLevelCommandManager : ObservableObject,
                 List<TopLevelViewModel> commandsToRemove = [];
                 lock (TopLevelCommands)
                 {
-                    foreach (var extension in extensions)
+                    foreach (IExtensionWrapper extension in extensions)
                     {
-                        foreach (var command in TopLevelCommands)
+                        foreach (TopLevelViewModel command in TopLevelCommands)
                         {
-                            var host = command.ExtensionHost;
+                            CommandPaletteHost host = command.ExtensionHost;
                             if (host?.Extension == extension)
                             {
                                 commandsToRemove.Add(command);
@@ -373,7 +373,7 @@ public partial class TopLevelCommandManager : ObservableObject,
                     {
                         if (commandsToRemove.Count != 0)
                         {
-                            foreach (var deleted in commandsToRemove)
+                            foreach (TopLevelViewModel deleted in commandsToRemove)
                             {
                                 TopLevelCommands.Remove(deleted);
                             }
@@ -390,7 +390,7 @@ public partial class TopLevelCommandManager : ObservableObject,
     {
         lock (TopLevelCommands)
         {
-            foreach (var command in TopLevelCommands)
+            foreach (TopLevelViewModel command in TopLevelCommands)
             {
                 if (command.Id == id)
                 {
@@ -407,7 +407,7 @@ public partial class TopLevelCommandManager : ObservableObject,
 
     void IPageContext.ShowException(Exception ex, string? extensionHint)
     {
-        var errorMessage = $"A bug occurred in {$"the \"{extensionHint}\"" ?? "an unknown's"} extension's code:\n{ex.Message}\n{ex.Source}\n{ex.StackTrace}\n\n";
+        string errorMessage = $"A bug occurred in {$"the \"{extensionHint}\"" ?? "an unknown's"} extension's code:\n{ex.Message}\n{ex.Source}\n{ex.StackTrace}\n\n";
         CommandPaletteHost.Instance.Log(errorMessage);
     }
 

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelHotkey.cs

@@ -1,8 +1,7 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Text.Json.Serialization;
 using Microsoft.CmdPal.UI.ViewModels.Settings;
 
 namespace Microsoft.CmdPal.UI.ViewModels;

src/modules/cmdpal/Microsoft.CmdPal.UI.ViewModels/TopLevelViewModel.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -185,7 +185,7 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
 
         if (IsFallback)
         {
-            var model = _commandItemViewModel.Model.Unsafe;
+            ICommandItem? model = _commandItemViewModel.Model.Unsafe;
 
             // RPC to check type
             if (model is IFallbackCommandItem fallback)
@@ -222,7 +222,7 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
 
     public void SetAlias()
     {
-        var commandAlias = Alias is null
+        CommandAlias? commandAlias = Alias is null
                 ? null
                 : new CommandAlias(Alias.Alias, Alias.CommandId, Alias.IsDirect);
 
@@ -232,10 +232,10 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
 
     private void FetchAliasFromAliasManager()
     {
-        var am = _serviceProvider.GetService<AliasManager>();
+        AliasManager? am = _serviceProvider.GetService<AliasManager>();
         if (am != null)
         {
-            var commandAlias = am.AliasFromId(Id);
+            CommandAlias? commandAlias = am.AliasFromId(Id);
             if (commandAlias is not null)
             {
                 // Decouple from the alias manager alias object
@@ -246,7 +246,7 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
 
     private void UpdateHotkey()
     {
-        var hotkey = _settings.CommandHotkeys.Where(hk => hk.CommandId == Id).FirstOrDefault();
+        TopLevelHotkey? hotkey = _settings.CommandHotkeys.Where(hk => hk.CommandId == Id).FirstOrDefault();
         if (hotkey != null)
         {
             _hotkey = hotkey.Hotkey;
@@ -279,13 +279,13 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
     {
         // Use WyHash64 to generate stable ID hashes.
         // manually seeding with 0, so that the hash is stable across launches
-        var result = WyHash64.ComputeHash64(_commandProviderId + DisplayTitle + Title + Subtitle, seed: 0);
+        ulong result = WyHash64.ComputeHash64(_commandProviderId + DisplayTitle + Title + Subtitle, seed: 0);
         _generatedId = $"{_commandProviderId}{result}";
     }
 
     private void DoOnUiThread(Action action)
     {
-        if (_commandItemViewModel.PageContext.TryGetTarget(out var pageContext))
+        if (_commandItemViewModel.PageContext.TryGetTarget(out IPageContext? pageContext))
         {
             Task.Factory.StartNew(
                 action,
@@ -327,16 +327,16 @@ public sealed partial class TopLevelViewModel : ObservableObject, IListItem
     /// <returns>true if our Title changed across this call</returns>
     private bool UnsafeUpdateFallbackSynchronous(string newQuery)
     {
-        var model = _commandItemViewModel.Model.Unsafe;
+        ICommandItem? model = _commandItemViewModel.Model.Unsafe;
 
         // RPC to check type
         if (model is IFallbackCommandItem fallback)
         {
-            var wasEmpty = string.IsNullOrEmpty(Title);
+            bool wasEmpty = string.IsNullOrEmpty(Title);
 
             // RPC for method
             fallback.FallbackHandler.UpdateQuery(newQuery);
-            var isEmpty = string.IsNullOrEmpty(Title);
+            bool isEmpty = string.IsNullOrEmpty(Title);
             return wasEmpty != isEmpty;
         }
 

src/modules/cmdpal/Microsoft.CmdPal.UI/App.xaml.cs

@@ -81,7 +81,7 @@ public partial class App : Application
     {
         AppWindow = new MainWindow();
 
-        var activatedEventArgs = Microsoft.Windows.AppLifecycle.AppInstance.GetCurrent().GetActivatedEventArgs();
+        Windows.AppLifecycle.AppActivationArguments activatedEventArgs = Microsoft.Windows.AppLifecycle.AppInstance.GetCurrent().GetActivatedEventArgs();
         ((MainWindow)AppWindow).HandleLaunch(activatedEventArgs);
     }
 
@@ -97,8 +97,11 @@ public partial class App : Application
         services.AddSingleton(TaskScheduler.FromCurrentSynchronizationContext());
 
         // Built-in Commands. Order matters - this is the order they'll be presented by default.
-        var allApps = new AllAppsCommandProvider();
-        var files = new IndexerCommandsProvider();
+#pragma warning disable CA2000 // Dispose objects before losing scope
+        // justification: these two live for the life of the app
+        AllAppsCommandProvider allApps = new AllAppsCommandProvider();
+        IndexerCommandsProvider files = new IndexerCommandsProvider();
+#pragma warning restore CA2000 // Dispose objects before losing scope
         files.SuppressFallbackWhen(ShellCommandsProvider.SuppressFileFallbackIf);
         services.AddSingleton<ICommandProvider>(allApps);
 
@@ -118,8 +121,11 @@ public partial class App : Application
         // for WinGetStatics
         try
         {
-            var winget = new WinGetExtensionCommandsProvider();
-            var callback = allApps.LookupApp;
+#pragma warning disable CA2000 // Dispose objects before losing scope
+            // justification: lives for the life of the app
+            WinGetExtensionCommandsProvider winget = new WinGetExtensionCommandsProvider();
+#pragma warning restore CA2000 // Dispose objects before losing scope
+            Func<string, ICommandItem?> callback = allApps.LookupApp;
             winget.SetAllLookup(callback);
             services.AddSingleton<ICommandProvider>(winget);
         }
@@ -141,9 +147,9 @@ public partial class App : Application
         services.AddSingleton<TopLevelCommandManager>();
         services.AddSingleton<AliasManager>();
         services.AddSingleton<HotkeyManager>();
-        var sm = SettingsModel.LoadSettings();
+        SettingsModel sm = SettingsModel.LoadSettings();
         services.AddSingleton(sm);
-        var state = AppStateModel.LoadState();
+        AppStateModel state = AppStateModel.LoadState();
         services.AddSingleton(state);
         services.AddSingleton<IExtensionService, ExtensionService>();
         services.AddSingleton<TrayIconService>();

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/AdaptiveCardsConfig.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/CommandBar.xaml.cs

@@ -95,7 +95,7 @@ public sealed partial class CommandBar : UserControl,
             return;
         }
 
-        var result = ViewModel?.CheckKeybinding(msg.Ctrl, msg.Alt, msg.Shift, msg.Win, msg.Key);
+        ContextKeybindingResult? result = ViewModel?.CheckKeybinding(msg.Ctrl, msg.Alt, msg.Shift, msg.Win, msg.Key);
 
         if (result == ContextKeybindingResult.Hide)
         {

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContentFormControl.xaml.cs

@@ -38,7 +38,7 @@ public sealed partial class ContentFormControl : UserControl
     public ContentFormControl()
     {
         this.InitializeComponent();
-        var lightTheme = ActualTheme == Microsoft.UI.Xaml.ElementTheme.Light;
+        bool lightTheme = ActualTheme == Microsoft.UI.Xaml.ElementTheme.Light;
         _renderer.HostConfig = lightTheme ? AdaptiveCardsConfig.Light : AdaptiveCardsConfig.Dark;
 
         // 5% BODGY: if we set this multiple times over the lifetime of the app,
@@ -66,7 +66,7 @@ public sealed partial class ContentFormControl : UserControl
         {
             _viewModel.PropertyChanged += ViewModel_PropertyChanged;
 
-            var c = _viewModel.Card;
+            AdaptiveCardParseResult? c = _viewModel.Card;
             if (c != null)
             {
                 DisplayCard(c);
@@ -83,7 +83,7 @@ public sealed partial class ContentFormControl : UserControl
 
         if (e.PropertyName == nameof(ViewModel.Card))
         {
-            var c = ViewModel.Card;
+            AdaptiveCardParseResult? c = ViewModel.Card;
             if (c != null)
             {
                 DisplayCard(c);
@@ -121,7 +121,7 @@ public sealed partial class ContentFormControl : UserControl
             // Focus on the first focusable element asynchronously to ensure the visual tree is fully built
             element.DispatcherQueue.TryEnqueue(Microsoft.UI.Dispatching.DispatcherQueuePriority.Normal, () =>
             {
-                var focusableElement = FindFirstFocusableElement(element);
+                Control? focusableElement = FindFirstFocusableElement(element);
                 focusableElement?.Focus(FocusState.Programmatic);
             });
         }
@@ -129,12 +129,12 @@ public sealed partial class ContentFormControl : UserControl
 
     private Control? FindFirstFocusableElement(DependencyObject parent)
     {
-        var childCount = VisualTreeHelper.GetChildrenCount(parent);
+        int childCount = VisualTreeHelper.GetChildrenCount(parent);
 
         // Process children first (depth-first search)
-        for (var i = 0; i < childCount; i++)
+        for (int i = 0; i < childCount; i++)
         {
-            var child = VisualTreeHelper.GetChild(parent, i);
+            DependencyObject child = VisualTreeHelper.GetChild(parent, i);
 
             // If the child is a focusable control like TextBox, ComboBox, etc.
             if (child is Control control &&
@@ -147,7 +147,7 @@ public sealed partial class ContentFormControl : UserControl
             }
 
             // Recursively check children
-            var result = FindFirstFocusableElement(child);
+            Control? result = FindFirstFocusableElement(child);
             if (result != null)
             {
                 return result;

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContentIcon.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ContextMenu.xaml.cs

@@ -48,7 +48,7 @@ public sealed partial class ContextMenu : UserControl,
 
     public void Receive(TryCommandKeybindingMessage msg)
     {
-        var result = ViewModel?.CheckKeybinding(msg.Ctrl, msg.Alt, msg.Shift, msg.Win, msg.Key);
+        ContextKeybindingResult? result = ViewModel?.CheckKeybinding(msg.Ctrl, msg.Alt, msg.Shift, msg.Win, msg.Key);
 
         if (result == ContextKeybindingResult.Hide)
         {
@@ -87,13 +87,13 @@ public sealed partial class ContextMenu : UserControl,
             return;
         }
 
-        var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
-        var altPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down);
-        var shiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
-        var winPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.LeftWindows).HasFlag(CoreVirtualKeyStates.Down) ||
+        bool ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
+        bool altPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down);
+        bool shiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
+        bool winPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.LeftWindows).HasFlag(CoreVirtualKeyStates.Down) ||
             InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.RightWindows).HasFlag(CoreVirtualKeyStates.Down);
 
-        var result = ViewModel?.CheckKeybinding(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
+        ContextKeybindingResult? result = ViewModel?.CheckKeybinding(ctrlPressed, altPressed, shiftPressed, winPressed, e.Key);
 
         if (result == ContextKeybindingResult.Hide)
         {
@@ -113,7 +113,7 @@ public sealed partial class ContextMenu : UserControl,
 
     private void ViewModel_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
     {
-        var prop = e.PropertyName;
+        string? prop = e.PropertyName;
 
         if (prop == nameof(ContextMenuViewModel.FilteredItems))
         {
@@ -133,10 +133,10 @@ public sealed partial class ContextMenu : UserControl,
 
     private void ContextFilterBox_KeyDown(object sender, KeyRoutedEventArgs e)
     {
-        var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
-        var altPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down);
-        var shiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
-        var winPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.LeftWindows).HasFlag(CoreVirtualKeyStates.Down) ||
+        bool ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
+        bool altPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down);
+        bool shiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
+        bool winPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.LeftWindows).HasFlag(CoreVirtualKeyStates.Down) ||
             InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.RightWindows).HasFlag(CoreVirtualKeyStates.Down);
 
         if (e.Key == VirtualKey.Enter)
@@ -192,7 +192,7 @@ public sealed partial class ContextMenu : UserControl,
 
     private void NavigateUp()
     {
-        var newIndex = CommandsDropdown.SelectedIndex;
+        int newIndex = CommandsDropdown.SelectedIndex;
 
         if (CommandsDropdown.SelectedIndex > 0)
         {
@@ -229,7 +229,7 @@ public sealed partial class ContextMenu : UserControl,
 
     private void NavigateDown()
     {
-        var newIndex = CommandsDropdown.SelectedIndex;
+        int newIndex = CommandsDropdown.SelectedIndex;
 
         if (CommandsDropdown.SelectedIndex == CommandsDropdown.Items.Count - 1)
         {

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/IconBox.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -101,8 +101,8 @@ public partial class IconBox : ContentControl
                 // _ = @this._queue.EnqueueAsync(() =>
                 @this._queue.TryEnqueue(new(async () =>
                 {
-                    var requestedTheme = @this.ActualTheme;
-                    var eventArgs = new SourceRequestedEventArgs(e.NewValue, requestedTheme);
+                    ElementTheme requestedTheme = @this.ActualTheme;
+                    SourceRequestedEventArgs eventArgs = new SourceRequestedEventArgs(e.NewValue, requestedTheme);
 
                     if (@this.SourceRequested != null)
                     {
@@ -147,12 +147,12 @@ public partial class IconBox : ContentControl
                         {
                             if (!string.IsNullOrEmpty(iconData.Icon) && iconData.Icon.Length <= 2)
                             {
-                                var ch = iconData.Icon[0];
+                                char ch = iconData.Icon[0];
 
                                 // The range of MDL2 Icons isn't explicitly defined, but
                                 // we're using this based off the table on:
                                 // https://docs.microsoft.com/en-us/windows/uwp/design/style/segoe-ui-symbol-font
-                                var isMDL2Icon = ch is >= '\uE700' and <= '\uF8FF';
+                                bool isMDL2Icon = ch is >= '\uE700' and <= '\uF8FF';
                                 if (!isMDL2Icon)
                                 {
                                     @this.Padding = new Thickness(-4);

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/KeyVisual/KeyVisual.cs

@@ -1,8 +1,7 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.UI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Markup;
@@ -110,27 +109,37 @@ public sealed partial class KeyVisual : Control
                     case 161: // The Shift key or button.
                         _keyVisual._keyPresenter.Content = "\uE752"; break; */
 
-                    case 38: _keyVisual._keyPresenter.Content = "\uE0E4"; break; // The Up Arrow key or button.
-                    case 40: _keyVisual._keyPresenter.Content = "\uE0E5"; break; // The Down Arrow key or button.
-                    case 37: _keyVisual._keyPresenter.Content = "\uE0E2"; break; // The Left Arrow key or button.
-                    case 39: _keyVisual._keyPresenter.Content = "\uE0E3"; break; // The Right Arrow key or button.
+                    case 38:
+                        _keyVisual._keyPresenter.Content = "\uE0E4";
+                        break; // The Up Arrow key or button.
+                    case 40:
+                        _keyVisual._keyPresenter.Content = "\uE0E5";
+                        break; // The Down Arrow key or button.
+                    case 37:
+                        _keyVisual._keyPresenter.Content = "\uE0E2";
+                        break; // The Left Arrow key or button.
+                    case 39:
+                        _keyVisual._keyPresenter.Content = "\uE0E3";
+                        break; // The Right Arrow key or button.
 
                     case 91: // The left Windows key
                     case 92: // The right Windows key
-                        var winIcon = XamlReader.Load(@"<PathIcon xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation"" Data=""M683 1229H0V546h683v683zm819 0H819V546h683v683zm-819 819H0v-683h683v683zm819 0H819v-683h683v683z"" />") as PathIcon;
-                        var winIconContainer = new Viewbox
+                        PathIcon? winIcon = XamlReader.Load(@"<PathIcon xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation"" Data=""M683 1229H0V546h683v683zm819 0H819V546h683v683zm-819 819H0v-683h683v683zm819 0H819v-683h683v683z"" />") as PathIcon;
+                        Viewbox winIconContainer = new Viewbox
                         {
                             Child = winIcon,
                             HorizontalAlignment = HorizontalAlignment.Center,
                             VerticalAlignment = VerticalAlignment.Center,
                         };
 
-                        var iconDimensions = GetIconSize();
+                        double iconDimensions = GetIconSize();
                         winIconContainer.Height = iconDimensions;
                         winIconContainer.Width = iconDimensions;
                         _keyVisual._keyPresenter.Content = winIconContainer;
                         break;
-                    default: _keyVisual._keyPresenter.Content = ((VirtualKey)_keyVisual.Content).ToString(); break;
+                    default:
+                        _keyVisual._keyPresenter.Content = ((VirtualKey)_keyVisual.Content).ToString();
+                        break;
                 }
             }
         }

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SearchBar.xaml.cs

@@ -48,7 +48,7 @@ public sealed partial class SearchBar : UserControl,
     private static void OnCurrentPageViewModelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
     {
         //// TODO: If the Debounce timer hasn't fired, we may want to store the current Filter in the OldValue/prior VM, but we don't want that to go actually do work...
-        var @this = (SearchBar)d;
+        SearchBar? @this = (SearchBar)d;
 
         if (@this != null
             && e.OldValue is PageViewModel old)
@@ -108,10 +108,10 @@ public sealed partial class SearchBar : UserControl,
             return;
         }
 
-        var ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
-        var altPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down);
-        var shiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
-        var winPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.LeftWindows).HasFlag(CoreVirtualKeyStates.Down) ||
+        bool ctrlPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
+        bool altPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Menu).HasFlag(CoreVirtualKeyStates.Down);
+        bool shiftPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
+        bool winPressed = InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.LeftWindows).HasFlag(CoreVirtualKeyStates.Down) ||
             InputKeyboardSource.GetKeyStateForCurrentThread(VirtualKey.RightWindows).HasFlag(CoreVirtualKeyStates.Down);
         if (ctrlPressed && e.Key == VirtualKey.Enter)
         {
@@ -232,7 +232,7 @@ public sealed partial class SearchBar : UserControl,
                 return;
             }
 
-            var ignoreLeave =
+            bool ignoreLeave =
 
                 e.Key == VirtualKey.Up ||
                 e.Key == VirtualKey.Down ||
@@ -320,7 +320,7 @@ public sealed partial class SearchBar : UserControl,
     // Used to handle the case when a ListPage's `SearchText` may have changed
     private void Page_PropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
     {
-        var property = e.PropertyName;
+        string? property = e.PropertyName;
 
         if (CurrentPageViewModel is ListViewModel list)
         {
@@ -356,11 +356,11 @@ public sealed partial class SearchBar : UserControl,
 
     public void Receive(UpdateSuggestionMessage message)
     {
-        var suggestion = message.TextToSuggest;
+        string suggestion = message.TextToSuggest;
 
         _queue.TryEnqueue(new(() =>
         {
-            var clearSuggestion = string.IsNullOrEmpty(suggestion);
+            bool clearSuggestion = string.IsNullOrEmpty(suggestion);
 
             if (clearSuggestion && _inSuggestion)
             {
@@ -386,7 +386,7 @@ public sealed partial class SearchBar : UserControl,
                 _deletedSuggestion = null;
             }
 
-            var currentText = _lastText ?? FilterBox.Text;
+            string currentText = _lastText ?? FilterBox.Text;
 
             _lastText = currentText;
 
@@ -400,10 +400,10 @@ public sealed partial class SearchBar : UserControl,
             // }
             _inSuggestion = true;
 
-            var matchedChars = 0;
-            var suggestionStartsWithQuote = suggestion.Length > 0 && suggestion[0] == '"';
-            var currentStartsWithQuote = currentText.Length > 0 && currentText[0] == '"';
-            var skipCheckingFirst = suggestionStartsWithQuote && !currentStartsWithQuote;
+            int matchedChars = 0;
+            bool suggestionStartsWithQuote = suggestion.Length > 0 && suggestion[0] == '"';
+            bool currentStartsWithQuote = currentText.Length > 0 && currentText[0] == '"';
+            bool skipCheckingFirst = suggestionStartsWithQuote && !currentStartsWithQuote;
             for (int i = skipCheckingFirst ? 1 : 0, j = 0;
                  i < suggestion.Length && j < currentText.Length;
                  i++, j++)
@@ -421,18 +421,18 @@ public sealed partial class SearchBar : UserControl,
                 }
             }
 
-            var first = skipCheckingFirst ? "\"" : string.Empty;
-            var second = currentText.AsSpan(0, matchedChars);
-            var third = suggestion.AsSpan(matchedChars + (skipCheckingFirst ? 1 : 0));
+            string first = skipCheckingFirst ? "\"" : string.Empty;
+            ReadOnlySpan<char> second = currentText.AsSpan(0, matchedChars);
+            ReadOnlySpan<char> third = suggestion.AsSpan(matchedChars + (skipCheckingFirst ? 1 : 0));
 
-            var newText = string.Concat(
+            string newText = string.Concat(
                 first,
                 second,
                 third);
 
             FilterBox.Text = newText;
 
-            var wrappedInQuotes = suggestionStartsWithQuote && suggestion.Last() == '"';
+            bool wrappedInQuotes = suggestionStartsWithQuote && suggestion.Last() == '"';
             if (wrappedInQuotes)
             {
                 FilterBox.Select(

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/HotkeySettingsControlHook.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/NativeKeyboardHelper.cs

@@ -1,8 +1,7 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Runtime.InteropServices;
 
 namespace Microsoft.PowerToys.Settings.UI.Helpers;
@@ -16,10 +15,7 @@ internal static class NativeKeyboardHelper
         internal INPUTTYPE type;
         internal InputUnion data;
 
-        internal static int Size
-        {
-            get { return Marshal.SizeOf<INPUT>(); }
-        }
+        internal static int Size => Marshal.SizeOf<INPUT>();
     }
 
     [StructLayout(LayoutKind.Explicit)]

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/NativeMethods.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -17,8 +17,8 @@ public static partial class NativeMethods
     internal const int SW_SHOWMAXIMIZED = 3;
     internal const int SW_HIDE = 0;
 
-    [DllImport("user32.dll")]
-    internal static extern IntPtr GetActiveWindow();
+    [LibraryImport("user32.dll")]
+    internal static partial IntPtr GetActiveWindow();
 
     [DllImport("user32.dll")]
     internal static extern bool SetWindowPlacement(IntPtr hWnd, ref WINDOWPLACEMENT lpwndpl);
@@ -32,25 +32,25 @@ public static partial class NativeMethods
     [LibraryImport("user32.dll")]
     internal static partial short GetAsyncKeyState(int vKey);
 
-    [DllImport("user32.dll", SetLastError = true)]
-    internal static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+    [LibraryImport("user32.dll", SetLastError = true)]
+    internal static partial int GetWindowLong(IntPtr hWnd, int nIndex);
 
-    [DllImport("user32.dll")]
-    internal static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+    [LibraryImport("user32.dll")]
+    internal static partial int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
 
     // [DllImport("shell32.dll")]
     // internal static extern IntPtr SHBrowseForFolderW(ref ShellGetFolder.BrowseInformation browseInfo);
-    [DllImport("shell32.dll")]
-    internal static extern int SHGetPathFromIDListW(IntPtr pidl, IntPtr pszPath);
+    [LibraryImport("shell32.dll")]
+    internal static partial int SHGetPathFromIDListW(IntPtr pidl, IntPtr pszPath);
 
     // [DllImport("Comdlg32.dll", CharSet = CharSet.Unicode)]
     // internal static extern bool GetOpenFileName([In, Out] OpenFileName openFileName);
 #pragma warning disable CA1401 // P/Invokes should not be visible
     [DllImport("user32.dll")]
-    public static extern bool ShowWindow(System.IntPtr hWnd, int nCmdShow);
+    public static extern bool ShowWindow(nint hWnd, int nCmdShow);
 
-    [DllImport("user32.dll")]
-    public static extern int GetDpiForWindow(System.IntPtr hWnd);
+    [LibraryImport("user32.dll")]
+    public static partial int GetDpiForWindow(nint hWnd);
 
     [DllImport("user32.dll")]
     public static extern bool IsWindowVisible(IntPtr hWnd);
@@ -61,8 +61,8 @@ public static partial class NativeMethods
     [System.Runtime.InteropServices.DllImport("User32.dll")]
     public static extern bool SetForegroundWindow(IntPtr handle);
 
-    [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
-    public static extern IntPtr LoadLibrary(string dllToLoad);
+    [LibraryImport("kernel32.dll", StringMarshalling = StringMarshalling.Utf16)]
+    public static partial IntPtr LoadLibrary(string dllToLoad);
 
     [DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
     public static extern bool FreeLibrary(IntPtr hModule);

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/POINT.cs

@@ -1,8 +1,7 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Runtime.InteropServices;
 
 namespace Microsoft.PowerToys.Settings.UI.Helpers

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/RECT.cs

@@ -1,8 +1,7 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Runtime.InteropServices;
 
 namespace Microsoft.PowerToys.Settings.UI.Helpers

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutControl.xaml.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -38,21 +38,21 @@ public sealed partial class ShortcutControl : UserControl, IDisposable, IRecipie
 
     private static void OnAllowDisableChanged(DependencyObject d, DependencyPropertyChangedEventArgs? e)
     {
-        var me = d as ShortcutControl;
+        ShortcutControl? me = d as ShortcutControl;
         if (me == null)
         {
             return;
         }
 
-        var description = me.c?.FindDescendant<TextBlock>();
+        TextBlock? description = me.c?.FindDescendant<TextBlock>();
         if (description == null)
         {
             return;
         }
 
-        var resourceLoader = Microsoft.CmdPal.UI.Helpers.ResourceLoaderInstance.ResourceLoader;
-        var newValue = (bool)(e?.NewValue ?? false);
-        var text = newValue ?
+        Windows.ApplicationModel.Resources.ResourceLoader resourceLoader = Microsoft.CmdPal.UI.Helpers.ResourceLoaderInstance.ResourceLoader;
+        bool newValue = (bool)(e?.NewValue ?? false);
+        string text = newValue ?
             resourceLoader.GetString("Activation_Shortcut_With_Disable_Description") :
             resourceLoader.GetString("Activation_Shortcut_Description");
         description.Text = text;
@@ -69,10 +69,7 @@ public sealed partial class ShortcutControl : UserControl, IDisposable, IRecipie
 
     public bool Enabled
     {
-        get
-        {
-            return _enabled;
-        }
+        get => _enabled;
 
         set
         {
@@ -85,10 +82,7 @@ public sealed partial class ShortcutControl : UserControl, IDisposable, IRecipie
 
     public HotkeySettings? HotkeySettings
     {
-        get
-        {
-            return hotkeySettings;
-        }
+        get => hotkeySettings;
 
         set
         {
@@ -108,7 +102,7 @@ public sealed partial class ShortcutControl : UserControl, IDisposable, IRecipie
         InitializeComponent();
         internalSettings = new HotkeySettings();
 
-        var resourceLoader = Microsoft.CmdPal.UI.Helpers.ResourceLoaderInstance.ResourceLoader;
+        Windows.ApplicationModel.Resources.ResourceLoader resourceLoader = Microsoft.CmdPal.UI.Helpers.ResourceLoaderInstance.ResourceLoader;
 
         // We create the Dialog in C# because doing it in XAML is giving WinUI/XAML Island bugs when using dark theme.
         shortcutDialog = new ContentDialog
@@ -175,7 +169,7 @@ public sealed partial class ShortcutControl : UserControl, IDisposable, IRecipie
 
     private void KeyEventHandler(int key, bool matchValue, int matchValueCode)
     {
-        var virtualKey = (VirtualKey)key;
+        VirtualKey virtualKey = (VirtualKey)key;
         switch (virtualKey)
         {
             case VirtualKey.LeftWindows:
@@ -234,7 +228,7 @@ public sealed partial class ShortcutControl : UserControl, IDisposable, IRecipie
     // Function to send a single key event to the system which would be ignored by the hotkey control.
     private void SendSingleKeyboardInput(short keyCode, uint keyStatus)
     {
-        var inputShift = new NativeKeyboardHelper.INPUT
+        NativeKeyboardHelper.INPUT inputShift = new NativeKeyboardHelper.INPUT
         {
             type = NativeKeyboardHelper.INPUTTYPE.INPUT_KEYBOARD,
             data = new NativeKeyboardHelper.InputUnion
@@ -448,7 +442,7 @@ public sealed partial class ShortcutControl : UserControl, IDisposable, IRecipie
             return;
         }
 
-        var empty = new HotkeySettings();
+        HotkeySettings empty = new HotkeySettings();
         HotkeySettings = empty;
 
         PreviewKeysControl.ItemsSource = HotkeySettings.GetKeysList();
@@ -490,10 +484,7 @@ public sealed partial class ShortcutControl : UserControl, IDisposable, IRecipie
         {
             if (disposing)
             {
-                if (hook != null)
-                {
-                    hook.Dispose();
-                }
+                hook?.Dispose();
 
                 hook = null;
             }

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml.cs

@@ -1,8 +1,7 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using Microsoft.CmdPal.UI;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
@@ -17,8 +16,7 @@ public sealed partial class ShortcutDialogContentControl : UserControl
 
     public List<object> Keys
     {
-        get { return (List<object>)GetValue(KeysProperty); }
-        set { SetValue(KeysProperty, value); }
+        get => (List<object>)GetValue(KeysProperty); set => SetValue(KeysProperty, value);
     }
 
     public static readonly DependencyProperty KeysProperty = DependencyProperty.Register("Keys", typeof(List<object>), typeof(ShortcutDialogContentControl), new PropertyMetadata(default(string)));

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/ShortcutWithTextLabelControl.xaml.cs

@@ -1,9 +1,7 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System.Collections.Generic;
-
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 
@@ -13,16 +11,14 @@ namespace Microsoft.CmdPal.UI.Controls
     {
         public string Text
         {
-            get { return (string)GetValue(TextProperty); }
-            set { SetValue(TextProperty, value); }
+            get => (string)GetValue(TextProperty); set => SetValue(TextProperty, value);
         }
 
         public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(ShortcutWithTextLabelControl), new PropertyMetadata(default(string)));
 
         public List<object> Keys
         {
-            get { return (List<object>)GetValue(KeysProperty); }
-            set { SetValue(KeysProperty, value); }
+            get => (List<object>)GetValue(KeysProperty); set => SetValue(KeysProperty, value);
         }
 
         public static readonly DependencyProperty KeysProperty = DependencyProperty.Register("Keys", typeof(List<object>), typeof(ShortcutWithTextLabelControl), new PropertyMetadata(default(string)));

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/ShortcutControl/WINDOWPLACEMENT.cs

@@ -1,8 +1,7 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
 using System.Runtime.InteropServices;
 
 namespace Microsoft.PowerToys.Settings.UI.Helpers

src/modules/cmdpal/Microsoft.CmdPal.UI/Controls/SourceRequestedEventArgs.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 

src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/ContentTemplateSelector.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 

src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/ContextItemTemplateSelector.cs

@@ -1,12 +1,10 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.CmdPal.Core.ViewModels;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Controls.Primitives;
-using Microsoft.UI.Xaml.Data;
 
 namespace Microsoft.CmdPal.UI;
 

src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/DetailsDataTemplateSelector.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -24,7 +24,7 @@ public partial class DetailsDataTemplateSelector : DataTemplateSelector
     {
         if (item is DetailsElementViewModel element)
         {
-            var data = element;
+            DetailsElementViewModel data = element;
             return data switch
             {
                 DetailsSeparatorViewModel => SeparatorTemplate,

src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/KeyChordToStringConverter.cs

@@ -1,11 +1,10 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.UI.Xaml.Data;
 using Windows.System;
-using RS_ = Microsoft.CmdPal.UI.Helpers.ResourceLoaderInstance;
 
 namespace Microsoft.CmdPal.UI;
 
@@ -15,7 +14,7 @@ public partial class KeyChordToStringConverter : IValueConverter
     {
         if (value is KeyChord shortcut && (VirtualKey)shortcut.Vkey != VirtualKey.None)
         {
-            var result = string.Empty;
+            string result = string.Empty;
 
             if (shortcut.Modifiers.HasFlag(VirtualKeyModifiers.Control))
             {

src/modules/cmdpal/Microsoft.CmdPal.UI/Converters/MessageStateToSeverityConverter.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation
+// Copyright (c) Microsoft Corporation
 // The Microsoft Corporation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.