DateTime formatted as round-trip

.editorconfig

@@ -13,5 +13,5 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 
 [*.fs]
-indent_size = 2
+indent_size = 4
 indent_style = space

.github/workflows/dotnetcore.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        dotnet: [3.1.300]
+        dotnet: [3.1.404]
     runs-on: ${{ matrix.os }}
 
     steps:

SwaggerProvider.TestsAndDocs.sln

@@ -25,15 +25,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "content", "content", "{8E6D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{ED8079DD-2B06-4030-9F0F-DC548F98E1C4}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SwaggerProvider.ProviderTests", "tests\SwaggerProvider.ProviderTests\SwaggerProvider.ProviderTests.fsproj", "{F26DFAA6-CB19-46EB-9FBD-F4A4DC46C3F5}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SwaggerProvider.ProviderTests", "tests\SwaggerProvider.ProviderTests\SwaggerProvider.ProviderTests.fsproj", "{F26DFAA6-CB19-46EB-9FBD-F4A4DC46C3F5}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SwaggerProvider.ProviderTests.CSharp", "tests\SwaggerProvider.ProviderTests.CSharp\SwaggerProvider.ProviderTests.CSharp.csproj", "{2950E2AC-A436-452A-9524-04BE7C82FA05}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{1D6B2F7D-FC4A-499B-B3D1-42A09F42AAAF}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SwaggerProvider.Runtime", "src\SwaggerProvider.Runtime\SwaggerProvider.Runtime.fsproj", "{DC3E73AF-5B15-45AD-B3C5-B3707DCB0F81}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SwaggerProvider.Runtime", "src\SwaggerProvider.Runtime\SwaggerProvider.Runtime.fsproj", "{DC3E73AF-5B15-45AD-B3C5-B3707DCB0F81}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SwaggerProvider.DesignTime", "src\SwaggerProvider.DesignTime\SwaggerProvider.DesignTime.fsproj", "{0598B4A4-3017-493E-8A64-293EAB4CFB95}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SwaggerProvider.DesignTime", "src\SwaggerProvider.DesignTime\SwaggerProvider.DesignTime.fsproj", "{0598B4A4-3017-493E-8A64-293EAB4CFB95}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CD49F31A-952B-4153-AB76-690091FCE484}"
+	ProjectSection(SolutionItems) = preProject
+		global.json = global.json
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

SwaggerProvider.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28621.142
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SwaggerProvider.Runtime", "src\SwaggerProvider.Runtime\SwaggerProvider.Runtime.fsproj", "{AD0B2860-9373-4BD9-906D-6D19F2F7DEE9}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SwaggerProvider.Runtime", "src\SwaggerProvider.Runtime\SwaggerProvider.Runtime.fsproj", "{AD0B2860-9373-4BD9-906D-6D19F2F7DEE9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{04303D28-4592-430A-B4A6-892105A95B22}"
 	ProjectSection(SolutionItems) = preProject
@@ -17,17 +17,23 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{3A51AC71
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution Files", "{302BCCA4-51B8-475C-9131-548CDC824026}"
 	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
 		build.fsx = build.fsx
 		global.json = global.json
 		README.md = README.md
 		docs\RELEASE_NOTES.md = docs\RELEASE_NOTES.md
 	EndProjectSection
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SwaggerProvider.DesignTime", "src\SwaggerProvider.DesignTime\SwaggerProvider.DesignTime.fsproj", "{DBE9AA3E-AB4C-4FE3-915B-886CC6E6A88D}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SwaggerProvider.DesignTime", "src\SwaggerProvider.DesignTime\SwaggerProvider.DesignTime.fsproj", "{DBE9AA3E-AB4C-4FE3-915B-886CC6E6A88D}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "SwaggerProvider.Tests", "tests\SwaggerProvider.Tests\SwaggerProvider.Tests.fsproj", "{358F1AB1-0F38-4D7D-B022-24F4E9EB5673}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "SwaggerProvider.Tests", "tests\SwaggerProvider.Tests\SwaggerProvider.Tests.fsproj", "{358F1AB1-0F38-4D7D-B022-24F4E9EB5673}"
 EndProject
-Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Swashbuckle.WebApi.Server", "tests\Swashbuckle.WebApi.Server\Swashbuckle.WebApi.Server.fsproj", "{112C445E-959B-4193-836A-78F36FB9F36E}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Swashbuckle.WebApi.Server", "tests\Swashbuckle.WebApi.Server\Swashbuckle.WebApi.Server.fsproj", "{112C445E-959B-4193-836A-78F36FB9F36E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{BA115E77-63E4-4D9C-AB91-F8FAAD2218D3}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\dotnetcore.yml = .github\workflows\dotnetcore.yml
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-        "version": "3.1.300",
+        "version": "3.1.404",
         "rollForward": "minor"
     }
 }

src/SwaggerProvider.DesignTime/v2/OperationCompiler.fs

@@ -104,13 +104,11 @@ type OperationCompiler (schema:SwaggerObject, defCompiler:DefinitionCompiler, ig
             // Makes argument a string // TODO: Make body an exception
             let coerceString defType (format : CollectionFormat) exp =
                 let obj = Expr.Coerce(exp, typeof<obj>) |> Expr.Cast<obj>
-                <@ let x = (%obj)
-                   if isNull x then null else x.ToString() @>
+                <@ let x = (%obj) in RuntimeHelpers.toParam x @>
 
             let rec coerceQueryString name expr =
                 let obj = Expr.Coerce(expr, typeof<obj>)
-                <@ let o = (%%obj : obj)
-                   RuntimeHelpers.toQueryParams name o (%this) @>
+                <@ let o = (%%obj : obj) in RuntimeHelpers.toQueryParams name o (%this) @>
 
             let replacePathTemplate (path: Expr<string>) (name: string) (value: Expr<string>) =
                 let pattern = sprintf "{%s}" name

src/SwaggerProvider.DesignTime/v3/OperationCompiler.fs

@@ -1,4 +1,4 @@
-namespace SwaggerProvider.Internal.v3.Compilers
+namespace SwaggerProvider.Internal.v3.Compilers
 
 open System
 open System.Net.Http
@@ -213,13 +213,11 @@ type OperationCompiler (schema:OpenApiDocument, defCompiler:DefinitionCompiler,
             // Makes argument a string // TODO: Make body an exception
             let coerceString exp =
                 let obj = Expr.Coerce(exp, typeof<obj>) |> Expr.Cast<obj>
-                <@ let x = (%obj)
-                   if isNull x then null else x.ToString() @>
+                <@ let x = (%obj) in RuntimeHelpers.toParam x @>
 
             let rec coerceQueryString name expr =
                 let obj = Expr.Coerce(expr, typeof<obj>)
-                <@ let o = (%%obj : obj)
-                   RuntimeHelpers.toQueryParams name o (%this) @>
+                <@ let o = (%%obj : obj) in RuntimeHelpers.toQueryParams name o (%this) @>
 
             // Partitions arguments based on their locations
             let (path, queryParams, headers) =

src/SwaggerProvider.Runtime/RuntimeHelpers.fs

@@ -1,4 +1,4 @@
-namespace Swagger.Internal
+namespace Swagger.Internal
 
 open System
 open System
@@ -26,16 +26,54 @@ module RuntimeHelpers =
         |> Array.map (fun value-> name, value.ToString())
         |> Array.toList
 
+    let inline private toStrArrayDateTime name (values: DateTime array) =
+        values
+        |> Array.map (fun value-> name, value.ToString("O"))
+        |> Array.toList
+
+    let inline private toStrArrayDateTimeOffset name (values: DateTimeOffset array) =
+        values
+        |> Array.map (fun value-> name, value.ToString("O"))
+        |> Array.toList
+
     let inline private toStrArrayOpt name values =
         values
         |> Array.choose (id)
         |> toStrArray name
 
+    let inline private toStrArrayDateTimeOpt name values =
+        values
+        |> Array.choose (id)
+        |> toStrArrayDateTime name
+
+    let inline private toStrArrayDateTimeOffsetOpt name values =
+        values
+        |> Array.choose (id)
+        |> toStrArrayDateTimeOffset name
+
+
     let inline private toStrOpt name value =
         match value with
         | Some(x) -> [name, x.ToString()]
         | None ->[]
 
+    let inline private toStrDateTimeOpt name (value : DateTime option) =
+        match value with
+        | Some(x) -> [name, x.ToString("O")]
+        | None ->[]
+
+    let inline private toStrDateTimeOffsetOpt name (value : DateTimeOffset option) =
+        match value with
+        | Some(x) -> [name, x.ToString("O")]
+        | None ->[]
+
+    let toParam (obj:obj) =
+        match obj with
+        | :? DateTime as dt -> dt.ToString("O")
+        | :? DateTimeOffset as dto -> dto.ToString("O")
+        | null -> null
+        | _ -> obj.ToString()
+
     let toQueryParams (name:string) (obj:obj) (client:Swagger.ProvidedApiClientBase) =
         match obj with
         | :? array<byte> as xs -> [name, (client.Serialize xs).Trim('\"')] // TODO: Need to verify how servers parse byte[] from query string
@@ -45,25 +83,25 @@ module RuntimeHelpers =
         | :? array<float32> as xs -> xs |> toStrArray name
         | :? array<double> as xs -> xs |> toStrArray name
         | :? array<string> as xs -> xs |> toStrArray name
-        | :? array<DateTime> as xs -> xs |> toStrArray name
-        | :? array<DateTimeOffset> as xs -> xs |> toStrArray name
+        | :? array<DateTime> as xs -> xs |> toStrArrayDateTime name
+        | :? array<DateTimeOffset> as xs -> xs |> toStrArrayDateTimeOffset name
         | :? array<Option<bool>> as xs -> xs |> toStrArrayOpt name
         | :? array<Option<int32>> as xs -> xs |> toStrArrayOpt name
         | :? array<Option<int64>> as xs -> xs |> toStrArrayOpt name
         | :? array<Option<float32>> as xs -> xs |> toStrArrayOpt name
         | :? array<Option<double>> as xs -> xs |> toStrArrayOpt name
         | :? array<Option<string>> as xs -> xs |> toStrArrayOpt name
-        | :? array<Option<DateTime>> as xs -> xs |> toStrArray name
-        | :? array<Option<DateTimeOffset>> as xs -> xs |> toStrArray name
+        | :? array<Option<DateTime>> as xs -> xs |> toStrArrayDateTimeOpt name
+        | :? array<Option<DateTimeOffset>> as xs -> xs |> toStrArrayDateTimeOffsetOpt name
         | :? array<Option<Guid>> as xs -> xs |> toStrArray name
         | :? Option<bool> as x -> x |> toStrOpt name
         | :? Option<int32> as x -> x |> toStrOpt name
         | :? Option<int64> as x -> x |> toStrOpt name
         | :? Option<float32> as x -> x |> toStrOpt name
         | :? Option<double> as x -> x |> toStrOpt name
         | :? Option<string> as x -> x |> toStrOpt name
-        | :? Option<DateTime> as x -> x |> toStrOpt name
-        | :? Option<DateTimeOffset> as x -> x |> toStrOpt name
+        | :? Option<DateTime> as x -> x |> toStrDateTimeOpt name
+        | :? Option<DateTimeOffset> as x -> x |> toStrDateTimeOffsetOpt name
         | :? Option<Guid> as x -> x |> toStrOpt name
         | _ -> [name, if isNull obj then null else obj.ToString()]