Skip to content

Commit

Permalink
Releases/3.0.0 pre.18 (#32)
Browse files Browse the repository at this point in the history
Prep the 3.0.0 pre.18 branch for release
  • Loading branch information
shaynie authored Aug 18, 2023
2 parents 2edf78e + 799d7f3 commit a194901
Show file tree
Hide file tree
Showing 2,993 changed files with 2,514 additions and 477 deletions.
22 changes: 11 additions & 11 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,17 @@
/Tooling/ @shaynie

# Feature packages
/com.microsoft.mrtk.accessibility/ @marlenaklein-msft @AMollis @shaynie
/com.microsoft.mrtk.audio/ @marlenaklein-msft @AMollis @shaynie
/com.microsoft.mrtk.core/ @marlenaklein-msft @AMollis @shaynie
/com.microsoft.mrtk.data/ @marlenaklein-msft @AMollis @shaynie
/com.microsoft.mrtk.diagnostics/ @marlenaklein-msft @AMollis @shaynie
/com.microsoft.mrtk.input/ @marlenaklein-msft @AMollis @shaynie
/com.microsoft.mrtk.spatialmanipulation/ @marlenaklein-msft @AMollis @shaynie
/com.microsoft.mrtk.tools/ @marlenaklein-msft @AMollis @shaynie
/com.microsoft.mrtk.uxcomponents/ @marlenaklein-msft @AMollis @shaynie
/com.microsoft.mrtk.uxcore/ @marlenaklein-msft @AMollis @shaynie
/com.microsoft.mrtk.windowsspeech/ @marlenaklein-msft @AMollis @shaynie
/org.mixedrealitytoolkit.accessibility/ @marlenaklein-msft @AMollis @shaynie
/org.mixedrealitytoolkit.audio/ @marlenaklein-msft @AMollis @shaynie
/org.mixedrealitytoolkit.core/ @marlenaklein-msft @AMollis @shaynie
/org.mixedrealitytoolkit.data/ @marlenaklein-msft @AMollis @shaynie
/org.mixedrealitytoolkit.diagnostics/ @marlenaklein-msft @AMollis @shaynie
/org.mixedrealitytoolkit.input/ @marlenaklein-msft @AMollis @shaynie
/org.mixedrealitytoolkit.spatialmanipulation/ @marlenaklein-msft @AMollis @shaynie
/org.mixedrealitytoolkit.tools/ @marlenaklein-msft @AMollis @shaynie
/org.mixedrealitytoolkit.uxcomponents/ @marlenaklein-msft @AMollis @shaynie
/org.mixedrealitytoolkit.uxcore/ @marlenaklein-msft @AMollis @shaynie
/org.mixedrealitytoolkit.windowsspeech/ @marlenaklein-msft @AMollis @shaynie

# Examples and templates
/UnityProjects/ @marlenaklein-msft @AMollis @shaynie
Expand Down
6 changes: 5 additions & 1 deletion MAINTAINERS.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
# Maintainers

This document lists the Maintainers of the Mixed Reality Toolkit for Unity Project. Maintainers may be added once approved by the existing maintainers as described in the [Governance document](./GOVERNANCE.md). By adding your name to this list you are agreeing to abide by the Project governance documents and to abide by all of the Organization's polices, including the [code of conduct](../org-docs/CODE-OF-CONDUCT.md), [trademark policy](../org-docs/TRADEMARKS.md), [antitrust policy](../org-docs/ANTITRUST.md), and the project's [contributing guidelines](./CONTRIBUTING.md). If you are participating because of your affiliation with another organization (designated below), you represent that you have the authority to bind that organization to these policies.
This document lists the Maintainers of the Mixed Reality Toolkit for Unity Project. Maintainers may be added once approved by the existing maintainers as described in the [Governance document](./GOVERNANCE.md). By adding your name to this list you are agreeing to abide by the Project governance documents and to abide by all of the Organization's polices, including the [code of conduct](https://github.com/MixedRealityToolkit/MixedRealityToolkit-MVG/blob/main/org-docs/CODE-OF-CONDUCT.md), [trademark policy](https://github.com/MixedRealityToolkit/MixedRealityToolkit-MVG/blob/main/org-docs/TRADEMARKS.md), [antitrust policy](https://github.com/MixedRealityToolkit/MixedRealityToolkit-MVG/blob/main/org-docs/ANTITRUST.md), and the project's [contributing guidelines](./CONTRIBUTING.md). If you are participating because of your affiliation with another organization (designated below), you represent that you have the authority to bind that organization to these policies.

| Name | Alias | Affiliated Organization |
|-------------------|---------------|---------------------------------|
| Adam Mollis | AMollis | Microsoft |
| Scott Haynie | SHaynie | Microsoft |
| Griff Hazen | GHazen-ML | Magic Leap |
| Wyck Hebert | whebertML | Magic Leap |
| Dave Kline | david-c-kline | Qualcomm |
| Kurtis Eveleigh | keveleigh | Qualcomm |

---
Part of MVG-0.1-beta.
Expand Down
2 changes: 1 addition & 1 deletion Pipelines/Config/settings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ variables:
# ProjectSettings/ProjectSettings.asset: metroPackageVersion: x.x.x.0
MRTKVersion: 3.0.0 # used for overall build number, but each package version is read from the package.json file in each package directory.
MRTKReleaseTag: 'pre.18' # final version component, e.g. 'RC2.1' or empty string.
ReleasePackages: 'None' # array of packages that shouldn't get the prerelease tag e.g. '"com.microsoft.mrtk.core,com.microsoft.mrtk.tools"'
ReleasePackages: 'None' # array of packages that shouldn't get the prerelease tag e.g. '"org.mixedrealitytoolkit.core,org.mixedrealitytoolkit.tools"'
4 changes: 2 additions & 2 deletions Pipelines/Scripts/common.psm1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

<#
.SYNOPSIS
Expand Down
4 changes: 2 additions & 2 deletions Pipelines/Scripts/edit-version.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

<#
.SYNOPSIS
Expand Down
4 changes: 2 additions & 2 deletions Pipelines/Scripts/gitchanges.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

<#
.SYNOPSIS
Expand Down
8 changes: 4 additions & 4 deletions Pipelines/Scripts/pack-upm.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

<#
.SYNOPSIS
Expand Down Expand Up @@ -66,7 +66,7 @@ try {

# loop through package directories, update package version, assembly version, and build version hash for updating dependencies
Get-ChildItem -Path $ProjectRoot/*/package.json | ForEach-Object {
$packageName = Select-String -Pattern "com\.microsoft\.mrtk\.\w+" -Path $_ | Select-Object -First 1
$packageName = Select-String -Pattern "org\.mixedrealitytoolkit\.\w+|com\.microsoft\.mrtk\.\w+" -Path $_ | Select-Object -First 1

if (-not $packageName) {
return # this is not an MRTK package, so skip
Expand Down Expand Up @@ -130,7 +130,7 @@ try {

# update dependencies using the versionHash map
Get-ChildItem -Path $ProjectRoot/*/package.json | ForEach-Object {
$currentPackageName = Select-String -Pattern "com\.microsoft\.mrtk\.\w+" -Path $_ | Select-Object -First 1
$currentPackageName = Select-String -Pattern "org\.mixedrealitytoolkit\.\w+|com\.microsoft\.mrtk\.\w+" -Path $_ | Select-Object -First 1
if (-not $currentPackageName) {
return # this is not an MRTK package, so skip
}
Expand Down
13 changes: 11 additions & 2 deletions Pipelines/Scripts/publish-upm.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

<#
.SYNOPSIS
Expand Down Expand Up @@ -38,12 +38,21 @@ try {
}

# Get the list of package (.tgz) files
Get-ChildItem -Path $PackageDirectory -Filter "org.mixedrealitytoolkit.*.tgz" | ForEach-Object {
Write-Output "======================="
Write-Output "Publishing: $($_.Name) "
Write-Output "======================="
npm publish $_
}

# Publish the deprecated package files
Get-ChildItem -Path $PackageDirectory -Filter "com.microsoft.mrtk.*.tgz" | ForEach-Object {
Write-Output "======================="
Write-Output "Publishing: $($_.Name) "
Write-Output "======================="
npm publish $_
}

}
finally {
if ($RegistryPath) {
Expand Down
8 changes: 4 additions & 4 deletions Pipelines/Scripts/repackage-for-release.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

<#
.SYNOPSIS
Expand Down Expand Up @@ -46,7 +46,7 @@ try {
Write-Output "PackageSearchPath: $packageSearchPath"

Get-ChildItem -Path $packageSearchPath | ForEach-Object {
$packageName = Select-String -Pattern "com\.microsoft\.mrtk\.\w+" -Path $_.FullName | Select-Object -First 1
$packageName = Select-String -Pattern "org\.mixedrealitytoolkit\.\w+|com\.microsoft\.mrtk\.\w+" -Path $_.FullName | Select-Object -First 1

if (-not $packageName) {
return # this is not an MRTK package, so skip
Expand Down Expand Up @@ -91,7 +91,7 @@ try {
}
# update all dependencies and repackage
Get-ChildItem -Path $packageSearchPath | ForEach-Object {
$currentPackageName = Select-String -Pattern "com\.microsoft\.mrtk\.\w+" -Path $_.FullName | Select-Object -First 1
$currentPackageName = Select-String -Pattern "org\.mixedrealitytoolkit\.\w+|com\.microsoft\.mrtk\.\w+" -Path $_.FullName | Select-Object -First 1

if (-not $currentPackageName) {
return # this is not an MRTK package, so skip
Expand Down
18 changes: 9 additions & 9 deletions Pipelines/Scripts/validatecode.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

<#
.SYNOPSIS
Expand Down Expand Up @@ -257,11 +257,11 @@ function GetProjectRelativePath {
# While individual handlers may not be that significant, the sum total of time across all handlers
# (which run serially) causes noticeable delays in responsiveness in the Unity editor.
$InitializeOnLoadExceptions = [System.Collections.Generic.HashSet[String]]@(
"com.microsoft.mrtk.core/Editor/MRTKSettings.cs",
"com.microsoft.mrtk.core/Editor/EditorProjectUtilities.cs",
"com.microsoft.mrtk.core/Editor/MRTKProjectValidation.cs",
"com.microsoft.mrtk.input/Editor/InputValidation.cs",
"com.microsoft.mrtk.windowsspeech/Editor/WindowsSpeechValidation.cs"
"org.mixedrealitytoolkit.core/Editor/MRTKSettings.cs",
"org.mixedrealitytoolkit.core/Editor/EditorProjectUtilities.cs",
"org.mixedrealitytoolkit.core/Editor/MRTKProjectValidation.cs",
"org.mixedrealitytoolkit.input/Editor/InputValidation.cs",
"org.mixedrealitytoolkit.windowsspeech/Editor/WindowsSpeechValidation.cs"
)

<#
Expand Down Expand Up @@ -304,7 +304,7 @@ to `$InitializeOnLoadExceptions after discussion with the rest of the team.
# Note that this is used in a rough regex to check for any references to ".GetTypes()"
# which is generally good enough catch those incorrect use cases.
$AssemblyTypesExceptions = [System.Collections.Generic.HashSet[String]]@(
"com.microsoft.mrtk.core/Utilities/Extensions/AssemblyExtensions.cs"
"org.mixedrealitytoolkit.core/Utilities/Extensions/AssemblyExtensions.cs"
)

<#
Expand Down Expand Up @@ -471,7 +471,7 @@ function CheckAsmDef {
# "@
# $containsIssue = $true
# }
if ($FileName -match "com.microsoft.mrtk" -and -not (Test-Path (Join-Path (Split-Path $FileName) "AssemblyInfo.cs"))) {
if ($FileName -match "org.mixedrealitytoolkit." -and -not (Test-Path (Join-Path (Split-Path $FileName) "AssemblyInfo.cs"))) {
Write-Warning @"
New Assembly Definition asset was added but a corresponding AssemblyInfo.cs wasn't committed.
Please run create-assemblyinfo.ps1 from the Tooling folder in the repo, open the project in Unity to generate a meta, and commit the resulting files.
Expand Down
4 changes: 2 additions & 2 deletions Pipelines/Templates/Tasks/build-appx.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

# [Template] Build appx from a Unity-built sln.

Expand Down
4 changes: 2 additions & 2 deletions Pipelines/Templates/Tasks/build-unity.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

# [Template] Build project inside Unity.

Expand Down
4 changes: 2 additions & 2 deletions Pipelines/Templates/Tasks/publish-upm.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

# [Template] Publish packages to UPM registry

Expand Down
4 changes: 2 additions & 2 deletions Pipelines/Templates/docs.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

# [Template] Generate binaries for API reference docs.

Expand Down
4 changes: 2 additions & 2 deletions Pipelines/Templates/tests.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

# [Template] Run MRTK tests.

Expand Down
4 changes: 2 additions & 2 deletions Pipelines/Templates/unity.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

parameters:
- name: UnityVersion
Expand Down
4 changes: 2 additions & 2 deletions Pipelines/Templates/upm.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

# [Template] Pack and optionally publish UPM packages.

Expand Down
4 changes: 2 additions & 2 deletions Pipelines/ci.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

# CI build producing developer packages.

Expand Down
4 changes: 2 additions & 2 deletions Pipelines/pr.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

# Build for PR validation

Expand Down
4 changes: 2 additions & 2 deletions Pipelines/rc.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

# RC build producing release candidate packages.

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ As of June 2022, the following components are considered to be in early preview.

| Name | Package Name |
| --- | --- |
| Accessibility | com.microsoft.mrtk.accessibility |
| Data Binding and Theming | com.microsoft.mrtk.data |
| Accessibility | org.mixedrealitytoolkit.accessibility |
| Data Binding and Theming | org.mixedrealitytoolkit.data |

The MRTK team is fully committed to releasing this functionality. It is important to note that the packages may not contain the complete feature set that is planned to be released or they may undergo major, breaking architectural changes before release.

Expand Down
4 changes: 2 additions & 2 deletions Tooling/Test/generate_repeat_tests.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python

# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

"""
Prints code that can be copy / pasted to run multiple Unity Playmode tests
Expand Down
4 changes: 2 additions & 2 deletions Tooling/Test/run_playmode_tests.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

<#
# Runs the playmode tests in batch mode. This is the same technique as
Expand Down
4 changes: 2 additions & 2 deletions Tooling/Test/run_repeat_tests.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

<#
# Runs the playmode tests in batch mode, repeatedly.
Expand Down
8 changes: 4 additions & 4 deletions Tooling/create-assemblyinfo.ps1
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
# Copyright (c) Mixed Reality Toolkit Contributors
# Licensed under the BSD 3-Clause

$gitRoot = ((git -C $PSScriptRoot rev-parse --show-toplevel) | Out-String).Trim()

Get-ChildItem -Path (Join-Path $gitRoot * package.json) | ForEach-Object {
$packageName = Select-String -Pattern "com\.microsoft\.mrtk\.\w+" -Path $_ | Select-Object -First 1
$packageName = Select-String -Pattern "org\.mixedrealitytoolkit\.\w+|com\.microsoft\.mrtk\.\w+" -Path $_ | Select-Object -First 1

if (-not $packageName) {
return # this is not an MRTK package, so skip
Expand Down Expand Up @@ -48,7 +48,7 @@ Get-ChildItem -Path (Join-Path $gitRoot * package.json) | ForEach-Object {
using System.Reflection;
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit $assemblyName")]
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]
[assembly: AssemblyCopyright("Copyright (c) Mixed Reality Toolkit Contributors")]
// The AssemblyVersion attribute is checked-in and is recommended not to be changed often.
// https://docs.microsoft.com/troubleshoot/visualstudio/general/assembly-version-assembly-file-version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -853,7 +853,7 @@ PrefabInstance:
2. Include the
Data Binding and Theming (com.microsoft.mrtk.data) package.'
Data Binding and Theming (org.mixedrealitytoolkit.data) package.'
objectReference: {fileID: 0}
- target: {fileID: 2446705927233332293, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3}
propertyPath: m_fontSize
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ MonoBehaviour:
in Player Settings -> Scripting Define Symbols.
2. Include the Data Binding
and Theming (com.microsoft.mrtk.data) package.
and Theming (org.mixedrealitytoolkit.data) package.
3. Press Play, then change
the <i>Battery Level 0 to 1</i> and <i>Charging State</i> values on the BatteryLevelDataSource.'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1694,7 +1694,7 @@ PrefabInstance:
2. Include
the Data Binding and Theming (com.microsoft.mrtk.data) package.'
the Data Binding and Theming (org.mixedrealitytoolkit.data) package.'
objectReference: {fileID: 0}
- target: {fileID: 2446705927233332293, guid: e8c3ea3c1046f8b4bbd682c2b7a0e4fe, type: 3}
propertyPath: m_fontSize
Expand Down
Loading

0 comments on commit a194901

Please sign in to comment.