Merge pull request Unity-Technologies#15 from unity/update

Package Update
MatthewMaker · Aug 4, 2020 · 1c66207 · 1c66207
2 parents ef10efd + 5379c7a
commit 1c66207
Show file tree

Hide file tree

Showing 488 changed files with 1,415 additions and 1,526 deletions.
diff --git a/.yamato/base.yml b/.yamato/base.yml
@@ -35,7 +35,7 @@ editor:priming:{{ editor.version }}:{{ platform.os }}:
     {{ v[0] }}: {{ v[1]}}
     {% endfor %}
   commands:
-    - pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.eu-cph-1.unityops.net/api/pypi/common-python/simple
+    - pip install unity-downloader-cli --user --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
     - >
       unity-downloader-cli
       -u {{ editor.version }}
@@ -65,7 +65,7 @@ editor:priming:{{ test.name }}:{{ platform.os }}:
     {{ v[0] }}: {{ v[1]}}
     {% endfor %}
   commands:
-    - pip install unity-downloader-cli --user --upgrade --extra-index-url https://artifactory.eu-cph-1.unityops.net/api/pypi/common-python/simple
+    - pip install unity-downloader-cli --user --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
     - >
       unity-downloader-cli
       -u {{ test.path }}

diff --git a/.yamato/package-publish.yml b/.yamato/package-publish.yml
@@ -66,7 +66,7 @@ publish:{{ test.name }}:
     {{ v[0] }}: {{ v[1]}}
     {% endfor %}
   commands:
-    - npm install upm-ci-utils@stable --registry https://api.bintray.com/npm/unity/unity-npm -g
+    - npm install upm-ci-utils@stable --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm -g
     - >
       upm-ci {{ test.type }} publish
 {% if test.type == "template" -%}
@@ -119,7 +119,7 @@ promote:{{ test.name }}:
   variables:
     UPMCI_PROMOTION: 1
   commands:
-    - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     - >
       upm-ci {{ test.type }} promote
       --{{ test.type }}-path {{ test.path }}

diff --git a/.yamato/package-test.yml b/.yamato/package-test.yml
@@ -27,7 +27,7 @@ images:
     flavor: b1.large
   macos:
     type: Unity::VM::osx
-    image: buildfarm/mac:stable
+    image: package-ci/mac:stable
     flavor: m1.mac
 
 scripting_backends:
@@ -56,8 +56,8 @@ scripting_backends:
     {{ v[0] }}: {{ v[1]}}
 {% endfor -%}
   commands:
-  - pip install unity-downloader-cli --upgrade --extra-index-url https://artifactory.eu-cph-1.unityops.net/api/pypi/common-python/simple
-  - npm install upm-ci-utils@stable --registry https://api.bintray.com/npm/unity/unity-npm -g
+  - pip install unity-downloader-cli --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
+  - npm install upm-ci-utils@stable --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm -g
   - unity-downloader-cli --source-file unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only
   # TODO: upm-ci needs to support scripting backends
   - >
@@ -100,8 +100,8 @@ scripting_backends:
     {{ v[0] }}: {{ v[1]}}
 {% endfor -%}
   commands:
-    - pip install unity-downloader-cli --upgrade --extra-index-url https://artifactory.eu-cph-1.unityops.net/api/pypi/common-python/simple
-    - npm install upm-ci-utils@stable --registry https://api.bintray.com/npm/unity/unity-npm -g
+    - pip install unity-downloader-cli --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
+    - npm install upm-ci-utils@stable --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm -g
     - unity-downloader-cli --source-file unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only
     - >
       upm-ci
@@ -143,8 +143,8 @@ scripting_backends:
     {{ v[0] }}: {{ v[1]}}
 {% endfor -%}
   commands:
-    - pip install unity-downloader-cli --upgrade --extra-index-url https://artifactory.eu-cph-1.unityops.net/api/pypi/common-python/simple
-    - npm install upm-ci-utils@stable --registry https://api.bintray.com/npm/unity/unity-npm -g
+    - pip install unity-downloader-cli --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
+    - npm install upm-ci-utils@stable --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm -g
     - unity-downloader-cli --source-file unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only
     - >
       upm-ci
@@ -213,7 +213,7 @@ test_trigger:
     image: package-ci/win10:stable
     flavor: b1.large
   commands:
-    - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     - upm-ci package izon --tests-complete
   triggers:
     branches:
@@ -231,86 +231,6 @@ test_trigger:
 {% endfor %}
 {% endfor %}
 
-{% for test in testables %}
-{% for editor in editors %}
-{% for platform in platforms %}
-dependency:{{ test.name }}:{{ platform.os }}:{{ editor.version }}:
-  name : "[{{ editor.version }},{{ platform.os }}] Dependency Test"
-  agent:
-    type: {{ images[platform.os].type }}
-    image: {{ images[platform.os].image }}
-    flavor: {{ images[platform.os].flavor }}
-  variables:
-{% if platform.os == "linux" -%}
-    PATH: /home/bokken/bin:/home/bokken/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/snap/bin:/sbin:/home/bokken/.npm-global/bin
-    DISPLAY: ":0"
-{% endif -%}
-{% for v in template_environment_variables -%}
-    {{ v[0] }}: {{ v[1]}}
-{% endfor -%}
-  commands:
-    - pip install unity-downloader-cli --upgrade --extra-index-url https://artifactory.eu-cph-1.unityops.net/api/pypi/common-python/simple
-    - unity-downloader-cli --source-file unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only
-    - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
-    - >
-      upm-ci
-      {{ test.type }}
-      test
-      -u {{ editor.version }}
-      --type updated-dependencies-tests
-{% if test.type == "template" -%}
-      --project-path {{ test.path }}
-{% else -%}
-      --{{ test.type }}-path {{ test.path }}
-{% endif -%}
-  artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-  triggers:
-    recurring:
-      - branch: master
-        frequency: 20 * * ?
-  dependencies:
-    - .yamato/package-test.yml#pack:{{ test.name }}
-    - .yamato/base.yml#editor:priming:{{ editor.version }}:{{ platform.os }}
-{% for prebuild in extra_jobs.pre -%}
-    - {{ prebuild }}
-{% endfor -%}
-{% endfor %}
-{% endfor %}
-{% endfor %}
-
-{% for test in testables %}
-dependency:test:trigger:{{ test.name }}:
-  name: "[{{ test.name }}] Dependency Tests Trigger"
-  agent:
-    type: Unity::VM
-    image: package-ci/win10:stable
-    flavor: b1.large
-  variables:
-{% for v in template_environment_variables -%}
-    {{ v[0] }}: {{ v[1]}}
-{% endfor -%}
-  commands:
-    - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
-    - upm-ci {{ test.type }} izon -d
-  triggers:
-    recurring:
-      - branch: master
-        frequency: 22 * * ?
-  dependencies:
-    - .yamato/package-test.yml#pack:{{ test.name }}
-{% for prebuild in extra_jobs.pre -%}
-    - {{ prebuild }}
-{% endfor -%}
-{% for editor in editors %}
-{% for platform in platforms %}
-    - .yamato/package-test.yml#dependency:{{ test.name }}:{{ platform.os }}:{{ editor.version }}
-{% endfor %}
-{% endfor %}
-{% endfor %}
-
 {% for test in testables %}
 {% for editor in editors %}
 {% for platform in platforms %}
@@ -330,15 +250,14 @@ promotion:test:{{ test.name }}:{{ platform.os }}:{{ editor.version }}:
 {% endfor -%}
     UPMCI_PROMOTION: 1
   commands:
-    - pip install unity-downloader-cli --upgrade --extra-index-url https://artifactory.eu-cph-1.unityops.net/api/pypi/common-python/simple
+    - pip install unity-downloader-cli --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
     - unity-downloader-cli --source-file unity_revision.txt {% for component in platform.components %}-c {{ component }} {% endfor %}--wait --published-only
-    - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     - >
       upm-ci
       {{ test.type }}
       test
       -u {{ editor.version }}
-      --type updated-dependencies-tests
 {% if test.type == "template" -%}
       --project-path {{ test.path }}
 {% else -%}
@@ -366,7 +285,7 @@ promotion:test:trigger:{{ test.name }}:
     image: package-ci/win10:stable
     flavor: b1.large
   commands:
-    - npm install upm-ci-utils@stable -g --registry https://api.bintray.com/npm/unity/unity-npm
+    - npm install upm-ci-utils@stable -g --registry https://artifactory.prd.cds.internal.unity3d.com/artifactory/api/npm/upm-npm
     - upm-ci {{ test.type }} izon -d
   dependencies:
     - .yamato/package-test.yml#pack:{{ test.name }}

diff --git a/.yamato/template-config.yml b/.yamato/template-config.yml
@@ -49,7 +49,7 @@ testables:
   # type: package or project
   # publish_source: indicates if this testable should be included in publishing
   # standalone: true/false for if this testable contains runtime code or if it's only editor code
-  - name: com.unity.labs.editorxr
+  - name: com.unity.editorxr
     path: .
     type: package
     publish_source: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.4.8-preview] - 2020-07-31
+- Remove UnityOctree and extract SpatialHashModule into its own package with custom octree
+- Improvements and optimizations related to MARS companion app development
+- Update dependencies to latest versions
+- Remove "Labs" from namespaces and package metadata
+
 ## [0.4.7-preview] - 2020-02-07
 - Update third party notices per legal review
 

diff --git a/Editor/ButtonEditor.cs b/Editor/ButtonEditor.cs
@@ -1,6 +1,6 @@
 using UnityEditor;
 
-namespace Unity.Labs.EditorXR.UI
+namespace Unity.EditorXR.UI
 {
     // Because Button already has a custom editor, and we need to expose SelectionFlags, we need a custom inspector
     [CustomEditor(typeof(Button))]

diff --git a/Editor/InputFieldEditor.cs b/Editor/InputFieldEditor.cs
@@ -1,7 +1,7 @@
 using UnityEditor;
 using UnityEditor.UI;
 
-namespace Unity.Labs.EditorXR.UI
+namespace Unity.EditorXR.UI
 {
     [CustomEditor(typeof(InputField))]
     [CanEditMultipleObjects]

diff --git a/Editor/KeyboardButtonEditor.cs b/Editor/KeyboardButtonEditor.cs
@@ -3,7 +3,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Unity.Labs.EditorXR.UI
+namespace Unity.EditorXR.UI
 {
     [CustomEditor(typeof(KeyboardButton))]
     sealed class KeyboardButtonEditor : Editor

diff --git a/Editor/KeyboardMalletEditor.cs b/Editor/KeyboardMalletEditor.cs
@@ -1,6 +1,6 @@
 using UnityEditor;
 
-namespace Unity.Labs.EditorXR.UI
+namespace Unity.EditorXR.UI
 {
     [CanEditMultipleObjects]
     [CustomEditor(typeof(KeyboardMallet))]

diff --git a/Editor/KeyboardUIEditor.cs b/Editor/KeyboardUIEditor.cs
@@ -1,7 +1,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Unity.Labs.EditorXR.UI
+namespace Unity.EditorXR.UI
 {
     [CustomEditor(typeof(KeyboardUI))]
     sealed class KeyboardUIEditor : Editor

diff --git a/Editor/LockableHierarchyGUI.cs b/Editor/LockableHierarchyGUI.cs
@@ -1,7 +1,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace Unity.Labs.EditorXR
+namespace Unity.EditorXR
 {
     [InitializeOnLoad]
     class LockableHierarchyGUI : ScriptableSingleton<LockableHierarchyGUI>

diff --git a/Editor/MainMenuEditor.cs b/Editor/MainMenuEditor.cs
@@ -1,9 +1,9 @@
-using Unity.Labs.EditorXR.Interfaces;
-using Unity.Labs.EditorXR.Menus;
+using Unity.EditorXR.Interfaces;
+using Unity.EditorXR.Menus;
 using UnityEditor;
 using UnityEngine;
 
-namespace Unity.Labs.EditorXR.UI
+namespace Unity.EditorXR.UI
 {
     [CustomEditor(typeof(MainMenu))]
     class MainMenuEditor : Editor

diff --git a/Editor/NumericInputFieldEditor.cs b/Editor/NumericInputFieldEditor.cs
@@ -1,6 +1,6 @@
 using UnityEditor;
 
-namespace Unity.Labs.EditorXR.UI
+namespace Unity.EditorXR.UI
 {
     [CustomEditor(typeof(NumericInputField))]
     [CanEditMultipleObjects]

diff --git a/Editor/PolyToolkitHelper.cs b/Editor/PolyToolkitHelper.cs
@@ -5,7 +5,7 @@
 using UnityEditor.Compilation;
 using UnityEngine;
 
-namespace Unity.Labs.EditorXR
+namespace Unity.EditorXR
 {
     [InitializeOnLoad]
     static class PolyToolkitHelper

diff --git a/Editor/RaySliderEditor.cs b/Editor/RaySliderEditor.cs
@@ -1,7 +1,7 @@
 using UnityEditor;
 using UnityEditor.UI;
 
-namespace Unity.Labs.EditorXR.UI
+namespace Unity.EditorXR.UI
 {
     // Because Slider already has a custom editor, and we need to expose SelectionFlags, we need a custom inspector
     [CustomEditor(typeof(RaySlider))]

diff --git a/Editor/SeedXRInputBindings.cs b/Editor/SeedXRInputBindings.cs
@@ -2,7 +2,7 @@
 using UnityEditor;
 
 // Copied from UnityEditor.XR.LegacyInputHelpers
-namespace Unity.Labs.EditorXR.LegacyInputHelpers
+namespace Unity.EditorXR.LegacyInputHelpers
 {
     /// <summary>
     /// The SeedXRInputBindings class is used to populate the Input Asset with the cross platform bindings published by Unity for most XR Devices.

diff --git a/Editor/SettingsProviders/EditorXRSettingsProvider.cs b/Editor/SettingsProviders/EditorXRSettingsProvider.cs
@@ -1,6 +1,6 @@
 using UnityEditor;
 
-namespace Unity.Labs.EditorXR.UI
+namespace Unity.EditorXR.UI
 {
     class EditorXRSettingsProvider : SettingsProvider
     {

diff --git a/Editor/SettingsProviders/HapticPulsesSettingsProvider.cs b/Editor/SettingsProviders/HapticPulsesSettingsProvider.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
-using Unity.Labs.EditorXR.Core;
-using Unity.Labs.EditorXR.Modules;
+using Unity.EditorXR.Core;
+using Unity.EditorXR.Modules;
 using UnityEditor;
 using UnityEngine;
 
@@ -10,7 +10,7 @@
 using UnityEngine.Experimental.UIElements;
 #endif
 
-namespace Unity.Labs.EditorXR.UI
+namespace Unity.EditorXR.UI
 {
     class HapticPulsesSettingsProvider : EditorXRSettingsProvider
     {

diff --git a/Editor/SettingsProviders/ProxyFeedbackSettingsProvider.cs b/Editor/SettingsProviders/ProxyFeedbackSettingsProvider.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
-using Unity.Labs.EditorXR.Modules;
-using Unity.Labs.EditorXR.Proxies;
+using Unity.EditorXR.Modules;
+using Unity.EditorXR.Proxies;
 using UnityEditor;
 using UnityEngine;
 
@@ -11,7 +11,7 @@
 using UnityEngine.Experimental.UIElements;
 #endif
 
-namespace Unity.Labs.EditorXR.UI
+namespace Unity.EditorXR.UI
 {
     class ProxyFeedbackSettingsProvider : EditorXRSettingsProvider
     {

diff --git a/Editor/SettingsProviders/TooltipsSettingsProvider.cs b/Editor/SettingsProviders/TooltipsSettingsProvider.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
-using Unity.Labs.EditorXR.Interfaces;
-using Unity.Labs.Utils;
+using Unity.EditorXR.Interfaces;
+using Unity.XRTools.Utils;
 using UnityEditor;
 using UnityEngine;
 
@@ -12,7 +12,7 @@
 using UnityEngine.Experimental.UIElements;
 #endif
 
-namespace Unity.Labs.EditorXR.UI
+namespace Unity.EditorXR.UI
 {
     class TooltipsSettingsProvider : EditorXRSettingsProvider
     {

diff --git a/Editor/StandardInputFieldEditor.cs b/Editor/StandardInputFieldEditor.cs
@@ -1,6 +1,6 @@
 using UnityEditor;
 
-namespace Unity.Labs.EditorXR.UI
+namespace Unity.EditorXR.UI
 {
     [CustomEditor(typeof(StandardInputField))]
     sealed class StandardInputFieldEditor : InputFieldEditor