Merge pull request #211 from Unity-Technologies/sync-missing-stable-changes

Sync changes in stable, missing dev

.yamato/promotion.yml

@@ -50,17 +50,6 @@ promotion_test_{{ platform.name }}_{{ editor.version }}:
 
 promotion_test_trigger:
   name: Promotion Tests Trigger
-  agent:
-    type: Unity::VM
-    image: package-ci/win10:stable
-    flavor: b1.large
-  artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-    packages:
-      paths:
-        - "upm-ci~/packages/**/*"
   dependencies:
 {% for editor in test_editors %}
 {% for platform in test_platforms %}

.yamato/upm-ci.yml

@@ -77,25 +77,12 @@ test_{{ platform.name }}_{{ editor.version }}:
 
 test_trigger:
   name: Tests Trigger
-  agent:
-    type: Unity::VM
-    image: package-ci/win10:stable
-    flavor: b1.large
-  commands:
-    - dir
   triggers:
     branches:
       only:
         - "/.*/"
       except:
         - stable
-  artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-    packages:
-      paths:
-        - "upm-ci~/packages/**/*"
   dependencies:
     - .yamato/upm-ci.yml#pack
       {% for editor in test_editors_all %}
@@ -106,25 +93,12 @@ test_trigger:
 
 nightly_test_trigger:
   name: Nightly tests Trigger
-  agent:
-    type: Unity::VM
-    image: package-ci/win10:stable
-    flavor: b1.large
-  commands:
-    - dir
   triggers:
     recurring:
       - branch: dev
         frequency: daily
       - branch: stable
         frequency: daily
-  artifacts:
-    logs:
-      paths:
-        - "upm-ci~/test-results/**/*"
-    packages:
-      paths:
-        - "upm-ci~/packages/**/*"
   dependencies:
     - .yamato/upm-ci.yml#pack
       {% for editor in test_editors_all %}

package/com.unity.formats.usd/CHANGELOG.md

@@ -4,6 +4,10 @@
 ### Changed
 - Updated USD version to 20.08
 
+## [1.0.3-preview.2] - 2020-04-24
+### Changed
+- Fix regression where the default usd root was ignored, creating broken hierarchies of game objects
+
 ## [1.0.3-preview.1] - 2020-04-01
 ### Changed
 - Fix the "Slow and safe as FBX" loading mode to perform the basis change as the FBX importer (#129)

package/com.unity.formats.usd/Editor/Scripts/Behaviors/UsdAssetEditor.cs

@@ -15,7 +15,11 @@
 using System.IO;
 using UnityEngine;
 using UnityEditor;
+#if UNITY_2020_2_OR_NEWER
+using UnityEditor.AssetImporters;
+#else
 using UnityEditor.Experimental.AssetImporters;
+#endif
 
 namespace Unity.Formats.USD {
   [CustomEditor(typeof(UsdAsset))]

package/com.unity.formats.usd/Editor/Scripts/Behaviors/UsdLayerStackEditor.cs

@@ -14,7 +14,11 @@
 
 using UnityEngine;
 using UnityEditor;
+#if UNITY_2020_2_OR_NEWER
+using UnityEditor.AssetImporters;
+#else
 using UnityEditor.Experimental.AssetImporters;
+#endif
 using USD.NET;
 
 namespace Unity.Formats.USD {

package/com.unity.formats.usd/Editor/Scripts/Behaviors/UsdScriptedImporter.cs

@@ -15,7 +15,11 @@
 using System.IO;
 using System.Collections.Generic;
 using UnityEngine;
+#if UNITY_2020_2_OR_NEWER
+using UnityEditor.AssetImporters;
+#else
 using UnityEditor.Experimental.AssetImporters;
+#endif
 using USD.NET;
 using USD.NET.Unity;
 

package/com.unity.formats.usd/Editor/Scripts/Behaviors/UsdScriptedImporterEditor.cs

@@ -16,7 +16,11 @@ using System.IO;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEditor;
+#if UNITY_2020_2_OR_NEWER
+using UnityEditor.AssetImporters;
+#else
 using UnityEditor.Experimental.AssetImporters;
+#endif
 using USD.NET.Unity;
 
 #if false

package/com.unity.formats.usd/package.json

@@ -27,7 +27,7 @@
         "type": "git",
         "url": "ssh://git@github.com:Unity-Technologies/usd-unity-sdk.git"
     },
-    "unity": "2018.3",
+    "unity": "2018.4",
     "unityRelease": "4f1",
     "version": "1.0.4-preview.1"
 }