Merge pull request #6782 from microsoft/mrtk_development

updating ux refactor with latest Mrtk development

Author: thalbern

.gitignore

@@ -92,3 +92,10 @@ doc/
 /MSBuild/
 /PackagesCopy/
 !/scripts/Packaging/NuGetRestoreProject.csproj
+
+# ========================= #
+# MSBuildForUnity generated #
+# ========================= #
+Assets/MixedRealityToolkit.Providers/WindowsMixedReality/DotNetAdapter/Plugins*
+MSBuildForUnity.Common.props
+.obj

Assets/MixedReality.Toolkit.Foundation.nuspec

@@ -12,6 +12,9 @@
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <releaseNotes>$releaseNotes$</releaseNotes>
     <tags>Unity MixedReality</tags>
+    <dependencies>
+      <dependency id="Microsoft.Windows.MixedReality.DotNetWinRT" version="0.5.1034" />
+    </dependencies>
     <contentFiles>
       <files include="any\any\.PkgSrc\**" buildAction="None" copyToOutput="false" />
     </contentFiles>

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/DemoTargetPositioning/Scripts/GrabReleaseDetector.cs

@@ -8,7 +8,7 @@
 namespace Microsoft.MixedReality.Toolkit.Examples.Demos.EyeTracking
 {
     [System.Obsolete("This component is no longer supported", true)]
-    [AddComponentMenu("Scripts/MRTK/Examples/GrabReleaseDetector")]
+    [AddComponentMenu("Scripts/MRTK/Obsolete/GrabReleaseDetector")]
     public class GrabReleaseDetector : MonoBehaviour, IMixedRealityPointerHandler
     {
         [SerializeField]

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/DemoVisualizer/Scripts/OnSelectVisualizerInputController.cs

@@ -12,7 +12,7 @@ namespace Microsoft.MixedReality.Toolkit.Examples.Demos.EyeTracking
     /// </summary>
     [RequireComponent(typeof(EyeTrackingTarget))]
     [System.Obsolete("This component is no longer supported", true)]
-    [AddComponentMenu("Scripts/MRTK/Examples/OnSelectVisualizerInputController")]
+    [AddComponentMenu("Scripts/MRTK/Obsolete/OnSelectVisualizerInputController")]
     public class OnSelectVisualizerInputController : BaseEyeFocusHandler, IMixedRealityPointerHandler
     {
         [SerializeField]

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/General/Scripts/TargetBehaviors/KeepFacingCamera.cs

@@ -10,7 +10,7 @@ namespace Microsoft.MixedReality.Toolkit.Examples.Demos.EyeTracking
     /// This script continuously updates the orientation of the associated game object to keep facing the camera/user.
     /// </summary>
     [System.Obsolete("This component is no longer supported", true)]
-    [AddComponentMenu("Scripts/MRTK/Examples/KeepFacingCamera")]
+    [AddComponentMenu("Scripts/MRTK/Obsolete/KeepFacingCamera")]
     public class KeepFacingCamera : MonoBehaviour
     {
         private Vector3 origForwardVector;

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/General/Scripts/Utils/KeepThisAlive.cs

@@ -9,7 +9,7 @@ namespace Microsoft.MixedReality.Toolkit.Examples.Demos.EyeTracking
     /// Enforces to keep this GameObject alive across different scenes.
     /// </summary>
     [System.Obsolete("This component is no longer supported", true)]
-    [AddComponentMenu("Scripts/MRTK/Examples/KeepThisAlive")]
+    [AddComponentMenu("Scripts/MRTK/Obsolete/KeepThisAlive")]
     public class KeepThisAlive : MonoBehaviour
     {
         public static KeepThisAlive Instance { get; private set; }

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/General/Scripts/Utils/StatusText.cs

@@ -6,7 +6,7 @@
 namespace Microsoft.MixedReality.Toolkit.Examples.Demos.EyeTracking
 {
     [System.Obsolete("This component is no longer supported", true)]
-    [AddComponentMenu("Scripts/MRTK/Examples/StatusText")]
+    [AddComponentMenu("Scripts/MRTK/Obsolete/StatusText")]
     public class StatusText : MonoBehaviour
     {
         #region Singleton

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-02-TargetSelection.unity

@@ -816,6 +816,11 @@ PrefabInstance:
       propertyPath: m_isInputParsingRequired
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6489359697116138686, guid: c0931c4da6d91ea429abedb10290dd16,
+        type: 3}
+      propertyPath: assetVersion
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents:
     - {fileID: 1272738663672335838, guid: c0931c4da6d91ea429abedb10290dd16, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: c0931c4da6d91ea429abedb10290dd16, type: 3}
@@ -1069,8 +1074,6 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_text: Eye Tracking Examples
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 6a84f857bec7e7345843ae29404c57ce, type: 2}
@@ -1280,8 +1283,6 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_text: Eye-gaze-supported Target Selections
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 6a84f857bec7e7345843ae29404c57ce, type: 2}
@@ -1669,8 +1670,6 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_text: Gaze & Commit
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: afc8299d5d5bbd440a0616c8ecbc7217, type: 2}
@@ -1880,8 +1879,6 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_text: Simply look at the gems and say "Select" or "Explode". You can also air-tap
     (i.e., pinch your thumb and index finger together) while looking at the gem you
     want to select.
@@ -2207,8 +2204,6 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_text: "With eye tracking, you can effortlessly target objects.\n\nDestroy gems
     as fast as you can.\nDo one of the following: \n   -   Look and air-tap\n   -
     \  Look and say \"Select\" or \"Explode\" \n\n"