Pulling some additional fixes from 10310 for 2.8 (#10588)

* Create .editorconfig

* Remove alloc

* foreach can alloc

* Add Conditional("UNITY_EDITOR") to editor debug utilities

* Use ENABLE_WINMD_SUPPORT

* Iterating a dictionary's values allocs...

* Use yield return instead of allocating a new list every call

* Cache the if statement end result

Author: keveleigh

.editorconfig

@@ -0,0 +1,206 @@
+# Remove the line below if you want to inherit .editorconfig settings from higher directories
+root = true
+
+# C# files
+[*.cs]
+
+#### Core EditorConfig Options ####
+
+# Indentation and spacing
+indent_size = 4
+indent_style = space
+tab_width = 4
+trim_trailing_whitespace = true
+
+# New line preferences
+insert_final_newline = true
+
+#### .NET Coding Conventions ####
+
+# Organize usings
+dotnet_separate_import_directive_groups = false
+dotnet_sort_system_directives_first = false
+file_header_template = unset
+
+# this. and Me. preferences
+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
+
+# Language keywords vs BCL types preferences
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
+dotnet_style_predefined_type_for_member_access = true: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
+
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+
+# Expression-level preferences
+dotnet_style_coalesce_expression = true:suggestion
+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
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+
+# Field preferences
+dotnet_style_readonly_field = true:suggestion
+
+# Parameter preferences
+dotnet_code_quality_unused_parameters = all:suggestion
+
+# Suppression preferences
+dotnet_remove_unnecessary_suppression_exclusions = none
+
+#### C# Coding Conventions ####
+
+# var preferences
+csharp_style_var_elsewhere = false:silent
+csharp_style_var_for_built_in_types = false:silent
+csharp_style_var_when_type_is_apparent = false:silent
+
+# Expression-bodied members
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+
+# Pattern matching preferences
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_prefer_not_pattern = true:suggestion
+csharp_style_prefer_pattern_matching = true:silent
+csharp_style_prefer_switch_expression = true:suggestion
+
+# Null-checking preferences
+csharp_style_conditional_delegate_call = true:suggestion
+
+# Modifier preferences
+csharp_prefer_static_local_function = true:suggestion
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:silent
+
+# Code-block preferences
+csharp_prefer_braces = true:silent
+csharp_prefer_simple_using_statement = true:suggestion
+
+# Expression-level preferences
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_pattern_local_over_anonymous_function = true:suggestion
+csharp_style_prefer_index_operator = true:suggestion
+csharp_style_prefer_range_operator = true:suggestion
+csharp_style_throw_expression = true:suggestion
+csharp_style_unused_value_assignment_preference = discard_variable:suggestion
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+
+# 'using' directive preferences
+csharp_using_directive_placement = inside_namespace:silent
+
+#### C# Formatting Rules ####
+
+# New line preferences
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+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
+
+# Indentation preferences
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = true
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+# Space preferences
+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 = false
+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
+
+# Wrapping preferences
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#### 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.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+# 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.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers =
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers =
+
+# Naming styles
+
+dotnet_naming_style.pascal_case.required_prefix =
+dotnet_naming_style.pascal_case.required_suffix =
+dotnet_naming_style.pascal_case.word_separator =
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix =
+dotnet_naming_style.begins_with_i.word_separator =
+dotnet_naming_style.begins_with_i.capitalization = pascal_case

Assets/MRTK/Core/Attributes/SystemTypeAttribute.cs

@@ -28,7 +28,7 @@ public abstract class SystemTypeAttribute : PropertyAttribute
         public bool AllowAbstract { get; protected set; } = false;
 
         /// <summary>
-        /// 
+        /// Constructor.
         /// </summary>
         /// <param name="type">Initializes a new instance of the <see cref="SystemTypeAttribute"/> class.</param>
         /// <param name="grouping">Gets or sets grouping of selectable classes. Defaults to <see cref="Utilities.TypeGrouping.ByNamespaceFlat"/> unless explicitly specified.</param>
@@ -39,7 +39,10 @@ protected SystemTypeAttribute(Type type, TypeGrouping grouping = TypeGrouping.By
 #else
             bool isValid = type.IsClass || type.IsInterface || type.IsValueType && !type.IsEnum;
 #endif // WINDOWS_UWP && !ENABLE_IL2CPP
-            Debug.Assert(isValid, $"Invalid Type {type} in attribute.");
+            if (!isValid)
+            {
+                Debug.Assert(isValid, $"Invalid Type {type} in attribute.");
+            }
             Grouping = grouping;
         }
 
@@ -60,4 +63,4 @@ public virtual bool IsConstraintSatisfied(Type type)
 #endif // WINDOWS_UWP && !ENABLE_IL2CPP
         }
     }
-}
+}

Assets/MRTK/Core/Services/BaseEventSystem.cs

@@ -99,8 +99,7 @@ public virtual void HandleEvent<T>(BaseEventData eventData, ExecuteEvents.EventF
             }
 
             // Send events to all handlers registered via RegisterHandler API.
-            List<EventHandlerEntry> handlers;
-            if (EventHandlersByType.TryGetValue(typeof(T), out handlers))
+            if (EventHandlersByType.TryGetValue(typeof(T), out List<EventHandlerEntry> handlers))
             {
                 for (int i = handlers.Count - 1; i >= 0; i--)
                 {
@@ -126,10 +125,19 @@ public virtual void HandleEvent<T>(BaseEventData eventData, ExecuteEvents.EventF
 
             eventExecutionDepth--;
 
-            if (eventExecutionDepth == 0 && (postponedActions.Count > 0 || postponedObjectActions.Count > 0))
+            if (eventExecutionDepth == 0)
             {
-                foreach (var handler in postponedActions)
+                int postponedActionsCount = postponedActions.Count;
+                int postponedObjectActionsCount = postponedObjectActions.Count;
+
+                if (postponedActionsCount <= 0 && postponedObjectActionsCount <= 0)
+                {
+                    return;
+                }
+
+                for (int i = 0; i < postponedActionsCount; i++)
                 {
+                    Tuple<Action, Type, IEventSystemHandler> handler = postponedActions[i];
                     if (handler.Item1 == Action.Add)
                     {
                         AddHandlerToMap(handler.Item2, handler.Item3);
@@ -140,8 +148,9 @@ public virtual void HandleEvent<T>(BaseEventData eventData, ExecuteEvents.EventF
                     }
                 }
 
-                foreach (var obj in postponedObjectActions)
+                for (int i = 0; i < postponedObjectActionsCount; i++)
                 {
+                    Tuple<Action, GameObject> obj = postponedObjectActions[i];
                     if (obj.Item1 == Action.Add)
                     {
                         // Can call it here, because guaranteed that eventExecutionDepth is 0

Assets/MRTK/Core/Utilities/DebugUtilities.cs

@@ -170,6 +170,7 @@ public static void LogVerboseFormat(string message, params object[] args)
         /// <summary>
         /// Draws a point in the Scene window.
         /// </summary>
+        [System.Diagnostics.Conditional("UNITY_EDITOR")]
         public static void DrawPoint(Vector3 point, Color color, float size = 0.05f)
         {
             DrawPoint(point, Quaternion.identity, color, size);
@@ -178,6 +179,7 @@ public static void DrawPoint(Vector3 point, Color color, float size = 0.05f)
         /// <summary>
         /// Draws a point with a rotation in the Scene window.
         /// </summary>
+        [System.Diagnostics.Conditional("UNITY_EDITOR")]
         public static void DrawPoint(Vector3 point, Quaternion rotation, Color color, float size = 0.05f)
         {
             Vector3[] axes = { rotation * Vector3.up, rotation * Vector3.right, rotation * Vector3.forward };
@@ -193,10 +195,11 @@ public static void DrawPoint(Vector3 point, Quaternion rotation, Color color, fl
         /// <summary>
         /// Draws the minimum and maximum points of the given bounds
         /// </summary>
+        [System.Diagnostics.Conditional("UNITY_EDITOR")]
         public static void DrawBounds(Bounds bounds, Color minColor, Color maxColor)
         {
             DrawPoint(bounds.min, minColor);
             DrawPoint(bounds.max, maxColor);
         }
     }
-}
+}

Assets/MRTK/Core/Utilities/Gltf/Serialization/GltfUtility.cs

@@ -10,7 +10,7 @@
 using System.Threading.Tasks;
 using UnityEngine;
 
-#if WINDOWS_UWP
+#if ENABLE_WINMD_SUPPORT
 using Windows.Storage;
 using Windows.Storage.Streams;
 #else
@@ -71,7 +71,7 @@ public static async Task<GltfObject> ImportGltfObjectFromPathAsync(string uri)
             {
                 byte[] glbData;
 
-#if WINDOWS_UWP
+#if ENABLE_WINMD_SUPPORT
                 if (useBackgroundThread)
                 {
                     try

Assets/MRTK/Examples/Demos/UX/BoundingBox/Scripts/BoundingBoxExampleTest.cs

@@ -3,7 +3,6 @@
 
 using Microsoft.MixedReality.Toolkit.Input;
 using Microsoft.MixedReality.Toolkit.UI;
-using Microsoft.MixedReality.Toolkit.Utilities;
 using System.Collections;
 using System.Text;
 using TMPro;
@@ -224,11 +223,6 @@ private IEnumerator Sequence()
 
             SetStatus("Done!");
         }
-        private void DebugDrawObjectBounds(Bounds bounds)
-        {
-            DebugUtilities.DrawPoint(bounds.min, Color.magenta);
-            DebugUtilities.DrawPoint(bounds.max, Color.yellow);
-        }
 
         private IEnumerator WaitForSpeechCommand()
         {
@@ -247,4 +241,4 @@ public void OnSpeechKeywordRecognized(SpeechEventData eventData)
             }
         }
     }
-}
+}

Assets/MRTK/Examples/Demos/UX/BoundsControl/Scripts/BoundsControlRuntimeExample.cs

@@ -5,7 +5,6 @@
 using Microsoft.MixedReality.Toolkit.UI;
 using Microsoft.MixedReality.Toolkit.UI.BoundsControl;
 using Microsoft.MixedReality.Toolkit.UI.BoundsControlTypes;
-using Microsoft.MixedReality.Toolkit.Utilities;
 using System.Collections;
 using System.Text;
 using TMPro;
@@ -227,11 +226,6 @@ private IEnumerator Sequence()
 
             SetStatus("Done!");
         }
-        private void DebugDrawObjectBounds(Bounds bounds)
-        {
-            DebugUtilities.DrawPoint(bounds.min, Color.magenta);
-            DebugUtilities.DrawPoint(bounds.max, Color.yellow);
-        }
 
         private IEnumerator WaitForSpeechCommand()
         {
@@ -250,4 +244,4 @@ public void OnSpeechKeywordRecognized(SpeechEventData eventData)
             }
         }
     }
-}
+}