Skip to content

Commit 42570b6

Browse files
John BerzyJohn Berzy
John Berzy
authored and
John Berzy
committed
reintroduce Microsoft.Extensions.Http as it was not the cause of TP loading bug
1 parent ead1ee4 commit 42570b6

6 files changed

Lines changed: 43 additions & 3 deletions

File tree

‎paket.dependencies‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ group Common
1616
# This should not be a problem since FParsec almost never gets a new release.
1717
nuget FParsec 1.1.1
1818

19+
nuget Microsoft.Extensions.Http 5
20+
1921
# Those are needed for the client type provider.
2022
github fsprojects/FSharp.TypeProviders.SDK:377d56321ad062985ed5aa19f205c1c4f04ef328 src/ProvidedTypes.fsi
2123
github fsprojects/FSharp.TypeProviders.SDK:377d56321ad062985ed5aa19f205c1c4f04ef328 src/ProvidedTypes.fs

‎paket.lock‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,50 @@ NUGET
99
FParsec (1.1.1)
1010
FSharp.Core (>= 4.3.4)
1111
FSharp.Core (4.7.2)
12+
Microsoft.Bcl.AsyncInterfaces (5.0) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netstandard2.1)) (== netstandard2.0)
13+
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.1) (< netstandard2.1)) (== netstandard2.0)
14+
Microsoft.Extensions.DependencyInjection (5.0.1)
15+
Microsoft.Bcl.AsyncInterfaces (>= 5.0) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netstandard2.1)) (== netstandard2.0)
16+
Microsoft.Extensions.DependencyInjection.Abstractions (>= 5.0)
17+
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.1) (< netstandard2.1)) (== netstandard2.0)
18+
Microsoft.Extensions.DependencyInjection.Abstractions (5.0)
19+
Microsoft.Extensions.Http (5.0)
20+
Microsoft.Extensions.DependencyInjection.Abstractions (>= 5.0)
21+
Microsoft.Extensions.Logging (>= 5.0)
22+
Microsoft.Extensions.Logging.Abstractions (>= 5.0)
23+
Microsoft.Extensions.Options (>= 5.0)
24+
Microsoft.Extensions.Logging (5.0)
25+
Microsoft.Extensions.DependencyInjection (>= 5.0)
26+
Microsoft.Extensions.DependencyInjection.Abstractions (>= 5.0)
27+
Microsoft.Extensions.Logging.Abstractions (>= 5.0)
28+
Microsoft.Extensions.Options (>= 5.0)
29+
System.Diagnostics.DiagnosticSource (>= 5.0) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netstandard2.1)) (== netstandard2.0)
30+
Microsoft.Extensions.Logging.Abstractions (5.0)
31+
Microsoft.Extensions.Options (5.0)
32+
Microsoft.Extensions.DependencyInjection.Abstractions (>= 5.0)
33+
Microsoft.Extensions.Primitives (>= 5.0)
34+
Microsoft.Extensions.Primitives (5.0.1)
35+
System.Buffers (>= 4.5.1) - restriction: || (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netstandard2.0) (>= xamarintvos)) (&& (== net50) (< netstandard2.0) (>= xamarinwatchos)) (== netstandard2.0)
36+
System.Memory (>= 4.5.4) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
37+
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)
1238
Microsoft.NETCore.Platforms (5.0.2) - restriction: || (&& (== net50) (< netcoreapp3.1)) (&& (== net50) (< netstandard1.2)) (&& (== net50) (< netstandard1.3)) (&& (== net50) (< netstandard1.5)) (== netstandard2.0)
1339
Microsoft.NETCore.Targets (5.0) - restriction: || (&& (== net50) (< netcoreapp3.1)) (&& (== net50) (< netstandard1.2)) (&& (== net50) (< netstandard1.3)) (&& (== net50) (< netstandard1.5)) (== netstandard2.0)
40+
System.Buffers (4.5.1) - restriction: || (&& (== net50) (>= monotouch)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0)) (&& (== net50) (< netstandard2.0) (>= xamarintvos)) (&& (== net50) (< netstandard2.0) (>= xamarinwatchos)) (== netstandard2.0)
41+
System.Diagnostics.DiagnosticSource (5.0.1) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (< netstandard2.1)) (== netstandard2.0)
42+
System.Memory (>= 4.5.4) - restriction: || (&& (== net50) (>= net45) (< netstandard1.3)) (&& (== net50) (>= net46)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
43+
System.Runtime.CompilerServices.Unsafe (>= 5.0) - restriction: || (&& (== net50) (>= monotouch)) (&& (== net50) (>= net45) (< netstandard1.3)) (&& (== net50) (>= net46)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (< netcoreapp3.0)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
44+
System.Memory (4.5.4) - restriction: || (&& (== net50) (>= net45) (< netstandard1.3)) (&& (== net50) (>= net46)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.1) (< netstandard2.1)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
45+
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)
46+
System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== net50) (< netcoreapp2.0)) (== netstandard2.0)
47+
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)
48+
System.Numerics.Vectors (4.5) - restriction: || (&& (== net50) (>= net45) (< netstandard1.3)) (&& (== net50) (>= net46)) (&& (== net50) (>= net461)) (&& (== net50) (< netcoreapp2.0) (< netstandard2.1)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
1449
System.Reactive (5.0)
1550
System.Runtime.InteropServices.WindowsRuntime (>= 4.3) - restriction: || (&& (== net50) (< netcoreapp3.1)) (== netstandard2.0)
1651
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (&& (== net50) (>= net472)) (&& (== net50) (< netcoreapp3.1)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
1752
System.Runtime (4.3.1) - restriction: || (&& (== net50) (< netcoreapp3.1)) (== netstandard2.0)
1853
Microsoft.NETCore.Platforms (>= 1.1.1)
1954
Microsoft.NETCore.Targets (>= 1.1.3)
20-
System.Runtime.CompilerServices.Unsafe (5.0) - restriction: || (&& (== net50) (>= net461)) (&& (== net50) (>= net472)) (&& (== net50) (< netcoreapp2.1)) (&& (== net50) (< netstandard1.0)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (>= uap10.1)) (&& (== net50) (>= wp8)) (== netstandard2.0)
55+
System.Runtime.CompilerServices.Unsafe (5.0) - restriction: || (&& (== net50) (>= monotouch)) (&& (== net50) (>= net45) (< netstandard1.3)) (&& (== net50) (>= net46)) (&& (== net50) (>= net461)) (&& (== net50) (< netstandard2.0)) (&& (== net50) (< netstandard2.1)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)
2156
System.Runtime.InteropServices.WindowsRuntime (4.3) - restriction: || (&& (== net50) (< netcoreapp3.1)) (== netstandard2.0)
2257
System.Runtime (>= 4.3)
2358
System.Threading.Tasks.Extensions (4.5.4) - restriction: || (&& (== net50) (>= net472)) (&& (== net50) (< netcoreapp3.1)) (&& (== net50) (>= uap10.1)) (== netstandard2.0)

‎src/FSharp.Data.GraphQL.Client.DesignTime/paket.references‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
group Common
22
FSharp.Core
33
FParsec
4+
Microsoft.Extensions.Http
45
File:ProvidedTypes.fsi
56
File:ProvidedTypes.fs

‎src/FSharp.Data.GraphQL.Client/FSharp.Data.GraphQL.Client.fsproj.paket.template‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ dependencies
2020
framework: netstandard2.0
2121
FSharp.Core >= LOCKEDVERSION-Common
2222
FParsec >= LOCKEDVERSION-Common
23+
Microsoft.Extensions.Http >= LOCKEDVERSION-Common
2324
FSharp.Data.GraphQL.Shared >= CURRENTVERSION

‎src/FSharp.Data.GraphQL.Client/GraphQLClientConnection.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type GraphQLClientConnection(invoker : HttpMessageInvoker, ownsInvoker : bool) =
1717

1818
/// Creates a new instance of GraphQLClientConnection, using a provided System.Net.Http.IHttpClientFactory to generate a System.Net.Http.HttpClient instance.
1919
/// The provided System.Net.Http.HttpMessageInvoker is owned by the connection, being disposed when the connection is disposed.
20-
//new(factory : IHttpClientFactory) = new GraphQLClientConnection(factory.CreateClient(), true)
20+
new(factory : IHttpClientFactory) = new GraphQLClientConnection(factory.CreateClient(), true)
2121

2222
/// Creates a new instance of GraphQLClientConnection, using a provided System.Net.Http.HttpClient as a System.Net.Http.HttpMessageInvoker to be wrapped inside.
2323
/// The provided System.Net.Http.HttpMessageInvoker is not owned by the connection, so it must be disposed when it is not necessary anymore.

‎src/FSharp.Data.GraphQL.Client/paket.references‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
group Common
22
FSharp.Core
3-
FParsec
3+
FParsec
4+
Microsoft.Extensions.Http

0 commit comments

Comments
 (0)