Skip to content

[WIP] Aspnet middleware #332

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

Open
jberzy wants to merge 8 commits into
base: dev
Choose a base branch
from
Open

[WIP] Aspnet middleware #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
578162d
first take at middleware
Apr 19, 2021
c48cac2
first take at middleware
Apr 19, 2021
a7dcfa2
wip
Apr 22, 2021
19aac5e
add asp.net package
Apr 23, 2021
508250c
copy paste typo
Apr 23, 2021
9c5b02f
use the open type syntax for sample
Apr 23, 2021
0123992
Packaging and renaming
Apr 24, 2021
94d1d19
Remove Application Insights
Apr 24, 2021
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
15 changes: 15 additions & 0 deletions FSharp.Data.GraphQL.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "server", "server", "{9D5C46
samples\client-provider\file-upload\server\types.mjs = samples\client-provider\file-upload\server\types.mjs
EndProjectSection
EndProject
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Data.GraphQL.Server.AspNet", "src\FSharp.Data.GraphQL.Server.AspNet\FSharp.Data.GraphQL.Server.AspNet.fsproj", "{F5640838-93AB-4903-822B-D31D4D0FEBE2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -243,6 +245,18 @@ Global
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x64.Build.0 = Release|Any CPU
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x86.ActiveCfg = Release|Any CPU
{B837B3ED-83CE-446F-A4E5-44CB06AA6505}.Release|x86.Build.0 = Release|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Debug|x64.ActiveCfg = Debug|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Debug|x64.Build.0 = Debug|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Debug|x86.ActiveCfg = Debug|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Debug|x86.Build.0 = Debug|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Release|Any CPU.Build.0 = Release|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Release|x64.ActiveCfg = Release|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Release|x64.Build.0 = Release|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Release|x86.ActiveCfg = Release|Any CPU
{F5640838-93AB-4903-822B-D31D4D0FEBE2}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -268,6 +282,7 @@ Global
{B837B3ED-83CE-446F-A4E5-44CB06AA6505} = {F66BEE6C-0CB7-4F39-97E4-243F797E8723}
{A47968E2-CDD1-4BCF-9093-D0C5225A815B} = {3D948D55-3CD2-496D-A04C-3B4E7BB69140}
{9D5C46E8-0C07-4384-8E58-903F7C2C7171} = {A47968E2-CDD1-4BCF-9093-D0C5225A815B}
{F5640838-93AB-4903-822B-D31D4D0FEBE2} = {BEFD8748-2467-45F9-A4AD-B450B12D5F78}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C5B9895C-9DF8-4557-8D44-7D0C4C31F86E}
Expand Down
4 changes: 4 additions & 0 deletions build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,9 @@ Target.create "PackMiddleware" (fun _ ->
pack "Server.Middleware"
)

Target.create "PackAspNet" (fun _ ->
pack "Server.AspNet"
)

// --------------------------------------------------------------------------------------
// Run all targets by default. Invoke 'build -t <Target>' to override
Expand All @@ -278,6 +281,7 @@ Target.create "PackAll" ignore
==> "PackServer"
==> "PackClient"
==> "PackMiddleware"
==> "PackAspNet"
==> "PackAll"

Target.runOrDefault "All"
12 changes: 11 additions & 1 deletion paket.dependencies
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,14 @@ group TestsAndSamples
nuget xunit.runner.console
nuget xunit.runner.visualstudio
nuget BenchmarkDotNet
nuget FSharp.Data.TypeProviders
nuget FSharp.Data.TypeProviders

group AspNetLib
source https://api.nuget.org/v3/index.json
frameworks: net5.0, netstandard2.0

nuget Microsoft.AspNetCore.Http
nuget Microsoft.AspNetCore.Http.Abstractions
nuget Microsoft.AspNetCore.Http.Extensions
nuget System.Text.Json
nuget System.IO.Pipelines
65 changes: 65 additions & 0 deletions paket.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,71 @@ NUGET
remote: https://api.nuget.org/v3/index.json
NuGet.CommandLine (5.8.1)

GROUP AspNetLib
RESTRICTION: || (== net50) (== netstandard2.0)
NUGET
remote: https://api.nuget.org/v3/index.json
Microsoft.AspNetCore.Http (2.2.2)
Microsoft.AspNetCore.Http.Abstractions (>= 2.2)
Microsoft.AspNetCore.WebUtilities (>= 2.2)
Microsoft.Extensions.ObjectPool (>= 2.2)
Microsoft.Extensions.Options (>= 2.2)
Microsoft.Net.Http.Headers (>= 2.2)
Microsoft.AspNetCore.Http.Abstractions (2.2)
Microsoft.AspNetCore.Http.Features (>= 2.2)
System.Text.Encodings.Web (>= 4.5)
Microsoft.AspNetCore.Http.Extensions (2.2)
Microsoft.AspNetCore.Http.Abstractions (>= 2.2)
Microsoft.Extensions.FileProviders.Abstractions (>= 2.2)
Microsoft.Net.Http.Headers (>= 2.2)
System.Buffers (>= 4.5)
Microsoft.AspNetCore.Http.Features (5.0.5)
Microsoft.Extensions.Primitives (>= 5.0.1)
System.IO.Pipelines (>= 5.0.1)
Microsoft.AspNetCore.WebUtilities (2.2)
Microsoft.Net.Http.Headers (>= 2.2)
System.Text.Encodings.Web (>= 4.5)
Microsoft.Bcl.AsyncInterfaces (5.0) - restriction: || (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (< netcoreapp3.0)) (&& (== net50) (< netstandard2.0) (>= xamarintvos)) (&& (== net50) (< netstandard2.0) (>= xamarinwatchos)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.1) (< netstandard2.1)) (== netstandard2.0)
Microsoft.Extensions.DependencyInjection.Abstractions (5.0)
Microsoft.Extensions.FileProviders.Abstractions (5.0)
Microsoft.Extensions.Primitives (>= 5.0)
Microsoft.Extensions.ObjectPool (5.0.5)
Microsoft.Extensions.Options (5.0)
Microsoft.Extensions.DependencyInjection.Abstractions (>= 5.0)
Microsoft.Extensions.Primitives (>= 5.0)
Microsoft.Extensions.Primitives (5.0.1)
System.Buffers (>= 4.5.1) - restriction: || (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netstandard2.0) (>= xamarintvos)) (&& (== net50) (< netstandard2.0) (>= xamarinwatchos)) (== netstandard2.0)
System.Memory (>= 4.5.4) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 5.0) - restriction: || (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (< netcoreapp3.0)) (&& (== net50) (< netstandard2.0) (>= xamarintvos)) (&& (== net50) (< netstandard2.0) (>= xamarinwatchos)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
Microsoft.Net.Http.Headers (2.2.8)
Microsoft.Extensions.Primitives (>= 2.2)
System.Buffers (>= 4.5)
System.Buffers (4.5.1)
System.IO.Pipelines (5.0.1)
System.Buffers (>= 4.5.1) - restriction: || (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (>= xamarinios)) (&& (== net50) (>= xamarinmac)) (&& (== net50) (>= xamarintvos)) (&& (== net50) (>= xamarinwatchos)) (== netstandard2.0)
System.Memory (>= 4.5.4) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
System.Memory (4.5.4) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
System.Buffers (>= 4.5.1) - restriction: || (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netstandard1.1)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (>= xamarinios)) (&& (== net50) (>= xamarinmac)) (&& (== net50) (>= xamarintvos)) (&& (== net50) (>= xamarinwatchos)) (== netstandard2.0)
System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net50) (< netcoreapp2.0)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (< netstandard1.1)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (>= uap10.1)) (&& (== net50) (>= xamarinios)) (&& (== net50) (>= xamarinmac)) (&& (== net50) (>= xamarintvos)) (&& (== net50) (>= xamarinwatchos)) (== netstandard2.0)
System.Numerics.Vectors (4.5) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (5.0) - restriction: || (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (< netcoreapp3.0)) (&& (== net50) (< netstandard2.0) (>= xamarintvos)) (&& (== net50) (< netstandard2.0) (>= xamarinwatchos)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
System.Text.Encodings.Web (5.0.1)
System.Buffers (>= 4.5.1) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0) (< netstandard2.1)) (== netstandard2.0)
System.Memory (>= 4.5.4) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net50) (< netcoreapp2.1) (< netstandard2.1)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
System.Text.Json (5.0.2)
Microsoft.Bcl.AsyncInterfaces (>= 5.0) - restriction: || (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (< netcoreapp3.0)) (&& (== net50) (< netstandard2.0) (>= xamarintvos)) (&& (== net50) (< netstandard2.0) (>= xamarinwatchos)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
System.Buffers (>= 4.5.1) - restriction: || (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netstandard2.0) (>= xamarintvos)) (&& (== net50) (< netstandard2.0) (>= xamarinwatchos)) (== netstandard2.0)
System.Memory (>= 4.5.4) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
System.Numerics.Vectors (>= 4.5) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 5.0) - restriction: || (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (< netcoreapp3.0)) (&& (== net50) (< netstandard2.0) (>= xamarintvos)) (&& (== net50) (< netstandard2.0) (>= xamarinwatchos)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
System.Text.Encodings.Web (>= 5.0.1) - restriction: || (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (< netcoreapp3.0)) (&& (== net50) (< netstandard2.0) (>= xamarintvos)) (&& (== net50) (< netstandard2.0) (>= xamarinwatchos)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (< netstandard1.0)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (>= wp8)) (== netstandard2.0)

GROUP Common
RESTRICTION: || (== net50) (== netstandard2.0)
NUGET
Expand Down
16 changes: 1 addition & 15 deletions samples/client-provider/field_aliases.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,5 @@
// Uncomment those to use build script client assembly
//#r "../../bin/FSharp.Data.GraphQL.Client/net47/FSharp.Data.GraphQL.Client.dll"
//#r "../../bin/FSharp.Data.GraphQL.Shared/net47/FSharp.Data.GraphQL.Shared.dll"

// Uncomment those to use build script client assembly using netstandard2.0
//#r "../../bin/FSharp.Data.GraphQL.Shared/netstandard2.0/FSharp.Data.GraphQL.Shared.dll"
//#r "../../bin/FSharp.Data.GraphQL.Client/netstandard2.0/netstandard.dll"
//#r "../../bin/FSharp.Data.GraphQL.Client/netstandard2.0/FSharp.Data.GraphQL.Client.dll"

// Uncomment those to use dotnet build command for the client assembly
// #r "../../src/FSharp.Data.GraphQL.Shared/bin/Debug/net47/FSharp.Data.GraphQL.Shared.dll"
// #r "../../src/FSharp.Data.GraphQL.Client/bin/Debug/net47/FSharp.Data.GraphQL.Client.dll"

//Uncomment those to use dotnet build command for the client assembly using netstandard2.0
#r "../../src/FSharp.Data.GraphQL.Client/bin/Debug/typeproviders/fsharp41/netstandard2.0/Microsoft.Extensions.Http.dll"
#r "../../src/FSharp.Data.GraphQL.Shared/bin/Debug/netstandard2.0/FSharp.Data.GraphQL.Shared.dll"
//#r "../../src/FSharp.Data.GraphQL.Client/bin/Debug/netstandard2.0/netstandard.dll"
#r "../../src/FSharp.Data.GraphQL.Client/bin/Debug/netstandard2.0/FSharp.Data.GraphQL.Client.dll"

open FSharp.Data.GraphQL
Expand Down
9 changes: 0 additions & 9 deletions samples/client-provider/file-upload/README.md
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions samples/client-provider/file-upload/multiple_files_upload.fsx
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions samples/client-provider/file-upload/server/.env
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions samples/client-provider/file-upload/server/.gitignore
View file
Open in desktop

This file was deleted.

Loading