Merge pull request #9085 from keveleigh/revert-oculushand

Revert "Merge pull request #9075 from RogPodge/oculushandrayfix" for 2.5.3

Assets/MRTK/Providers/Oculus/XRSDK/MRTK-Quest/Scripts/Input/Controllers/OculusHand.cs

@@ -182,9 +182,6 @@ protected bool IsInTeleportPose
             }
         }
 
-        /// <inheritdoc/>
-        public override bool IsInPointingPose => handDefinition.IsInPointingPose;
-
         protected bool IsPinching { set; get; }
 
         // Pinch was also used as grab, we want to allow hand-curl grab not just pinch.

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.2.0' />
+              <Identity Name='Microsoft.MixedReality.Toolkit' Publisher='CN=Microsoft' Version='2.5.3.0' />
               <mp:PhoneIdentity PhoneProductId='85c8bcd4-fbac-44ed-adf6-bfc01242a27f' PhonePublisherId='00000000-0000-0000-0000-000000000000' />
               <Properties>
                 <DisplayName>MixedRealityToolkit</DisplayName>

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.2](https://github.com/Microsoft/MixedRealityToolkit-Unity/releases/tag/v2.5.2)
+[Microsoft Mixed Reality Toolkit v2.5.3](https://github.com/Microsoft/MixedRealityToolkit-Unity/releases/tag/v2.5.3)
 
 ## Upcoming releases
 

Documentation/ReleaseNotes.md

@@ -1,4 +1,4 @@
-# Microsoft Mixed Reality Toolkit 2.5.2 release notes
+# Microsoft Mixed Reality Toolkit 2.5.3 release notes
 
 - [What's new](#whats-new)
 - [Updating guidance](Updating.md#upgrading-to-a-new-version-of-mrtk)
@@ -11,6 +11,10 @@
 
 ## What's new
 
+### 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.
+
 ### Add support for OpenXR
 
 Initial support for Unity's OpenXR preview package and Microsoft's Mixed Reality OpenXR package has been added. See [the MRTK/XRSDK getting started page](GettingStartedWithMRTKAndXRSDK.md), [Unity's forum post](https://forum.unity.com/threads/unity-support-for-openxr-in-preview.1023613/), or [Microsoft's documentation](https://aka.ms/openxr-unity-install) for more information.
@@ -26,7 +30,7 @@ Boundary visualizations, like the floor or walls, will now be properly configure
 
 ### MSBuild for Unity support
 
-Support for MSBuild for Unity has been removed in the 2.5.2 release, to align with [Unity's new package guidance](https://forum.unity.com/threads/updates-to-our-terms-of-service-and-new-package-guidelines.999940/).
+Support for MSBuild for Unity has been removed as of the 2.5.2 release, to align with [Unity's new package guidance](https://forum.unity.com/threads/updates-to-our-terms-of-service-and-new-package-guidelines.999940/).
 
 ## Known issues
 

Documentation/usingupm.md

@@ -42,9 +42,9 @@ To add an MRTK package, modify the dependencies section of the `Packages/manifes
 
 ```json
   "dependencies": {
-    "com.microsoft.mixedreality.toolkit.foundation": "2.5.2",
-    "com.microsoft.mixedreality.toolkit.tools": "2.5.2",
-    "com.microsoft.mixedreality.toolkit.examples": "2.5.2",
+    "com.microsoft.mixedreality.toolkit.foundation": "2.5.3",
+    "com.microsoft.mixedreality.toolkit.tools": "2.5.3",
+    "com.microsoft.mixedreality.toolkit.examples": "2.5.3",
 ```
 
 > [!IMPORTANT]

ProjectSettings/ProjectSettings.asset

@@ -118,7 +118,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 2.5.2
+  bundleVersion: 2.5.3
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -687,7 +687,7 @@ PlayerSettings:
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
   metroPackageName: Microsoft.MixedReality.Toolkit
-  metroPackageVersion: 2.5.2.0
+  metroPackageVersion: 2.5.3.0
   metroCertificatePath: Assets/WSATestCertificate.pfx
   metroCertificatePassword: 
   metroCertificateSubject: Microsoft

pipelines/config/settings.yml

@@ -11,7 +11,7 @@ variables:
   # match (see scripts/packaging/versionmetadata.ps1)
   # ProjectSettings/ProjectSettings.asset:  bundleVersion: x.x.x
   # ProjectSettings/ProjectSettings.asset:  metroPackageVersion: x.x.x.0
-  MRTKVersion: 2.5.2
+  MRTKVersion: 2.5.3
   MRTKReleaseTag: ''  # final version component, e.g. 'RC2.1' or empty string
   ToolsRepoName: mixedrealitytoolkit.build
   ToolsDir: $(Build.SourcesDirectory)\$(ToolsRepoName)

scripts/docs/web/version.js

@@ -1,7 +1,7 @@
 function createDropdown()
 {
 	// configurable values:
-	var defaultTitle = "releases/2.5.2"; // title in the dropdown for the root version of the docs - alternatively put a version from the version array as a default
+	var defaultTitle = "releases/2.5.3"; // title in the dropdown for the root version of the docs - alternatively put a version from the version array as a default
 
 	// list of all versions in the version folder
 	var versionArray = [
@@ -14,6 +14,7 @@ function createDropdown()
 		"releases/2.5.0",
 		"releases/2.5.1",
 		"releases/2.5.2",
+		"releases/2.5.3",
 	];
 
 	var ignoreDefaultInVersionFolder = true;