Removed .md Support for Emojis due to Conflict; Updated version.

rionmonster · Oct 24, 2016 · 06668bf · 06668bf
1 parent afd3c1a
commit 06668bf
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/Glyphs/MaterialDesign/source.extension.vsixmanifest b/Glyphs/MaterialDesign/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="950d05f7-bb25-43ce-b682-44b377b5307d" Version="1.5.2.0" Language="en-US" Publisher="Rion Williams" />
+    <Identity Id="950d05f7-bb25-43ce-b682-44b377b5307d" Version="1.5.2.1" Language="en-US" Publisher="Rion Williams" />
     <DisplayName>Glyphfriend</DisplayName>
     <Description xml:space="preserve">Glyphfriend is a Visual Studio extension to enhance the existing Intellisense to display preview glyphs for many of the common glyph-based font libraries like Font Awesome, Foundation, IonIcons and more.</Description>
     <MoreInfo>https://visualstudiogallery.msdn.microsoft.com/5fd24afb-b3b2-4cec-9b03-1cfcec6123aa</MoreInfo>

diff --git a/Helpers/Markdown/MarkdownContentTypeDefinition.cs b/Helpers/Markdown/MarkdownContentTypeDefinition.cs
@@ -12,10 +12,12 @@ public class MarkdownContentTypeDefinition
         [BaseDefinition("htmlx")]
         public ContentTypeDefinition IMarkdownContentType { get; set; }
 
-        [Export(typeof(FileExtensionToContentTypeDefinition))]
-        [ContentType(MarkdownContentType)]
-        [FileExtension(".md")]
-        public FileExtensionToContentTypeDefinition MdFileExtension { get; set; }
+        // Removed due to conflict with MarkdownEditor extension (https://github.com/madskristensen/MarkdownEditor)
+
+        //[Export(typeof(FileExtensionToContentTypeDefinition))]
+        //[ContentType(MarkdownContentType)]
+        //[FileExtension(".md")]
+        //public FileExtensionToContentTypeDefinition MdFileExtension { get; set; }
 
         [Export(typeof(FileExtensionToContentTypeDefinition))]
         [ContentType(MarkdownContentType)]

diff --git a/source.extension.vsixmanifest b/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="950d05f7-bb25-43ce-b682-44b377b5307d" Version="1.5.2.0" Language="en-US" Publisher="Rion Williams" />
+    <Identity Id="950d05f7-bb25-43ce-b682-44b377b5307d" Version="1.5.2.1" Language="en-US" Publisher="Rion Williams" />
     <DisplayName>Glyphfriend</DisplayName>
     <Description xml:space="preserve">Glyphfriend is a Visual Studio extension to enhance the existing Intellisense to display preview glyphs for many of the common glyph-based font libraries like Font Awesome, Foundation, IonIcons and more.</Description>
     <MoreInfo>https://visualstudiogallery.msdn.microsoft.com/5fd24afb-b3b2-4cec-9b03-1cfcec6123aa</MoreInfo>