Skip to content

Commit

Permalink
Merge pull request #1407 from NeerajW/master
Browse files Browse the repository at this point in the history
Adding Roadmap.md
  • Loading branch information
NeerajW authored Dec 12, 2017
2 parents 405bb16 + 59faa9f commit 4b8b699
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 44 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ You can update message of local commits you haven't pushed yet using git commit

# Pull request

Start a GitHub pull request to merge your topic branch into the [main repository's master branch](https://github.com/Microsoft/HoloToolkit-Unity/tree/master).
Start a GitHub pull request to merge your topic branch into the [main repository's Dev_Working_Branch](https://github.com/Microsoft/HoloToolkit-Unity/tree/Dev_Working_Branch).
(If you are a Microsoft employee and are not a member of the [Microsoft organization on GitHub](https://github.com/Microsoft) yet, please link your Microsoft and GitHub accounts on corpnet by visiting [Open Source at Microsoft](https://opensource.microsoft.com/) before you start your pull request. There's some process stuff you'll need to do ahead of time.)
If you haven't contributed to a Microsoft project before, you may be asked to sign a [contribution license agreement](https://cla.microsoft.com/).
A comment in the PR will let you know if you do.
Expand Down
45 changes: 2 additions & 43 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ _Note: The latest release should work for both HoloLens and Windows Mixed Realit
[unity-version-badge]: https://img.shields.io/badge/Current%20Unity%20Editor%20Version-2017.2.0p1%20MRTP4-green.svg
[![Github Release][unity-version-badge]][unity-download]

> Check out the MRTK [Roadmap](/Roadmap.md) for Unity.
>
> Check out the updates from the [Fall Creators update](/FallCreatorsUpdate.md) for Windows Mixed Reality.
>
> Check out the [Breaking Changes](/BreakingChanges.md) from the previous release.
Expand Down Expand Up @@ -65,49 +67,6 @@ The MRTK includes many great samples and starter scenes to demonstrate the uses

Check out the [Examples](/Assets/HoloToolkit-Examples) folder for more details.

# Roadmaps
### Master branch
| Target Unity release | Release timeframe | Master release tag | Toolkit release features |
| --- | --- | --- | --- |
| 2017.2.0 | (current) | v1.2017.2.0 | <ul><li>Updated master with Windows Mixed Reality support (xR namespace).</li><li>RI Dev_Unity_2017.2.0 into master.</li><li>Toolkit will work on both HoloLens and immersive headsets.</li><li>Windows Mixed Reality motion controller support.</li></ul>|
| 2017.3.0 | End Dec 2017 | v1.2017.3.0 | <ul><li>360 video player prefabs.</li><li>Scriptable foveated rendering prefabs.</li></ul>|

### Dev_Unity_2017.2.0 branch

| Target Unity release | Release timeframe | Branch release tag | Branch pre-release features | Status |
| --- | --- | --- | --- | --- |
| 2017.2.1             | Mid Oct 2017     | v1.Dev.2017.2.1 | <ul><li>Merge branch into master.</li></ul>| Complete |

# Future work planning
- Updating landing page for the ReadMe.md to help app developers find content better.
- Updating API documentation using tools like Doxygen and not writing them manually. This is something we will work with all of you on.
- Update Wiki to host API documentation instead.
- Move reusable features from [Mixed Reality Design Labs](https://github.com/Microsoft/MRDesignLabs_Unity) project into toolkit.
- Improved samples and test cases

# Release cadence
### Master branch
- **Master branch releases** will align with **major Unity releases marking a release every 3 months**. Please read the [Unity roadmap](https://unity3d.com/unity/roadmap).
- Each release will be marked as a GitHub [release tag](https://github.com/Microsoft/HoloToolkit-Unity/releases). You can consume this release by:
- Using the zip file available in the release notes
- Unity packages available in the release notes
- Syncing to the specific git tag you would like to lock on.
- Release tag name convention: v1.Unity release major number.Unity release minor number.Iteration number
- For example: For Unity version 2017.1.0 our release tag would be **v1.2017.1.0**
- If we marked another release with the same Unity version: **v1.2017.1.1**
- Unity packages for each release will be published to the Unity asset store.
- Unity packages for each feature area like Input/SpatialMapping will also be added to the release notes.
- Academy content will be updated with each major toolkit release.

### Development branches
- Development branches are great for incubating features before they make their way into master.
- These branches can be feature work or experimental features.
- Development branches might not be on the same Unity versions as master.
- For being merged into Master the dev branch will have to follow the cadence laid out for master.
- Development branches might choose to mark releases on a faster cadence based on customer/project needs.
- Recommend marking a development branch tag every 2 weeks as needed to ensure stability before making up to master.
- Development branches might be deleted once merged into master. If more work is pending, it's ok to continue working in them.

**External\How To** docs folder is meant to help everyone with migrating forward or any simple doubts they might have about the process.
Please feel free to grow all these sections. We can't wait to see your additions!

Expand Down
51 changes: 51 additions & 0 deletions Roadmap.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# Roadmap

### Master branch
| Target Unity release | Release timeframe | Master release tag | Toolkit release features |
| --- | --- | --- | --- |
| 2017.2.0 | COMPLETED | v1.2017.2.0 | <ul><li>Updated master with Windows Mixed Reality support (xR namespace).</li><li>RI Dev_Unity_2017.2.0 into master.</li><li>Toolkit will work on both HoloLens and immersive headsets.</li><li>Windows Mixed Reality motion controller support.</li></ul>|
| 2017.3.0 | End Dec 2017 | 2017.3.0 | <ul><li>360 video player prefabs.</li><li>Scriptable foveated rendering prefabs.</li></ul>|

### Dev_Unity_2017.2.0 branch - COMPLETED

| Target Unity release | Release timeframe | Branch release tag | Branch pre-release features | Status |
| --- | --- | --- | --- | --- |
| 2017.2.1             | Mid Oct 2017     | v1.Dev.2017.2.1 | <ul><li>Merge branch into master.</li></ul>| COMPLETED |

# Future work planning
- Automated build for MRTK-Unity.
- Unity packages for each release will be published to the Unity asset store.
- Unity packages for each feature area like Input/SpatialMapping will also be added to the release notes. More work needs to happen to ensure feature areas don't have cross dependencies.
- [Academy content](https://github.com/Microsoft/HolographicAcademy) will be updated with each major toolkit release.
- Updating API documentation using tools like Doxygen and not writing them manually. This is something we will work with all of you on.
- Update Wiki to host API documentation instead.
- Move reusable features from [Mixed Reality Design Labs](https://github.com/Microsoft/MRDesignLabs_Unity) project into toolkit.
- Improved samples and test cases

# Release cadence
### Master branch
- **No direct PR's into master branch.** It will be locked and only merges from stable development branches will be taken.
- Exception will be major bug fixes on a case by case basis.
- Please use the [working development branch](https://github.com/Microsoft/MixedRealityToolkit-Unity/tree/Dev_Working_Branch) for daily feature work.
- [Working development branch](https://github.com/Microsoft/MixedRealityToolkit-Unity/tree/Dev_Working_Branch) will be snapshot every 3 weeks for stabilization into a separate branch. Working branch will still be open for contributions.
- That stabilization branch will be worked on for at least 1 week.
- Only bug fixes will be accepted in the stabilization branch before being merged into master.

- **Master branch releases** will align with **major Unity releases marking a release every 3 months**. Please read the [Unity roadmap](https://unity3d.com/unity/roadmap).
- Each release will be marked as a GitHub [release tag](https://github.com/Microsoft/HoloToolkit-Unity/releases). You can consume this release by:
- Using the zip file available in the release notes
- Unity packages available in the release notes
- Syncing to the specific git tag you would like to lock on.
- Release tag name convention: <Unity release major number>.<Unity release minor number>.Iteration number
- For example: For Unity version 2017.1.0 our release tag would be **2017.1.0.0**
- If we marked another release with the same Unity version: **2017.1.0.1**


### Development branches
- Development branches are great for incubating features before they make their way into master.
- These branches can be feature work or experimental features.
- Development branches might not be on the same Unity versions as master.
- For being merged into Master the dev branch will have to follow the cadence laid out for master.
- Development branches might choose to mark releases on a faster cadence based on customer/project needs.
- Recommend marking a development branch tag every 2-3 weeks as needed to ensure stability before making up to master.
- Development branches might be deleted once merged into master. If more work is pending, it's ok to continue working in them.

0 comments on commit 4b8b699

Please sign in to comment.