Merge branch 'develop' into release

Author: cpmcgrath

CodeAlignment.VisualStudio/CodeAlignmentPackage.cs

@@ -5,7 +5,7 @@
 namespace CMcG.CodeAlignment
 {
     [PackageRegistration(UseManagedResourcesOnly = true)]
-    [InstalledProductRegistration("#110", "#112", "12", IconResourceID = 400)]
+    [InstalledProductRegistration("#110", "#112", "12.1", IconResourceID = 400)]
     [ProvideMenuResource("Menus.ctmenu", 1)]
     [Guid(GuidList.PackageGuidStr)]
     public sealed class CodeAlignmentPackage : Package

CodeAlignment.VisualStudio/Properties/AssemblyInfo.cs

@@ -28,5 +28,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion    ("12.0.0.*")]
-[assembly: AssemblyFileVersion("12.0.0.0")]
+[assembly: AssemblyVersion("12.1.0.*")]
+[assembly: AssemblyFileVersion("12.1.0.0")]

CodeAlignment.VisualStudio/source.extension.vsixmanifest

@@ -3,7 +3,7 @@
   <Identifier Id="2adcbb11-89c4-451e-97f2-14049154ccad">
     <Name>Code alignment</Name>
     <Author>Chris McGrath</Author>
-    <Version>12.0</Version>
+    <Version>12.1</Version>
     <Description xml:space="preserve">Code alignment helps you present your code beautifully, enhancing clarity and readability.</Description>
     <Locale>1033</Locale>
     <MoreInfoUrl>http://www.codealignment.com</MoreInfoUrl>
@@ -32,6 +32,10 @@
         <Edition>Premium</Edition>
         <Edition>Pro</Edition>
       </VisualStudio>
+      <VisualStudio Version="15.0">
+        <Edition>Pro</Edition>
+        <Edition>Community</Edition>
+      </VisualStudio>
       <IsolatedShell Version="6.0">AtmelStudio</IsolatedShell>
     </SupportedProducts>
     <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.0" />