Merge branch 'develop'

giraffe-fsharp · Jan 29, 2018 · d1edd92 · d1edd92
2 parents 2104908 + 26169f6
commit d1edd92
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 16 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,12 @@
 Release Notes
 =============
 
+## 0.14.0
+
+#### New features
+
+- Added the ASP.NET Core default developer exception page when environment is development.
+
 ## 0.13.0
 
 #### New features

diff --git a/src/content/DotLiquid/src/AppNamePlaceholder/Program.fs b/src/content/DotLiquid/src/AppNamePlaceholder/Program.fs
@@ -48,10 +48,13 @@ let configureCors (builder : CorsPolicyBuilder) =
            |> ignore
 
 let configureApp (app : IApplicationBuilder) =
-    app.UseCors(configureCors)
-       .UseGiraffeErrorHandler(errorHandler)
-       .UseStaticFiles()
-       .UseGiraffe(webApp)
+    let env = app.ApplicationServices.GetService<IHostingEnvironment>()
+    (match env.IsDevelopment() with
+    | true  -> app.UseDeveloperExceptionPage()
+    | false -> app.UseGiraffeErrorHandler errorHandler)
+        .UseCors(configureCors)
+        .UseStaticFiles()
+        .UseGiraffe(webApp)
 
 let configureServices (services : IServiceCollection) =
     services.AddCors() |> ignore

diff --git a/src/content/Giraffe/src/AppNamePlaceholder/Program.fs b/src/content/Giraffe/src/AppNamePlaceholder/Program.fs
@@ -81,10 +81,13 @@ let configureCors (builder : CorsPolicyBuilder) =
            |> ignore
 
 let configureApp (app : IApplicationBuilder) =
-    app.UseCors(configureCors)
-       .UseGiraffeErrorHandler(errorHandler)
-       .UseStaticFiles()
-       .UseGiraffe(webApp)
+    let env = app.ApplicationServices.GetService<IHostingEnvironment>()
+    (match env.IsDevelopment() with
+    | true  -> app.UseDeveloperExceptionPage()
+    | false -> app.UseGiraffeErrorHandler errorHandler)
+        .UseCors(configureCors)
+        .UseStaticFiles()
+        .UseGiraffe(webApp)
 
 let configureServices (services : IServiceCollection) =
     services.AddCors() |> ignore

diff --git a/src/content/None/src/AppNamePlaceholder/Program.fs b/src/content/None/src/AppNamePlaceholder/Program.fs
@@ -42,9 +42,12 @@ let configureCors (builder : CorsPolicyBuilder) =
            |> ignore
 
 let configureApp (app : IApplicationBuilder) =
-    app.UseCors(configureCors)
-       .UseGiraffeErrorHandler(errorHandler)
-       .UseGiraffe(webApp)
+    let env = app.ApplicationServices.GetService<IHostingEnvironment>()
+    (match env.IsDevelopment() with
+    | true  -> app.UseDeveloperExceptionPage()
+    | false -> app.UseGiraffeErrorHandler errorHandler)
+        .UseCors(configureCors)
+        .UseGiraffe(webApp)
 
 let configureServices (services : IServiceCollection) =
     let sp  = services.BuildServiceProvider()

diff --git a/src/content/Razor/src/AppNamePlaceholder/Program.fs b/src/content/Razor/src/AppNamePlaceholder/Program.fs
@@ -48,10 +48,13 @@ let configureCors (builder : CorsPolicyBuilder) =
            |> ignore
 
 let configureApp (app : IApplicationBuilder) =
-    app.UseCors(configureCors)
-       .UseGiraffeErrorHandler(errorHandler)
-       .UseStaticFiles()
-       .UseGiraffe(webApp)
+    let env = app.ApplicationServices.GetService<IHostingEnvironment>()
+    (match env.IsDevelopment() with
+    | true  -> app.UseDeveloperExceptionPage()
+    | false -> app.UseGiraffeErrorHandler errorHandler)
+        .UseCors(configureCors)
+        .UseStaticFiles()
+        .UseGiraffe(webApp)
 
 let configureServices (services : IServiceCollection) =
     let sp  = services.BuildServiceProvider()

diff --git a/src/giraffe-template.nuspec b/src/giraffe-template.nuspec
@@ -2,7 +2,7 @@
 <package>
     <metadata>
         <id>giraffe-template</id>
-        <version>0.13.0</version>
+        <version>0.14.0</version>
         <title>Giraffe Template for dotnet-new</title>
         <summary>A dotnet-new template for Giraffe web applications.</summary>
         <description>A dotnet-new template for Giraffe web applications.</description>