microsoft · AndrewDessin · Apr 10, 2020
diff --git a/src/Microsoft.OpenApi.CSharpAnnotations.DocumentGeneration/Extensions/TypeExtensions.cs b/src/Microsoft.OpenApi.CSharpAnnotations.DocumentGeneration/Extensions/TypeExtensions.cs
@@ -31,6 +31,7 @@ public static class TypeExtensions
                 [typeof(decimal)] = () => new OpenApiSchema {Type = "number", Format = "double"},
                 [typeof(DateTime)] = () => new OpenApiSchema {Type = "string", Format = "date-time"},
                 [typeof(DateTimeOffset)] = () => new OpenApiSchema {Type = "string", Format = "date-time"},
+                [typeof(TimeSpan)] = () => new OpenApiSchema {Type = "string"},
                 [typeof(Guid)] = () => new OpenApiSchema {Type = "string", Format = "uuid"},
                 [typeof(char)] = () => new OpenApiSchema {Type = "string"},
 
@@ -47,6 +48,7 @@ public static class TypeExtensions
                 [typeof(DateTime?)] = () => new OpenApiSchema {Type = "string", Format = "date-time", Nullable = true},
                 [typeof(DateTimeOffset?)] = () =>
                     new OpenApiSchema {Type = "string", Format = "date-time", Nullable = true},
+                [typeof(TimeSpan?)] = () => new OpenApiSchema { Type = "string", Nullable = true },
                 [typeof(Guid?)] = () => new OpenApiSchema {Type = "string", Format = "uuid", Nullable = true},
                 [typeof(char?)] = () => new OpenApiSchema {Type = "string", Nullable = true},
 

diff --git a/test/Microsoft.OpenApi.CSharpAnnotations.DocumentGeneration.Tests.Contracts/SampleObject1.cs b/test/Microsoft.OpenApi.CSharpAnnotations.DocumentGeneration.Tests.Contracts/SampleObject1.cs
@@ -4,6 +4,7 @@
 // ------------------------------------------------------------
 
 using Newtonsoft.Json;
+using System;
 
 namespace Microsoft.OpenApi.CSharpAnnotations.DocumentGeneration.Tests.Contracts
 {
@@ -53,5 +54,11 @@ public sealed class SampleObject1
         /// </summary>
         [JsonProperty(PropertyName = "samplePropertyEnum", Required = Required.Always)]
         public SampleEnum1 SamplePropertyEnum { get; set; }
+
+        /// <summary>
+        /// Gets or sets the sample timespan
+        /// </summary>
+        [JsonProperty(PropertyName = "samplePropertyTimespan", Required = Required.Always)]
+        public TimeSpan SamplePropertyTimespan { get; set; }
     }
 }
diff --git a/...ations.DocumentGeneration.Tests/DocumentVariantTests/Output/AnnotationDefaultVariant.json b/...ations.DocumentGeneration.Tests/DocumentVariantTests/Output/AnnotationDefaultVariant.json
@@ -631,7 +631,8 @@
         "required": [
           "samplePropertyString3",
           "samplePropertyString4",
-          "samplePropertyEnum"
+          "samplePropertyEnum",
+          "samplePropertyTimespan"
         ],
         "type": "object",
         "properties": {
@@ -667,6 +668,10 @@
             ],
             "type": "string",
             "description": "Gets or sets the sample property enum"
+          },
+          "samplePropertyTimespan": {
+            "type": "string",
+            "description": "Gets or sets the sample timespan"
           }
         }
       },

diff --git a/....DocumentGeneration.Tests/DocumentVariantTests/Output/AnnotationVariantSwaggerGroup1.json b/....DocumentGeneration.Tests/DocumentVariantTests/Output/AnnotationVariantSwaggerGroup1.json
@@ -151,7 +151,8 @@
         "required": [
           "samplePropertyString3",
           "samplePropertyString4",
-          "samplePropertyEnum"
+          "samplePropertyEnum",
+          "samplePropertyTimespan"
         ],
         "type": "object",
         "properties": {
@@ -187,6 +188,10 @@
             ],
             "type": "string",
             "description": "Gets or sets the sample property enum"
+          },
+          "samplePropertyTimespan": {
+            "type": "string",
+            "description": "Gets or sets the sample timespan"
           }
         }
       },

diff --git a/....DocumentGeneration.Tests/DocumentVariantTests/Output/AnnotationVariantSwaggerGroup2.json b/....DocumentGeneration.Tests/DocumentVariantTests/Output/AnnotationVariantSwaggerGroup2.json
@@ -151,7 +151,8 @@
         "required": [
           "samplePropertyString3",
           "samplePropertyString4",
-          "samplePropertyEnum"
+          "samplePropertyEnum",
+          "samplePropertyTimespan"
         ],
         "type": "object",
         "properties": {
@@ -187,6 +188,10 @@
             ],
             "type": "string",
             "description": "Gets or sets the sample property enum"
+          },
+          "samplePropertyTimespan": {
+            "type": "string",
+            "description": "Gets or sets the sample timespan"
           }
         }
       },

diff --git a/...ocumentVariantTests/Output/AnnotationsWithCommonAnnotations/AnnotationDefaultVariant.json b/...ocumentVariantTests/Output/AnnotationsWithCommonAnnotations/AnnotationDefaultVariant.json
@@ -703,7 +703,8 @@
         "required": [
           "samplePropertyString3",
           "samplePropertyString4",
-          "samplePropertyEnum"
+          "samplePropertyEnum",
+          "samplePropertyTimespan"
         ],
         "type": "object",
         "properties": {
@@ -739,6 +740,10 @@
             ],
             "type": "string",
             "description": "Gets or sets the sample property enum"
+          },
+          "samplePropertyTimespan": {
+            "type": "string",
+            "description": "Gets or sets the sample timespan"
           }
         }
       },

diff --git a/...tVariantTests/Output/AnnotationsWithCommonAnnotations/AnnotationVariantSwaggerGroup1.json b/...tVariantTests/Output/AnnotationsWithCommonAnnotations/AnnotationVariantSwaggerGroup1.json
@@ -167,7 +167,8 @@
         "required": [
           "samplePropertyString3",
           "samplePropertyString4",
-          "samplePropertyEnum"
+          "samplePropertyEnum",
+          "samplePropertyTimespan"
         ],
         "type": "object",
         "properties": {
@@ -203,6 +204,10 @@
             ],
             "type": "string",
             "description": "Gets or sets the sample property enum"
+          },
+          "samplePropertyTimespan": {
+            "type": "string",
+            "description": "Gets or sets the sample timespan"
           }
         }
       },

diff --git a/...tVariantTests/Output/AnnotationsWithCommonAnnotations/AnnotationVariantSwaggerGroup2.json b/...tVariantTests/Output/AnnotationsWithCommonAnnotations/AnnotationVariantSwaggerGroup2.json
@@ -167,7 +167,8 @@
         "required": [
           "samplePropertyString3",
           "samplePropertyString4",
-          "samplePropertyEnum"
+          "samplePropertyEnum",
+          "samplePropertyTimespan"
         ],
         "type": "object",
         "properties": {
@@ -203,6 +204,10 @@
             ],
             "type": "string",
             "description": "Gets or sets the sample property enum"
+          },
+          "samplePropertyTimespan": {
+            "type": "string",
+            "description": "Gets or sets the sample timespan"
           }
         }
       },

diff --git a/...s/DocumentVariantTests/Output/AnnotationsWithDuplicatePaths/AnnotationDefaultVariant.json b/...s/DocumentVariantTests/Output/AnnotationsWithDuplicatePaths/AnnotationDefaultVariant.json
@@ -218,7 +218,8 @@
         "required": [
           "samplePropertyString3",
           "samplePropertyString4",
-          "samplePropertyEnum"
+          "samplePropertyEnum",
+          "samplePropertyTimespan"
         ],
         "type": "object",
         "properties": {
@@ -254,6 +255,10 @@
             ],
             "type": "string",
             "description": "Gets or sets the sample property enum"
+          },
+          "samplePropertyTimespan": {
+            "type": "string",
+            "description": "Gets or sets the sample timespan"
           }
         }
       },

diff --git a/...mentVariantTests/Output/AnnotationsWithDuplicatePaths/AnnotationVariantSwaggerGroup1.json b/...mentVariantTests/Output/AnnotationsWithDuplicatePaths/AnnotationVariantSwaggerGroup1.json
@@ -93,7 +93,8 @@
         "required": [
           "samplePropertyString3",
           "samplePropertyString4",
-          "samplePropertyEnum"
+          "samplePropertyEnum",
+          "samplePropertyTimespan"
         ],
         "type": "object",
         "properties": {
@@ -129,6 +130,10 @@
             ],
             "type": "string",
             "description": "Gets or sets the sample property enum"
+          },
+          "samplePropertyTimespan": {
+            "type": "string",
+            "description": "Gets or sets the sample timespan"
           }
         }
       }

diff --git a/...mentVariantTests/Output/AnnotationsWithDuplicatePaths/AnnotationVariantSwaggerGroup2.json b/...mentVariantTests/Output/AnnotationsWithDuplicatePaths/AnnotationVariantSwaggerGroup2.json
@@ -209,7 +209,8 @@
         "required": [
           "samplePropertyString3",
           "samplePropertyString4",
-          "samplePropertyEnum"
+          "samplePropertyEnum",
+          "samplePropertyTimespan"
         ],
         "type": "object",
         "properties": {
@@ -245,6 +246,10 @@
             ],
             "type": "string",
             "description": "Gets or sets the sample property enum"
+          },
+          "samplePropertyTimespan": {
+            "type": "string",
+            "description": "Gets or sets the sample timespan"
           }
         }
       }

diff --git a/...torTests/Input/Microsoft.OpenApi.CSharpAnnotations.DocumentGeneration.Tests.Contracts.dll b/...torTests/Input/Microsoft.OpenApi.CSharpAnnotations.DocumentGeneration.Tests.Contracts.dll
diff --git a/...torTests/Input/Microsoft.OpenApi.CSharpAnnotations.DocumentGeneration.Tests.Contracts.xml b/...torTests/Input/Microsoft.OpenApi.CSharpAnnotations.DocumentGeneration.Tests.Contracts.xml
diff --git a/...Annotations.DocumentGeneration.Tests/OpenApiDocumentGeneratorTests/Output/Annotation.Json b/...Annotations.DocumentGeneration.Tests/OpenApiDocumentGeneratorTests/Output/Annotation.Json
@@ -641,7 +641,8 @@
         "required": [
           "samplePropertyString3",
           "samplePropertyString4",
-          "samplePropertyEnum"
+          "samplePropertyEnum",
+          "samplePropertyTimespan"
         ],
         "type": "object",
         "properties": {
@@ -677,6 +678,10 @@
             ],
             "type": "string",
             "description": "Gets or sets the sample property enum"
+          },
+          "samplePropertyTimespan": {
+            "type": "string",
+            "description": "Gets or sets the sample timespan"
           }
         }
       },

diff --git a/...Generation.Tests/OpenApiDocumentGeneratorTests/Output/AnnotationAlternativeParamTags.Json b/...Generation.Tests/OpenApiDocumentGeneratorTests/Output/AnnotationAlternativeParamTags.Json
@@ -640,7 +640,8 @@
         "required": [
           "samplePropertyString3",
           "samplePropertyString4",
-          "samplePropertyEnum"
+          "samplePropertyEnum",
+          "samplePropertyTimespan"
         ],
         "type": "object",
         "properties": {
@@ -676,6 +677,10 @@
             ],
             "type": "string",
             "description": "Gets or sets the sample property enum"
+          },
+          "samplePropertyTimespan": {
+            "type": "string",
+            "description": "Gets or sets the sample timespan"
           }
         }
       },

diff --git a/...mentGeneration.Tests/OpenApiDocumentGeneratorTests/Output/AnnotationArrayInParamTags.Json b/...mentGeneration.Tests/OpenApiDocumentGeneratorTests/Output/AnnotationArrayInParamTags.Json
@@ -634,7 +634,8 @@
         "required": [
           "samplePropertyString3",
           "samplePropertyString4",
-          "samplePropertyEnum"
+          "samplePropertyEnum",
+          "samplePropertyTimespan"
         ],
         "type": "object",
         "properties": {
@@ -670,6 +671,10 @@
             ],
             "type": "string",
             "description": "Gets or sets the sample property enum"
+          },
+          "samplePropertyTimespan": {
+            "type": "string",
+            "description": "Gets or sets the sample timespan"
           }
         }
       },

diff --git a/...ns.DocumentGeneration.Tests/OpenApiDocumentGeneratorTests/Output/AnnotationCamelCase.Json b/...ns.DocumentGeneration.Tests/OpenApiDocumentGeneratorTests/Output/AnnotationCamelCase.Json
@@ -641,7 +641,8 @@
         "required": [
           "samplePropertyString3",
           "samplePropertyString4",
-          "samplePropertyEnum"
+          "samplePropertyEnum",
+          "samplePropertyTimespan"
         ],
         "type": "object",
         "properties": {
@@ -677,6 +678,10 @@
             ],
             "type": "string",
             "description": "Gets or sets the sample property enum"
+          },
+          "samplePropertyTimespan": {
+            "type": "string",
+            "description": "Gets or sets the sample timespan"
           }
         }
       },

diff --git a/...sts/OpenApiDocumentGeneratorTests/Output/AnnotationConflictingPathAndQueryParameters.json b/...sts/OpenApiDocumentGeneratorTests/Output/AnnotationConflictingPathAndQueryParameters.json
@@ -557,7 +557,8 @@
         "required": [
           "samplePropertyString3",
           "samplePropertyString4",
-          "samplePropertyEnum"
+          "samplePropertyEnum",
+          "samplePropertyTimespan"
         ],
         "type": "object",
         "properties": {
@@ -593,6 +594,10 @@
             ],
             "type": "string",
             "description": "Gets or sets the sample property enum"
+          },
+          "samplePropertyTimespan": {
+            "type": "string",
+            "description": "Gets or sets the sample timespan"
           }
         }
       },

diff --git a/...ation.Tests/OpenApiDocumentGeneratorTests/Output/AnnotationIncorrectlyOrderedGeneric.json b/...ation.Tests/OpenApiDocumentGeneratorTests/Output/AnnotationIncorrectlyOrderedGeneric.json
@@ -570,7 +570,8 @@
         "required": [
           "samplePropertyString3",
           "samplePropertyString4",
-          "samplePropertyEnum"
+          "samplePropertyEnum",
+          "samplePropertyTimespan"
         ],
         "type": "object",
         "properties": {
@@ -606,6 +607,10 @@
             ],
             "type": "string",
             "description": "Gets or sets the sample property enum"
+          },
+          "samplePropertyTimespan": {
+            "type": "string",
+            "description": "Gets or sets the sample timespan"
           }
         }
       },

diff --git a/...s.DocumentGeneration.Tests/OpenApiDocumentGeneratorTests/Output/AnnotationInvalidUri.json b/...s.DocumentGeneration.Tests/OpenApiDocumentGeneratorTests/Output/AnnotationInvalidUri.json
@@ -615,7 +615,8 @@
         "required": [
           "samplePropertyString3",
           "samplePropertyString4",
-          "samplePropertyEnum"
+          "samplePropertyEnum",
+          "samplePropertyTimespan"
         ],
         "type": "object",
         "properties": {
@@ -651,6 +652,10 @@
             ],
             "type": "string",
             "description": "Gets or sets the sample property enum"
+          },
+          "samplePropertyTimespan": {
+            "type": "string",
+            "description": "Gets or sets the sample timespan"
           }
         }
       },