From 9609f315178b79574d4c7d04324c2d3752e1263a Mon Sep 17 00:00:00 2001 From: Sam Christiansen Date: Thu, 17 Jan 2019 18:00:36 -0800 Subject: [PATCH 1/4] fix asmdef files giving errors on 2018.3 --- .../ExtensionLoader/ExtensionLoader.asmdef | 2 +- .../Assets/Editor/UnityTests/UnityTests.asmdef | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.asmdef b/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.asmdef index a5ed02083..1703a7af8 100644 --- a/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.asmdef +++ b/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.asmdef @@ -1,6 +1,6 @@ { "name": "ExtensionLoader", - "references": ["../../build/GitHub.UnityShim.dll"], + "precompiledReferences": ["../../build/GitHub.UnityShim.dll"], "includePlatforms": [ "Editor" ], diff --git a/src/UnityExtension/Assets/Editor/UnityTests/UnityTests.asmdef b/src/UnityExtension/Assets/Editor/UnityTests/UnityTests.asmdef index eef024216..d49630a1a 100644 --- 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": [] } \ No newline at end of file From 160bd8c4d8d3f2b9b4a8d497345e825cd36a84b4 Mon Sep 17 00:00:00 2001 From: Andreia Gaita Date: Fri, 18 Jan 2019 17:19:32 +0100 Subject: [PATCH 2/4] Fix dark mode in development mode --- .../Assets/Editor/GitHub.Unity/Misc/Utility.cs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Utility.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Utility.cs index 990ba7061..c43c76893 100644 --- 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(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; From 8391ec00a9313cc804be72a75a25a955ca145f7b Mon Sep 17 00:00:00 2001 From: Andreia Gaita Date: Fri, 18 Jan 2019 17:19:55 +0100 Subject: [PATCH 3/4] Let Unity 2018.3 recreate the ExtensionLoader.asmdef file --- .../ExtensionLoader/ExtensionLoader.asmdef | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.asmdef b/src/UnityExtension/Assets/Editor/GitHub.Unity/ExtensionLoader/ExtensionLoader.asmdef index 1703a7af8..4408c5c12 100644 --- 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", - "precompiledReferences": ["../../build/GitHub.UnityShim.dll"], + "references": [], + "optionalUnityReferences": [], "includePlatforms": [ "Editor" ], - "excludePlatforms": [] + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": true, + "precompiledReferences": [ + "GitHub.UnityShim.dll" + ], + "autoReferenced": true } \ No newline at end of file From cd75bf8a1f1b17585fe07f0c301787de3422f82e Mon Sep 17 00:00:00 2001 From: Andreia Gaita Date: Mon, 21 Jan 2019 11:58:06 +0100 Subject: [PATCH 4/4] Store the version of Unity we're using for the UnityExtension project --- src/UnityExtension/ProjectSettings/ProjectVersion.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/UnityExtension/ProjectSettings/ProjectVersion.txt diff --git a/src/UnityExtension/ProjectSettings/ProjectVersion.txt b/src/UnityExtension/ProjectSettings/ProjectVersion.txt new file mode 100644 index 000000000..78fa54032 --- /dev/null +++ b/src/UnityExtension/ProjectSettings/ProjectVersion.txt @@ -0,0 +1 @@ +m_EditorVersion: 2018.3.2f1