Merge pull request #9253 from microsoft/releases/2.5.4

keveleigh · web-flow · commit 8a9d151d1f9a · 2021-02-08T15:41:17.000-08:00
Releases/2.5.4 -&gt; mrtk_release
diff --git a/Assets/MRTK/Core/Utilities/Editor/Setup/MixedRealityToolkitPreserveSettings.cs b/Assets/MRTK/Core/Utilities/Editor/Setup/MixedRealityToolkitPreserveSettings.cs
@@ -41,6 +41,7 @@ internal static class MixedRealityToolkitPreserveSettings
             "  <!-- Data providers --> \n" +
             "  <assembly fullname = \"Microsoft.MixedReality.Toolkit.Providers.LeapMotion\" preserve=\"all\"/> \n" +
             "  <assembly fullname = \"Microsoft.MixedReality.Toolkit.Providers.OpenVR\" preserve=\"all\"/> \n" +
+            "  <assembly fullname = \"Microsoft.MixedReality.Toolkit.Providers.OpenXR\" preserve=\"all\"/> \n" +
             "  <assembly fullname = \"Microsoft.MixedReality.Toolkit.Providers.UnityAR\" preserve=\"all\"/> \n" +
             "  <assembly fullname = \"Microsoft.MixedReality.Toolkit.Providers.WindowsMixedReality.Shared\" preserve=\"all\"/> \n" +
             "  <assembly fullname = \"Microsoft.MixedReality.Toolkit.Providers.WindowsMixedReality\" preserve=\"all\"/> \n" +
diff --git a/Assets/MRTK/Providers/Oculus/XRSDK/OculusXRSDKDeviceManager.cs b/Assets/MRTK/Providers/Oculus/XRSDK/OculusXRSDKDeviceManager.cs
@@ -17,7 +17,9 @@ namespace Microsoft.MixedReality.Toolkit.XRSDK.Oculus.Input
     [MixedRealityDataProvider(
         typeof(IMixedRealityInputSystem),
         SupportedPlatforms.WindowsStandalone | SupportedPlatforms.Android,
-        "XRSDK Oculus Device Manager")]
+        "XR SDK Oculus Device Manager",
+        "Oculus/XRSDK/Profiles/OculusXRSDKDeviceManagerProfile.asset",
+        "MixedRealityToolkit.Providers")]
     public class OculusXRSDKDeviceManager : XRSDKDeviceManager
     {
         /// <summary>
@@ -345,4 +347,3 @@ private void RemoveHandDevice(OculusHand handDevice)
 #endif
     }
 }
-
diff --git a/Assets/MRTK/Providers/Oculus/XRSDK/OculusXRSDKDeviceManagerProfile.cs b/Assets/MRTK/Providers/Oculus/XRSDK/OculusXRSDKDeviceManagerProfile.cs
@@ -38,7 +38,7 @@ namespace Microsoft.MixedReality.Toolkit.XRSDK.Oculus.Input
     /// The profile for the Oculus XRSDK Device Manager. The settings for this profile can be viewed if the Leap Motion Device Manager input data provider is 
     /// added to the MRTK input configuration profile.
     /// </summary>
-    [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Profiles/Mixed Reality Oculus XRSDK Profile", fileName = "OculusXRSDKDeviceManagerProfile", order = 4)]
+    [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Profiles/Mixed Reality Oculus XR SDK Profile", fileName = "OculusXRSDKDeviceManagerProfile", order = 4)]
     [MixedRealityServiceProfile(typeof(OculusXRSDKDeviceManager))]
     public class OculusXRSDKDeviceManagerProfile : BaseMixedRealityProfile
     {
diff --git a/Assets/MRTK/Providers/Oculus/XRSDK/Profiles/OculusXRSDKDeviceManagerProfile.asset b/Assets/MRTK/Providers/Oculus/XRSDK/Profiles/OculusXRSDKDeviceManagerProfile.asset
@@ -13,9 +13,11 @@ MonoBehaviour:
   m_Name: OculusXRSDKDeviceManagerProfile
   m_EditorClassIdentifier: 
   isCustomProfile: 0
-  ovrCameraRigPrefab: {fileID: 0}
+  ovrCameraRigPrefab: {fileID: 2343937678421323989, guid: 69a746aa83d0d0e45b4e2d33eab0fff4,
+    type: 3}
   renderAvatarHandsInsteadOfControllers: 1
-  localAvatarPrefab: {fileID: 0}
+  localAvatarPrefab: {fileID: 6297684789857299957, guid: 5357c8e6c4495c04f90e97272375c294,
+    type: 3}
   useCustomHandMaterial: 1
   customHandMaterial: {fileID: 2100000, guid: 46180a965b426614f97a7239d1248a1a, type: 2}
   updateMaterialPinchStrengthValue: 1
diff --git a/Assets/MRTK/Providers/WindowsMixedReality/Shared/Editor/WindowsMixedRealityCameraSettingsProfileInspector.cs b/Assets/MRTK/Providers/WindowsMixedReality/Shared/Editor/WindowsMixedRealityCameraSettingsProfileInspector.cs
@@ -46,7 +46,8 @@ public override void OnInspectorGUI()
                     EditorGUILayout.LabelField("Mixed Reality Capture Settings (Experimental)", EditorStyles.boldLabel);
                     InspectorUIUtility.RenderDocumentationButton(MRCDocURL);
                 }
-                EditorGUILayout.HelpBox("Render from PV Camera is supported on Unity 2018.4.13f1 or newer and 2019.3.0f1 or newer. Enabling the feature on other versions may result in incorrect capture behavior.", MessageType.Info);
+                EditorGUILayout.HelpBox("Render from PV camera is supported in Unity 2018.4.13 and newer if using Unity 2018, and in Unity 2019.4.9f1 and newer if using Unity 2019. Enabling the feature on other versions may result in incorrect capture behavior.", MessageType.Info);
+                EditorGUILayout.HelpBox("This doesn't work on XR SDK when we shipped this MRTK release. See this page for the latest information: https://github.com/microsoft/MixedRealityToolkit-Unity/issues/8707", MessageType.Info);
                 EditorGUILayout.PropertyField(renderFromPVCameraForMixedRealityCapture, pvCameraRenderingTitle);
 
                 EditorGUILayout.Space();
@@ -72,4 +73,4 @@ protected override bool IsProfileInActiveInstance()
                    MixedRealityToolkit.Instance.ActiveProfile.CameraProfile.SettingsConfigurations.Any(s => s.SettingsProfile == profile);
         }
     }
-}
+}
diff --git a/Assets/MRTK/Providers/WindowsMixedReality/XRSDK/WindowsMixedRealityDeviceManager.cs b/Assets/MRTK/Providers/WindowsMixedReality/XRSDK/WindowsMixedRealityDeviceManager.cs
@@ -30,7 +30,7 @@ namespace Microsoft.MixedReality.Toolkit.XRSDK.WindowsMixedReality
     [MixedRealityDataProvider(
         typeof(IMixedRealityInputSystem),
         SupportedPlatforms.WindowsStandalone | SupportedPlatforms.WindowsUniversal,
-        "XRSDK Windows Mixed Reality Device Manager")]
+        "XR SDK Windows Mixed Reality Device Manager")]
     public class WindowsMixedRealityDeviceManager : XRSDKDeviceManager
     {
         /// <summary>
diff --git a/Assets/MRTK/Providers/XRSDK/XRSDKDeviceManager.cs b/Assets/MRTK/Providers/XRSDK/XRSDKDeviceManager.cs
@@ -17,7 +17,7 @@ namespace Microsoft.MixedReality.Toolkit.XRSDK.Input
     [MixedRealityDataProvider(
         typeof(IMixedRealityInputSystem),
         SupportedPlatforms.WindowsStandalone | SupportedPlatforms.MacStandalone | SupportedPlatforms.LinuxStandalone | SupportedPlatforms.WindowsUniversal,
-        "XRSDK Device Manager")]
+        "XR SDK Device Manager")]
     public class XRSDKDeviceManager : BaseInputDeviceManager, IMixedRealityCapabilityCheck
     {
         /// <summary>
diff --git a/Assets/MRTK/Tests/EditModeTests/Core/Utilities/BuildAndDeploy/UwpAppxBuildToolsTest.cs b/Assets/MRTK/Tests/EditModeTests/Core/Utilities/BuildAndDeploy/UwpAppxBuildToolsTest.cs
@@ -26,7 +26,7 @@ class UwpAppxBuildToolsTest
                      xmlns:mobile='http://schemas.microsoft.com/appx/manifest/mobile/windows10'
                      IgnorableNamespaces='uap uap2 uap3 uap4 mp mobile iot'
                      xmlns='http://schemas.microsoft.com/appx/manifest/foundation/windows10'>
-              <Identity Name='Microsoft.MixedReality.Toolkit' Publisher='CN=Microsoft' Version='2.5.3.0' />
+              <Identity Name='Microsoft.MixedReality.Toolkit' Publisher='CN=Microsoft' Version='2.5.4.0' />
               <mp:PhoneIdentity PhoneProductId='85c8bcd4-fbac-44ed-adf6-bfc01242a27f' PhonePublisherId='00000000-0000-0000-0000-000000000000' />
               <Properties>
                 <DisplayName>MixedRealityToolkit</DisplayName>
diff --git a/Documentation/Contributing/Roadmap.md b/Documentation/Contributing/Roadmap.md
@@ -4,7 +4,7 @@ This document outlines the roadmap of the Mixed Reality Toolkit. Please note tha
 
 ## Current release
 
-[Microsoft Mixed Reality Toolkit v2.5.3](https://github.com/Microsoft/MixedRealityToolkit-Unity/releases/tag/v2.5.3)
+[Microsoft Mixed Reality Toolkit v2.5.4](https://github.com/Microsoft/MixedRealityToolkit-Unity/releases/tag/v2.5.4)
 
 ## Upcoming releases
 
diff --git a/Documentation/CrossPlatform/OculusQuestMRTK.md b/Documentation/CrossPlatform/OculusQuestMRTK.md
@@ -1,4 +1,4 @@
-# How to configure Oculus Quest in MRTK using the XRSDK pipeline
+# How to configure Oculus Quest in MRTK using the XR SDK pipeline
 
 A [Oculus Quest](https://www.oculus.com/quest/) is required.
 
@@ -46,9 +46,9 @@ to "Controllers and Hands".
 1. Create a new Unity scene or open a pre-existing scene like HandInteractionExamples
 1. Add MRTK to the scene by navigating to **Mixed Reality Toolkit** > **Add to Scene and Configure**
 
-## Using the Oculus XRSDK Data Provider
+## Using the Oculus XR SDK Data Provider
 
-1. Configure your profile to use the **Oculus XRSDK Data Provider**
+1. Configure your profile to use the **Oculus XR SDK Data Provider**
     - If not intending to modify the configuration profiles
         - Change your profile to DefaultXRSDKInputSystemProfile and go to [Build and deploy your project to Oculus Quest](OculusQuestMRTK.md#build-and-deploy-your-project-to-oculus-quest)
 
@@ -69,7 +69,7 @@ to "Controllers and Hands".
 
         ![OculusAddXRSDKDataProvider](../Images/CrossPlatform/OculusQuest/OculusAddDataXRSDKProvider.png)
 
-    - You can verify that the Oculus Controllers are detected by 
+1. The Oculus XR SDK Data Provider includes an OVR Camera Rig Prefab which automatically configures the project with an OVR Camera Rig and OVR Hands to properly route input. Manually adding an OVR Camera Rig to the scene will require manual configuration of settings and input.
 
 ## Build and deploy your project to Oculus Quest
 1. Plug in your Oculus Quest via a USB 3.0 -> USB C cable
diff --git a/Documentation/GettingStartedWithMRTKAndXRSDK.md b/Documentation/GettingStartedWithMRTKAndXRSDK.md
@@ -6,11 +6,28 @@ XR SDK is Unity's [new XR pipeline in Unity 2019.3 and beyond](https://blogs.uni
 
 To get started with the Mixed Reality Toolkit, follow [the provided steps](WelcomeToMRTK.md) to add MRTK to a project.
 
-## Add XR SDK to a Unity project
+## Configuring Unity for the XR SDK pipeline
 
-Windows Mixed Reality, Oculus, and OpenXR are supported on XR SDK.
+The XR SDK pipeline currently supports 3 platforms: Windows Mixed Reality, Oculus, and OpenXR. The sections below will cover the steps needed to configure XR SDK for each platform.
 
-### Required in Unity
+#### Windows Mixed Reality
+
+1. Go into Unity's Package Manager and install the Windows XR Plugin package, which adds support for Windows Mixed Reality on XR SDK. This will pull down a few dependency packages as well. Ensure that the following all successfully installed:
+   1. XR Plugin Management
+   1. Windows XR Plugin
+   1. XR Legacy Input Helpers
+1. Go to Edit > Project Settings.
+1. Click on the XR Plug-in Management tab in the Project Settings window.
+1. Go to the Universal Windows Platform settings and ensure Windows Mixed Reality is checked under Plug-in Providers.
+1. Ensure that Initialize XR on Startup is checked.
+1. (**_Required for in-editor HoloLens Remoting, otherwise optional_**) Go to the Standalone settings and ensure Windows Mixed Reality is checked under Plug-in Providers. Also ensure that Initialize XR on Startup is checked.
+1. (**_Optional_**) Click on the Windows Mixed Reality tab under XR Plug-in Management and create a custom settings profile to change the defaults. If the list of settings are already there, no profile needs to be created.
+
+![Plugin management](Images/XRSDK/PluginManagement.png)
+
+#### Oculus
+
+1. Follow the [How to configure Oculus Quest in MRTK using the XR SDK pipeline](CrossPlatform/OculusQuestMRTK.md) guide to the end. The guide outlines the steps needed to configure both Unity and MRTK to use the XR SDK pipeline for the Oculus Quest.
 
 #### OpenXR (Preview)
 
@@ -19,33 +36,27 @@ Windows Mixed Reality, Oculus, and OpenXR are supported on XR SDK.
 >
 > Currently, it also only supports x64 and ARM64 builds.
 
-1. Follow the [Using the Mixed Reality OpenXR Plugin for Unity](https://aka.ms/openxr-unity-install) guide, including the steps for configuring XR Plugin Management and Optimization to install the OpenXR plug-in to your project.
-1. Ensure that the following have successfully installed:
+1. Follow the [Using the Mixed Reality OpenXR Plugin for Unity](https://aka.ms/openxr-unity-install) guide, including the steps for configuring XR Plugin Management and Optimization to install the OpenXR plug-in to your project. Ensure that the following have successfully installed:
    1. XR Plugin Management
    1. OpenXR Plugin
    1. Mixed Reality OpenXR Plugin
-
-> [!NOTE]
-> For the initial release of MRTK and OpenXR, only the HoloLens 2 articulated hands and Windows Mixed Reality motion controllers are natively supported. Support for additional hardware will be added in upcoming releases.
+1. Go to Edit > Project Settings.
+1. Click on the XR Plug-in Management tab in the Project Settings window.
+1. Ensure that Initialize XR on Startup is checked.
+1. (**_Optional_**) If targeting HoloLens 2, make sure you're on the UWP platform and select Microsoft HoloLens Feature Set
 
 ![Plugin management](Images/XRSDK/PluginManagementOpenXR.png)
 
-#### Windows Mixed Reality
+> [!NOTE] 
+> If you have a pre-existing project that is using MRTK from UPM, make sure that the following line is in the **link.xml** file located in the MixedRealityToolkit.Generated folder.
+   
+`<assembly fullname = "Microsoft.MixedReality.Toolkit.Providers.OpenXR" preserve="all"/>`
 
-1. Go into Unity's Package Manager and install the Windows XR Plugin package, which adds support for Windows Mixed Reality on XR SDK. This will pull down a few dependency packages as well. Ensure the following all successfully installed:
-   1. XR Plugin Management
-   1. Windows XR Plugin
-   1. XR Legacy Input Helpers
-1. Go to Edit > Project Settings.
-1. Click on the XR Plug-in Management tab in the Project Settings window.
-1. Go to the Universal Windows Platform settings and ensure Windows Mixed Reality is checked under Plug-in Providers.
-1. Ensure that Initialize XR on Startup is checked.
-1. (**_Required for in-editor HoloLens Remoting, otherwise optional_**) Go to the Standalone settings and ensure Windows Mixed Reality is checked under Plug-in Providers. Also ensure that Initialize XR on Startup is checked.
-1. (**_Optional_**) Click on the Windows Mixed Reality tab under XR Plug-in Management and create a custom settings profile to change the defaults. If the list of settings are already there, no profile needs to be created.
+> [!NOTE]
+> For the initial release of MRTK and OpenXR, only the HoloLens 2 articulated hands and Windows Mixed Reality motion controllers are natively supported. Support for additional hardware will be added in upcoming releases.
 
-![Plugin management](Images/XRSDK/PluginManagement.png)
 
-### Required in MRTK
+### Configuring MRTK for the XR SDK pipeline
 
 If using OpenXR, choose "DefaultOpenXRConfigurationProfile" as the active profile or clone it to make customizations.
 
diff --git a/Documentation/Images/Packaging/DiscoverFeatures.png b/Documentation/Images/Packaging/DiscoverFeatures.png
diff --git a/Documentation/Images/Packaging/RemoveScopedRegistry.png b/Documentation/Images/Packaging/RemoveScopedRegistry.png
diff --git a/Documentation/Images/Packaging/RequiredDependencies.png b/Documentation/Images/Packaging/RequiredDependencies.png
diff --git a/Documentation/ReleaseNotes.md b/Documentation/ReleaseNotes.md
@@ -1,4 +1,4 @@
-# Microsoft Mixed Reality Toolkit 2.5.3 release notes
+# Microsoft Mixed Reality Toolkit 2.5.4 release notes
 
 - [What's new](#whats-new)
 - [Updating guidance](Updating.md#upgrading-to-a-new-version-of-mrtk)
@@ -11,6 +11,16 @@
 
 ## What's new
 
+### Fixes a bug with Oculus Integration when using UPM
+
+When using UPM, the OculusXRSDKDeviceManagerProfile would always have its [prefabs set to None on startup](https://github.com/microsoft/MixedRealityToolkit-Unity/issues/9160). This release configures the Device Manager to point to a working set of prefabs on startup.
+
+### Fixes an issue with OpenXR via UPM
+
+Fixes an issue where the OpenXR providers weren't added to the link.xml by default, causing new projects to fail to run on-device when using OpenXR and MRTK via Unity's Package Manager. Existing projects that are upgraded will still need this added manually.
+
+## What was new in 2.5.3
+
 ### Fixes a regression with Oculus introduced in 2.5.2
 
 2.5.2 introduced [a build issue when integrating the Oculus SDK](https://github.com/microsoft/MixedRealityToolkit-Unity/issues/9083). This release reverts that issue.
@@ -38,7 +48,6 @@ Support for MSBuild for Unity has been removed as of the 2.5.2 release, to align
 
 There's currently a known issue with Holographic Remoting and OpenXR, where hand joints aren't consistently available.
 Additionally, the eye tracking sample scenes aren't currently compatible, though eye tracking *does* work.
-Lastly, there's an additional issue where some OpenXR APIs return DllNotFound exceptions if they're called in the editor before an XR session is established.
 
 ### Some Mixed Reality Toolkit Standard Shader features require the Foundation package
 
diff --git a/Documentation/usingupm.md b/Documentation/usingupm.md
@@ -1,65 +1,34 @@
 # Mixed Reality Toolkit and Unity Package Manager
 
-Starting with version 2.5.0, the Microsoft Mixed Reality Toolkit is available using the Unity Package Manager (UPM), on Unity 2019.4 and newer.
+Starting with version 2.5.0, using the [Mixed Reality Feature Tool](https://aka.ms/MRFeatureToolDocs), the Microsoft Mixed Reality Toolkit integrates with the Unity Package Manager (UPM) when using Unity 2019.4 and newer.
 
-## Installing Mixed Reality features using the Unity Package Manager
+## Using the Mixed Reality Feature Tool
 
-The Unity Package Manager uses a [manifest file](https://docs.unity3d.com/Manual/upm-manifestPkg.html) (manifest.json) to determine which packages to install and the registries (servers) from which they can be installed.
+As described in [Welcome to the Mixed Reality Feature Tool](https://aka.ms/MRFeatureToolDocs) you can download the tool using [this link](https://aka.ms/MRFeatureTool).
 
-> [!Note]
-> Initial registration of the server and packages is a per-project, manual procedure, please read the following sections for detailed instructions.
+> [!IMPORTANT]
+> If the project's manifest has a `Microsoft Mixed Reality` entry in the `scopedRegistries` section, it is recommended that it be removed.
 >
-> This process is required due to UPM's use of legacy npm search functionality (/-/all) that is not supported by Azure DevOps.
-
-### Registering the Mixed Reality component server
-
-For each project that will be using the Microsoft Mixed Reality Toolkit, the `manifest.json` file (in the Packages folder) will need to have the Mixed Reality scoped registry added. The following illustrate how to properly modify `manifest.json` to support Mixed Reality.
-
-1. Open `<projectRoot>/Packages/manifest.json` in a text editor, such as [Visual Studio Code](https://code.visualstudio.com/).
-1. At the top of the manifest file, add the Mixed Reality server to the scoped registry section and save the file.
-
-```json
-{
-  "scopedRegistries": [
-    {
-      "name": "Microsoft Mixed Reality",
-      "url": "https://pkgs.dev.azure.com/aipmr/MixedReality-Unity-Packages/_packaging/Unity-packages/npm/registry/",
-      "scopes": [
-        "com.microsoft.mixedreality",
-        "com.microsoft.spatialaudio"
-      ]
-    }
-  ],
-```
-
-### Adding MRTK packages
-
-Once the Microsoft Mixed Reality scoped registry has been added to the manifest, the MRTK packages can be specified.
+> To remove a configured scoped registry, please to to `Edit` > `Project Settings` > `Package Manager`.
+>
+> ![Removing scoped registry](Images/Packaging/RemoveScopedRegistry.png)
 
-The [Unity Package Manager](Packaging/MRTK_Packages.md#unity-package-manager) section of the [Mixed Reality Toolkit package](Packaging/MRTK_Packages.md) article describes the available MRTK packages, their contents and the scenarios for their use.
+MRTK packages appear under the `Mixed Reality Toolkit` heading when discovering features.
 
-To add an MRTK package, modify the dependencies section of the `Packages/manifest.json` file. The following example illustrates adding the foundation, tools and examples packages, the standard assets package will be added automatically as a dependency of the foundation.
+![Discover features](Images/Packaging/DiscoverFeatures.png)
 
-```json
-  "dependencies": {
-    "com.microsoft.mixedreality.toolkit.foundation": "2.5.3",
-    "com.microsoft.mixedreality.toolkit.tools": "2.5.3",
-    "com.microsoft.mixedreality.toolkit.examples": "2.5.3",
-```
+When selecting features, there is no need to be concerned with required dependencies, the tool will automatically download and integrate them into the project.
 
-> [!IMPORTANT]
-> There is a known compiler issue that impacts applications built for Microsoft HoloLens 2 using
-> ARM64. This issue is fixed by updating Visual Studio 2019 to version 16.8 or later. If you are unable to update Visual Studio,
-> please import the `com.microsoft.mixedreality.toolkit.tools` package to apply a workaround.
+![Required dependencies](Images/Packaging/RequiredDependencies.png)
 
 ## Managing Mixed Reality features with the Unity Package Manager
 
 Once a Mixed Reality Toolkit package has been added to the package manifest, it can be managed using the Unity Package Manager user interface.
 
 ![MRTK Foundation UPM Package](Images/Packaging/MRTK_FoundationUPM.png)
 
-> [!Note]
-> If a Mixed Reality Toolkit package is removed using the Unity Package Manager, it will have to be re-added using the [previously described steps](#adding-mrtk-packages).
+> [!NOTE]
+> If a Mixed Reality Toolkit package is removed using the Unity Package Manager, it will have to be re-added using the [previously described steps](#using-the-mixed-reality-feature-tool).
 
 ### Using Mixed Reality Toolkit examples
 
@@ -76,7 +45,7 @@ To utilize one or more of the examples, please use the following steps:
 
 When an example package is updated, Unity provides the option to update imported samples.
 
-> [!Note]
+> [!NOTE]
 > Updating an imported sample will overwrite any changes that have been made to that sample and the associated assets.
 
 ## See Also
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
diff --git a/pipelines/config/settings.yml b/pipelines/config/settings.yml
diff --git a/scripts/docs/web/version.js b/scripts/docs/web/version.js

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,9 @@ namespace Microsoft.MixedReality.Toolkit.XRSDK.Oculus.Input`
`17`	`17`	`[MixedRealityDataProvider(`
`18`	`18`	`typeof(IMixedRealityInputSystem),`
`19`	`19`	`SupportedPlatforms.WindowsStandalone \| SupportedPlatforms.Android,`
`20`		`- "XRSDK Oculus Device Manager")]`
	`20`	`+ "XR SDK Oculus Device Manager",`
	`21`	`+ "Oculus/XRSDK/Profiles/OculusXRSDKDeviceManagerProfile.asset",`
	`22`	`+ "MixedRealityToolkit.Providers")]`
`21`	`23`	`public class OculusXRSDKDeviceManager : XRSDKDeviceManager`
`22`	`24`	`{`
`23`	`25`	`/// <summary>`
`@@ -345,4 +347,3 @@ private void RemoveHandDevice(OculusHand handDevice)`
`345`	`347`	`#endif`
`346`	`348`	`}`
`347`	`349`	`}`
`348`		`-`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ namespace Microsoft.MixedReality.Toolkit.XRSDK.Oculus.Input`
`38`	`38`	`/// The profile for the Oculus XRSDK Device Manager. The settings for this profile can be viewed if the Leap Motion Device Manager input data provider is`
`39`	`39`	`/// added to the MRTK input configuration profile.`
`40`	`40`	`/// </summary>`
`41`		`- [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Profiles/Mixed Reality Oculus XRSDK Profile", fileName = "OculusXRSDKDeviceManagerProfile", order = 4)]`
	`41`	`+ [CreateAssetMenu(menuName = "Mixed Reality Toolkit/Profiles/Mixed Reality Oculus XR SDK Profile", fileName = "OculusXRSDKDeviceManagerProfile", order = 4)]`
`42`	`42`	`[MixedRealityServiceProfile(typeof(OculusXRSDKDeviceManager))]`
`43`	`43`	`public class OculusXRSDKDeviceManagerProfile : BaseMixedRealityProfile`
`44`	`44`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ public override void OnInspectorGUI()`
`46`	`46`	`EditorGUILayout.LabelField("Mixed Reality Capture Settings (Experimental)", EditorStyles.boldLabel);`
`47`	`47`	`InspectorUIUtility.RenderDocumentationButton(MRCDocURL);`
`48`	`48`	`}`
`49`		`- EditorGUILayout.HelpBox("Render from PV Camera is supported on Unity 2018.4.13f1 or newer and 2019.3.0f1 or newer. Enabling the feature on other versions may result in incorrect capture behavior.", MessageType.Info);`
	`49`	`+ EditorGUILayout.HelpBox("Render from PV camera is supported in Unity 2018.4.13 and newer if using Unity 2018, and in Unity 2019.4.9f1 and newer if using Unity 2019. Enabling the feature on other versions may result in incorrect capture behavior.", MessageType.Info);`
	`50`	`+ EditorGUILayout.HelpBox("This doesn't work on XR SDK when we shipped this MRTK release. See this page for the latest information: https://github.com/microsoft/MixedRealityToolkit-Unity/issues/8707", MessageType.Info);`
`50`	`51`	`EditorGUILayout.PropertyField(renderFromPVCameraForMixedRealityCapture, pvCameraRenderingTitle);`
`51`	`52`
`52`	`53`	`EditorGUILayout.Space();`
`@@ -72,4 +73,4 @@ protected override bool IsProfileInActiveInstance()`
`72`	`73`	`MixedRealityToolkit.Instance.ActiveProfile.CameraProfile.SettingsConfigurations.Any(s => s.SettingsProfile == profile);`
`73`	`74`	`}`
`74`	`75`	`}`
`75`		`-}`
	`76`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ namespace Microsoft.MixedReality.Toolkit.XRSDK.WindowsMixedReality`
`30`	`30`	`[MixedRealityDataProvider(`
`31`	`31`	`typeof(IMixedRealityInputSystem),`
`32`	`32`	`SupportedPlatforms.WindowsStandalone \| SupportedPlatforms.WindowsUniversal,`
`33`		`- "XRSDK Windows Mixed Reality Device Manager")]`
	`33`	`+ "XR SDK Windows Mixed Reality Device Manager")]`
`34`	`34`	`public class WindowsMixedRealityDeviceManager : XRSDKDeviceManager`
`35`	`35`	`{`
`36`	`36`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace Microsoft.MixedReality.Toolkit.XRSDK.Input`
`17`	`17`	`[MixedRealityDataProvider(`
`18`	`18`	`typeof(IMixedRealityInputSystem),`
`19`	`19`	`SupportedPlatforms.WindowsStandalone \| SupportedPlatforms.MacStandalone \| SupportedPlatforms.LinuxStandalone \| SupportedPlatforms.WindowsUniversal,`
`20`		`- "XRSDK Device Manager")]`
	`20`	`+ "XR SDK Device Manager")]`
`21`	`21`	`public class XRSDKDeviceManager : BaseInputDeviceManager, IMixedRealityCapabilityCheck`
`22`	`22`	`{`
`23`	`23`	`/// <summary>`