Merge branch 'develop'

giraffe-fsharp · Dec 9, 2020 · e6fce75 · e6fce75
2 parents c5862d7 + f8553e4
commit e6fce75
Show file tree

Hide file tree

Showing 14 changed files with 80 additions and 58 deletions.
diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ Whenever there is a new version of the Giraffe template you can update it by re-
 You can also explicitly set the version when installing the template:
 
 ```
-dotnet new -i "giraffe-template::1.0.0"
+dotnet new -i "giraffe-template::1.3.0"
 ```
 
 ## Basics

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,13 @@
 Release Notes
 =============
 
+## 1.3.0
+
+- Removed log filter
+- Improved default CORS policy
+- HTTPS redirection not during Development
+- Updated to Giraffe 5.0.0-rc-6 with Ply
+
 ## 1.2.0
 
 - Updated all templates to .NET 5 and Giraffe 5.0.0-rc-1

diff --git a/src/content/DotLiquid/paket.dependencies b/src/content/DotLiquid/paket.dependencies
@@ -2,9 +2,9 @@ storage: none
 framework: auto-detect
 source https://api.nuget.org/v3/index.json
 
-nuget Giraffe ~> 5.0.0-rc-1
+nuget Giraffe ~> 5.0.0-rc-6
 nuget Giraffe.DotLiquid
-nuget TaskBuilder.fs
+nuget Ply
 nuget Microsoft.NET.Test.Sdk
 nuget Microsoft.AspNetCore.TestHost
 nuget xunit

diff --git a/src/content/DotLiquid/src/AppName.1/AppName.1.fsproj b/src/content/DotLiquid/src/AppName.1/AppName.1.fsproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(Paket)' == false OR '$(Paket)' == ''">
-    <PackageReference Include="Giraffe" Version="5.0.0-rc-1" />
-    <PackageReference Include="Giraffe.DotLiquid" Version="2.0.*" />
-    <PackageReference Include="TaskBuilder.fs" Version="2.1.*" />
+    <PackageReference Include="Giraffe" Version="5.0.0-rc-6" />
+    <PackageReference Include="Giraffe.DotLiquid" Version="3.0.0-rc-1" />
+    <PackageReference Include="Ply" Version="0.3.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/content/DotLiquid/src/AppName.1/Program.fs b/src/content/DotLiquid/src/AppName.1/Program.fs
@@ -43,17 +43,22 @@ let errorHandler (ex : Exception) (logger : ILogger) =
 // ---------------------------------
 
 let configureCors (builder : CorsPolicyBuilder) =
-    builder.WithOrigins("http://localhost:8080")
-           .AllowAnyMethod()
-           .AllowAnyHeader()
-           |> ignore
+    builder
+        .WithOrigins(
+            "http://localhost:5000",
+            "https://localhost:5001")
+       .AllowAnyMethod()
+       .AllowAnyHeader()
+       |> ignore
 
 let configureApp (app : IApplicationBuilder) =
     let env = app.ApplicationServices.GetService<IWebHostEnvironment>()
-    (match env.EnvironmentName with
-    | "Development" -> app.UseDeveloperExceptionPage()
-    | _ -> app.UseGiraffeErrorHandler(errorHandler))
-        .UseHttpsRedirection()
+    (match env.IsDevelopment() with
+    | true  ->
+        app.UseDeveloperExceptionPage()
+    | false ->
+        app .UseGiraffeErrorHandler(errorHandler)
+            .UseHttpsRedirection())
         .UseCors(configureCors)
         .UseStaticFiles()
         .UseGiraffe(webApp)
@@ -63,8 +68,7 @@ let configureServices (services : IServiceCollection) =
     services.AddGiraffe() |> ignore
 
 let configureLogging (builder : ILoggingBuilder) =
-    builder.AddFilter(fun l -> l.Equals LogLevel.Error)
-           .AddConsole()
+    builder.AddConsole()
            .AddDebug() |> ignore
 
 [<EntryPoint>]

diff --git a/src/content/DotLiquid/src/AppName.1/paket.references b/src/content/DotLiquid/src/AppName.1/paket.references
@@ -1,3 +1,3 @@
 Giraffe
 Giraffe.DotLiquid
-TaskBuilder.fs
+Ply
diff --git a/src/content/Giraffe/src/AppName.1/AppName.1.fsproj b/src/content/Giraffe/src/AppName.1/AppName.1.fsproj
@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(Paket)' == false OR '$(Paket)' == ''">
-    <PackageReference Include="Giraffe" Version="5.0.0-rc-1" />
+    <PackageReference Include="Giraffe" Version="5.0.0-rc-6" />
     <PackageReference Include="Giraffe.ViewEngine" Version="1.3.*" />
-    <PackageReference Include="TaskBuilder.fs" Version="2.1.*" />
+    <PackageReference Include="Ply" Version="0.3.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/content/Giraffe/src/AppName.1/Program.fs b/src/content/Giraffe/src/AppName.1/Program.fs
@@ -78,17 +78,22 @@ let errorHandler (ex : Exception) (logger : ILogger) =
 // ---------------------------------
 
 let configureCors (builder : CorsPolicyBuilder) =
-    builder.WithOrigins("http://localhost:8080")
-           .AllowAnyMethod()
-           .AllowAnyHeader()
-           |> ignore
+    builder
+        .WithOrigins(
+            "http://localhost:5000",
+            "https://localhost:5001")
+       .AllowAnyMethod()
+       .AllowAnyHeader()
+       |> ignore
 
 let configureApp (app : IApplicationBuilder) =
     let env = app.ApplicationServices.GetService<IWebHostEnvironment>()
-    (match env.EnvironmentName with
-    | "Development" -> app.UseDeveloperExceptionPage()
-    | _ -> app.UseGiraffeErrorHandler(errorHandler))
-        .UseHttpsRedirection()
+    (match env.IsDevelopment() with
+    | true  ->
+        app.UseDeveloperExceptionPage()
+    | false ->
+        app .UseGiraffeErrorHandler(errorHandler)
+            .UseHttpsRedirection())
         .UseCors(configureCors)
         .UseStaticFiles()
         .UseGiraffe(webApp)
@@ -98,8 +103,7 @@ let configureServices (services : IServiceCollection) =
     services.AddGiraffe() |> ignore
 
 let configureLogging (builder : ILoggingBuilder) =
-    builder.AddFilter(fun l -> l.Equals LogLevel.Error)
-           .AddConsole()
+    builder.AddConsole()
            .AddDebug() |> ignore
 
 [<EntryPoint>]

diff --git a/src/content/None/src/AppName.1/AppName.1.fsproj b/src/content/None/src/AppName.1/AppName.1.fsproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(Paket)' == false OR '$(Paket)' == ''">
-    <PackageReference Include="Giraffe" Version="5.0.0-rc-1" />
-    <PackageReference Include="TaskBuilder.fs" Version="2.1.*" />
+    <PackageReference Include="Giraffe" Version="5.0.0-rc-6" />
+    <PackageReference Include="Ply" Version="0.3.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/content/None/src/AppName.1/HttpHandlers.fs b/src/content/None/src/AppName.1/HttpHandlers.fs
@@ -3,7 +3,7 @@ namespace AppName._1
 module HttpHandlers =
 
     open Microsoft.AspNetCore.Http
-    open FSharp.Control.Tasks.V2.ContextInsensitive
+    open FSharp.Control.Tasks
     open Giraffe
     open AppName._1.Models
 

diff --git a/src/content/None/src/AppName.1/Program.fs b/src/content/None/src/AppName.1/Program.fs
@@ -37,17 +37,22 @@ let errorHandler (ex : Exception) (logger : ILogger) =
 // ---------------------------------
 
 let configureCors (builder : CorsPolicyBuilder) =
-    builder.WithOrigins("http://localhost:8080")
-           .AllowAnyMethod()
-           .AllowAnyHeader()
-           |> ignore
+    builder
+        .WithOrigins(
+            "http://localhost:5000",
+            "https://localhost:5001")
+       .AllowAnyMethod()
+       .AllowAnyHeader()
+       |> ignore
 
 let configureApp (app : IApplicationBuilder) =
     let env = app.ApplicationServices.GetService<IWebHostEnvironment>()
-    (match env.EnvironmentName with
-    | "Development" -> app.UseDeveloperExceptionPage()
-    | _ -> app.UseGiraffeErrorHandler(errorHandler))
-        .UseHttpsRedirection()
+    (match env.IsDevelopment() with
+    | true  ->
+        app.UseDeveloperExceptionPage()
+    | false ->
+        app .UseGiraffeErrorHandler(errorHandler)
+            .UseHttpsRedirection())
         .UseCors(configureCors)
         .UseGiraffe(webApp)
 
@@ -56,8 +61,7 @@ let configureServices (services : IServiceCollection) =
     services.AddGiraffe() |> ignore
 
 let configureLogging (builder : ILoggingBuilder) =
-    builder.AddFilter(fun l -> l.Equals LogLevel.Error)
-           .AddConsole()
+    builder.AddConsole()
            .AddDebug() |> ignore
 
 [<EntryPoint>]

diff --git a/src/content/Razor/src/AppName.1/AppName.1.fsproj b/src/content/Razor/src/AppName.1/AppName.1.fsproj
@@ -7,11 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(Paket)' == false OR '$(Paket)' == ''">
-    <PackageReference Include="Giraffe" Version="5.0.0-rc-1" />
-    <PackageReference Include="Giraffe.Razor" Version="5.0.*" />
-    <!-- TODO Upadte Giraffe.Razor directly -->
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.0" />
-    <PackageReference Include="TaskBuilder.fs" Version="2.1.*" />
+    <PackageReference Include="Giraffe" Version="5.0.0-rc-6" />
+    <PackageReference Include="Giraffe.Razor" Version="5.1.0-rc-2" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.*" />
+    <PackageReference Include="Ply" Version="0.3.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/content/Razor/src/AppName.1/Program.fs b/src/content/Razor/src/AppName.1/Program.fs
@@ -43,17 +43,22 @@ let errorHandler (ex : Exception) (logger : ILogger) =
 // ---------------------------------
 
 let configureCors (builder : CorsPolicyBuilder) =
-    builder.WithOrigins("http://localhost:8080")
-           .AllowAnyMethod()
-           .AllowAnyHeader()
-           |> ignore
+    builder
+        .WithOrigins(
+            "http://localhost:5000",
+            "https://localhost:5001")
+       .AllowAnyMethod()
+       .AllowAnyHeader()
+       |> ignore
 
 let configureApp (app : IApplicationBuilder) =
     let env = app.ApplicationServices.GetService<IWebHostEnvironment>()
-    (match env.EnvironmentName with
-    | "Development" -> app.UseDeveloperExceptionPage()
-    | _ -> app.UseGiraffeErrorHandler(errorHandler))
-        .UseHttpsRedirection()
+    (match env.IsDevelopment() with
+    | true  ->
+        app.UseDeveloperExceptionPage()
+    | false ->
+        app .UseGiraffeErrorHandler(errorHandler)
+            .UseHttpsRedirection())
         .UseCors(configureCors)
         .UseStaticFiles()
         .UseGiraffe(webApp)
@@ -67,8 +72,7 @@ let configureServices (services : IServiceCollection) =
     services.AddGiraffe() |> ignore
 
 let configureLogging (builder : ILoggingBuilder) =
-    builder.AddFilter(fun l -> l.Equals LogLevel.Error)
-           .AddConsole()
+    builder.AddConsole()
            .AddDebug() |> ignore
 
 [<EntryPoint>]

diff --git a/src/giraffe-template.nuspec b/src/giraffe-template.nuspec
@@ -2,7 +2,7 @@
 <package>
     <metadata>
         <id>giraffe-template</id>
-        <version>1.2.0</version>
+        <version>1.3.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>