Fixed issue #36 and also allowed for the update to the Swagger template

JamesRandall · Feb 1, 2019 · a6cd464 · a6cd464
1 parent e283579
commit a6cd464
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.csproj b/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>    
-    <Version>0.19.1-beta000</Version>
+    <Version>0.19.3-beta000</Version>
     <AssemblyName>FunctionMonkey.Compiler</AssemblyName>
     <PackageId>FunctionMonkey.Compiler</PackageId>
   </PropertyGroup>
@@ -358,8 +358,8 @@
     <IntermediatePackDir>$(MSBuildProjectDirectory)/bin/$(Configuration)/publish/</IntermediatePackDir>
     <PublishDir>$(IntermediatePackDir)$(TargetFramework)/</PublishDir>
     <NuspecProperties>publishDir=$([MSBuild]::NormalizeDirectory($(IntermediatePackDir)))</NuspecProperties>
-    <AssemblyVersion>0.19.1.0</AssemblyVersion>
-    <FileVersion>0.19.1.0</FileVersion>
+    <AssemblyVersion>0.19.3.0</AssemblyVersion>
+    <FileVersion>0.19.3.0</FileVersion>
     <PackageReleaseNotes></PackageReleaseNotes>
   </PropertyGroup>
 

diff --git a/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.nuspec b/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>FunctionMonkey.Compiler</id>
-    <version>0.19.1-beta000</version>
+    <version>0.19.3-beta000</version>
     <authors>James Randall</authors>
     <description>Generates Azure Functions from command registrations</description>
     <licenseUrl>https://raw.githubusercontent.com/JamesRandall/AzureFromTheTrenches.Commanding/master/LICENSE</licenseUrl>

diff --git a/Source/FunctionMonkey.Compiler/Implementation/OpenApiCompiler.cs b/Source/FunctionMonkey.Compiler/Implementation/OpenApiCompiler.cs
@@ -113,6 +113,7 @@ private OpenApiFileReference[] CopySwaggerUserInterfaceFilesToWebFolder()
                 if (swaggerFile.EndsWith(".index.html"))
                 {
                     content = content.Replace("http://petstore.swagger.io/v2/swagger.json", "/openapi.yaml");
+                    content = content.Replace("https://petstore.swagger.io/v2/swagger.json", "/openapi.yaml");
                 }
 
                 result[index] = new OpenApiFileReference

diff --git a/Source/FunctionMonkey.Compiler/Templates/http.csharp.handlebars b/Source/FunctionMonkey.Compiler/Templates/http.csharp.handlebars
@@ -84,7 +84,7 @@ namespace {{Namespace}}
             {{/if}}
 
             {{CommandTypeName}} command;
-            string contentType = req.ContentType.ToLower();
+            string contentType = req.ContentType?.ToLower() ?? "application/json";
             if (contentType=="application/json")
             {
                 string requestBody = new StreamReader(req.Body).ReadToEnd();