Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

fix asmdef files giving errors on 2018.3 #1001

Merged
merged 4 commits into from
Jan 21, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
}
12 changes: 5 additions & 7 deletions src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Utility.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 9 additions & 1 deletion src/UnityExtension/Assets/Editor/UnityTests/UnityTests.asmdef
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,16 @@
"references": [
"GitHub.Unity"
],
"optionalUnityReferences": [
"TestAssemblies"
],
"includePlatforms": [
"Editor"
],
"excludePlatforms": []
"excludePlatforms": [],
"allowUnsafeCode": false,
"overrideReferences": false,
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": []
}
1 change: 1 addition & 0 deletions src/UnityExtension/ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
m_EditorVersion: 2018.3.2f1