Merge branch 'main' into samples_manipulation_consistent

Author: keveleigh

.github/workflows/issue_labeler.yaml

@@ -14,23 +14,23 @@ jobs:
       - uses: actions/github-script@v6
         with:
           script: |
-            if (context.payload.pull_request.base.ref == 'mrtk3')
+            if (context.payload.pull_request.base.ref == 'feature/XRI3')
             {
               github.rest.issues.addLabels({
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                labels: ['MRTK3']
+                labels: ['Branch: feature/XRI3']
               })
             }
 
-            // When we switch the repo to MRTK3, we'll have to edit this.
+            // When we switch the repo to XRI3, we'll have to edit this.
             if (context.payload.pull_request.base.ref == 'main')
             {
               github.rest.issues.addLabels({
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                labels: ['MRTK2']
+                labels: ['Branch: main']
               })
-            }
+            }

.github/workflows/pr_labeler.yaml

@@ -1,10 +1,11 @@
-name: Code Validation (MRTK3)
+name: Code Validation
 
 on:
   push:
-    branches: ["mrtk3"]
+    branches:
+      - main
+      - 'feature/*'
   pull_request:
-    branches: ["mrtk3"]
 
 jobs:
   validation:

.github/workflows/validation_mrtk3.yaml

@@ -58,6 +58,7 @@ doc/
 # Other files #
 # =========== #
 .DS_Store
+.utmp/
 
 # ================================#
 # MRTK2 for branch switching ease #

.gitignore

@@ -23,30 +23,29 @@
 * @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
 
 # Build / CI Pipeline
-/Pipelines/ @shaynie @amollis @keveleigh
+/Pipelines/ @keveleigh
 
 # Tooling
-/Tooling/ @shaynie @amollis @keveleigh @david-c-kline
+/Tooling/ @keveleigh
 
 # Feature packages
-/org.mixedrealitytoolkit.accessibility/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
-/org.mixedrealitytoolkit.audio/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
-/org.mixedrealitytoolkit.core/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
-/org.mixedrealitytoolkit.data/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
-/org.mixedrealitytoolkit.diagnostics/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
-/org.mixedrealitytoolkit.input/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
-/org.mixedrealitytoolkit.spatialmanipulation/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
-/org.mixedrealitytoolkit.tools/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
-/org.mixedrealitytoolkit.uxcomponents/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
-/org.mixedrealitytoolkit.uxcore/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
-/org.mixedrealitytoolkit.windowsspeech/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
+/org.mixedrealitytoolkit.accessibility/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
+/org.mixedrealitytoolkit.audio/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
+/org.mixedrealitytoolkit.core/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
+/org.mixedrealitytoolkit.data/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
+/org.mixedrealitytoolkit.diagnostics/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
+/org.mixedrealitytoolkit.input/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
+/org.mixedrealitytoolkit.spatialmanipulation/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
+/org.mixedrealitytoolkit.tools/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
+/org.mixedrealitytoolkit.uxcomponents/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
+/org.mixedrealitytoolkit.uxcore/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
+/org.mixedrealitytoolkit.windowsspeech/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
 
 # Examples and templates
-/UnityProjects/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers @marlenaklein-msft @AMollis @shaynie
+/UnityProjects/ @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
 
 # Goverance documents (Must include Maintainers)
 CODEOWNERS @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
 CONTRIBUTING.md @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
 MAINTAINERS.md @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
 GOVERNANCE.md @MixedRealityToolkit/mixedrealitytoolkit-unity-maintainers
-

CODEOWNERS

@@ -2,15 +2,15 @@
 
 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                      |
-| Kurtis Eveleigh   | keveleigh     | Qualcomm                        |
-| Max Palmer        | MaxPalmer-UH  | Ultraleap                       |
-| Rob Blenkinsopp   | rblenkinsopp  | Ultraleap                       |
+|     Name          |     Alias       |     Affiliated Organization     |
+|-------------------|-----------------|---------------------------------|
+| Jackie Curley     | jackiecurley    | Microsoft                       |
+| Chris Oje         | whitetigerhelix | Microsoft                       |
+| Griff Hazen       | GHazen-ML       | Magic Leap                      |
+| Wyck Hebert       | whebertML       | Magic Leap                      |
+| Kurtis Eveleigh   | keveleigh       | Qualcomm                        |
+| Max Palmer        | MaxPalmer-UH    | Ultraleap                       |
+| Rob Blenkinsopp   | rblenkinsopp    | Ultraleap                       |
 
 ---
 Part of MVG-0.1-beta.

ExternalDependencies/com.microsoft.mixedreality.openxr-1.10.0.tgz

@@ -13,10 +13,9 @@
 .PARAMETER PrereleaseTag
     The tag to append after the version (e.g. "build", "internal" or "prerelease"). Leave blank for a release build.
 .PARAMETER Revision
-    The revision number for the build, to append after the release labal and suffix.
+    The revision number for the build, to append after the release label and suffix.
 .PARAMETER BuildNumber
     The fourth digit for the full version number for assembly versioning. This is the build number.
-
 #>
 param(
     [Parameter(Mandatory = $true)]
@@ -39,16 +38,16 @@ if (-not (Test-Path $OutputDirectory -PathType Container)) {
 $OutputDirectory = Resolve-Path -Path $OutputDirectory
 
 Write-Host ""
-Write-Host -ForegroundColor Blue "======================================="  
+Write-Host -ForegroundColor Blue "======================================="
 Write-Host -ForegroundColor Blue "Packing All Packages"
-Write-Host -ForegroundColor Blue "=======================================" 
+Write-Host -ForegroundColor Blue "======================================="
 Write-Host "OutputDirectory: $OutputDirectory"
 
 try {
     Push-Location $OutputDirectory
 
     # Update package versions
-    . $PSScriptRoot\update-versions.ps1 -PackagesRoot $ProjectRoot -PrereleaseTag $PrereleaseTag -Revision $Revision -BuildNumber $BuildNumber 
+    . $PSScriptRoot\update-versions.ps1 -PackagesRoot $ProjectRoot -PrereleaseTag $PrereleaseTag -Revision $Revision -BuildNumber $BuildNumber
 
     # Loop through package directories and copy documentation
     Get-ChildItem -Path $ProjectRoot/*/package.json | ForEach-Object {
@@ -63,32 +62,32 @@ try {
         $docFolder = "$packagePath/Documentation~"
 
         Write-Host ""
-        Write-Host -ForegroundColor Green "======================================="  
+        Write-Host -ForegroundColor Green "======================================="
         Write-Host -ForegroundColor Green "Copying Documentation~"
-        Write-Host -ForegroundColor Green "=======================================" 
+        Write-Host -ForegroundColor Green "======================================="
         Write-Host "Package name: $packageName"
 
         if (Test-Path -Path $docFolder) {
             Copy-Item -Path "$ProjectRoot/Pipelines/UPM/Documentation~/*" -Destination $docFolder -Recurse
         }
         else {
             Copy-Item -Path "$ProjectRoot/Pipelines/UPM/Documentation~" -Destination $docFolder -Recurse
-        }  
+        }
     }
 
     # Package the package directories
     Get-ChildItem -Path $ProjectRoot/*/package.json | ForEach-Object {
         $currentPackageName = Select-String -Pattern "org\.mixedrealitytoolkit\.\w+(\.\w+)*" -Path $_ | Select-Object -First 1
-        
+
         if (-not $currentPackageName) {
             return # this is not an MRTK package, so skip
         }
 
         Write-Host ""
-        Write-Host -ForegroundColor Green "======================================="  
+        Write-Host -ForegroundColor Green "======================================="
         Write-Host -ForegroundColor Green "Packing Package"
         Write-Host -ForegroundColor Green "======================================="
-        Write-Host "Package name: $currentPackageName" 
+        Write-Host "Package name: $currentPackageName"
 
         $currentPackageName = $currentPackageName.Matches[0].Value
         $packageFriendlyName = (Select-String -Pattern "`"displayName`": `"(.+)`"" -Path $_ | Select-Object -First 1).Matches.Groups[1].Value
@@ -102,7 +101,7 @@ try {
         # clean up
         if (Test-Path -Path $docFolder) {
             Write-Host "Cleaning up Documentation~ from $packageFriendlyName"
-            # A documentation folder was created. Remove it.            
+            # A documentation folder was created. Remove it.
             Remove-Item -Path $docFolder -Recurse -Force
 
             # But restore anything that's checked-in.
@@ -118,8 +117,8 @@ try {
     }
 
     Write-Host ""
-    Write-Host -ForegroundColor Blue "======================================="  
-    Write-Host -ForegroundColor Blue "Successfully Packed All Pacakges"
+    Write-Host -ForegroundColor Blue "======================================="
+    Write-Host -ForegroundColor Blue "Successfully Packed All Packages"
     Write-Host -ForegroundColor Blue "======================================="
     Write-Host ""
 }