Merge branch 'prerelease/2.6.0_stabilization' of https://github.com/microsoft/MixedRealityToolkit-Unity into ExamplesHub_2.6.0

Author: cre8ivepark

Assets/MRTK/Examples/Demos/Input/Scenes/InputActions/InputActions.MixedRealityInputSimulationProfile.asset

@@ -34,7 +34,7 @@ MonoBehaviour:
   currentControlMode: 0
   fastControlKey:
     bindingType: 2
-    code: 305
+    code: 303
   controlSlowSpeed: 1
   controlFastSpeed: 5
   moveHorizontal: Horizontal

Assets/MRTK/Examples/Demos/Input/Scenes/PrimaryPointer/PrimaryPointerHandlerExample.cs

@@ -24,7 +24,19 @@ private void OnPrimaryPointerChanged(IMixedRealityPointer oldPointer, IMixedReal
             {
                 if (newPointer != null)
                 {
-                    Transform parentTransform = newPointer.BaseCursor.TryGetMonoBehaviour(out MonoBehaviour baseCursor) ? baseCursor.transform : null;
+                    Transform parentTransform = null;
+
+                    // For this example scene, use special logic if a GGVPointer becomes the primary pointer. 
+                    // In particular, the GGV pointer defers its cursor management to the GazeProvider, which has its own internal pointer definition as well
+                    // In the future, the pointer/cursor relationship will be reworked and standardized to remove this awkward set of co-dependencies
+                    if (newPointer is GGVPointer)
+                    {
+                        parentTransform = CoreServices.InputSystem.GazeProvider.GazePointer.BaseCursor.TryGetMonoBehaviour(out MonoBehaviour baseCursor) ? baseCursor.transform : null;
+                    }
+                    else
+                    {
+                        parentTransform = newPointer.BaseCursor.TryGetMonoBehaviour(out MonoBehaviour baseCursor) ? baseCursor.transform : null;
+                    }
 
                     // If there's no cursor try using the controller pointer transform instead
                     if (parentTransform == null)

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()

Assets/MRTK/Tools/MSBuild/Scripts/AssetScriptReferenceRetargeter.cs

@@ -56,6 +56,7 @@ public static class Utilities
         public static string MSBuildOutputFolder { get; } = GetNormalizedPath(ProjectPath + MSBuildFolderName, true);
         public static string PackagesCopyPath { get; } = Path.Combine(MSBuildOutputFolder, PackagesCopyFolderName);
         public const string MetaFileGuidRegex = @"guid:\s*([0-9a-fA-F]{32})";
+        public const string MetaFileIdRegex = @"fileID:\s*(-?[0-9]+)";
 
         private static readonly string packagesPath;
 
@@ -118,7 +119,7 @@ public static bool TryGetGuidForAsset(FileInfo assetPath, out Guid guid)
                 while (!reader.EndOfStream)
                 {
                     string line = reader.ReadLine();
-                    Match match = Regex.Match(line, Utilities.MetaFileGuidRegex);
+                    Match match = Regex.Match(line, MetaFileGuidRegex);
 
                     if (match.Success)
                     {

Assets/MRTK/Tools/MSBuild/Scripts/Utilities.cs

@@ -0,0 +1 @@
+This file is intentionally left blank. It will be filled in during the build pipeline. It exists to maintain a stable meta file and GUID.

Assets/MRTK/Tools/MSBuild/mrtk_guid_remapping_dictionary.txt

@@ -27,6 +27,7 @@
     <file src="..\..\MRTK\Core\MixedReality.Toolkit.targets" target="build\Microsoft.MixedReality.Toolkit.Tools.targets" />
 
     <file src="..\..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Tools.*" target="Plugins\" />
+    <file src="..\..\..\Plugins\**\Microsoft.MixedReality.Toolkit.MSBuild.*" target="Plugins\" />
     <file src="..\..\..\..\Assets\MRTK\Tools\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\Tools" />
   </files>
 </package>

Assets/MRTK/Tools/MSBuild/mrtk_guid_remapping_dictionary.txt.meta

@@ -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