Skip to content

Commit ef3351b

Browse files
committed
Added back .NET 6 support
1 parent 1c1c024 commit ef3351b

File tree

9 files changed

+24
-7
lines changed

9 files changed

+24
-7
lines changed

Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<DotNetVersion>net8.0</DotNetVersion>
5+
<LibraryDotNetVersions>net6.0;net8.0</LibraryDotNetVersions>
56
<LangVersion>9.0</LangVersion>
67
<FSharpCoreVersion>9.0.*</FSharpCoreVersion>
78
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>

src/FSharp.Data.GraphQL.Server.AspNetCore/FSharp.Data.GraphQL.Server.AspNetCore.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DotNetVersion)</TargetFrameworks>
4+
<TargetFrameworks>$(LibraryDotNetVersions)</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<Deterministic>true</Deterministic>
77
<Description>FSharp implementation of Facebook GraphQL query language (Application Infrastructure)</Description>

src/FSharp.Data.GraphQL.Server.AspNetCore/GraphQLRequestHandler.fs

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,11 @@ and [<AbstractClass>] GraphQLRequestHandler<'Root>
153153
| ValueSome ast -> executor.AsyncExecute (ast, getInputContext)
154154

155155
let response = result |> toResponse
156+
#if NET6_0
157+
return Results.Ok response
158+
#else
156159
return (TypedResults.Ok response) :> IResult
160+
#endif
157161
}
158162

159163
/// <summary>Check if the request is an introspection query
@@ -240,12 +244,20 @@ and [<AbstractClass>] GraphQLRequestHandler<'Root>
240244
)
241245

242246
let response = result |> toResponse
247+
#if NET6_0
248+
return Results.Ok response
249+
#else
243250
return (TypedResults.Ok response) :> IResult
251+
#endif
244252
}
245253

246254
member handler.HandleAsync () : Task<Result<IResult, IResult>> = taskResult {
247255
if ctx.RequestAborted.IsCancellationRequested then
256+
#if NET6_0
257+
return Results.NoContent()
258+
#else
248259
return TypedResults.Empty
260+
#endif
249261
else
250262
let executor = options.CurrentValue.SchemaExecutor
251263
match! checkOperationType () with

src/FSharp.Data.GraphQL.Server.Giraffe/FSharp.Data.GraphQL.Server.Giraffe.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DotNetVersion)</TargetFrameworks>
4+
<TargetFrameworks>$(LibraryDotNetVersions)</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<Deterministic>true</Deterministic>
77
<Description>FSharp implementation of Facebook GraphQL query language (Giraffe integration)</Description>

src/FSharp.Data.GraphQL.Server.Giraffe/HttpHandlers.fs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ module HttpHandlers =
3333

3434
let private isMultipartRequest (req : HttpRequest) =
3535
not (System.String.IsNullOrEmpty (req.ContentType))
36-
&& req.ContentType.Contains (MediaTypeNames.Multipart.FormData)
36+
#if NET6_0
37+
&& req.ContentType.Contains "multipart/form-data"
38+
#else
39+
&& req.ContentType.Contains MediaTypeNames.Multipart.FormData
40+
#endif
3741

3842
let setRequestType : HttpHandler =
3943
fun (next) (ctx) ->

src/FSharp.Data.GraphQL.Server.Middleware/FSharp.Data.GraphQL.Server.Middleware.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DotNetVersion)</TargetFrameworks>
4+
<TargetFrameworks>$(LibraryDotNetVersions)</TargetFrameworks>
55
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>

src/FSharp.Data.GraphQL.Server.Relay/FSharp.Data.GraphQL.Server.Relay.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DotNetVersion)</TargetFrameworks>
4+
<TargetFrameworks>$(LibraryDotNetVersions)</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
77
<Deterministic>true</Deterministic>

src/FSharp.Data.GraphQL.Server/FSharp.Data.GraphQL.Server.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(DotNetVersion)</TargetFrameworks>
4+
<TargetFrameworks>$(LibraryDotNetVersions)</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
77
<Deterministic>true</Deterministic>

src/FSharp.Data.GraphQL.Shared/FSharp.Data.GraphQL.Shared.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;$(DotNetVersion)</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;$(LibraryDotNetVersions)</TargetFrameworks>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
77
<Deterministic>true</Deterministic>

0 commit comments

Comments
 (0)