Merge branch 'prerelease/2.6.0_stabilization' into su_2.6

Author: MaxWang-MS

Assets/MRTK/Examples/Demos/ReadingMode/Scripts/ReadingModeSceneBehavior.cs

@@ -4,7 +4,14 @@
 using Microsoft.MixedReality.Toolkit.CameraSystem;
 using Microsoft.MixedReality.Toolkit.UI;
 using UnityEngine;
+
+#if UNITY_2019_3_OR_NEWER
+using Microsoft.MixedReality.Toolkit.Utilities;
+#endif // UNITY_2019_3_OR_NEWER
+
+#if !UNITY_2020_1_OR_NEWER
 using UnityEngine.XR;
+#endif // !UNITY_2020_1_OR_NEWER
 
 namespace Microsoft.MixedReality.Toolkit.Examples.Demos.ReadingMode
 {
@@ -16,12 +23,32 @@ public class ReadingModeSceneBehavior : MonoBehaviour
         [SerializeField]
         private PinchSlider renderViewportScaleSlider = null;
 
+        private float previousSliderValue = -1;
+        private const float MinScale = 0.001f;
+
         private void Update()
         {
-            if (renderViewportScaleSlider != null)
+            if (renderViewportScaleSlider == null || renderViewportScaleSlider.SliderValue == previousSliderValue)
+            {
+                return;
+            }
+
+            previousSliderValue = renderViewportScaleSlider.SliderValue;
+
+#if UNITY_2019_3_OR_NEWER
+            if (XRSubsystemHelpers.DisplaySubsystem != null)
+            {
+                XRSubsystemHelpers.DisplaySubsystem.scaleOfAllViewports = Mathf.Max(renderViewportScaleSlider.SliderValue, MinScale);
+                return;
+            }
+#endif // UNITY_2019_3_OR_NEWER
+
+#if !UNITY_2020_1_OR_NEWER
+            if (XRDevice.isPresent)
             {
-                XRSettings.renderViewportScale = renderViewportScaleSlider.SliderValue;
+                XRSettings.renderViewportScale = Mathf.Max(renderViewportScaleSlider.SliderValue, MinScale);
             }
+#endif // !UNITY_2020_1_OR_NEWER
         }
 
         public void EnableReadingMode()

Documentation/Images/Tools/Remoting/SelectDotNetWinRT.png

@@ -33,20 +33,13 @@ These issues are particularly relevant when running on **Unity 2019.3** or later
 
 #### Import DotNetWinRT into the project
 
-1. Install a NuGet client
+1. Download the [Mixed Reality Feature Tool](https://aka.ms/MRFeatureTool)
 
-    > [!Note]
-    > The following instructions presume use of [NuGet for Unity](https://github.com/GlitchEnzo/NuGetForUnity/releases)
+1. In the **Discover features** view, select *Mixed Reality WinRT Projections*
 
-1. Navigate to the NuGet client UI
+    ![Select DotNetWinRT package](../images/tools/remoting/SelectDotNetWinRT.png)
 
-    ![Launch NuGet UI](../Images/Tools/Remoting/LaunchNuGetForUnity.png)
-
-1. Locate the `Microsoft.Windows.MixedReality.DotNetWinRT` package
-
-    ![Locate Package](../Images/Tools/Remoting/LocateDotNetWinRT.png)
-
-1. Select Install
+1. Click **Get Features** and continue to [import the package](https://docs.microsoft.com/windows/mixed-reality/develop/unity/welcome-to-mr-feature-tool#3-importing-feature-packages).
 
 #### DOTNETWINRT_PRESENT define written into player settings