Merge branch 'develop'

giraffe-fsharp · Dec 6, 2020 · d48d78c · d48d78c
2 parents 1599dcc + 08027a8
commit d48d78c
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 19 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.301
+          dotnet-version: 5.0.100
       - name: Restore
         run: dotnet restore
       - name: Build
@@ -71,7 +71,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.301
+          dotnet-version: 5.0.100
       - name: Create Release NuGet package
         run: |
           arrTag=(${GITHUB_REF//\// })

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,11 @@
 Release Notes
 =============
 
+## 5.1.0-rc-1
+
+- Upgraded to .NET 5
+- Added an overload to the `AddRazorEngine` extension method to set if existing file providers should be kept or cleared via the `persistFileProviders` flag.
+
 ## 5.0.0
 
 - Dropped support for all .NET framework monikers except .NET Core 3.1 (in preparation for the .NET 5 release)

diff --git a/samples/GiraffeRazorSample/GiraffeRazorSample.fsproj b/samples/GiraffeRazorSample/GiraffeRazorSample.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <AssemblyName>GiraffeRazorSample</AssemblyName>
     <PackageId>GiraffeRazorSample</PackageId>
     <EnableDefaultContentItems>false</EnableDefaultContentItems>
@@ -26,4 +26,4 @@
     </Content>
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/src/Giraffe.Razor/Giraffe.Razor.fsproj b/src/Giraffe.Razor/Giraffe.Razor.fsproj
@@ -7,8 +7,11 @@
     <Authors>Dustin Moris Gorski and contributors</Authors>
     <NeutralLanguage>en-GB</NeutralLanguage>
 
+    <!-- Tell NuGet to STFU -->
+    <NoWarn>$(NoWarn);NU5104</NoWarn>
+
     <!-- Build settings -->
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <DebugType>portable</DebugType>
     <OutputType>Library</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -31,7 +34,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <NoWarn>FS2003</NoWarn>
+    <NoWarn>$(NoWarn);FS2003</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -42,8 +45,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Giraffe" Version="4.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.0" />
+    <PackageReference Include="Giraffe" Version="5.0.0-rc-3" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Giraffe.Razor/Middleware.fs b/src/Giraffe.Razor/Middleware.fs
@@ -9,13 +9,19 @@ module Middleware =
 
     type IServiceCollection with
 
-        member this.AddRazorEngine(viewsFolderPath: string) =
+        member this.AddRazorEngine(viewsFolderPath : string, persistFileProviders : bool) =
             this.Configure<MvcRazorRuntimeCompilationOptions>(fun (options: MvcRazorRuntimeCompilationOptions) ->
-                options.FileProviders.Clear()
+                if not persistFileProviders then
+                    options.FileProviders.Clear()
+                else
+                    ()
                 options.FileProviders.Add(new PhysicalFileProvider(viewsFolderPath))).AddMvc().AddRazorRuntimeCompilation()
             |> ignore
             this.AddAntiforgery()
 
+        member this.AddRazorEngine(viewsFolderPath : string) =
+            this.AddRazorEngine(viewsFolderPath, false)
+
         member this.AddRazorEngine() =
             this.AddMvc().AddRazorRuntimeCompilation() |> ignore
             this.AddAntiforgery()
diff --git a/src/Giraffe.Razor/RazorEngine.fs b/src/Giraffe.Razor/RazorEngine.fs
@@ -15,7 +15,7 @@ module RazorEngine =
     open Microsoft.AspNetCore.Routing
     open FSharp.Control.Tasks.V2.ContextInsensitive
 
-    let private extractRouteData (path:string) =
+    let private extractRouteData (path : string) =
         // Normalize nulls
         let templatePath = path + ""
 
@@ -43,14 +43,14 @@ module RazorEngine =
 
         routeData
 
-    let renderView (razorViewEngine   : IRazorViewEngine)
-                   (modelMetadataProvider: IModelMetadataProvider)
-                   (tempDataDict      : ITempDataDictionary)
-                   (httpContext       : HttpContext)
-                   (viewName          : string)
-                   (model             : 'T option)
-                   (viewData          : IDictionary<string, obj> option)
-                   (modelState        : ModelStateDictionary option) =
+    let renderView (razorViewEngine       : IRazorViewEngine)
+                   (modelMetadataProvider : IModelMetadataProvider)
+                   (tempDataDict          : ITempDataDictionary)
+                   (httpContext           : HttpContext)
+                   (viewName              : string)
+                   (model                 : 'T option)
+                   (viewData              : IDictionary<string, obj> option)
+                   (modelState            : ModelStateDictionary option) =
         task {
             let routeData = extractRouteData(viewName)
             let templateName = routeData.Values.["action"].ToString()