Merge pull request #3696 from Railboy/mrtk_net_compilation_fix

Minor changes to ensure MRTK compiles with .NET

Author: Railboy

Assets/MixedRealityToolkit/Definitions/Physics/RayStep.cs

@@ -137,7 +137,8 @@ public static Vector3 GetPointByDistance(RayStep[] steps, float distance)
             Debug.Assert(steps != null);
             Debug.Assert(steps.Length > 0);
 
-            var (rayStep, remainingDistance) = GetStepByDistance(steps, distance);
+            float remainingDistance = 0;
+            RayStep rayStep = GetStepByDistance(steps, distance, ref remainingDistance);
             if (remainingDistance > 0)
             {
                 return Vector3.Lerp(rayStep.Origin, rayStep.Terminus, remainingDistance / rayStep.Length);
@@ -154,7 +155,7 @@ public static Vector3 GetPointByDistance(RayStep[] steps, float distance)
         /// <param name="steps"></param>
         /// <param name="distance"></param>
         /// <returns></returns>
-        public static (RayStep rayStep, float traveledDistance) GetStepByDistance(RayStep[] steps, float distance)
+        public static RayStep GetStepByDistance(RayStep[] steps, float distance, ref float traveledDistance)
         {
             Debug.Assert(steps != null);
             Debug.Assert(steps.Length > 0);
@@ -174,11 +175,13 @@ public static (RayStep rayStep, float traveledDistance) GetStepByDistance(RaySte
                 }
                 else
                 {
-                    return (steps[i], remainingDistance);
+                    traveledDistance = remainingDistance;
+                    return steps[i];
                 }
             }
 
-            return (steps[steps.Length - 1], remainingDistance);
+            traveledDistance = remainingDistance;
+            return steps[steps.Length - 1];
         }
 
         /// <summary>
@@ -192,7 +195,8 @@ public static Vector3 GetDirectionByDistance(RayStep[] steps, float distance)
             Debug.Assert(steps != null);
             Debug.Assert(steps.Length > 0);
 
-            return GetStepByDistance(steps, distance).rayStep.Direction;
+            float traveledDistance = 0;
+            return GetStepByDistance(steps, distance, ref traveledDistance).Direction;
         }
 
         #endregion

Assets/MixedRealityToolkit/Utilities/InspectorFields/InspectorGenericFields.cs

@@ -23,8 +23,8 @@ public static void LoadSettings(T target, List<InspectorPropertySetting> setting
         {
             Type myType = target.GetType();
 
-            PropertyInfo[] propInfoList = myType.GetProperties();
-            for (int i = 0; i < propInfoList.Length; i++)
+            List<PropertyInfo> propInfoList = new List<PropertyInfo>(myType.GetProperties());
+            for (int i = 0; i < propInfoList.Count; i++)
             {
                 PropertyInfo propInfo = propInfoList[i];
                 var attrs = (InspectorField[])propInfo.GetCustomAttributes(typeof(InspectorField), false);
@@ -35,8 +35,8 @@ public static void LoadSettings(T target, List<InspectorPropertySetting> setting
                 }
             }
 
-            FieldInfo[] fieldInfoList = myType.GetFields();
-            for (int i = 0; i < fieldInfoList.Length; i++)
+            List<FieldInfo> fieldInfoList = new List<FieldInfo>(myType.GetFields());
+            for (int i = 0; i < fieldInfoList.Count; i++)
             {
                 FieldInfo fieldInfo = fieldInfoList[i];
                 var attrs = (InspectorField[])fieldInfo.GetCustomAttributes(typeof(InspectorField), false);
@@ -59,8 +59,8 @@ public static List<InspectorPropertySetting> GetSettings(T source)
             Type myType = source.GetType();
             List<InspectorPropertySetting> settings = new List<InspectorPropertySetting>();
 
-            PropertyInfo[] propInfoList = myType.GetProperties();
-            for (int i = 0; i < propInfoList.Length; i++)
+            List<PropertyInfo> propInfoList = new List<PropertyInfo>(myType.GetProperties());
+            for (int i = 0; i < propInfoList.Count; i++)
             {
                 PropertyInfo propInfo = propInfoList[i];
                 var attrs = (InspectorField[])propInfo.GetCustomAttributes(typeof(InspectorField), false);
@@ -70,8 +70,8 @@ public static List<InspectorPropertySetting> GetSettings(T source)
                 }
             }
 
-            FieldInfo[] fieldInfoList = myType.GetFields();
-            for (int i = 0; i < fieldInfoList.Length; i++)
+            List<FieldInfo> fieldInfoList = new List<FieldInfo>(myType.GetFields());
+            for (int i = 0; i < fieldInfoList.Count; i++)
             {
                 FieldInfo fieldInfo = fieldInfoList[i];
                 var attrs = (InspectorField[])fieldInfo.GetCustomAttributes(typeof(InspectorField), false);