Renamed IMixedRealityComponent to IMixedRealityServiceProvider

StephenHodgson · StephenHodgson · commit 07971ff49ed8 · 2018-10-19T11:50:36.000-07:00
diff --git a/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityConfigurationProfile.asset b/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityConfigurationProfile.asset
@@ -3,7 +3,7 @@
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
@@ -43,5 +43,5 @@ MonoBehaviour:
   diagnosticsSystemType:
     reference: Microsoft.MixedReality.Toolkit.SDK.DiagnosticsSystem.MixedRealityDiagnosticsManager,
       Microsoft.MixedReality.Toolkit.SDK
-  registeredComponentsProfile: {fileID: 11400000, guid: efbaf6ea540c69f4fb75415a5d145a53,
+  registeredServiceProvidersProfile: {fileID: 11400000, guid: efbaf6ea540c69f4fb75415a5d145a53,
     type: 2}
diff --git a/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityRegisteredServiceProvidersProfile.asset b/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityRegisteredServiceProvidersProfile.asset
@@ -3,13 +3,13 @@
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInternal: {fileID: 0}
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: eebbca41bb0b40d298ef201735d08616, type: 3}
-  m_Name: DefaultMixedRealityRegisteredComponentsProfile
+  m_Name: DefaultMixedRealityRegisteredServiceProvidersProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
   configurations:
diff --git a/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityRegisteredServiceProvidersProfile.asset.meta b/Assets/MixedRealityToolkit-SDK/Profiles/DefaultMixedRealityRegisteredServiceProvidersProfile.asset.meta
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityConfigurationProfile.cs b/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityConfigurationProfile.cs
@@ -229,13 +229,13 @@ public SystemType DiagnosticsSystemSystemType
         }
 
         [SerializeField]
-        [Tooltip("All the additional non-required systems, features, and managers registered with the Mixed Reality Toolkit.")]
-        private MixedRealityRegisteredComponentsProfile registeredComponentsProfile = null;
+        [Tooltip("All the additional non-required services registered with the Mixed Reality Toolkit.")]
+        private MixedRealityRegisteredServiceProvidersProfile registeredServiceProvidersProfile = null;
 
         /// <summary>
         /// All the additional non-required systems, features, and managers registered with the Mixed Reality Toolkit.
         /// </summary>
-        public MixedRealityRegisteredComponentsProfile RegisteredComponentsProfile => registeredComponentsProfile;
+        public MixedRealityRegisteredServiceProvidersProfile RegisteredServiceProvidersProfile => registeredServiceProvidersProfile;
 
         #endregion Mixed Reality Toolkit configurable properties
 
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityRegisteredServiceProvidersProfile.cs b/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityRegisteredServiceProvidersProfile.cs
@@ -6,15 +6,15 @@
 
 namespace Microsoft.MixedReality.Toolkit.Core.Definitions
 {
-    [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Registered Components Profile", fileName = "MixedRealityRegisteredComponentsProfile", order = (int)CreateProfileMenuItemIndices.RegisteredComponents)]
-    public class MixedRealityRegisteredComponentsProfile : BaseMixedRealityProfile
+    [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Registered Service Providers Profile", fileName = "MixedRealityRegisteredServiceProvidersProfile", order = (int)CreateProfileMenuItemIndices.RegisteredServiceProviders)]
+    public class MixedRealityRegisteredServiceProvidersProfile : BaseMixedRealityProfile
     {
         [SerializeField]
-        private MixedRealityComponentConfiguration[] configurations = null;
+        private MixedRealityServiceConfiguration[] configurations = null;
 
         /// <summary>
         /// Currently registered system and manager configurations.
         /// </summary>
-        public MixedRealityComponentConfiguration[] Configurations => configurations;
+        public MixedRealityServiceConfiguration[] Configurations => configurations;
     }
 }
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityRegisteredServiceProvidersProfile.cs.meta b/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityRegisteredServiceProvidersProfile.cs.meta
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityServiceConfiguration.cs b/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityServiceConfiguration.cs
@@ -10,10 +10,10 @@
 namespace Microsoft.MixedReality.Toolkit.Core.Definitions
 {
     /// <summary>
-    /// Defines a system, feature, or manager to be registered with the <see cref="IMixedRealityService"/> on startup.
+    /// Defines a system, feature, or manager to be registered with as a <see cref="IMixedRealityServiceProvider"/> on startup.
     /// </summary>
     [Serializable]
-    public struct MixedRealityComponentConfiguration
+    public struct MixedRealityServiceConfiguration
     {
         /// <summary>
         /// Constructor.
@@ -23,7 +23,7 @@ public struct MixedRealityComponentConfiguration
         /// <param name="priority">The priority this system, feature, or manager will be initialized in.</param>
         /// <param name="runtimePlatform">The runtime platform(s) to run this system, feature, or manager on.</param>
         /// <param name="configurationProfile">The configuration profile for the system, feature, or manager.</param>
-        public MixedRealityComponentConfiguration(SystemType componentType, string componentName, uint priority, SupportedPlatforms runtimePlatform, ScriptableObject configurationProfile)
+        public MixedRealityServiceConfiguration(SystemType componentType, string componentName, uint priority, SupportedPlatforms runtimePlatform, ScriptableObject configurationProfile)
         {
             this.componentType = componentType;
             this.componentName = componentName;
@@ -33,7 +33,7 @@ public MixedRealityComponentConfiguration(SystemType componentType, string compo
         }
 
         [SerializeField]
-        [Implements(typeof(IMixedRealityComponent), TypeGrouping.ByNamespaceFlat)]
+        [Implements(typeof(IMixedRealityServiceProvider), TypeGrouping.ByNamespaceFlat)]
         private SystemType componentType;
 
         /// <summary>
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityServiceConfiguration.cs.meta b/Assets/MixedRealityToolkit/_Core/Definitions/MixedRealityServiceConfiguration.cs.meta
diff --git a/Assets/MixedRealityToolkit/_Core/Definitions/Utilities/ProfileMenuItemIndices.cs b/Assets/MixedRealityToolkit/_Core/Definitions/Utilities/ProfileMenuItemIndices.cs
@@ -22,7 +22,7 @@ public enum CreateProfileMenuItemIndices
         Gestures,
         TouchInput,
         Diagnostics,
-        RegisteredComponents,
+        RegisteredServiceProviders,
 
         Assembly = 99
     }
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/MixedReality/WindowsMixedRealityDeviceManager.cs b/Assets/MixedRealityToolkit/_Core/Devices/MixedReality/WindowsMixedRealityDeviceManager.cs
@@ -19,7 +19,7 @@
 
 namespace Microsoft.MixedReality.Toolkit.Core.Devices.WindowsMixedReality
 {
-    public class WindowsMixedRealityDeviceManager : BaseDeviceManager, IMixedRealityComponent
+    public class WindowsMixedRealityDeviceManager : BaseDeviceManager, IMixedRealityServiceProvider
     {
         /// <summary>
         /// Constructor.
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/OpenVR/OpenVRDeviceManager.cs b/Assets/MixedRealityToolkit/_Core/Devices/OpenVR/OpenVRDeviceManager.cs
@@ -14,7 +14,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Devices.OpenVR
     /// <summary>
     /// Manages Open VR Devices using unity's input system.
     /// </summary>
-    public class OpenVRDeviceManager : UnityJoystickManager, IMixedRealityComponent
+    public class OpenVRDeviceManager : UnityJoystickManager, IMixedRealityServiceProvider
     {
         /// <summary>
         /// Constructor.
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/MouseDeviceManager.cs b/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/MouseDeviceManager.cs
@@ -11,7 +11,7 @@
 
 namespace Microsoft.MixedReality.Toolkit.Core.Devices.UnityInput
 {
-    public class MouseDeviceManager : BaseDeviceManager, IMixedRealityComponent
+    public class MouseDeviceManager : BaseDeviceManager, IMixedRealityServiceProvider
     {
         public MouseDeviceManager(string name, uint priority) : base(name, priority) { }
 
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/UnityJoystickManager.cs b/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/UnityJoystickManager.cs
@@ -16,7 +16,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Devices.UnityInput
     /// <summary>
     /// Manages joysticks using unity input system.
     /// </summary>
-    public class UnityJoystickManager : BaseDeviceManager, IMixedRealityComponent
+    public class UnityJoystickManager : BaseDeviceManager, IMixedRealityServiceProvider
     {
         /// <summary>
         /// Constructor.
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/UnityTouchDeviceManager.cs b/Assets/MixedRealityToolkit/_Core/Devices/UnityInput/UnityTouchDeviceManager.cs
@@ -15,7 +15,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Devices.UnityInput
     /// <summary>
     /// Manages Touch devices using unity input system.
     /// </summary>
-    public class UnityTouchDeviceManager : BaseDeviceManager, IMixedRealityComponent
+    public class UnityTouchDeviceManager : BaseDeviceManager, IMixedRealityServiceProvider
     {
         /// <summary>
         /// Constructor.
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityConfigurationProfileInspector.cs b/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityConfigurationProfileInspector.cs
@@ -36,7 +36,7 @@ public class MixedRealityConfigurationProfileInspector : MixedRealityBaseConfigu
         private SerializedProperty diagnosticsSystemProfile;
 
         // Additional registered components profile
-        private SerializedProperty registeredComponentsProfile;
+        private SerializedProperty registeredServiceProvidersProfile;
 
         private MixedRealityConfigurationProfile configurationProfile;
 
@@ -100,7 +100,7 @@ private void OnEnable()
             diagnosticsSystemProfile = serializedObject.FindProperty("diagnosticsSystemProfile");
 
             // Additional registered components configuration
-            registeredComponentsProfile = serializedObject.FindProperty("registeredComponentsProfile");
+            registeredServiceProvidersProfile = serializedObject.FindProperty("registeredServiceProvidersProfile");
         }
 
         public override void OnInspectorGUI()
@@ -203,8 +203,8 @@ public override void OnInspectorGUI()
             changed |= RenderProfile(diagnosticsSystemProfile);
 
             GUILayout.Space(12f);
-            EditorGUILayout.LabelField("Additional Components", EditorStyles.boldLabel);
-            changed |= RenderProfile(registeredComponentsProfile);
+            EditorGUILayout.LabelField("Additional Service Providers", EditorStyles.boldLabel);
+            changed |= RenderProfile(registeredServiceProvidersProfile);
 
             if (!changed)
             {
diff --git a/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityRegisteredComponentsProfileInspector.cs b/Assets/MixedRealityToolkit/_Core/Inspectors/Profiles/MixedRealityRegisteredComponentsProfileInspector.cs
@@ -8,11 +8,11 @@
 
 namespace Microsoft.MixedReality.Toolkit.Core.Inspectors.Profiles
 {
-    [CustomEditor(typeof(MixedRealityRegisteredComponentsProfile))]
+    [CustomEditor(typeof(MixedRealityRegisteredServiceProvidersProfile))]
     public class MixedRealityRegisteredComponentsProfileInspector : MixedRealityBaseConfigurationProfileInspector
     {
         private static readonly GUIContent MinusButtonContent = new GUIContent("-", "Unregister");
-        private static readonly GUIContent AddButtonContent = new GUIContent("+ Register a new configuration");
+        private static readonly GUIContent AddButtonContent = new GUIContent("+ Register a new Service Provider");
         private SerializedProperty configurations;
 
         private static bool[] configFoldouts;
@@ -42,8 +42,8 @@ public override void OnInspectorGUI()
             }
 
             EditorGUILayout.Space();
-            EditorGUILayout.LabelField("Registered Components Profile", EditorStyles.boldLabel);
-            EditorGUILayout.HelpBox("This profile defines any additional systems, features, and managers to register with the Mixed Reality Toolkit.", MessageType.Info);
+            EditorGUILayout.LabelField("Registered Service Providers Profile", EditorStyles.boldLabel);
+            EditorGUILayout.HelpBox("This profile defines any additional Services like systems, features, and managers to register with the Mixed Reality Toolkit.", MessageType.Info);
 
             if (MixedRealityPreferences.LockProfiles && !((BaseMixedRealityProfile)target).IsCustomProfile)
             {
@@ -73,7 +73,7 @@ private void RenderList(SerializedProperty list)
                 var configurationProfile = managerConfig.FindPropertyRelative("configurationProfile");
                 configurationProfile.objectReferenceValue = null;
                 serializedObject.ApplyModifiedProperties();
-                var componentType = ((MixedRealityRegisteredComponentsProfile)serializedObject.targetObject).Configurations[list.arraySize - 1].ComponentType;
+                var componentType = ((MixedRealityRegisteredServiceProvidersProfile)serializedObject.targetObject).Configurations[list.arraySize - 1].ComponentType;
                 componentType.Type = null;
                 configFoldouts = new bool[list.arraySize];
                 return;
@@ -83,7 +83,7 @@ private void RenderList(SerializedProperty list)
 
             if (list == null || list.arraySize == 0)
             {
-                EditorGUILayout.HelpBox("Register a new configuration.", MessageType.Warning);
+                EditorGUILayout.HelpBox("Register a new Service Provider.", MessageType.Warning);
                 GUILayout.EndVertical();
                 return;
             }
diff --git a/Assets/MixedRealityToolkit/_Core/Interfaces/Devices/IMixedRealityDictationSystem.cs b/Assets/MixedRealityToolkit/_Core/Interfaces/Devices/IMixedRealityDictationSystem.cs
@@ -9,7 +9,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Interfaces.Devices
     /// <summary>
     /// Mixed Reality Toolkit controller definition, used to manage a specific controller type
     /// </summary>
-    public interface IMixedRealityDictationSystem : IMixedRealityDeviceManager, IMixedRealityComponent
+    public interface IMixedRealityDictationSystem : IMixedRealityDeviceManager, IMixedRealityServiceProvider
     {
         /// <summary>
         /// Is the system currently listing to dictation input?
diff --git a/Assets/MixedRealityToolkit/_Core/Interfaces/Devices/IMixedRealitySpeechSystem.cs b/Assets/MixedRealityToolkit/_Core/Interfaces/Devices/IMixedRealitySpeechSystem.cs
@@ -6,7 +6,7 @@ namespace Microsoft.MixedReality.Toolkit.Core.Interfaces.Devices
     /// <summary>
     /// Mixed Reality Toolkit controller definition, used to manage a specific controller type
     /// </summary>
-    public interface IMixedRealitySpeechSystem : IMixedRealityDeviceManager, IMixedRealityComponent
+    public interface IMixedRealitySpeechSystem : IMixedRealityDeviceManager, IMixedRealityServiceProvider
     {
         /// <summary>
         /// Make sure the keyword recognizer is on, then stop it.
diff --git a/Assets/MixedRealityToolkit/_Core/Interfaces/IMixedRealityServiceProvider.cs b/Assets/MixedRealityToolkit/_Core/Interfaces/IMixedRealityServiceProvider.cs
@@ -4,9 +4,9 @@
 namespace Microsoft.MixedReality.Toolkit.Core.Interfaces
 {
     /// <summary>
-    /// Generic interface for all optional Mixed Reality systems, components, or features that can be added to the <see cref="Definitions.MixedRealityComponentConfiguration"/>
+    /// Generic interface for all optional Mixed Reality systems, components, or features that can be added to the <see cref="Definitions.MixedRealityServiceConfiguration"/>
     /// </summary>
-    public interface IMixedRealityComponent : IMixedRealityService
+    public interface IMixedRealityServiceProvider : IMixedRealityService
     {
         // Empty for now, but it is used to filter out the valid class types in the inspector dropdown.
     }
diff --git a/Assets/MixedRealityToolkit/_Core/Interfaces/IMixedRealityServiceProvider.cs.meta b/Assets/MixedRealityToolkit/_Core/Interfaces/IMixedRealityServiceProvider.cs.meta
diff --git a/Assets/MixedRealityToolkit/_Core/Services/MixedRealityToolkit.cs b/Assets/MixedRealityToolkit/_Core/Services/MixedRealityToolkit.cs
@@ -108,9 +108,9 @@ public void ResetConfiguration(MixedRealityConfigurationProfile profile)
         #region Mixed Reality runtime component registry
 
         /// <summary>
-        /// Local component registry for the Mixed Reality Toolkit, to allow runtime use of the <see cref="IMixedRealityComponent"/>.
+        /// Local component registry for the Mixed Reality Toolkit, to allow runtime use of the <see cref="IMixedRealityServiceProvider"/>.
         /// </summary>
-        public List<Tuple<Type, IMixedRealityComponent>> MixedRealityComponents { get; } = new List<Tuple<Type, IMixedRealityComponent>>();
+        public List<Tuple<Type, IMixedRealityServiceProvider>> MixedRealityComponents { get; } = new List<Tuple<Type, IMixedRealityServiceProvider>>();
 
         private int mixedRealityComponentsCount = 0;
 
@@ -218,11 +218,11 @@ private void Initialize()
                 }
             }
 
-            if (ActiveProfile.RegisteredComponentsProfile != null)
+            if (ActiveProfile.RegisteredServiceProvidersProfile != null)
             {
-                for (int i = 0; i < ActiveProfile.RegisteredComponentsProfile.Configurations?.Length; i++)
+                for (int i = 0; i < ActiveProfile.RegisteredServiceProvidersProfile.Configurations?.Length; i++)
                 {
-                    var configuration = ActiveProfile.RegisteredComponentsProfile.Configurations[i];
+                    var configuration = ActiveProfile.RegisteredServiceProvidersProfile.Configurations[i];
 #if UNITY_EDITOR
                     if (UnityEditor.EditorUserBuildSettings.activeBuildTarget.IsPlatformSupported(configuration.RuntimePlatform))
 #else
@@ -231,7 +231,7 @@ private void Initialize()
                     {
                         if (configuration.ComponentType.Type != null)
                         {
-                            RegisterService(typeof(IMixedRealityComponent), Activator.CreateInstance(configuration.ComponentType, configuration.ComponentName, configuration.Priority) as IMixedRealityComponent);
+                            RegisterService(typeof(IMixedRealityServiceProvider), Activator.CreateInstance(configuration.ComponentType, configuration.ComponentName, configuration.Priority) as IMixedRealityServiceProvider);
                         }
                     }
                 }
@@ -522,7 +522,7 @@ public void RegisterService(Type type, IMixedRealityService service)
             }
             else
             {
-                MixedRealityComponents.Add(new Tuple<Type, IMixedRealityComponent>(type, (IMixedRealityComponent)service));
+                MixedRealityComponents.Add(new Tuple<Type, IMixedRealityServiceProvider>(type, (IMixedRealityServiceProvider)service));
                 if (!isInitializing) { service.Initialize(); }
                 mixedRealityComponentsCount = MixedRealityComponents.Count;
             }
@@ -633,7 +633,7 @@ public void UnregisterService(Type type)
                 GetService(type, out service);
                 if (service != null)
                 {
-                    MixedRealityComponents.Remove(new Tuple<Type, IMixedRealityComponent>(type, (IMixedRealityComponent)service));
+                    MixedRealityComponents.Remove(new Tuple<Type, IMixedRealityServiceProvider>(type, (IMixedRealityServiceProvider)service));
                 }
             }
         }
@@ -664,7 +664,7 @@ public void UnregisterService(Type type, string serviceName)
 
                 if (GetService(type, serviceName, out service))
                 {
-                    MixedRealityComponents.Remove(new Tuple<Type, IMixedRealityComponent>(type, (IMixedRealityComponent)service));
+                    MixedRealityComponents.Remove(new Tuple<Type, IMixedRealityServiceProvider>(type, (IMixedRealityServiceProvider)service));
                 }
             }
         }
@@ -1022,7 +1022,7 @@ private void GetServices(Type type, string serviceName, ref List<IMixedRealitySe
             }
         }
 
-        private static bool CheckComponentMatch(Type type, string serviceName, Tuple<Type, IMixedRealityComponent> components)
+        private static bool CheckComponentMatch(Type type, string serviceName, Tuple<Type, IMixedRealityServiceProvider> components)
         {
             bool isValid = string.IsNullOrEmpty(serviceName) || components.Item2.Name == serviceName;
 

Original file line number	Diff line number	Diff line change
`@@ -6,15 +6,15 @@`
`6`	`6`
`7`	`7`	`namespace Microsoft.MixedReality.Toolkit.Core.Definitions`
`8`	`8`	`{`
`9`		`- [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Registered Components Profile", fileName = "MixedRealityRegisteredComponentsProfile", order = (int)CreateProfileMenuItemIndices.RegisteredComponents)]`
`10`		`- public class MixedRealityRegisteredComponentsProfile : BaseMixedRealityProfile`
	`9`	`+ [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Mixed Reality Registered Service Providers Profile", fileName = "MixedRealityRegisteredServiceProvidersProfile", order = (int)CreateProfileMenuItemIndices.RegisteredServiceProviders)]`
	`10`	`+ public class MixedRealityRegisteredServiceProvidersProfile : BaseMixedRealityProfile`
`11`	`11`	`{`
`12`	`12`	`[SerializeField]`
`13`		`- private MixedRealityComponentConfiguration[] configurations = null;`
	`13`	`+ private MixedRealityServiceConfiguration[] configurations = null;`
`14`	`14`
`15`	`15`	`/// <summary>`
`16`	`16`	`/// Currently registered system and manager configurations.`
`17`	`17`	`/// </summary>`
`18`		`- public MixedRealityComponentConfiguration[] Configurations => configurations;`
	`18`	`+ public MixedRealityServiceConfiguration[] Configurations => configurations;`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public enum CreateProfileMenuItemIndices`
`22`	`22`	`Gestures,`
`23`	`23`	`TouchInput,`
`24`	`24`	`Diagnostics,`
`25`		`- RegisteredComponents,`
	`25`	`+ RegisteredServiceProviders,`
`26`	`26`
`27`	`27`	`Assembly = 99`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`
`20`	`20`	`namespace Microsoft.MixedReality.Toolkit.Core.Devices.WindowsMixedReality`
`21`	`21`	`{`
`22`		`- public class WindowsMixedRealityDeviceManager : BaseDeviceManager, IMixedRealityComponent`
	`22`	`+ public class WindowsMixedRealityDeviceManager : BaseDeviceManager, IMixedRealityServiceProvider`
`23`	`23`	`{`
`24`	`24`	`/// <summary>`
`25`	`25`	`/// Constructor.`