Skip to content

Commit

Permalink
Rename packages to reflect the new org (#23)
Browse files Browse the repository at this point in the history
* Rename the packages to use the new org name

* Use the correct package names

* Missed the uxcore directory rename

* Update subsystem author names
  • Loading branch information
shaynie authored Aug 16, 2023
1 parent 6da56a1 commit 83f8da4
Show file tree
Hide file tree
Showing 2,860 changed files with 260 additions and 260 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
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.19' # 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"'
2 changes: 1 addition & 1 deletion Pipelines/Scripts/publish-upm.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ try {
}

# Get the list of package (.tgz) files
Get-ChildItem -Path $PackageDirectory -Filter "com.microsoft.mrtk.*.tgz" | ForEach-Object {
Get-ChildItem -Path $PackageDirectory -Filter "org.mixedrealitytoolkit.*.tgz" | ForEach-Object {
Write-Output "======================="
Write-Output "Publishing: $($_.Name) "
Write-Output "======================="
Expand Down
14 changes: 7 additions & 7 deletions Pipelines/Scripts/validatecode.ps1
Original file line number Diff line number Diff line change
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 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
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
52 changes: 26 additions & 26 deletions UnityProjects/MRTKDevTemplate/Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
"com.atteneder.ktx": "https://github.com/atteneder/KtxUnity.git#v2.1.2",
"com.microsoft.mixedreality.openxr": "file:../../../ExternalDependencies/com.microsoft.mixedreality.openxr-1.7.0.tgz",
"com.microsoft.mixedreality.visualprofiler": "https://github.com/microsoft/VisualProfiler-Unity.git#v2.2.0",
"com.microsoft.mrtk.accessibility": "file:../../../com.microsoft.mrtk.accessibility",
"com.microsoft.mrtk.audio": "file:../../../com.microsoft.mrtk.audio",
"com.microsoft.mrtk.core": "file:../../../com.microsoft.mrtk.core",
"com.microsoft.mrtk.data": "file:../../../com.microsoft.mrtk.data",
"com.microsoft.mrtk.diagnostics": "file:../../../com.microsoft.mrtk.diagnostics",
"com.microsoft.mrtk.extendedassets": "file:../../../com.microsoft.mrtk.extendedassets",
"com.microsoft.mrtk.graphicstools.unity": "https://github.com/microsoft/MixedReality-GraphicsTools-Unity.git?path=/com.microsoft.mrtk.graphicstools.unity#v0.5.14",
"com.microsoft.mrtk.input": "file:../../../com.microsoft.mrtk.input",
"com.microsoft.mrtk.spatialmanipulation": "file:../../../com.microsoft.mrtk.spatialmanipulation",
"com.microsoft.mrtk.standardassets": "file:../../../com.microsoft.mrtk.standardassets",
"com.microsoft.mrtk.tools": "file:../../../com.microsoft.mrtk.tools",
"com.microsoft.mrtk.tts.windows": "file:../../../ExternalDependencies/com.microsoft.mrtk.tts.windows-1.0.1.tgz",
"com.microsoft.mrtk.uxcomponents": "file:../../../com.microsoft.mrtk.uxcomponents",
"com.microsoft.mrtk.uxcomponents.noncanvas": "file:../../../com.microsoft.mrtk.uxcomponents.noncanvas",
"com.microsoft.mrtk.uxcore": "file:../../../com.microsoft.mrtk.uxcore",
"com.microsoft.mrtk.windowsspeech": "file:../../../com.microsoft.mrtk.windowsspeech",
"com.microsoft.spatialaudio.spatializer.unity": "file:../../../ExternalDependencies/com.microsoft.spatialaudio.spatializer.unity-2.0.37.tgz",
"org.mixedrealitytoolkit.accessibility": "file:../../../org.mixedrealitytoolkit.accessibility",
"org.mixedrealitytoolkit.audio": "file:../../../org.mixedrealitytoolkit.audio",
"org.mixedrealitytoolkit.core": "file:../../../org.mixedrealitytoolkit.core",
"org.mixedrealitytoolkit.data": "file:../../../org.mixedrealitytoolkit.data",
"org.mixedrealitytoolkit.diagnostics": "file:../../../org.mixedrealitytoolkit.diagnostics",
"org.mixedrealitytoolkit.extendedassets": "file:../../../org.mixedrealitytoolkit.extendedassets",
"org.mixedrealitytoolkit.input": "file:../../../org.mixedrealitytoolkit.input",
"org.mixedrealitytoolkit.spatialmanipulation": "file:../../../org.mixedrealitytoolkit.spatialmanipulation",
"org.mixedrealitytoolkit.standardassets": "file:../../../org.mixedrealitytoolkit.standardassets",
"org.mixedrealitytoolkit.tools": "file:../../../org.mixedrealitytoolkit.tools",
"org.mixedrealitytoolkit.uxcomponents": "file:../../../org.mixedrealitytoolkit.uxcomponents",
"org.mixedrealitytoolkit.uxcomponents.noncanvas": "file:../../../org.mixedrealitytoolkit.uxcomponents.noncanvas",
"org.mixedrealitytoolkit.uxcore": "file:../../../org.mixedrealitytoolkit.uxcore",
"org.mixedrealitytoolkit.windowsspeech": "file:../../../org.mixedrealitytoolkit.windowsspeech",
"com.unity.collab-proxy": "2.0.1",
"com.unity.ide.rider": "3.0.18",
"com.unity.ide.visualstudio": "2.0.17",
Expand Down Expand Up @@ -71,17 +71,17 @@
},
"testables": [
"com.unity.inputsystem",
"com.microsoft.mrtk.accessibility",
"com.microsoft.mrtk.core",
"com.microsoft.mrtk.data",
"com.microsoft.mrtk.diagnostics",
"com.microsoft.mrtk.extendedassets",
"com.microsoft.mrtk.input",
"com.microsoft.mrtk.spatialmanipulation",
"com.microsoft.mrtk.standardassets",
"com.microsoft.mrtk.uxcomponents",
"com.microsoft.mrtk.uxcomponents.noncanvas",
"com.microsoft.mrtk.uxcore",
"com.microsoft.mrtk.windowsspeech"
"org.mixedrealitytoolkit.accessibility",
"org.mixedrealitytoolkit.core",
"org.mixedrealitytoolkit.data",
"org.mixedrealitytoolkit.diagnostics",
"org.mixedrealitytoolkit.extendedassets",
"org.mixedrealitytoolkit.input",
"org.mixedrealitytoolkit.spatialmanipulation",
"org.mixedrealitytoolkit.standardassets",
"org.mixedrealitytoolkit.uxcomponents",
"org.mixedrealitytoolkit.uxcomponents.noncanvas",
"org.mixedrealitytoolkit.uxcore",
"org.mixedrealitytoolkit.windowsspeech"
]
}
Loading

0 comments on commit 83f8da4

Please sign in to comment.