Skip to content

Commit 5e03898

Browse files
authored
Merge pull request #9063 from keveleigh/2.5.2-docs
Update versioning to 2.5.2
2 parents 260fd66 + 9895d9a commit 5e03898

File tree

7 files changed

+27
-27
lines changed

7 files changed

+27
-27
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) Microsoft Corporation.
1+
// Copyright (c) Microsoft Corporation.
22
// Licensed under the MIT License.
33

44
using Microsoft.MixedReality.Toolkit.Build.Editor;
@@ -26,7 +26,7 @@ class UwpAppxBuildToolsTest
2626
xmlns:mobile='http://schemas.microsoft.com/appx/manifest/mobile/windows10'
2727
IgnorableNamespaces='uap uap2 uap3 uap4 mp mobile iot'
2828
xmlns='http://schemas.microsoft.com/appx/manifest/foundation/windows10'>
29-
<Identity Name='Microsoft.MixedReality.Toolkit' Publisher='CN=Microsoft' Version='2.5.1.0' />
29+
<Identity Name='Microsoft.MixedReality.Toolkit' Publisher='CN=Microsoft' Version='2.5.2.0' />
3030
<mp:PhoneIdentity PhoneProductId='85c8bcd4-fbac-44ed-adf6-bfc01242a27f' PhonePublisherId='00000000-0000-0000-0000-000000000000' />
3131
<Properties>
3232
<DisplayName>MixedRealityToolkit</DisplayName>

Documentation/Contributing/Roadmap.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This document outlines the roadmap of the Mixed Reality Toolkit. Please note tha
44

55
## Current release
66

7-
[Microsoft Mixed Reality Toolkit v2.5.1](https://github.com/Microsoft/MixedRealityToolkit-Unity/releases/tag/v2.5.1)
7+
[Microsoft Mixed Reality Toolkit v2.5.2](https://github.com/Microsoft/MixedRealityToolkit-Unity/releases/tag/v2.5.2)
88

99
## Upcoming releases
1010

@@ -45,26 +45,26 @@ Quality and stability are the top priority for this and all Microsoft Mixed Real
4545
**User Experience**
4646

4747
We're listening to your feedback about MRTK and have continued plans for:
48+
4849
- Bug fixes
4950
- Making MRTK UX controls easier to understand
5051
- HoloLens Shell parity
5152
- Tests to ensure features do not regress
5253

5354
**Platform Expansion: OpenXR**
5455

55-
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.
56+
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.
5657

5758
**Developer Education**
5859

59-
[Developer documentation](https://microsoft.github.io/MixedRealityToolkit-Unity) and example scenes are an ongoing priority for the MRTK team.
60+
[Developer documentation](https://microsoft.github.io/MixedRealityToolkit-Unity) and example scenes are an ongoing priority for the MRTK team.
6061

61-
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.
62+
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.
6263

6364
**Packaging**
6465

6566
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.
6667

67-
6868
## Backlog
6969

7070
The following list highlights some of the key investments the MRTK team intends to pursue.

Documentation/ReleaseNotes.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Microsoft Mixed Reality Toolkit 2.5.1 release notes
1+
# Microsoft Mixed Reality Toolkit 2.5.2 release notes
22

33
- [What's new](#whats-new)
44
- [Breaking changes](#breaking-changes)
@@ -7,9 +7,8 @@
77

88
> [!IMPORTANT]
99
> There is a known compiler issue that impacts applications built for Microsoft HoloLens 2 using
10-
> ARM64. This issue is fixed by updating Visual Studio 2019 to version 16.8 or later. If you are unable to update Visual Studio,
11-
> please import the `com.microsoft.mixedreality.toolkit.tools` package to apply
12-
> a workaround.
10+
> ARM64. This issue is fixed by updating Visual Studio 2019 to version 16.8 or later. If you are unable to update Visual Studio,
11+
> please import the `com.microsoft.mixedreality.toolkit.tools` package to apply a workaround.
1312
1413
## What's new
1514

@@ -27,7 +26,7 @@ This release fixes an [issue](https://github.com/microsoft/MixedRealityToolkit-U
2726

2827
## Breaking changes
2928

30-
There are no breaking changes since version 2.5.0.
29+
There are no breaking changes since version 2.5.1.
3130

3231
## Known issues
3332

Documentation/usingupm.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ Starting with version 2.5.0, the Microsoft Mixed Reality Toolkit is available us
77
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.
88

99
> [!Note]
10-
> 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.
11-
>
10+
> Initial registration of the server and packages is a per-project, manual procedure, please read the following sections for detailed instructions.
11+
>
1212
> This process is required due to UPM's use of legacy npm search functionality (/-/all) that is not supported by Azure DevOps.
1313
1414
### Registering the Mixed Reality component server
@@ -18,7 +18,7 @@ For each project that will be using the Microsoft Mixed Reality Toolkit, the `ma
1818
1. Open `<projectRoot>/Packages/manifest.json` in a text editor, such as [Visual Studio Code](https://code.visualstudio.com/).
1919
1. At the top of the manifest file, add the Mixed Reality server to the scoped registry section and save the file.
2020

21-
```
21+
```json
2222
{
2323
"scopedRegistries": [
2424
{
@@ -40,17 +40,17 @@ The [Unity Package Manager](Packaging/MRTK_Packages.md#unity-package-manager) se
4040

4141
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.
4242

43-
```
43+
```json
4444
"dependencies": {
45-
"com.microsoft.mixedreality.toolkit.foundation": "2.5.1",
46-
"com.microsoft.mixedreality.toolkit.tools": "2.5.1",
47-
"com.microsoft.mixedreality.toolkit.examples": "2.5.1",
45+
"com.microsoft.mixedreality.toolkit.foundation": "2.5.2",
46+
"com.microsoft.mixedreality.toolkit.tools": "2.5.2",
47+
"com.microsoft.mixedreality.toolkit.examples": "2.5.2",
4848
```
49+
4950
> [!IMPORTANT]
5051
> There is a known compiler issue that impacts applications built for Microsoft HoloLens 2 using
51-
> ARM64. This issue is addressed in the forthcoming 16.8 update for Visual Studio 2019. Until the
52-
> update is available, please import the `com.microsoft.mixedreality.toolkit.tools` package to apply
53-
> a workaround.
52+
> ARM64. This issue is fixed by updating Visual Studio 2019 to version 16.8 or later. If you are unable to update Visual Studio,
53+
> please import the `com.microsoft.mixedreality.toolkit.tools` package to apply a workaround.
5454

5555
## Managing Mixed Reality features with the Unity Package Manager
5656

ProjectSettings/ProjectSettings.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ PlayerSettings:
118118
16:10: 1
119119
16:9: 1
120120
Others: 1
121-
bundleVersion: 2.5.1
121+
bundleVersion: 2.5.2
122122
preloadedAssets: []
123123
metroInputSource: 0
124124
wsaTransparentSwapchain: 0
@@ -687,7 +687,7 @@ PlayerSettings:
687687
m_RenderingPath: 1
688688
m_MobileRenderingPath: 1
689689
metroPackageName: Microsoft.MixedReality.Toolkit
690-
metroPackageVersion: 2.5.1.0
690+
metroPackageVersion: 2.5.2.0
691691
metroCertificatePath: Assets/WSATestCertificate.pfx
692692
metroCertificatePassword:
693693
metroCertificateSubject: Microsoft

pipelines/config/settings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ variables:
1111
# match (see scripts/packaging/versionmetadata.ps1)
1212
# ProjectSettings/ProjectSettings.asset: bundleVersion: x.x.x
1313
# ProjectSettings/ProjectSettings.asset: metroPackageVersion: x.x.x.0
14-
MRTKVersion: 2.5.1
14+
MRTKVersion: 2.5.2
1515
MRTKReleaseTag: '' # final version component, e.g. 'RC2.1' or empty string
1616
ToolsRepoName: mixedrealitytoolkit.build
1717
ToolsDir: $(Build.SourcesDirectory)\$(ToolsRepoName)

scripts/docs/web/version.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
function createDropdown()
22
{
33
// configurable values:
4-
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
4+
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
55

66
// list of all versions in the version folder
77
var versionArray = [
@@ -12,7 +12,8 @@ function createDropdown()
1212
"releases/2.3.0",
1313
"releases/2.4.0",
1414
"releases/2.5.0",
15-
"releases/2.5.1"
15+
"releases/2.5.1",
16+
"releases/2.5.2",
1617
];
1718

1819
var ignoreDefaultInVersionFolder = true;

0 commit comments

Comments
 (0)