Merge branch 'master' into fixes/api

github-for-unity · Jan 23, 2019 · 58a35fb · 58a35fb
2 parents 381ae22 + be609cf
commit 58a35fb
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.asmdef b/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.asmdef
@@ -1,8 +1,15 @@
 {
     "name": "ExtensionLoader",
-    "references": ["../../build/GitHub.UnityShim.dll"],
+    "references": [],
+    "optionalUnityReferences": [],
     "includePlatforms": [
         "Editor"
     ],
-    "excludePlatforms": []
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "GitHub.UnityShim.dll"
+    ],
+    "autoReferenced": true
 }
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Utility.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Utility.cs
@@ -37,16 +37,14 @@ public static Texture2D GetIcon(string filename, string filename2x = "", bool in
             Texture2D texture2D = null;
 
             var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("GitHub.Unity.IconsAndLogos." + filename);
-            if (stream != null)
+            if (stream == null)
             {
-                texture2D = stream.ToTexture2D();
-            }
-            else
-            {
-                var iconPath = "Assets/Editor/GitHub.Unity/IconsAndLogos/" + filename;
-                texture2D = AssetDatabase.LoadAssetAtPath<Texture2D>(iconPath);
+                stream = new MemoryStream(Application.dataPath.ToNPath().Combine("Editor/GitHub.Unity/IconsAndLogos/", filename).ReadAllBytes());
             }
 
+            texture2D = stream.ToTexture2D();
+            stream.Dispose();
+
             if (texture2D != null)
             {
                 texture2D.hideFlags = HideFlags.HideAndDontSave;

diff --git a/src/UnityExtension/Assets/Editor/UnityTests/UnityTests.asmdef b/src/UnityExtension/Assets/Editor/UnityTests/UnityTests.asmdef
@@ -3,8 +3,16 @@
     "references": [
         "GitHub.Unity"
     ],
+    "optionalUnityReferences": [
+        "TestAssemblies"
+    ],
     "includePlatforms": [
         "Editor"
     ],
-    "excludePlatforms": []
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": []
 }
diff --git a/src/UnityExtension/ProjectSettings/ProjectVersion.txt b/src/UnityExtension/ProjectSettings/ProjectVersion.txt
@@ -0,0 +1 @@
+m_EditorVersion: 2018.3.2f1