Merge pull request #7110 from keveleigh/fix-extensions

Allow Windows extensions to properly use DotNetWinRT (and some compiler warning fixes)

Author: keveleigh

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/Shared/Extensions/WindowsExtensions.cs

@@ -3,7 +3,11 @@
 
 #if (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
 using Microsoft.MixedReality.Toolkit.Utilities;
+#if WINDOWS_UWP
 using Windows.UI.Input.Spatial;
+#elif DOTNETWINRT_PRESENT
+using Microsoft.Windows.UI.Input.Spatial;
+#endif
 #endif // (UNITY_WSA && DOTNETWINRT_PRESENT) || WINDOWS_UWP
 
 namespace Microsoft.MixedReality.Toolkit.WindowsMixedReality

Assets/MixedRealityToolkit/Inspectors/Profiles/MixedRealityInputSystemProfileInspector.cs

@@ -19,7 +19,6 @@ public class MixedRealityInputSystemProfileInspector : BaseDataProviderServiceIn
 
         private static bool showDataProviders = false;
         private const string ShowInputSystem_DataProviders_PreferenceKey = "ShowInputSystem_DataProviders_PreferenceKey";
-        private SerializedProperty dataProviderConfigurations;
 
         private SerializedProperty focusProviderType;
         private SerializedProperty focusQueryBufferSize;
@@ -212,10 +211,14 @@ protected override ServiceConfigurationProperties GetDataProviderConfigurationPr
         /// <inheritdoc/>
         protected override IMixedRealityServiceConfiguration GetDataProviderConfiguration(int index)
         {
-            var configurations = (target as MixedRealityInputSystemProfile)?.DataProviderConfigurations;
-            if (configurations != null && index >= 0 && index < configurations.Length)
+            MixedRealityInputSystemProfile targetProfile = target as MixedRealityInputSystemProfile;
+            if (targetProfile != null)
             {
-                return configurations[index];
+                var configurations = targetProfile.DataProviderConfigurations;
+                if (configurations != null && index >= 0 && index < configurations.Length)
+                {
+                    return configurations[index];
+                }
             }
 
             return null;