From 0d4ec80abe47fec90e56aa73a3ee4c51a405e292 Mon Sep 17 00:00:00 2001
From: Stefan Cullmann <stefan.cullmann@gmail.com>
Date: Wed, 17 Aug 2022 12:08:21 +0200
Subject: [PATCH 1/2] target .NET 6.0 giraffe-fsharp/Giraffe.Razor/#26

---
 samples/GiraffeRazorSample/GiraffeRazorSample.fsproj | 6 +-----
 samples/GiraffeRazorSample/Program.fs                | 1 -
 src/Giraffe.Razor/Giraffe.Razor.fsproj               | 5 ++---
 src/Giraffe.Razor/HttpHandlers.fs                    | 1 -
 src/Giraffe.Razor/RazorEngine.fs                     | 1 -
 5 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/samples/GiraffeRazorSample/GiraffeRazorSample.fsproj b/samples/GiraffeRazorSample/GiraffeRazorSample.fsproj
index c56f144..e20b44e 100644
--- a/samples/GiraffeRazorSample/GiraffeRazorSample.fsproj
+++ b/samples/GiraffeRazorSample/GiraffeRazorSample.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>GiraffeRazorSample</AssemblyName>
     <PackageId>GiraffeRazorSample</PackageId>
     <EnableDefaultContentItems>false</EnableDefaultContentItems>
@@ -12,10 +12,6 @@
     <ProjectReference Include="..\..\src\Giraffe.Razor\Giraffe.Razor.fsproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Ply" Version="0.3.*" />
-  </ItemGroup>
-
   <ItemGroup>
     <Watch Include="**\*.cshtml" Exclude="bin\**\*" />
   </ItemGroup>
diff --git a/samples/GiraffeRazorSample/Program.fs b/samples/GiraffeRazorSample/Program.fs
index b866c00..83c7d5e 100644
--- a/samples/GiraffeRazorSample/Program.fs
+++ b/samples/GiraffeRazorSample/Program.fs
@@ -11,7 +11,6 @@ open Microsoft.AspNetCore.Http.Features
 open Microsoft.AspNetCore.Mvc.ModelBinding
 open Microsoft.Extensions.Logging
 open Microsoft.Extensions.DependencyInjection
-open FSharp.Control.Tasks
 open Giraffe
 open Giraffe.Razor
 
diff --git a/src/Giraffe.Razor/Giraffe.Razor.fsproj b/src/Giraffe.Razor/Giraffe.Razor.fsproj
index 85ab485..b3d840f 100755
--- a/src/Giraffe.Razor/Giraffe.Razor.fsproj
+++ b/src/Giraffe.Razor/Giraffe.Razor.fsproj
@@ -11,7 +11,7 @@
     <NoWarn>$(NoWarn);NU5104</NoWarn>
 
     <!-- Build settings -->
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <DebugType>portable</DebugType>
     <OutputType>Library</OutputType>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -45,8 +45,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Giraffe" Version="5.0.0-rc-6" />
-    <PackageReference Include="Ply" Version="0.3.*" />
+    <PackageReference Include="Giraffe" Version="6" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.*" />
   </ItemGroup>
 
diff --git a/src/Giraffe.Razor/HttpHandlers.fs b/src/Giraffe.Razor/HttpHandlers.fs
index cfca34a..9858029 100644
--- a/src/Giraffe.Razor/HttpHandlers.fs
+++ b/src/Giraffe.Razor/HttpHandlers.fs
@@ -12,7 +12,6 @@ module HttpHandlers =
     open Microsoft.AspNetCore.Mvc.ViewFeatures
     open Microsoft.Extensions.DependencyInjection
     open Microsoft.AspNetCore.Antiforgery
-    open FSharp.Control.Tasks
     open Giraffe
     open RazorEngine
 
diff --git a/src/Giraffe.Razor/RazorEngine.fs b/src/Giraffe.Razor/RazorEngine.fs
index 32cac04..293e1d5 100644
--- a/src/Giraffe.Razor/RazorEngine.fs
+++ b/src/Giraffe.Razor/RazorEngine.fs
@@ -13,7 +13,6 @@ module RazorEngine =
     open Microsoft.AspNetCore.Mvc.Rendering
     open Microsoft.AspNetCore.Mvc.ViewFeatures
     open Microsoft.AspNetCore.Routing
-    open FSharp.Control.Tasks
 
     let private extractRouteData (path : string) =
         // Normalize nulls

From 67347bf5399bab2b42c87adfb52a80e0471d7590 Mon Sep 17 00:00:00 2001
From: Stefan Cullmann <stefan.cullmann@gmail.com>
Date: Wed, 17 Aug 2022 12:09:37 +0200
Subject: [PATCH 2/2] Fix large FileUpload giraffe-fsharp/Giraffe.Razor/#26

---
 samples/GiraffeRazorSample/Program.fs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/samples/GiraffeRazorSample/Program.fs b/samples/GiraffeRazorSample/Program.fs
index 83c7d5e..0ba8ccc 100644
--- a/samples/GiraffeRazorSample/Program.fs
+++ b/samples/GiraffeRazorSample/Program.fs
@@ -61,6 +61,7 @@ let smallFileUploadHandler =
 let largeFileUploadHandler =
     fun (next : HttpFunc) (ctx : HttpContext) ->
         task {
+            ctx.Request.HasFormContentType |>ignore //otherwise formFeature will be null
             let formFeature = ctx.Features.Get<IFormFeature>()
             let! form = formFeature.ReadFormAsync CancellationToken.None
             return! (form.Files |> displayFileInfos) next ctx