1.14.2

frhagn · Oct 11, 2017 · f6c69ac · f6c69ac
1 parent e70d7df
commit f6c69ac
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/docs/pages/changelog.html b/docs/pages/changelog.html
@@ -61,8 +61,13 @@
                     <div class="col-sm-10 col-sm-push-1">
                         <h1>Change log</h1>
 
-                        <h3>Typewriter 1.13</h3>
-                        <p class="lead">Improved support ASP.NET Core routing.</p>
+                        <h3>Typewriter 1.14</h3>
+                        <p class="lead">Render All Templates context menu, bug fixes.</p>
+
+                        <h4>1.14.2</h4>
+                        <ul>
+                            <li>Fixed bug where convension-based routes combined with method route attribute returned wrong url. (<a href="https://github.com/frhagn/Typewriter/pull/222">#222</a>)</li>
+                        </ul>
 
                         <h4>1.14.1</h4>
                         <ul>
@@ -77,6 +82,9 @@ <h4>1.14.0</h4>
                             <li>Added support for IsAbstract on Properties and Methods. (<a href="https://github.com/frhagn/Typewriter/issues/215">#215</a>)</li>
                         </ul>
 
+                        <h3>Typewriter 1.13</h3>
+                        <p class="lead">Improved support ASP.NET Core routing.</p>
+
                         <h4>1.13.0</h4>
                         <ul>
                             <li>Improved support ASP.NET Core routing. (<a href="https://github.com/frhagn/Typewriter/pull/191">#191</a>)</li>

diff --git a/src/CodeModel/Extensions/WebApi/UrlExtensions.cs b/src/CodeModel/Extensions/WebApi/UrlExtensions.cs
@@ -68,7 +68,6 @@ public static string Route(this Method method, string route)
 
                 if (string.IsNullOrEmpty(value))
                 {
-                    // Todo: What happens with empty route and no route prefix?
                     route = routePrefix ?? route;
                 }
                 else if (value.StartsWith("~"))

diff --git a/src/Typewriter/Properties/SharedAssemblyInfo.cs b/src/Typewriter/Properties/SharedAssemblyInfo.cs
@@ -12,4 +12,4 @@
 
 [assembly: NeutralResourcesLanguage("en-US")]
 
-[assembly: AssemblyVersion("1.14.1.*")]
+[assembly: AssemblyVersion("1.14.2.*")]
diff --git a/src/Typewriter/VisualStudio/ExtensionPackage.cs b/src/Typewriter/VisualStudio/ExtensionPackage.cs
@@ -20,7 +20,7 @@ namespace Typewriter.VisualStudio
     [Guid(Constants.ExtensionPackageId)]
     [PackageRegistration(UseManagedResourcesOnly = true)]
     [ProvideAutoLoad(VSConstants.UICONTEXT.SolutionExists_string)]
-    [InstalledProductRegistration("#110", "#112", "1.14.1", IconResourceID = 401)]
+    [InstalledProductRegistration("#110", "#112", "1.14.2", IconResourceID = 401)]
     [ProvideLanguageService(typeof(LanguageService), Constants.LanguageName, 100, DefaultToInsertSpaces = true)]
     [ProvideLanguageExtension(typeof(LanguageService), Constants.TemplateExtension)]
     [ProvideMenuResource("Menus.ctmenu", 1)]

diff --git a/src/Typewriter/source.extension.vsixmanifest b/src/Typewriter/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="45b6b392-ce2f-409c-a39f-bbf90b34349e" Version="1.14.1" Language="en-US" Publisher="frhagn" />
+        <Identity Id="45b6b392-ce2f-409c-a39f-bbf90b34349e" Version="1.14.2" Language="en-US" Publisher="frhagn" />
         <DisplayName>Typewriter</DisplayName>
         <Description xml:space="preserve">Typewriter generates TypeScript files from c# code files using TypeScript Templates. This allows you to create fully typed TypeScript representations of server side API that automatically updates when you make changes to your c# code.</Description>
         <MoreInfo>http://frhagn.github.io/Typewriter/</MoreInfo>