Merge pull request microsoft#9063 from keveleigh/2.5.2-docs

Update versioning to 2.5.2

Assets/MRTK/Tests/EditModeTests/Core/Utilities/BuildAndDeploy/UwpAppxBuildToolsTest.cs

@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation.
+// Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
 using Microsoft.MixedReality.Toolkit.Build.Editor;
@@ -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.1.0' />
+              <Identity Name='Microsoft.MixedReality.Toolkit' Publisher='CN=Microsoft' Version='2.5.2.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.1](https://github.com/Microsoft/MixedRealityToolkit-Unity/releases/tag/v2.5.1)
+[Microsoft Mixed Reality Toolkit v2.5.2](https://github.com/Microsoft/MixedRealityToolkit-Unity/releases/tag/v2.5.2)
 
 ## Upcoming releases
 
@@ -45,26 +45,26 @@ Quality and stability are the top priority for this and all Microsoft Mixed Real
 **User Experience**
 
 We're listening to your feedback about MRTK and have continued plans for:
+
 - Bug fixes
 - Making MRTK UX controls easier to understand
 - HoloLens Shell parity
 - Tests to ensure features do not regress
 
 **Platform Expansion: OpenXR**
 
-The MRTK team supports the open future of mixed reality through [OpenXR](https://techcommunity.microsoft.com/t5/mixed-reality-blog/moving-forward-to-openxr/ba-p/1825672). Support for OpenXR is currently under development. 
+The MRTK team supports the open future of mixed reality through [OpenXR](https://techcommunity.microsoft.com/t5/mixed-reality-blog/moving-forward-to-openxr/ba-p/1825672). Support for OpenXR is currently under development, with initial preview support released in MRTK 2.5.2.
 
 **Developer Education**
 
-[Developer documentation](https://microsoft.github.io/MixedRealityToolkit-Unity) and example scenes are an ongoing priority for the MRTK team. 
+[Developer documentation](https://microsoft.github.io/MixedRealityToolkit-Unity) and example scenes are an ongoing priority for the MRTK team.
 
-With continued investments in [MRTK tutorials](https://docs.microsoft.com/en-us/windows/mixed-reality/develop/unity/tutorials), the MRTK team seeks to accelerate the getting started experience for developers and improve instructions on how to leverage Azure Services and other extensions with the MRTK.
+With continued investments in [MRTK tutorials](https://docs.microsoft.com/windows/mixed-reality/develop/unity/tutorials), the MRTK team seeks to accelerate the getting started experience for developers and improve instructions on how to leverage Azure Services and other extensions with the MRTK.
 
 **Packaging**
 
 In MRTK 2.5.0 we released support for Unity Package Manager (UPM). We are continuing to make improvements so it's even easier for you to download packages with UPM.
 
-
 ## Backlog
 
 The following list highlights some of the key investments the MRTK team intends to pursue.

Documentation/ReleaseNotes.md

@@ -1,4 +1,4 @@
-# Microsoft Mixed Reality Toolkit 2.5.1 release notes
+# Microsoft Mixed Reality Toolkit 2.5.2 release notes
 
 - [What's new](#whats-new)
 - [Breaking changes](#breaking-changes)
@@ -7,9 +7,8 @@
 
 > [!IMPORTANT]
 > There is a known compiler issue that impacts applications built for Microsoft HoloLens 2 using
-> ARM64. This issue is fixed by updating Visual Studio 2019 to version 16.8 or later. If you are unable to update Visual Studio, 
-> please import the `com.microsoft.mixedreality.toolkit.tools` package to apply 
-> a workaround.
+> ARM64. This issue is fixed by updating Visual Studio 2019 to version 16.8 or later. If you are unable to update Visual Studio,
+> please import the `com.microsoft.mixedreality.toolkit.tools` package to apply a workaround.
 
 ## What's new
 
@@ -27,7 +26,7 @@ This release fixes an [issue](https://github.com/microsoft/MixedRealityToolkit-U
 
 ## Breaking changes
 
-There are no breaking changes since version 2.5.0.
+There are no breaking changes since version 2.5.1.
 
 ## Known issues
 

Documentation/usingupm.md

@@ -7,8 +7,8 @@ Starting with version 2.5.0, the Microsoft Mixed Reality Toolkit is available us
 The Unity Package Manager uses a [manifest file](https://docs.unity3d.com/Manual/upm-manifestPkg.html) (manifest.json) to determine which packages to install and the registries (servers) from which they can be installed.
 
 > [!Note]
-> As of version 2.5.1 of the MRTK, initial registration of the server and packages is a per-project, manual procedure, please read the following sections for detailed instructions.
-> 
+> Initial registration of the server and packages is a per-project, manual procedure, please read the following sections for detailed instructions.
+>
 > This process is required due to UPM's use of legacy npm search functionality (/-/all) that is not supported by Azure DevOps.
 
 ### Registering the Mixed Reality component server
@@ -18,7 +18,7 @@ For each project that will be using the Microsoft Mixed Reality Toolkit, the `ma
 1. Open `<projectRoot>/Packages/manifest.json` in a text editor, such as [Visual Studio Code](https://code.visualstudio.com/).
 1. At the top of the manifest file, add the Mixed Reality server to the scoped registry section and save the file.
 
-```
+```json
 {
   "scopedRegistries": [
     {
@@ -40,17 +40,17 @@ The [Unity Package Manager](Packaging/MRTK_Packages.md#unity-package-manager) se
 
 To add an MRTK package, modify the dependencies section of the `Packages/manifest.json` file. The following example illustrates adding the foundation, tools and examples packages, the standard assets package will be added automatically as a dependency of the foundation.
 
-```
+```json
   "dependencies": {
-    "com.microsoft.mixedreality.toolkit.foundation": "2.5.1",
-    "com.microsoft.mixedreality.toolkit.tools": "2.5.1",
-    "com.microsoft.mixedreality.toolkit.examples": "2.5.1",
+    "com.microsoft.mixedreality.toolkit.foundation": "2.5.2",
+    "com.microsoft.mixedreality.toolkit.tools": "2.5.2",
+    "com.microsoft.mixedreality.toolkit.examples": "2.5.2",
 ```
+
 > [!IMPORTANT]
 > There is a known compiler issue that impacts applications built for Microsoft HoloLens 2 using
-> ARM64. This issue is addressed in the forthcoming 16.8 update for Visual Studio 2019. Until the 
-> update is available, please import the `com.microsoft.mixedreality.toolkit.tools` package to apply 
-> a workaround.
+> ARM64. This issue is fixed by updating Visual Studio 2019 to version 16.8 or later. If you are unable to update Visual Studio,
+> please import the `com.microsoft.mixedreality.toolkit.tools` package to apply a workaround.
 
 ## Managing Mixed Reality features with the Unity Package Manager
 

ProjectSettings/ProjectSettings.asset

@@ -118,7 +118,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 2.5.1
+  bundleVersion: 2.5.2
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -687,7 +687,7 @@ PlayerSettings:
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
   metroPackageName: Microsoft.MixedReality.Toolkit
-  metroPackageVersion: 2.5.1.0
+  metroPackageVersion: 2.5.2.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.1
+  MRTKVersion: 2.5.2
   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.1"; // 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.2"; // 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 = [
@@ -12,7 +12,8 @@ function createDropdown()
 		"releases/2.3.0",
 		"releases/2.4.0",
 		"releases/2.5.0",
-		"releases/2.5.1"
+		"releases/2.5.1",
+		"releases/2.5.2",
 	];
 
 	var ignoreDefaultInVersionFolder = true;