Automated commit for release version 1.1.33

NativeCpp/HoloLens-OpenXr/samples/BasicXrApp/BasicXrApp_uwp.targets

@@ -1,9 +1,9 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Redirect to the nuget .targets and .props file -->
-  <Import Project="$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.1.32\build\microsoft.azure.remoterendering.Cpp.props" Condition="Exists('$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.1.32\build\microsoft.azure.remoterendering.Cpp.props')" />
+  <Import Project="$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.1.33\build\microsoft.azure.remoterendering.Cpp.props" Condition="Exists('$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.1.33\build\microsoft.azure.remoterendering.Cpp.props')" />
 
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.1.32\build\microsoft.azure.remoterendering.Cpp.targets" Condition="Exists('$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.1.32\build\microsoft.azure.remoterendering.Cpp.targets')" />
+    <Import Project="$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.1.33\build\microsoft.azure.remoterendering.Cpp.targets" Condition="Exists('$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.1.33\build\microsoft.azure.remoterendering.Cpp.targets')" />
   </ImportGroup>
 
 </Project>

NativeCpp/HoloLens-OpenXr/samples/BasicXrApp/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Azure.RemoteRendering.Cpp" version="1.1.32" targetFramework="native" />
+  <package id="Microsoft.Azure.RemoteRendering.Cpp" version="1.1.33" targetFramework="native" />
   <package id="OpenXR.Headers" version="1.0.10.2" targetFramework="native" />
   <package id="OpenXR.Loader" version="1.0.10.2" targetFramework="native" />
 </packages>

NativeCpp/HoloLens-Wmr/HolographicApp.targets

@@ -1,9 +1,9 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Redirect to the nuget .targets and .props file -->
-  <Import Project="$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.1.32\build\microsoft.azure.remoterendering.Cpp.props" Condition="Exists('$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.1.32\build\microsoft.azure.remoterendering.Cpp.props')" />
+  <Import Project="$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.1.33\build\microsoft.azure.remoterendering.Cpp.props" Condition="Exists('$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.1.33\build\microsoft.azure.remoterendering.Cpp.props')" />
 
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.1.32\build\microsoft.azure.remoterendering.Cpp.targets" Condition="Exists('$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.1.32\build\microsoft.azure.remoterendering.Cpp.targets')" />
+    <Import Project="$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.1.33\build\microsoft.azure.remoterendering.Cpp.targets" Condition="Exists('$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.1.33\build\microsoft.azure.remoterendering.Cpp.targets')" />
   </ImportGroup>
 
 </Project>

NativeCpp/HoloLens-Wmr/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.200729.8" targetFramework="native" />
-  <package id="Microsoft.Azure.RemoteRendering.Cpp" version="1.1.32" targetFramework="native" />
+  <package id="Microsoft.Azure.RemoteRendering.Cpp" version="1.1.33" targetFramework="native" />
 </packages>

Scripts/unity_sample_dependencies.json

@@ -62,7 +62,7 @@
     },
     {
       "name": "com.microsoft.azure.remote-rendering",
-      "version": "1.1.32",
+      "version": "1.1.33",
       "registry": "https://pkgs.dev.azure.com/aipmr/MixedReality-Unity-Packages/_packaging/Unity-packages/npm/registry"
     }
   ]

Unity/Quickstart/Packages/manifest.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.microsoft.azure.remote-rendering": "file:../../MRPackages/com.microsoft.azure.remote-rendering-1.1.32.tgz",
+    "com.microsoft.azure.remote-rendering": "file:../../MRPackages/com.microsoft.azure.remote-rendering-1.1.33.tgz",
     "com.microsoft.mixedreality.openxr": "file:../../MRPackages/com.microsoft.mixedreality.openxr-1.3.1.tgz",
     "com.unity.ide.rider": "2.0.7",
     "com.unity.ide.visualstudio": "2.0.17",

Unity/Showcase/App/Assets/App/Menu/Scripts/CloseModelsMenuOnClick.cs

@@ -40,9 +40,6 @@ private void CloseModelsMenu()
         {
             // close menu
             handMenuHooks.ClearMenu();
-
-            // set current mode to "none" so you don't accidentally delete or move the model
-            AppServices.PointerStateService.Mode = PointerMode.None;
         }
     }
     #endregion Private Functions

Unity/Showcase/App/Assets/App/Profiles/RemotingDesktopConfigurationProfile.asset

@@ -22,7 +22,7 @@ MonoBehaviour:
     reference: Microsoft.MixedReality.Toolkit.CameraSystem.MixedRealityCameraSystem,
       Microsoft.MixedReality.Toolkit.Services.CameraSystem
   enableInputSystem: 1
-  inputSystemProfile: {fileID: 11400000, guid: ff0845faa1cbfe348a4bb60b9383a917, type: 2}
+  inputSystemProfile: {fileID: 11400000, guid: 47dbd10df5632c44d8652b14431539f7, type: 2}
   inputSystemType:
     reference: Microsoft.MixedReality.Toolkit.Input.MixedRealityInputSystem, Microsoft.MixedReality.Toolkit.Services.InputSystem
   enableBoundarySystem: 0

Unity/Showcase/App/Assets/App/Profiles/RemotingDesktopMixedRealityInputSystemProfile.asset

@@ -0,0 +1,61 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b71cb900fa9dec5488df2deb180db58f, type: 3}
+  m_Name: RemotingDesktopMixedRealityInputSystemProfile
+  m_EditorClassIdentifier: 
+  isCustomProfile: 1
+  dataProviderConfigurations:
+  - componentType:
+      reference: Microsoft.MixedReality.Toolkit.WindowsMixedReality.Input.WindowsMixedRealityDeviceManager,
+        Microsoft.MixedReality.Toolkit.Providers.WindowsMixedReality
+    componentName: Windows Mixed Reality Device Manager
+    priority: 0
+    runtimePlatform: 8
+    deviceManagerProfile: {fileID: 0}
+  - componentType:
+      reference: Microsoft.MixedReality.Toolkit.OpenVR.Input.OpenVRDeviceManager,
+        Microsoft.MixedReality.Toolkit.Providers.OpenVR
+    componentName: OpenVR Device Manager
+    priority: 0
+    runtimePlatform: 7
+    deviceManagerProfile: {fileID: 0}
+  - componentType:
+      reference: Microsoft.MixedReality.Toolkit.Input.UnityInput.MouseDeviceManager,
+        Microsoft.MixedReality.Toolkit
+    componentName: Unity Mouse Device Manager
+    priority: 0
+    runtimePlatform: -1
+    deviceManagerProfile: {fileID: 11400000, guid: cc2a0fa97d2f9f14996ffd20776bab57,
+      type: 2}
+  focusProviderType:
+    reference: Microsoft.MixedReality.Toolkit.Input.RemoteFocusProviderNoCollider,
+      Assembly-CSharp
+  raycastProviderType:
+    reference: Microsoft.MixedReality.Toolkit.Input.DefaultRaycastProvider, Microsoft.MixedReality.Toolkit.Services.InputSystem
+  focusQueryBufferSize: 128
+  shouldUseGraphicsRaycast: 1
+  focusIndividualCompoundCollider: 0
+  inputActionsProfile: {fileID: 11400000, guid: 723eb97b02944311b92861f473eee53e,
+    type: 2}
+  inputActionRulesProfile: {fileID: 11400000, guid: 03945385d89102f41855bc8f5116b199,
+    type: 2}
+  pointerProfile: {fileID: 11400000, guid: 7675c9e1a16189e4a8112f3dbe7845ef, type: 2}
+  gesturesProfile: {fileID: 11400000, guid: bd7829a9b29409045a745b5a18299291, type: 2}
+  speechCommandsProfile: {fileID: 11400000, guid: f91cc56052923bd49814bb7937153cb4,
+    type: 2}
+  enableControllerMapping: 1
+  controllerMappingProfile: {fileID: 11400000, guid: 8237c848ef7592341960b70cb43d05b6,
+    type: 2}
+  controllerVisualizationProfile: {fileID: 11400000, guid: 345c06fdf3732db46b96299bd3cba653,
+    type: 2}
+  handTrackingProfile: {fileID: 11400000, guid: a00bc5590b88d854d959006e1da7d27d,
+    type: 2}

Unity/Showcase/App/Assets/App/Profiles/RemotingMixedRealityInputPointerProfile.asset

@@ -24,7 +24,7 @@ MonoBehaviour:
   - {r: 0, g: 1, b: 0.2163105, a: 1}
   - {r: 0, g: 0.3028021, b: 1, a: 1}
   - {r: 0.44855833, g: 0, b: 1, a: 1}
-  gazeCursorPrefab: {fileID: 7595626493485288418, guid: dcd2751b9256e93498f05f4e489c31a3,
+  gazeCursorPrefab: {fileID: 3908768167658931896, guid: f7657f5acf012aa4a868b19616cb58c8,
     type: 3}
   gazeProviderType:
     reference: Microsoft.MixedReality.Toolkit.Input.GazeProvider, Microsoft.MixedReality.Toolkit.Services.InputSystem

Unity/Showcase/App/Assets/App/Profiles/RemotingMixedRealityInputSimulationProfile.asset

@@ -22,7 +22,7 @@ MonoBehaviour:
     bindingType: 1
     code: 0
   doublePressTime: 0.4
-  isHandsFreeInputEnabled: 0
+  isHandsFreeInputEnabled: 1
   isCameraControlEnabled: 1
   mouseLookSpeed: 3
   mouseLookButton:

Unity/Showcase/App/Assets/App/Profiles/RemotingMixedRealityInputSystemProfile.asset

@@ -104,14 +104,6 @@ MonoBehaviour:
     priority: 0
     runtimePlatform: -1
     deviceManagerProfile: {fileID: 0}
-  - componentType:
-      reference: Microsoft.MixedReality.Toolkit.Input.UnityInput.MouseDeviceManager,
-        Microsoft.MixedReality.Toolkit
-    componentName: Unity Mouse Device Manager
-    priority: 0
-    runtimePlatform: -1
-    deviceManagerProfile: {fileID: 11400000, guid: cc2a0fa97d2f9f14996ffd20776bab57,
-      type: 2}
   focusProviderType:
     reference: Microsoft.MixedReality.Toolkit.Input.RemoteFocusProviderNoCollider,
       Assembly-CSharp

Unity/Showcase/App/Assets/App/Services/Interfaces/IPointerStateService.cs

@@ -32,6 +32,11 @@ public interface IPointerStateService : IMixedRealityExtensionService
         /// </summary>
         void SetModeWithData(PointerMode mode, object modeData);
 
+        /// <summary>
+        /// Set the pointer mode and associate data to the previous state.
+        /// </summary>
+        void RestorePreviousMode();
+
         /// <summary>
         /// Prevent the given pointer type from being shown/used. If ShowPointer() is called after this, the pointer
         /// will be shown until the caller of ShowPointer() disposes its IPointerStateVisibilityOverride object.

Unity/Showcase/App/Assets/App/Services/PointerStateService.cs

@@ -14,6 +14,8 @@ public class PointerStateService : BaseExtensionService, IPointerStateService, I
 	{
 		private PointerStateServiceProfile _pointerStateServiceProfile;
         private PointerMode _mode = PointerMode.None;
+        private PointerMode _previousMode = PointerMode.None;
+        private object _previousModeData = null;
         private readonly Dictionary<PointerType, List<PointerStateVisibilityOverride>> _visibilityOverrideRequests =
             new Dictionary<PointerType, List<PointerStateVisibilityOverride>>();
 
@@ -38,7 +40,7 @@ public PointerMode Mode
         /// <summary>
         /// Get or set mode data for the current mode.
         /// </summary>
-        public System.Object ModeData { get; private set; }
+        public object ModeData { get; private set; }
         #endregion IPointerStateService Properties
 
         #region IPointerStateService Event
@@ -54,14 +56,21 @@ public PointerMode Mode
        /// </summary>
         public void SetModeWithData(PointerMode mode, object modeData)
         {
-            var oldData = ModeData;
+            _previousModeData = ModeData;
             ModeData = modeData;
 
-            var oldMode = _mode;
+            _previousMode = _mode;
             _mode = mode;
+
             // Always fire changed event, even if _mode hasn't really changed. Resetting the mode to the same value can
             // have meaning. For example, resetting "clip" mode can reset the clipping plane position.
-            ModeChanged?.Invoke(this, new PointerModeChangedEventData(oldMode, oldData, _mode, ModeData));
+            ModeChanged?.Invoke(this, new PointerModeChangedEventData(_previousMode, _previousModeData, _mode, ModeData));
+        }
+
+        /// <inheritdoc/>
+        public void RestorePreviousMode()
+        {
+            SetModeWithData(_previousMode, _previousModeData);
         }
 
         /// <summary>