diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a2d207..d99724d 100644 --- 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 b/Editor/MarkdownAsset.cs similarity index 100% rename from Runtime/MarkdownAsset.cs rename to Editor/MarkdownAsset.cs diff --git a/Runtime/MarkdownAsset.cs.meta b/Editor/MarkdownAsset.cs.meta similarity index 100% rename from Runtime/MarkdownAsset.cs.meta rename to Editor/MarkdownAsset.cs.meta diff --git a/Runtime/MarkdownImporter.cs b/Editor/MarkdownImporter.cs similarity index 100% rename from Runtime/MarkdownImporter.cs rename to Editor/MarkdownImporter.cs diff --git a/Runtime/MarkdownImporter.cs.meta b/Editor/MarkdownImporter.cs.meta similarity index 100% rename from Runtime/MarkdownImporter.cs.meta rename to Editor/MarkdownImporter.cs.meta diff --git a/Editor/Mischief.MDV.Editor.asmdef b/Editor/Mischief.MDV.Editor.asmdef index a69d7ae..73a18b2 100644 --- 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": [] } \ No newline at end of file diff --git a/Editor/Scripts/MarkdownEditor.cs b/Editor/Scripts/MarkdownEditor.cs index 464a1cf..5a64ca1 100644 --- 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 deleted file mode 100644 index b54ff0b..0000000 --- a/Runtime.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7011a06f75eb23a45b71a1375951228c -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Runtime/Mischief.MDV.Runtime.asmdef b/Runtime/Mischief.MDV.Runtime.asmdef deleted file mode 100644 index 773eb20..0000000 --- a/Runtime/Mischief.MDV.Runtime.asmdef +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "Mischief.MDV.Runtime", - "references": [], - "optionalUnityReferences": [], - "includePlatforms": [], - "excludePlatforms": [], - "allowUnsafeCode": false, - "overrideReferences": false, - "precompiledReferences": [], - "autoReferenced": true, - "defineConstraints": [], - "versionDefines": [] -} \ No newline at end of file diff --git a/Runtime/Mischief.MDV.Runtime.asmdef.meta b/Runtime/Mischief.MDV.Runtime.asmdef.meta deleted file mode 100644 index 9051628..0000000 --- a/Runtime/Mischief.MDV.Runtime.asmdef.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3bc27ff3b9d9e1b4faf59f5aadd7fec4 -AssemblyDefinitionImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Tests/Editor/EdgeCases/markdown.markdown.meta b/Tests/Editor/EdgeCases/markdown.markdown.meta index 88708f6..7ae14a0 100644 --- a/Tests/Editor/EdgeCases/markdown.markdown.meta +++ b/Tests/Editor/EdgeCases/markdown.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 01001ad4321ca914fb60bbaae2588dd3 ScriptedImporter: - fileIDToRecycleName: - 4900000: main + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 2 userData: assetBundleName: assetBundleVariant: 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 index 5c42416..834c580 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/blackfriday/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/blackfriday/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 0497e70644e65f340aa0b19fb145ecbb ScriptedImporter: - fileIDToRecycleName: - 4900000: main + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 2 userData: assetBundleName: assetBundleVariant: 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 index ac07fe8..40aced9 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/gfm/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/gfm/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 6ca62dc301597f549877b28d12f46db5 ScriptedImporter: - fileIDToRecycleName: - 4900000: main + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 2 userData: assetBundleName: assetBundleVariant: 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 index 8f4bbec..4d9e6de 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/hoedown/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/hoedown/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 51527ad4342d4a443b4ebde0cf2d3030 ScriptedImporter: - fileIDToRecycleName: - 4900000: main + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 2 userData: assetBundleName: assetBundleVariant: 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 index 47b7a82..4ad9c63 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/kramdown/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/kramdown/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 98d415e947b39dc4a9bd992507b74994 ScriptedImporter: - fileIDToRecycleName: - 4900000: main + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 2 userData: assetBundleName: assetBundleVariant: 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 index 265fb32..2a533b4 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/lunamark/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/lunamark/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: ff524cf114406374da753bde522a9008 ScriptedImporter: - fileIDToRecycleName: - 4900000: main + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 2 userData: assetBundleName: assetBundleVariant: 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 index ca6dd5a..612353e 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/markdown2/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/markdown2/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: fbe88e28611f27f448ec293e94fc96db ScriptedImporter: - fileIDToRecycleName: - 4900000: main + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 2 userData: assetBundleName: assetBundleVariant: 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 index f096764..2c97b9b 100644 --- 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 @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 6396143fabe3f4a4391824d363adce63 ScriptedImporter: - fileIDToRecycleName: - 4900000: main + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 2 userData: assetBundleName: assetBundleVariant: 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 index 45d9dac..4637e9e 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/marked/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/marked/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: b5c62f5220c875a418252529da3a6df2 ScriptedImporter: - fileIDToRecycleName: - 4900000: main + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 2 userData: assetBundleName: assetBundleVariant: 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 index 25d2546..054b1b0 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/maruku/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/maruku/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: a979567576ab3ae4c8eb52252ad276ac ScriptedImporter: - fileIDToRecycleName: - 4900000: main + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 2 userData: assetBundleName: assetBundleVariant: 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 index 0877270..b3de9cd 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/md2html/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/md2html/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 37b1509bb9145854ab253dc11bd62903 ScriptedImporter: - fileIDToRecycleName: - 4900000: main + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 2 userData: assetBundleName: assetBundleVariant: 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 index 74f4b97..be33c65 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/multimarkdown/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/multimarkdown/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 6532382f9e8535a429970174b6c8b563 ScriptedImporter: - fileIDToRecycleName: - 4900000: main + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 2 userData: assetBundleName: assetBundleVariant: 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 index 8c97f65..64531d5 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/pandoc/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/pandoc/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 8cd874ab5dbeca14b9159a3103ec6f3d ScriptedImporter: - fileIDToRecycleName: - 4900000: main + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 2 userData: assetBundleName: assetBundleVariant: 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 index ce40584..5cc371c 100644 --- 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 @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: d48734260fc2a8248905d656b3f2df15 ScriptedImporter: - fileIDToRecycleName: - 4900000: main + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 2 userData: assetBundleName: assetBundleVariant: 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 index d0b66a0..3fb185c 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/rdiscount/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/rdiscount/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 55e1a83d1343cbc47b820556749cdd2d ScriptedImporter: - fileIDToRecycleName: - 4900000: main + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 2 userData: assetBundleName: assetBundleVariant: 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 index 5fe3f6b..ee1855c 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/redcarpet/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/redcarpet/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 8192a18812b66f0499eab3ac098c7ab5 ScriptedImporter: - fileIDToRecycleName: - 4900000: main + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 2 userData: assetBundleName: assetBundleVariant: 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 index e3ab5ba..f79466c 100644 --- a/Tests/Editor/Samples/markdown-testsuite/tests/extensions/showdown/README.markdown.meta +++ b/Tests/Editor/Samples/markdown-testsuite/tests/extensions/showdown/README.markdown.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 guid: 8d31e5f9c4546c44abde424efbbd2c48 ScriptedImporter: - fileIDToRecycleName: - 4900000: main + internalIDToNameTable: [] externalObjects: {} + serializedVersion: 2 userData: assetBundleName: assetBundleVariant: diff --git a/package.json b/package.json index ffb02c6..4b68b6d 100644 --- 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",