PR fixes

Author: Viktor Tochonov

build/Program.fs

@@ -32,7 +32,7 @@ let ctx = Context.forceFakeContext ()
 let embedAll = ctx.Arguments |> List.exists (fun arg -> arg = BuildArguments.EmbedAll)
 
 module DotNetCli =
-    let setVersion (o : DotNet.Options) = { o with Version = Some "9.0.200" }
+    let setVersion (o : DotNet.Options) = { o with Version = Some "9.0.304" }
     let setRestoreOptions (o : DotNet.RestoreOptions) = o.WithCommon setVersion
 
 let configurationString = Environment.environVarOrDefault "CONFIGURATION" "Release"

src/FSharp.Data.GraphQL.Client/Upload.fs

@@ -38,7 +38,7 @@ type Upload
             | _ -> MediaTypeNames.Application.Octet
         | ct -> ct
 
-    /// Gets the name used to uniquily identify upload throuout multiple uploads
+    /// Gets the name used to uniquely identify upload throughout multiple uploads
     /// and within a request.
     member val Name =
         name

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

@@ -18,7 +18,7 @@ type HttpContextRequestExecutionContext (httpContext : HttpContext) =
                     let memoryStream = new MemoryStream ()
                     use fileStream = file.OpenReadStream ()
                     fileStream.CopyTo (memoryStream)
-                    memoryStream.Position <- 0L
+                    memoryStream.Seek (0L, SeekOrigin.Begin) |> ignore
                     Ok {
                         FileName = file.FileName
                         Stream = memoryStream

tests/FSharp.Data.GraphQL.IntegrationTests.Server/FSharp.Data.GraphQL.IntegrationTests.Server.fsproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(DotNetVersion)</TargetFramework>
-    <UserSecretsId>2cdd2058-1c78-4088-b2a9-3848706cf422</UserSecretsId>
+    <UserSecretsId>FSharp.Data.GraphQL.IntegrationTests.Server</UserSecretsId>
   </PropertyGroup>
 
   <ItemGroup>

tests/FSharp.Data.GraphQL.IntegrationTests.Server/Schema.fs

@@ -198,8 +198,12 @@ module Schema =
                         description = "Upload several files in different forms.",
                         args = [ Define.Input("request", UploadRequestType, description = "The request for uploading several files in different forms.") ],
                         resolve = fun ctx _ -> mapUploadRequestToOutput (ctx.Arg("request")))
-                    Define.Field ("uploadFileComplex", StringType, "", [ Define.Input ("input", InputFileObject) ],
-                    (fun ctx _ -> getFileContent ctx "input"))
+                    Define.Field (
+                        name = "uploadFileComplex",
+                        typedef = StringType,
+                        description = "",
+                        args = [ Define.Input ("input", InputFileObject) ],
+                        resolve = fun ctx _ -> getFileContent ctx "input")
                 ])
 
     let schema : ISchema<Root> = upcast Schema(QueryType, MutationType)

tests/FSharp.Data.GraphQL.IntegrationTests/FSharp.Data.GraphQL.IntegrationTests.fsproj

@@ -24,19 +24,19 @@
     <Compile Include="Helpers.fs" />
     <Compile Include="LocalProviderTests.fs" />
     <Compile Include="LocalProviderWithOptionalParametersOnlyTests.fs" />
-    <None Include="SwapiLocalProviderTests.fs" />
-    <None Include="SwapiRemoteProviderTests.fs" />
+    <Compile Include="SwapiLocalProviderTests.fs" />
+    <Compile Include="SwapiRemoteProviderTests.fs" />
   </ItemGroup>
 
   <ItemGroup>
     <Reference Include="FSharp.Data.GraphQL.Client">
       <HintPath Condition="Exists('..\..\src\FSharp.Data.GraphQL.Client\bin\Debug\netstandard2.0\FSharp.Data.GraphQL.Client.dll')">..\..\src\FSharp.Data.GraphQL.Client\bin\Debug\netstandard2.0\FSharp.Data.GraphQL.Client.dll</HintPath>
-      <!--<HintPath Condition="Exists('..\..\src\FSharp.Data.GraphQL.Client\bin\Release\netstandard2.0\FSharp.Data.GraphQL.Client.dll')">..\..\src\FSharp.Data.GraphQL.Client\bin\Release\netstandard2.0\FSharp.Data.GraphQL.Client.dll</HintPath>-->
+      <HintPath Condition="Exists('..\..\src\FSharp.Data.GraphQL.Client\bin\Release\netstandard2.0\FSharp.Data.GraphQL.Client.dll')">..\..\src\FSharp.Data.GraphQL.Client\bin\Release\netstandard2.0\FSharp.Data.GraphQL.Client.dll</HintPath>
       <HintPath Condition="Exists('..\..\bin\FSharp.Data.GraphQL.Client\netstandard2.0\FSharp.Data.GraphQL.Client.dll')">..\..\bin\FSharp.Data.GraphQL.Client\netstandard2.0\FSharp.Data.GraphQL.Client.dll</HintPath>
     </Reference>
     <Reference Include="FSharp.Data.GraphQL.Shared">
       <HintPath Condition="Exists('..\..\src\FSharp.Data.GraphQL.Client\bin\Debug\netstandard2.0\FSharp.Data.GraphQL.Shared.dll')">..\..\src\FSharp.Data.GraphQL.Client\bin\Debug\netstandard2.0\FSharp.Data.GraphQL.Shared.dll</HintPath>
-      <!--<HintPath Condition="Exists('..\..\src\FSharp.Data.GraphQL.Client\bin\Release\netstandard2.0\FSharp.Data.GraphQL.Shared.dll')">..\..\src\FSharp.Data.GraphQL.Client\bin\Release\netstandard2.0\FSharp.Data.GraphQL.Shared.dll</HintPath>-->
+      <HintPath Condition="Exists('..\..\src\FSharp.Data.GraphQL.Client\bin\Release\netstandard2.0\FSharp.Data.GraphQL.Shared.dll')">..\..\src\FSharp.Data.GraphQL.Client\bin\Release\netstandard2.0\FSharp.Data.GraphQL.Shared.dll</HintPath>
       <HintPath Condition="Exists('..\..\bin\FSharp.Data.GraphQL.Client\netstandard2.0\FSharp.Data.GraphQL.Shared.dll')">..\..\bin\FSharp.Data.GraphQL.Client\netstandard2.0\FSharp.Data.GraphQL.Shared.dll</HintPath>
     </Reference>
   </ItemGroup>

tests/FSharp.Data.GraphQL.IntegrationTests/Helpers.fs

@@ -3,8 +3,8 @@ module FSharp.Data.GraphQL.IntegrationTests.Helpers
 open Xunit
 open System.Text
 open System.Collections.Generic
-open FSharp.Data.GraphQL
 open System.Runtime.InteropServices
+open FSharp.Data.GraphQL
 
 let normalize (x : string) =
     x.Replace("\r\n", "\n").Split ([| '\n' |])

tests/FSharp.Data.GraphQL.IntegrationTests/LocalProviderTests.fs

@@ -221,7 +221,6 @@ module SingleRequiredUploadOperation =
 [<Fact>]
 let ``Should be able to execute a single required upload``() =
     let file  = { Name = "file.txt"; ContentType = "text/plain"; Content = "Sample text file contents" }
-    //let upload : Upload =
     SingleRequiredUploadOperation.operation.Run(file.MakeUpload())
     |> SingleRequiredUploadOperation.validateResult file
 
@@ -254,12 +253,6 @@ module SingleOptionalUploadOperation =
         result.Data.Value.NullableSingleUpload.Value.ContentType |> equals file.ContentType)
 
 
-[<Fact>]
-let ``Should be able to execute a upload by passing a file with new approach``() =
-    let file = { Name = "file.txt"; ContentType = "text/plain"; Content = "Sample text file contents" }
-    SingleOptionalUploadOperation.operation.Run(file.MakeUpload())
-    |> SingleOptionalUploadOperation.validateResult (Some file)
-
 [<Fact>]
 let ``Should be able to execute a single optional upload by passing a file``() =
     let file = { Name = "file.txt"; ContentType = "text/plain"; Content = "Sample text file contents" }
@@ -278,7 +271,7 @@ let ``Should be able to execute a single optional upload by not passing a file``
     SingleOptionalUploadOperation.operation.Run()
     |> SingleOptionalUploadOperation.validateResult None
 
-//[<Fact>]
+[<Fact>]
 let ``Should be able to execute a single optional upload by not passing a file asynchronously``() : Task = task {
     let! result = SingleOptionalUploadOperation.operation.AsyncRun()
     result |> SingleOptionalUploadOperation.validateResult None
@@ -487,7 +480,7 @@ let ``Should be able to upload files inside another input type``() : Task = task
             Some [| Some { Name = "multiple4.txt"; ContentType = "text/plain"; Content = "Multiple files fourth file content" }; None |] }
     let input =
         let makeUpload (x : File) = x.MakeUpload()
-        UploadRequestOperation.Request(makeUpload request.Single,
+        UploadRequestOperation.Request(single = makeUpload request.Single,
                                        multiple = Array.map makeUpload request.Multiple,
                                        nullableMultiple = Array.map makeUpload request.NullableMultiple.Value,
                                        nullableMultipleNullable = Array.map (Option.map makeUpload) request.NullableMultipleNullable.Value)

tests/FSharp.Data.GraphQL.IntegrationTests/LocalProviderWithOptionalParametersOnlyTests.fs

@@ -226,7 +226,7 @@ let ``Should be able to execute a single required upload``() =
 [<Fact>]
 let ``Should be able to execute a single required upload asynchronously``() : Task = task {
     let file = { Name = "file.txt"; ContentType = "text/plain"; Content = "Sample text file contents" }
-    let! result = SingleRequiredUploadOperation.operation.AsyncRun(file.MakeUpload("test"))
+    let! result = SingleRequiredUploadOperation.operation.AsyncRun(file.MakeUpload())
     result |> SingleRequiredUploadOperation.validateResult file
 }
 
@@ -335,8 +335,8 @@ module OptionalMultipleUploadOperation =
 [<Fact>]
 let ``Should be able to execute a multiple upload``() =
     let files =
-        [|  { Name = "file1.txt"; ContentType = "text/plain"; Content = "Sample text file contents 1" }
-            { Name = "file2.txt"; ContentType = "text/plain"; Content = "Sample text file contents 2" } |]
+        [| { Name = "file1.txt"; ContentType = "text/plain"; Content = "Sample text file contents 1" }
+           { Name = "file2.txt"; ContentType = "text/plain"; Content = "Sample text file contents 2" } |]
     OptionalMultipleUploadOperation.operation.Run(files |> Array.map (fun f -> f.MakeUpload()) |> Some)
     |> OptionalMultipleUploadOperation.validateResult (Some files)