fixed

gwaredd · Nov 9, 2019 · 0e066ab · 0e066ab
1 parent f1ae006
commit 0e066ab
Show file tree

Hide file tree

Showing 28 changed files with 64 additions and 72 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.0.2] - 2019-09-11
+
+### Changes
+
+* Removed runtime, moved into editor assembly
+* Fix for wrong version number on workaround for unity bug
+
 ## [1.0.1] - 2019-11-03
 
 ### Fix

diff --git a/Runtime/MarkdownAsset.cs → Editor/MarkdownAsset.cs b/Runtime/MarkdownAsset.cs → Editor/MarkdownAsset.cs
diff --git a/Runtime/MarkdownAsset.cs.meta → Editor/MarkdownAsset.cs.meta b/Runtime/MarkdownAsset.cs.meta → Editor/MarkdownAsset.cs.meta
diff --git a/Runtime/MarkdownImporter.cs → Editor/MarkdownImporter.cs b/Runtime/MarkdownImporter.cs → Editor/MarkdownImporter.cs
diff --git a/Runtime/MarkdownImporter.cs.meta → Editor/MarkdownImporter.cs.meta b/Runtime/MarkdownImporter.cs.meta → Editor/MarkdownImporter.cs.meta
diff --git a/Editor/Mischief.MDV.Editor.asmdef b/Editor/Mischief.MDV.Editor.asmdef
@@ -3,6 +3,14 @@
     "references": [
         "Mischief.MDV.Runtime"
     ],
-    "includePlatforms": [],
-    "excludePlatforms": []
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": []
 }
diff --git a/Editor/Scripts/MarkdownEditor.cs b/Editor/Scripts/MarkdownEditor.cs
@@ -59,11 +59,21 @@ public override bool UseDefaultMargins()
         // https://forum.unity.com/threads/oninspectorgui-not-being-called-on-defaultasset-in-2019-2-0f1.724328/
         protected override void OnHeaderGUI()
         {
-            OnInspectorGUI();
+            DrawEditor();
+        }
+#else
+        public override void OnInspectorGUI()
+        {
+            DrawEditor();
         }
 #endif
 
-        public override void OnInspectorGUI()
+
+        //------------------------------------------------------------------------------
+
+        private Editor mDefaultEditor;
+
+        void DrawEditor()
         {
             if( mViewer != null )
             {
@@ -75,11 +85,6 @@ public override void OnInspectorGUI()
             }
         }
 
-
-        //------------------------------------------------------------------------------
-
-        private Editor mDefaultEditor;
-
         void DrawDefaultEditor()
         {
             mDefaultEditor = mDefaultEditor ?? CreateEditor( target, Type.GetType( "UnityEditor.TextAssetInspector, UnityEditor" ) );

diff --git a/Runtime.meta b/Runtime.meta
diff --git a/Runtime/Mischief.MDV.Runtime.asmdef b/Runtime/Mischief.MDV.Runtime.asmdef
diff --git a/Runtime/Mischief.MDV.Runtime.asmdef.meta b/Runtime/Mischief.MDV.Runtime.asmdef.meta
diff --git a/Tests/Editor/EdgeCases/markdown.markdown.meta b/Tests/Editor/EdgeCases/markdown.markdown.meta
diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/blackfriday/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/blackfriday/README.markdown.meta
diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/gfm/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/gfm/README.markdown.meta
diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/hoedown/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/hoedown/README.markdown.meta
diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/kramdown/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/kramdown/README.markdown.meta
diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/lunamark/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/lunamark/README.markdown.meta
diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/markdown2/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/markdown2/README.markdown.meta
diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/markdown_pl/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/markdown_pl/README.markdown.meta
diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/marked/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/marked/README.markdown.meta
diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/maruku/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/maruku/README.markdown.meta
diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/md2html/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/md2html/README.markdown.meta
diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/multimarkdown/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/multimarkdown/README.markdown.meta
diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/pandoc/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/pandoc/README.markdown.meta
diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/peg_markdown/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/peg_markdown/README.markdown.meta
diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/rdiscount/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/rdiscount/README.markdown.meta
diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/redcarpet/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/redcarpet/README.markdown.meta
diff --git a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/showdown/README.markdown.meta b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/showdown/README.markdown.meta
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.mischief.markdownviewer",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "displayName": "Unity Markdown Viewer",
   "description": "Editor inspector for markdown files",
   "unity": "2017.4",