Merge pull request microsoft#1894 from microsoft/feature/3.1.1

baywet · web-flow · commit dc5de444f19e · 2024-11-12T15:41:50.000+05:30
feature/3.1.1
diff --git a/src/Microsoft.OpenApi.Workbench/MainWindow.xaml b/src/Microsoft.OpenApi.Workbench/MainWindow.xaml
@@ -40,7 +40,7 @@
                     </StackPanel>
                     <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
                         <Label>Version:</Label>
-                        <RadioButton GroupName="Format" Content="V3.1.0" Padding="5" Height="24" VerticalAlignment="Top" IsChecked="{Binding IsV3_1}" />
+                        <RadioButton GroupName="Format" Content="V3.1.1" Padding="5" Height="24" VerticalAlignment="Top" IsChecked="{Binding IsV3_1}" />
                         <RadioButton GroupName="Format" Content="V3.0.4" Padding="5" Height="24" VerticalAlignment="Top" IsChecked="{Binding IsV3_0}" />
                         <RadioButton GroupName="Format" Content="V2.0" Padding="5" Height="24" VerticalAlignment="Top" IsChecked="{Binding IsV2_0}" />
                     </StackPanel>
diff --git a/src/Microsoft.OpenApi/Models/OpenApiDocument.cs b/src/Microsoft.OpenApi/Models/OpenApiDocument.cs
@@ -138,7 +138,7 @@ public void SerializeAsV31(IOpenApiWriter writer)
             writer.WriteStartObject();
 
             // openApi;
-            writer.WriteProperty(OpenApiConstants.OpenApi, "3.1.0");
+            writer.WriteProperty(OpenApiConstants.OpenApi, "3.1.1");
 
             // jsonSchemaDialect
             writer.WriteProperty(OpenApiConstants.JsonSchemaDialect, JsonSchemaDialect);
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.ParseDocumentWith31PropertiesWorks.verified.txt b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.ParseDocumentWith31PropertiesWorks.verified.txt
@@ -1,4 +1,4 @@
-﻿openapi: '3.1.0'
+﻿openapi: '3.1.1'
 jsonSchemaDialect: https://json-schema.org/draft/2020-12/schema
 info:
   title: Sample OpenAPI 3.1 API
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithExample.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithExample.yaml
@@ -1,4 +1,4 @@
-openapi: 3.1.0 # The version of the OpenAPI Specification
+openapi: 3.1.1 # The version of the OpenAPI Specification
 info: # Metadata about the API
   title: A simple OpenAPI 3.1 example
   version: 1.0.0
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithPatternPropertiesInSchema.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithPatternPropertiesInSchema.yaml
@@ -1,4 +1,4 @@
-openapi: 3.1.0
+openapi: 3.1.1
 info:
   title: Example API
   version: 1.0.0
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithReferenceById.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/docWithReferenceById.yaml
@@ -1,4 +1,4 @@
-openapi: 3.1.0
+openapi: 3.1.1
 info:
   title: ReferenceById
   version: 1.0.0
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWith31Properties.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWith31Properties.yaml
@@ -1,4 +1,4 @@
-openapi: 3.1.0
+openapi: 3.1.1
 info:
   title: Sample OpenAPI 3.1 API
   description: A sample API demonstrating OpenAPI 3.1 features
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithReusablePaths.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithReusablePaths.yaml
@@ -1,4 +1,4 @@
-﻿openapi : 3.1.0
+﻿openapi : 3.1.1
 info:
   title: Webhook Example
   version: 1.0.0
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithSummaryAndDescriptionInReference.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithSummaryAndDescriptionInReference.yaml
@@ -1,4 +1,4 @@
-﻿openapi: '3.1.0'
+﻿openapi: '3.1.1'
 info:
   version: '1.0.0'
   title: Swagger Petstore (Simple)
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithWebhooks.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithWebhooks.yaml
@@ -1,4 +1,4 @@
-﻿openapi: 3.1.0
+﻿openapi: 3.1.1
 info:
   title: Webhook Example
   version: 1.0.0
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/externalRefById.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/externalRefById.yaml
@@ -1,4 +1,4 @@
-openapi: 3.1.0
+openapi: 3.1.1
 info:
   title: ReferenceById
   version: 1.0.0
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/externalRefByJsonPointer.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/externalRefByJsonPointer.yaml
@@ -1,4 +1,4 @@
-openapi: 3.1.0
+openapi: 3.1.1
 info:
   title: ReferenceById
   version: 1.0.0
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/externalResource.yaml b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/externalResource.yaml
@@ -1,4 +1,4 @@
-openapi: 3.1.0
+openapi: 3.1.1
 info:
   title: ReferencedById
   version: 1.0.0
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDocumentWithWebhooksAsV3JsonWorks_produceTerseOutput=False.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDocumentWithWebhooksAsV3JsonWorks_produceTerseOutput=False.verified.txt
@@ -1,5 +1,5 @@
 ﻿{
-  "openapi": "3.1.0",
+  "openapi": "3.1.1",
   "info": {
     "title": "Webhook Example",
     "version": "1.0.0"
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDocumentWithWebhooksAsV3JsonWorks_produceTerseOutput=True.verified.txt b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.SerializeDocumentWithWebhooksAsV3JsonWorks_produceTerseOutput=True.verified.txt
@@ -1 +1 @@
-﻿{"openapi":"3.1.0","info":{"title":"Webhook Example","version":"1.0.0"},"paths":{},"components":{"schemas":{"Pet":{"required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}},"webhooks":{"newPet":{"post":{"requestBody":{"description":"Information about a new pet in the system","content":{"application/json":{"schema":{"$ref":"#/components/schemas/Pet"}}}},"responses":{"200":{"description":"Return a 200 status to indicate that the data was received successfully"}}}}}}
+﻿{"openapi":"3.1.1","info":{"title":"Webhook Example","version":"1.0.0"},"paths":{},"components":{"schemas":{"Pet":{"required":["id","name"],"properties":{"id":{"type":"integer","format":"int64"},"name":{"type":"string"},"tag":{"type":"string"}}}}},"webhooks":{"newPet":{"post":{"requestBody":{"description":"Information about a new pet in the system","content":{"application/json":{"schema":{"$ref":"#/components/schemas/Pet"}}}},"responses":{"200":{"description":"Return a 200 status to indicate that the data was received successfully"}}}}}}
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs
@@ -1929,7 +1929,7 @@ public async Task SerializeDocumentWithWebhooksAsV3JsonWorks(bool produceTerseOu
         public void SerializeDocumentWithWebhooksAsV3YamlWorks()
         {
             // Arrange
-            var expected = @"openapi: '3.1.0'
+            var expected = @"openapi: '3.1.1'
 info:
   title: Webhook Example
   version: 1.0.0
@@ -1984,7 +1984,7 @@ public void SerializeDocumentWithRootJsonSchemaDialectPropertyWorks()
                 JsonSchemaDialect = "http://json-schema.org/draft-07/schema#"
             };
 
-            var expected = @"openapi: '3.1.0'
+            var expected = @"openapi: '3.1.1'
 jsonSchemaDialect: http://json-schema.org/draft-07/schema#
 info:
   title: JsonSchemaDialectTest
@@ -2027,7 +2027,7 @@ public void SerializeV31DocumentWithRefsInWebhooksWorks()
         [Fact]
         public void SerializeDocWithDollarIdInDollarRefSucceeds()
         {
-            var expected = @"openapi: '3.1.0'
+            var expected = @"openapi: '3.1.1'
 info:
   title: Simple API
   version: 1.0.0
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.cs
@@ -20,7 +20,7 @@ namespace Microsoft.OpenApi.Tests.Models.References
     public class OpenApiPathItemReferenceTests
     {
         private const string OpenApi = @"
-openapi: 3.1.0
+openapi: 3.1.1
 info:
   title: Sample API
   version: 1.0.0
@@ -41,7 +41,7 @@ public class OpenApiPathItemReferenceTests
 ";
 
         private const string OpenApi_2 = @"
-openapi: 3.1.0
+openapi: 3.1.1
 info:
   title: Sample API
   version: 1.0.0
diff --git a/test/Microsoft.OpenApi.Tests/Models/Samples/docWithDollarId.yaml b/test/Microsoft.OpenApi.Tests/Models/Samples/docWithDollarId.yaml
@@ -1,4 +1,4 @@
-openapi: 3.1.0
+openapi: 3.1.1
 info:
   title: Simple API
   version: 1.0.0
diff --git a/test/Microsoft.OpenApi.Tests/Models/Samples/docWithReusableWebhooks.yaml b/test/Microsoft.OpenApi.Tests/Models/Samples/docWithReusableWebhooks.yaml
@@ -1,4 +1,4 @@
-openapi : 3.1.0
+openapi : 3.1.1
 info:
   title: Webhook Example
   version: 1.0.0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-openapi: '3.1.0'`
	`1`	`+openapi: '3.1.1'`
`2`	`2`	`jsonSchemaDialect: https://json-schema.org/draft/2020-12/schema`
`3`	`3`	`info:`
`4`	`4`	`title: Sample OpenAPI 3.1 API`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-openapi: 3.1.0 # The version of the OpenAPI Specification`
	`1`	`+openapi: 3.1.1 # The version of the OpenAPI Specification`
`2`	`2`	`info: # Metadata about the API`
`3`	`3`	`title: A simple OpenAPI 3.1 example`
`4`	`4`	`version: 1.0.0`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-openapi: 3.1.0`
	`1`	`+openapi: 3.1.1`
`2`	`2`	`info:`
`3`	`3`	`title: Example API`
`4`	`4`	`version: 1.0.0`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-openapi : 3.1.0`
	`1`	`+openapi : 3.1.1`
`2`	`2`	`info:`
`3`	`3`	`title: Webhook Example`
`4`	`4`	`version: 1.0.0`