Skip to content

Target .NET 6.0 #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Target .NET 6.0 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d4ec80
target .NET 6.0
SCullman Aug 17, 2022
67347bf
Fix large FileUpload
SCullman Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions samples/GiraffeRazorSample/GiraffeRazorSample.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion samples/GiraffeRazorSample/Program.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -62,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
Expand Down
5 changes: 2 additions & 3 deletions src/Giraffe.Razor/Giraffe.Razor.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down
1 change: 0 additions & 1 deletion src/Giraffe.Razor/HttpHandlers.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion src/Giraffe.Razor/RazorEngine.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down