From 8ad030f2427da6abd8516da95a42d15b5a2e51ce Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Sun, 31 Mar 2019 20:38:37 -0700 Subject: [PATCH 1/6] updated package manifest --- XRTK.WindowsMixedReality/Packages/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/XRTK.WindowsMixedReality/Packages/manifest.json b/XRTK.WindowsMixedReality/Packages/manifest.json index 6dc1fbb..fd8bc27 100644 --- a/XRTK.WindowsMixedReality/Packages/manifest.json +++ b/XRTK.WindowsMixedReality/Packages/manifest.json @@ -3,9 +3,9 @@ "com.unity.analytics": "3.2.2", "com.unity.package-manager-ui": "2.0.7", "com.unity.xr.windowsmr.metro": "1.0.8", - "com.xrtk.upm-git-extension": "https://github.com/XRTK/UpmGitExtension.git#0.9.1", "com.xrtk.core": "https://github.com/XRTK/XRTK-Core.git#0.1.0", "com.xrtk.sdk": "https://github.com/XRTK/SDK.git#0.1.0", + "com.xrtk.upm-git-extension": "https://github.com/XRTK/UpmGitExtension.git#0.9.1", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", From f20ed4765aa9ecc28a40f40440664b02ae30853b Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Mon, 1 Apr 2019 15:11:05 -0700 Subject: [PATCH 2/6] updated package manifest --- XRTK.WindowsMixedReality/Packages/manifest.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/XRTK.WindowsMixedReality/Packages/manifest.json b/XRTK.WindowsMixedReality/Packages/manifest.json index fd8bc27..0d76a95 100644 --- a/XRTK.WindowsMixedReality/Packages/manifest.json +++ b/XRTK.WindowsMixedReality/Packages/manifest.json @@ -2,6 +2,7 @@ "dependencies": { "com.unity.analytics": "3.2.2", "com.unity.package-manager-ui": "2.0.7", + "com.unity.xr.oculus.standalone": "1.29.1", "com.unity.xr.windowsmr.metro": "1.0.8", "com.xrtk.core": "https://github.com/XRTK/XRTK-Core.git#0.1.0", "com.xrtk.sdk": "https://github.com/XRTK/SDK.git#0.1.0", @@ -36,5 +37,19 @@ "com.unity.modules.vr": "1.0.0", "com.unity.modules.wind": "1.0.0", "com.unity.modules.xr": "1.0.0" + }, + "lock": { + "com.xrtk.upm-git-extension": { + "hash": "9cdc5a92ad0d1f3606026765a29d458555e54251", + "revision": "0.9.1" + }, + "com.xrtk.core": { + "hash": "792b32d81829ba6b3f7327366f70ea787e06b841", + "revision": "0.1.0" + }, + "com.xrtk.sdk": { + "hash": "e878eb56cdf1a971eb9a27fb0f7eda4d6b73dba9", + "revision": "0.1.0" + } } } From 073df4d5bc8968c5f30a241f25c017b973d659f8 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Mon, 1 Apr 2019 15:11:55 -0700 Subject: [PATCH 3/6] Revert "updated package manifest" This reverts commit f20ed4765aa9ecc28a40f40440664b02ae30853b. --- XRTK.WindowsMixedReality/Packages/manifest.json | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/XRTK.WindowsMixedReality/Packages/manifest.json b/XRTK.WindowsMixedReality/Packages/manifest.json index 0d76a95..fd8bc27 100644 --- a/XRTK.WindowsMixedReality/Packages/manifest.json +++ b/XRTK.WindowsMixedReality/Packages/manifest.json @@ -2,7 +2,6 @@ "dependencies": { "com.unity.analytics": "3.2.2", "com.unity.package-manager-ui": "2.0.7", - "com.unity.xr.oculus.standalone": "1.29.1", "com.unity.xr.windowsmr.metro": "1.0.8", "com.xrtk.core": "https://github.com/XRTK/XRTK-Core.git#0.1.0", "com.xrtk.sdk": "https://github.com/XRTK/SDK.git#0.1.0", @@ -37,19 +36,5 @@ "com.unity.modules.vr": "1.0.0", "com.unity.modules.wind": "1.0.0", "com.unity.modules.xr": "1.0.0" - }, - "lock": { - "com.xrtk.upm-git-extension": { - "hash": "9cdc5a92ad0d1f3606026765a29d458555e54251", - "revision": "0.9.1" - }, - "com.xrtk.core": { - "hash": "792b32d81829ba6b3f7327366f70ea787e06b841", - "revision": "0.1.0" - }, - "com.xrtk.sdk": { - "hash": "e878eb56cdf1a971eb9a27fb0f7eda4d6b73dba9", - "revision": "0.1.0" - } } } From 131d907ce923e6172b342c24bca3ce2e175d3755 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Wed, 3 Apr 2019 09:29:19 -0700 Subject: [PATCH 4/6] Added proper dependancies --- .../Assets/XRTK.WindowsMixedReality/package.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/XRTK.WindowsMixedReality/Assets/XRTK.WindowsMixedReality/package.json b/XRTK.WindowsMixedReality/Assets/XRTK.WindowsMixedReality/package.json index 72398d6..157f79e 100644 --- a/XRTK.WindowsMixedReality/Assets/XRTK.WindowsMixedReality/package.json +++ b/XRTK.WindowsMixedReality/Assets/XRTK.WindowsMixedReality/package.json @@ -12,5 +12,7 @@ "src": "Assets/XRTK.WindowsMixedReality", "author": "XRTK Team (https://github.com/XRTK)", "dependencies": { + "com.xrtk.upm-git-extension": "https://github.com/XRTK/UpmGitExtension.git#0.9.1", + "com.xrtk.core": "https://github.com/XRTK/XRTK-Core.git#0.1.0" } } \ No newline at end of file From d3075c6044161b7b686f62ada20408e9a3d5a534 Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Fri, 5 Apr 2019 04:21:19 -0700 Subject: [PATCH 5/6] updated readme with build status --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index e613e50..d0fb283 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,6 @@ # WindowsMixedReality The Windows Mixed Reality Extension for the [XRTK - Mixed Reality Toolkit](https://github.com/XRTK/XRTK-Core) + +## Build Status + +[![Build status](https://dev.azure.com/xrtk/Mixed%20Reality%20Toolkit/_apis/build/status/XRTK.WMR%20Master%20Build)](https://dev.azure.com/xrtk/Mixed%20Reality%20Toolkit/_build/latest?definitionId=21) \ No newline at end of file From bb79ddda1924a691d4c2ae63923f7ffb3e4c74ec Mon Sep 17 00:00:00 2001 From: Stephen Hodgson Date: Fri, 5 Apr 2019 08:27:52 -0700 Subject: [PATCH 6/6] reverted dependencies --- .../Assets/XRTK.WindowsMixedReality/package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/XRTK.WindowsMixedReality/Assets/XRTK.WindowsMixedReality/package.json b/XRTK.WindowsMixedReality/Assets/XRTK.WindowsMixedReality/package.json index 157f79e..72398d6 100644 --- a/XRTK.WindowsMixedReality/Assets/XRTK.WindowsMixedReality/package.json +++ b/XRTK.WindowsMixedReality/Assets/XRTK.WindowsMixedReality/package.json @@ -12,7 +12,5 @@ "src": "Assets/XRTK.WindowsMixedReality", "author": "XRTK Team (https://github.com/XRTK)", "dependencies": { - "com.xrtk.upm-git-extension": "https://github.com/XRTK/UpmGitExtension.git#0.9.1", - "com.xrtk.core": "https://github.com/XRTK/XRTK-Core.git#0.1.0" } } \ No newline at end of file