Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Preparing to release UPM Packages to Unity's Asset store. #519

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_enabled: 0
nameUi: Holographic Remoting remote app
version: 1.7.0
version: 1.10.0
featureIdInternal: com.microsoft.openxr.feature.appremoting
openxrExtensionStrings: XR_MSFT_holographic_remoting XR_MSFT_holographic_remoting_speech
company: Microsoft
Expand Down Expand Up @@ -114,7 +114,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_enabled: 0
nameUi: HP Reverb G2 Controller Profile
version: 1.7.0
version: 1.10.0
featureIdInternal: com.microsoft.openxr.feature.interaction.hpmixedrealitycontroller
openxrExtensionStrings: XR_EXT_hp_mixed_reality_controller
company: Microsoft
Expand Down Expand Up @@ -154,7 +154,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_enabled: 0
nameUi: Holographic Remoting remote app
version: 1.7.0
version: 1.10.0
featureIdInternal: com.microsoft.openxr.feature.appremoting
openxrExtensionStrings: XR_MSFT_holographic_remoting XR_MSFT_holographic_remoting_speech
company: Microsoft
Expand All @@ -174,7 +174,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_enabled: 0
nameUi: Motion Controller Model
version: 1.7.0
version: 1.10.0
featureIdInternal: com.microsoft.openxr.feature.controller
openxrExtensionStrings: XR_MSFT_controller_model XR_FB_render_model
company: Microsoft
Expand Down Expand Up @@ -295,7 +295,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_enabled: 0
nameUi: Holographic Remoting for Play Mode
version: 1.7.0
version: 1.10.0
featureIdInternal: com.microsoft.openxr.feature.playmoderemoting
openxrExtensionStrings: XR_MSFT_holographic_remoting XR_MSFT_holographic_remoting_speech
company: Microsoft
Expand Down Expand Up @@ -340,9 +340,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_enabled: 1
nameUi: Hand Tracking
version: 1.7.0
version: 1.10.0
featureIdInternal: com.microsoft.openxr.feature.handtracking
openxrExtensionStrings: XR_EXT_hand_tracking XR_EXT_hand_joints_motion_range XR_MSFT_hand_tracking_mesh
openxrExtensionStrings: XR_EXT_hand_tracking XR_EXT_hand_joints_motion_range XR_EXT_hand_tracking_data_source
XR_MSFT_hand_tracking_mesh
company: Microsoft
priority: 0
required: 0
Expand Down Expand Up @@ -498,13 +499,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_enabled: 1
nameUi: Mixed Reality Features
version: 1.7.0
version: 1.10.0
featureIdInternal: com.microsoft.openxr.feature.hololens
openxrExtensionStrings: XR_MSFT_holographic_window_attachment XR_KHR_win32_convert_performance_counter_time
XR_MSFT_unbounded_reference_space XR_MSFT_spatial_anchor XR_MSFT_secondary_view_configuration
XR_MSFT_first_person_observer XR_MSFT_spatial_graph_bridge XR_MSFT_perception_anchor_interop
XR_MSFT_spatial_anchor_persistence XR_MSFT_scene_understanding XR_MSFT_scene_understanding_serialization
XR_MSFT_spatial_anchor_export_preview XR_MSFT_composition_layer_reprojection
XR_MSFT_scene_marker XR_MSFT_spatial_anchor_export_preview XR_MSFT_composition_layer_reprojection
company: Microsoft
priority: 0
required: 1
Expand Down Expand Up @@ -637,13 +638,13 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_enabled: 1
nameUi: Mixed Reality Features
version: 1.7.0
version: 1.10.0
featureIdInternal: com.microsoft.openxr.feature.hololens
openxrExtensionStrings: XR_MSFT_holographic_window_attachment XR_KHR_win32_convert_performance_counter_time
XR_MSFT_unbounded_reference_space XR_MSFT_spatial_anchor XR_MSFT_secondary_view_configuration
XR_MSFT_first_person_observer XR_MSFT_spatial_graph_bridge XR_MSFT_perception_anchor_interop
XR_MSFT_spatial_anchor_persistence XR_MSFT_scene_understanding XR_MSFT_scene_understanding_serialization
XR_MSFT_spatial_anchor_export_preview XR_MSFT_composition_layer_reprojection
XR_MSFT_scene_marker XR_MSFT_spatial_anchor_export_preview XR_MSFT_composition_layer_reprojection
company: Microsoft
priority: 0
required: 1
Expand Down Expand Up @@ -823,7 +824,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_enabled: 0
nameUi: Motion Controller Model
version: 1.7.0
version: 1.10.0
featureIdInternal: com.microsoft.openxr.feature.controller
openxrExtensionStrings: XR_MSFT_controller_model XR_FB_render_model
company: Microsoft
Expand All @@ -843,9 +844,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_enabled: 1
nameUi: Hand Tracking
version: 1.7.0
version: 1.10.0
featureIdInternal: com.microsoft.openxr.feature.handtracking
openxrExtensionStrings: XR_EXT_hand_tracking XR_EXT_hand_joints_motion_range XR_MSFT_hand_tracking_mesh
openxrExtensionStrings: XR_EXT_hand_tracking XR_EXT_hand_joints_motion_range XR_EXT_hand_tracking_data_source
XR_MSFT_hand_tracking_mesh
company: Microsoft
priority: 0
required: 0
Expand Down Expand Up @@ -908,9 +910,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_enabled: 1
nameUi: Hand Tracking
version: 1.7.0
version: 1.10.0
featureIdInternal: com.microsoft.openxr.feature.handtracking
openxrExtensionStrings: XR_EXT_hand_tracking XR_EXT_hand_joints_motion_range XR_MSFT_hand_tracking_mesh
openxrExtensionStrings: XR_EXT_hand_tracking XR_EXT_hand_joints_motion_range XR_EXT_hand_tracking_data_source
XR_MSFT_hand_tracking_mesh
company: Microsoft
priority: 0
required: 0
Expand Down Expand Up @@ -1115,7 +1118,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_enabled: 0
nameUi: Motion Controller Model
version: 1.7.0
version: 1.10.0
featureIdInternal: com.microsoft.openxr.feature.controller
openxrExtensionStrings: XR_MSFT_controller_model XR_FB_render_model
company: Microsoft
Expand All @@ -1135,7 +1138,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_enabled: 0
nameUi: HP Reverb G2 Controller Profile
version: 1.7.0
version: 1.10.0
featureIdInternal: com.microsoft.openxr.feature.interaction.hpmixedrealitycontroller
openxrExtensionStrings: XR_EXT_hp_mixed_reality_controller
company: Microsoft
Expand Down
9 changes: 5 additions & 4 deletions UnityProjects/MRTKDevTemplate/Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"dependencies": {
"com.atteneder.gltfast": "https://github.com/atteneder/glTFast.git#v4.8.3",
"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.openxr": "file:../../../ExternalDependencies/com.microsoft.mixedreality.openxr-1.10.0.tgz",
"com.microsoft.mixedreality.visualprofiler": "https://github.com/microsoft/VisualProfiler-Unity.git#v2.2.0",
"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.tts.windows": "file:../../../ExternalDependencies/com.microsoft.mrtk.tts.windows-1.0.1.tgz",
"com.microsoft.spatialaudio.spatializer.unity": "file:../../../ExternalDependencies/com.microsoft.spatialaudio.spatializer.unity-2.0.37.tgz",
"com.microsoft.mrtk.graphicstools.unity": "https://github.com/microsoft/MixedReality-GraphicsTools-Unity.git?path=/com.microsoft.mrtk.graphicstools.unity#v0.6.6",
"com.microsoft.mrtk.tts.windows": "file:../../../ExternalDependencies/com.microsoft.mrtk.tts.windows-1.0.4.tgz",
"com.microsoft.spatialaudio.spatializer.unity": "file:../../../ExternalDependencies/com.microsoft.spatialaudio.spatializer.unity-2.0.55.tgz",
"org.mixedrealitytoolkit.accessibility": "file:../../../org.mixedrealitytoolkit.accessibility",
"org.mixedrealitytoolkit.audio": "file:../../../org.mixedrealitytoolkit.audio",
"org.mixedrealitytoolkit.core": "file:../../../org.mixedrealitytoolkit.core",
Expand All @@ -21,6 +21,7 @@
"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.asset-store-validation": "0.2.1",
"com.unity.collab-proxy": "2.0.1",
"com.unity.ide.rider": "3.0.18",
"com.unity.ide.visualstudio": "2.0.17",
Expand Down
21 changes: 15 additions & 6 deletions UnityProjects/MRTKDevTemplate/Packages/packages-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
"hash": "7747a48d5e994db800b4c60a0a8b95a5ae2ce39f"
},
"com.microsoft.mixedreality.openxr": {
"version": "file:../../../ExternalDependencies/com.microsoft.mixedreality.openxr-1.7.0.tgz",
"version": "file:../../../ExternalDependencies/com.microsoft.mixedreality.openxr-1.10.0.tgz",
"depth": 0,
"source": "local-tarball",
"dependencies": {
"com.unity.xr.arfoundation": "4.1.7",
"com.unity.xr.management": "4.2.0",
"com.unity.xr.openxr": "1.5.3",
"com.unity.xr.openxr": "1.7.0",
"com.unity.xr.core-utils": "2.1.0"
}
},
Expand All @@ -41,24 +41,33 @@
"hash": "22d727d4d1641c27fa85a7519cf76b81890c8f3d"
},
"com.microsoft.mrtk.graphicstools.unity": {
"version": "https://github.com/microsoft/MixedReality-GraphicsTools-Unity.git?path=/com.microsoft.mrtk.graphicstools.unity#v0.5.14",
"version": "https://github.com/microsoft/MixedReality-GraphicsTools-Unity.git?path=/com.microsoft.mrtk.graphicstools.unity#v0.6.6",
"depth": 0,
"source": "git",
"dependencies": {},
"hash": "96743038a313c93322c935d99d2deb18e831aa2d"
"hash": "4497602bcf9d4e7a175cf9d2a2bee9f086a3129c"
},
"com.microsoft.mrtk.tts.windows": {
"version": "file:../../../ExternalDependencies/com.microsoft.mrtk.tts.windows-1.0.1.tgz",
"version": "file:../../../ExternalDependencies/com.microsoft.mrtk.tts.windows-1.0.4.tgz",
"depth": 0,
"source": "local-tarball",
"dependencies": {}
},
"com.microsoft.spatialaudio.spatializer.unity": {
"version": "file:../../../ExternalDependencies/com.microsoft.spatialaudio.spatializer.unity-2.0.37.tgz",
"version": "file:../../../ExternalDependencies/com.microsoft.spatialaudio.spatializer.unity-2.0.55.tgz",
"depth": 0,
"source": "local-tarball",
"dependencies": {}
},
"com.unity.asset-store-validation": {
"version": "0.2.1",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.nuget.newtonsoft-json": "2.0.2"
},
"url": "https://packages.unity.com"
},
"com.unity.burst": {
"version": "1.6.6",
"depth": 1,
Expand Down
9 changes: 9 additions & 0 deletions org.mixedrealitytoolkit.accessibility/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Changelog

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

## [1.0.1-development] - 2024-02-04

### Fixed

* Fixed support for UPM package publishing in the Unity Asset Store.
7 changes: 7 additions & 0 deletions org.mixedrealitytoolkit.accessibility/CHANGELOG.md.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions org.mixedrealitytoolkit.accessibility/Tests/Editor.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// Copyright (c) Mixed Reality Toolkit Contributors
// Licensed under the BSD 3-Clause

using System.Reflection;

[assembly: AssemblyProduct("Mixed Reality Toolkit Accessibility Editor Tests")]
[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
// AssemblyFileVersion and AssemblyInformationalVersion are added by pack-upm.ps1 to match the current MRTK build version.
[assembly: AssemblyVersion("3.0.0.0")]

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"name": "MixedReality.Toolkit.Accessibility.Editor.Tests",
"rootNamespace": "",
"references": [
"MixedReality.Toolkit.Core.TestUtilities",
"UnityEngine.TestRunner",
"UnityEditor.TestRunner"
],
"includePlatforms": [
"Editor"
],
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": true,
"precompiledReferences": [
"nunit.framework.dll"
],
"autoReferenced": false,
"defineConstraints": [
"UNITY_INCLUDE_TESTS"
],
"versionDefines": [
{
"name": "com.unity.asset-store-validation",
"expression": "",
"define": "HAS_ASSET_STORE_VALIDATION"
}
],
"noEngineReferences": false
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Copyright (c) Mixed Reality Toolkit Contributors
// Licensed under the BSD 3-Clause

#if HAS_ASSET_STORE_VALIDATION

using MixedReality.Toolkit.Core.Tests.EditMode;
using NUnit.Framework;
using System;

namespace MixedReality.Toolkit.Accessibility.Tests.EditMode
{
/// <summary>
/// This class is used to validate the package for the Mixed Reality Toolkit Accessibility package, verifying that all
/// requirements are met for publishing the package to the Unity Asset Store.
/// </summary>
internal class PackageValidationTest
{
/// <summary>
/// Test to validate the package for the Mixed Reality Toolkit Accessibility package, verifying that all
/// requirements are met for publishing the package to the Unity Asset Store.
/// </summary>
[Test]
public void PackageTest()
{
PackageValidatorResults results = PackageValidator.Validate("org.mixedrealitytoolkit.accessibility");
Assert.AreEqual(0, results.FailedCount, $"Failed tests found.{Environment.NewLine}{results.ToString(PackageValidatorResults.MessageType.Failed)}");
Assert.IsTrue(0 < results.SucceededCount, "No tests succeeded");
}
}
}
#endif // HAS_ASSET_STORE_VALIDATION

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
"MixedReality.Toolkit.Core.TestUtilities",
"UnityEditor.TestRunner",
"UnityEngine.TestRunner",
"MixedReality.Toolkit.Input.Runtime.Tests",
""
"MixedReality.Toolkit.Input.Runtime.Tests"
],
"includePlatforms": [],
"excludePlatforms": [],
Expand Down
2 changes: 2 additions & 0 deletions org.mixedrealitytoolkit.accessibility/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
"url": "https://github.com/MixedRealityToolkit/MixedRealityToolkit-Unity/issues"
},
"unity": "2021.3",
"unityRelease": "26f1",
"documentationUrl": "https://www.mixedrealitytoolkit.org",
"dependencies": {
"com.microsoft.mrtk.graphicstools.unity": "0.5.12",
"org.mixedrealitytoolkit.core": "3.0.0",
Expand Down
9 changes: 9 additions & 0 deletions org.mixedrealitytoolkit.audio/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Changelog

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).

## [3.0.2-development] - 2024-02-04

### Fixed

* Fixed support for UPM package publishing in the Unity Asset Store.
7 changes: 7 additions & 0 deletions org.mixedrealitytoolkit.audio/CHANGELOG.md.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading