Merge pull request #9655 from keveleigh/deprecate

keveleigh · web-flow · commit 6f0f9d38af69 · 2021-04-13T11:02:19.000-07:00
Deprecate `DeviceManagerProfile` in favor of inherited property
diff --git a/Assets/MRTK/Core/Definitions/MixedRealityInputDataProviderConfiguration.cs b/Assets/MRTK/Core/Definitions/MixedRealityInputDataProviderConfiguration.cs
@@ -45,6 +45,7 @@ public struct MixedRealityInputDataProviderConfiguration : IMixedRealityServiceC
         /// <summary>
         /// Device manager specific configuration profile.
         /// </summary>
+        [Obsolete("Use the Profile property instead.")]
         public BaseMixedRealityProfile DeviceManagerProfile => deviceManagerProfile;
 
         /// <summary>
diff --git a/Assets/MRTK/Core/Definitions/MixedRealityServiceConfiguration.cs b/Assets/MRTK/Core/Definitions/MixedRealityServiceConfiguration.cs
@@ -70,7 +70,7 @@ public MixedRealityServiceConfiguration(
         /// <summary>
         /// The configuration profile for the service.
         /// </summary>
-        [Obsolete("Use Profile property instead")]
+        [Obsolete("Use the Profile property instead.")]
         public BaseMixedRealityProfile ConfigurationProfile => configurationProfile;
     }
 }
diff --git a/Assets/MRTK/Core/Inspectors/Profiles/BaseMixedRealityToolkitConfigurationProfileInspector.cs b/Assets/MRTK/Core/Inspectors/Profiles/BaseMixedRealityToolkitConfigurationProfileInspector.cs
@@ -1,7 +1,6 @@
 ﻿// Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-using Microsoft.MixedReality.Toolkit.Utilities;
 using Microsoft.MixedReality.Toolkit.Utilities.Editor;
 using Microsoft.MixedReality.Toolkit.Utilities.Editor.Search;
 using System.Reflection;
diff --git a/Assets/MRTK/Core/Inspectors/Profiles/DataProviderAccessServiceInspector.cs b/Assets/MRTK/Core/Inspectors/Profiles/DataProviderAccessServiceInspector.cs
@@ -71,7 +71,7 @@ protected virtual void AddDataProvider()
             providerConfigurations.InsertArrayElementAtIndex(providerConfigurations.arraySize);
             SerializedProperty provider = providerConfigurations.GetArrayElementAtIndex(providerConfigurations.arraySize - 1);
 
-            var providerProperties = GetDataProviderConfigurationProperties(provider);
+            ServiceConfigurationProperties providerProperties = GetDataProviderConfigurationProperties(provider);
             providerProperties.componentName.stringValue = $"New data provider {providerConfigurations.arraySize - 1}";
             providerProperties.runtimePlatform.intValue = -1;
             providerProperties.providerProfile.objectReferenceValue = null;
diff --git a/Assets/MRTK/Core/Inspectors/Profiles/MixedRealityEyeTrackingProfileInspector.cs b/Assets/MRTK/Core/Inspectors/Profiles/MixedRealityEyeTrackingProfileInspector.cs
@@ -43,7 +43,7 @@ protected override bool IsProfileInActiveInstance()
                 MixedRealityToolkit.Instance.HasActiveProfile &&
                 MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile != null &&
                 MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations != null &&
-                MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations.Any(s => profile == s.DeviceManagerProfile);
+                MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations.Any(s => profile == s.Profile);
         }
     }
 }
diff --git a/Assets/MRTK/Core/Providers/InputSimulation/Editor/MixedRealityInputSimulationProfileInspector.cs b/Assets/MRTK/Core/Providers/InputSimulation/Editor/MixedRealityInputSimulationProfileInspector.cs
@@ -223,7 +223,7 @@ protected override bool IsProfileInActiveInstance()
             return MixedRealityToolkit.IsInitialized && profile != null &&
                 MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile != null &&
                 MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations != null &&
-                MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations.Any(s => profile == s.DeviceManagerProfile);
+                MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations.Any(s => profile == s.Profile);
         }
     }
 }
diff --git a/Assets/MRTK/Providers/LeapMotion/Editor/LeapMotionDeviceManagerProfileInspector.cs b/Assets/MRTK/Providers/LeapMotion/Editor/LeapMotionDeviceManagerProfileInspector.cs
@@ -134,7 +134,7 @@ protected override bool IsProfileInActiveInstance()
             return MixedRealityToolkit.IsInitialized && profile != null &&
                 MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile != null &&
                 MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations != null &&
-                MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations.Any(s => profile == s.DeviceManagerProfile);
+                MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations.Any(s => profile == s.Profile);
         }
     }
 }
diff --git a/Assets/MRTK/Services/InputSystem/MixedRealityInputSystem.cs b/Assets/MRTK/Services/InputSystem/MixedRealityInputSystem.cs
@@ -288,7 +288,7 @@ private void CreateDataProviders()
                 for (int i = 0; i < profile.DataProviderConfigurations.Length; i++)
                 {
                     MixedRealityInputDataProviderConfiguration configuration = profile.DataProviderConfigurations[i];
-                    object[] args = { this, configuration.ComponentName, configuration.Priority, configuration.DeviceManagerProfile };
+                    object[] args = { this, configuration.ComponentName, configuration.Priority, configuration.Profile };
 
                     DebugUtilities.LogVerboseFormat(
                         "Attempting to register input system data provider {0}, {1}, {2}",

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public MixedRealityServiceConfiguration(`
`70`	`70`	`/// <summary>`
`71`	`71`	`/// The configuration profile for the service.`
`72`	`72`	`/// </summary>`
`73`		`- [Obsolete("Use Profile property instead")]`
	`73`	`+ [Obsolete("Use the Profile property instead.")]`
`74`	`74`	`public BaseMixedRealityProfile ConfigurationProfile => configurationProfile;`
`75`	`75`	`}`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ protected override bool IsProfileInActiveInstance()`
`43`	`43`	`MixedRealityToolkit.Instance.HasActiveProfile &&`
`44`	`44`	`MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile != null &&`
`45`	`45`	`MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations != null &&`
`46`		`- MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations.Any(s => profile == s.DeviceManagerProfile);`
	`46`	`+ MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations.Any(s => profile == s.Profile);`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -223,7 +223,7 @@ protected override bool IsProfileInActiveInstance()`
`223`	`223`	`return MixedRealityToolkit.IsInitialized && profile != null &&`
`224`	`224`	`MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile != null &&`
`225`	`225`	`MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations != null &&`
`226`		`- MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations.Any(s => profile == s.DeviceManagerProfile);`
	`226`	`+ MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations.Any(s => profile == s.Profile);`
`227`	`227`	`}`
`228`	`228`	`}`
`229`	`229`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ protected override bool IsProfileInActiveInstance()`
`134`	`134`	`return MixedRealityToolkit.IsInitialized && profile != null &&`
`135`	`135`	`MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile != null &&`
`136`	`136`	`MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations != null &&`
`137`		`- MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations.Any(s => profile == s.DeviceManagerProfile);`
	`137`	`+ MixedRealityToolkit.Instance.ActiveProfile.InputSystemProfile.DataProviderConfigurations.Any(s => profile == s.Profile);`
`138`	`138`	`}`
`139`	`139`	`}`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ private void CreateDataProviders()`
`288`	`288`	`for (int i = 0; i < profile.DataProviderConfigurations.Length; i++)`
`289`	`289`	`{`
`290`	`290`	`MixedRealityInputDataProviderConfiguration configuration = profile.DataProviderConfigurations[i];`
`291`		`- object[] args = { this, configuration.ComponentName, configuration.Priority, configuration.DeviceManagerProfile };`
	`291`	`+ object[] args = { this, configuration.ComponentName, configuration.Priority, configuration.Profile };`
`292`	`292`
`293`	`293`	`DebugUtilities.LogVerboseFormat(`
`294`	`294`	`"Attempting to register input system data provider {0}, {1}, {2}",`