diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
index cedb47a0..836c94d2 100644
--- a/.azure-pipelines/ci-build.yml
+++ b/.azure-pipelines/ci-build.yml
@@ -8,6 +8,7 @@ trigger:
     include:
       - main
       - support/v1
+      - support/v2
   tags:
     include:
       - 'v*'
@@ -16,6 +17,7 @@ pr:
     include:
       - main
       - support/v1
+      - support/v2
 
 variables:
   buildPlatform: 'Any CPU'
diff --git a/.github/policies/OpenAPI.NET.OData-branch-protection.yml b/.github/policies/OpenAPI.NET.OData-branch-protection.yml
index 7a91aec7..ffd1f84a 100644
--- a/.github/policies/OpenAPI.NET.OData-branch-protection.yml
+++ b/.github/policies/OpenAPI.NET.OData-branch-protection.yml
@@ -49,6 +49,42 @@ configuration:
     # This branch pattern applies to the following branches as of 06/09/2024 20:45:44:
     # support/v1
 
+    # Specifies whether this branch can be deleted. boolean
+    allowsDeletions: false
+    # Specifies whether forced pushes are allowed on this branch. boolean
+    allowsForcePushes: false
+    # Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
+    dismissStaleReviews: true
+    # Specifies whether admins can overwrite branch protection. boolean
+    isAdminEnforced: false
+    # Indicates whether "Require a pull request before merging" is enabled. boolean
+    requiresPullRequestBeforeMerging: true
+    # Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
+    requiredApprovingReviewsCount: 1
+    # Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
+    requireCodeOwnersReview: true
+    # Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
+    requiresCommitSignatures: false
+    # Are conversations required to be resolved before merging? boolean
+    requiresConversationResolution: true
+    # Are merge commits prohibited from being pushed to this branch. boolean
+    requiresLinearHistory: false
+    # Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
+    requiredStatusChecks:
+    - license/cla
+    - Continuous Integration
+    - CodeQL
+    # Require branches to be up to date before merging. This should be false since the repo contains autogenerated files. boolean
+    requiresStrictStatusChecks: false
+    # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
+    restrictsPushes: false
+    # Restrict who can dismiss pull request reviews. boolean
+    restrictsReviewDismissals: false
+
+  - branchNamePattern: support/v2
+    # This branch pattern applies to the following branches as of 06/09/2024 20:45:44:
+    # support/v1
+
     # Specifies whether this branch can be deleted. boolean
     allowsDeletions: false
     # Specifies whether forced pushes are allowed on this branch. boolean
diff --git a/.github/release-please.yml b/.github/release-please.yml
index c821fc16..ce23f6ec 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -3,5 +3,8 @@ primaryBranch: main
 handleGHRelease: true
 branches:
   - branch: support/v1
+    manifest: true
+    handleGHRelease: true
+  - branch: support/v2
     manifest: true
     handleGHRelease: true
\ No newline at end of file
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 75416eca..0f20d41d 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -13,10 +13,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ main, support/v1 ]
+    branches: [ main, support/v1, support/v2 ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ main, support/v1 ]
+    branches: [ main, support/v1, support/v2 ]
   schedule:
     - cron: '32 2 * * 6'
   workflow_dispatch:
diff --git a/.github/workflows/release-please-gha.yml b/.github/workflows/release-please-gha.yml
index b6ccb702..5014a162 100644
--- a/.github/workflows/release-please-gha.yml
+++ b/.github/workflows/release-please-gha.yml
@@ -15,6 +15,7 @@ on:
     branches:
       - main
       - support/v1
+      - support/v2
 
 permissions:
   contents: read
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index fdf1d245..a4629065 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -5,6 +5,7 @@ on:
     branches:
       - main
       - support/v1
+      - support/v2
     paths-ignore: ['.vscode/**']
   pull_request:
     types: [opened, synchronize, reopened]
diff --git a/.github/workflows/validate-descriptions.yml b/.github/workflows/validate-descriptions.yml
index 46799533..58c61387 100644
--- a/.github/workflows/validate-descriptions.yml
+++ b/.github/workflows/validate-descriptions.yml
@@ -2,9 +2,9 @@ name: OpenAPI Parser Validation for latest OpenAPI docs
 
 on:
   push:
-    branches: [ main, support/v1 ]
+    branches: [ main, support/v1, support/v2 ]
   pull_request:
-    branches: [ main, support/v1 ]
+    branches: [ main, support/v1, support/v2 ]
 
 jobs:
 
diff --git a/src/Microsoft.OpenApi.OData.Reader/Common/OpenApiOperationExtensions.cs b/src/Microsoft.OpenApi.OData.Reader/Common/OpenApiOperationExtensions.cs
index 54a92bc3..f0126f72 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Common/OpenApiOperationExtensions.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Common/OpenApiOperationExtensions.cs
@@ -43,7 +43,7 @@ public static void AddErrorResponses(this OpenApiOperation operation, OpenApiCon
                     response = new()
                     {
                         Description = Constants.Success,
-                        Content = new Dictionary<string, OpenApiMediaType>
+                        Content = new Dictionary<string, IOpenApiMediaType>
                         {
                             {
                                 Constants.ApplicationJsonMediaType,
diff --git a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiParameterGenerator.cs b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiParameterGenerator.cs
index 06087925..a7105851 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiParameterGenerator.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiParameterGenerator.cs
@@ -94,7 +94,7 @@ public static IList<IOpenApiParameter> CreateParameters(this ODataContext contex
                         Required = true,
 
                         // Create schema in the Content property to indicate that the parameters are serialized as JSON
-                        Content = new Dictionary<string, OpenApiMediaType>
+                        Content = new Dictionary<string, IOpenApiMediaType>
                         {
                             {
                                 Constants.ApplicationJsonMediaType,
diff --git a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiRequestBodyGenerator.cs b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiRequestBodyGenerator.cs
index 9be25fe6..e49a150b 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiRequestBodyGenerator.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiRequestBodyGenerator.cs
@@ -78,7 +78,7 @@ internal static class OpenApiRequestBodyGenerator
             {
                 Description = "Action parameters",
                 Required = true,
-                Content = new Dictionary<string, OpenApiMediaType>()
+                Content = new Dictionary<string, IOpenApiMediaType>()
             };
 
             requestBody.Content.Add(Constants.ApplicationJsonMediaType, new OpenApiMediaType
@@ -123,7 +123,7 @@ private static OpenApiRequestBody CreateRefPostRequestBody(OpenApiDocument docum
             {
                 Required = true,
                 Description = "New navigation property ref value",
-                Content = new Dictionary<string, OpenApiMediaType>
+                Content = new Dictionary<string, IOpenApiMediaType>
                 {
                     {
                         Constants.ApplicationJsonMediaType, new OpenApiMediaType
@@ -148,7 +148,7 @@ private static OpenApiRequestBody CreateRefPutRequestBody(OpenApiDocument docume
             {
                 Required = true,
                 Description = "New navigation property ref values",
-                Content = new Dictionary<string, OpenApiMediaType>
+                Content = new Dictionary<string, IOpenApiMediaType>
                 {
                     {
                         Constants.ApplicationJsonMediaType, new OpenApiMediaType
diff --git a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiResponseGenerator.cs b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiResponseGenerator.cs
index 2c5f193c..0d59595c 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiResponseGenerator.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiResponseGenerator.cs
@@ -242,7 +242,7 @@ public static OpenApiResponses CreateResponses(this ODataContext context, IEdmOp
             OpenApiResponse response = new()
             {
                 Description = "Success",
-                Content = new Dictionary<string, OpenApiMediaType>
+                Content = new Dictionary<string, IOpenApiMediaType>
                 {
                     {
                         mediaType,
@@ -267,7 +267,7 @@ private static OpenApiResponse CreateCollectionResponse(string typeName, OpenApi
             return new OpenApiResponse
             {
                 Description = "Retrieved collection",
-                Content = new Dictionary<string, OpenApiMediaType>
+                Content = new Dictionary<string, IOpenApiMediaType>
                 {
                     {
                         Constants.ApplicationJsonMediaType,
@@ -286,7 +286,7 @@ private static OpenApiResponse CreateCountResponse(OpenApiDocument document)
             return new OpenApiResponse
             {
                 Description = "The count of the resource",
-                Content = new Dictionary<string, OpenApiMediaType>
+                Content = new Dictionary<string, IOpenApiMediaType>
                 {
                     {
                         "text/plain",
@@ -305,7 +305,7 @@ private static OpenApiResponse CreateErrorResponse(this ODataContext context, Op
             return new OpenApiResponse
             {
                 Description = "error",
-                Content = new Dictionary<string, OpenApiMediaType>
+                Content = new Dictionary<string, IOpenApiMediaType>
                 {
                     {
                         Constants.ApplicationJsonMediaType,
diff --git a/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj b/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj
index 5cd56b25..c9108cd2 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj
+++ b/src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj
@@ -30,7 +30,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.OData.Edm" Version="8.4.2" />
-    <PackageReference Include="Microsoft.OpenApi" Version="2.3.9" />
+    <PackageReference Include="Microsoft.OpenApi" Version="3.0.0" />
     <None Include="..\..\README.md" Pack="true" PackagePath="\" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyPostOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyPostOperationHandler.cs
index e213bff9..6cc3ac45 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyPostOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyPostOperationHandler.cs
@@ -89,7 +89,7 @@ protected override void SetRequestBody(OpenApiOperation operation)
         {
             Required = true,
             Description = "New property values",
-            Content = new Dictionary<string, OpenApiMediaType>
+            Content = new Dictionary<string, IOpenApiMediaType>
             {
                 {
                     Constants.ApplicationJsonMediaType, new OpenApiMediaType
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyUpdateOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyUpdateOperationHandler.cs
index 2455530b..0b775538 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyUpdateOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyUpdateOperationHandler.cs
@@ -65,7 +65,7 @@ protected override void SetRequestBody(OpenApiOperation operation)
         {
             Required = true,
             Description = "New property values",
-            Content = new Dictionary<string, OpenApiMediaType>
+            Content = new Dictionary<string, IOpenApiMediaType>
             {
                 {
                     Constants.ApplicationJsonMediaType, new OpenApiMediaType
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EntityGetOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EntityGetOperationHandler.cs
index 37ed31b4..e7baa571 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/EntityGetOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/EntityGetOperationHandler.cs
@@ -128,7 +128,7 @@ protected override void SetResponses(OpenApiOperation operation)
                     new OpenApiResponse
                     {
                         Description = "Retrieved entity",
-                        Content = new Dictionary<string, OpenApiMediaType>
+                        Content = new Dictionary<string, IOpenApiMediaType>
                         {
                             {
                                 Constants.ApplicationJsonMediaType,
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EntitySetPostOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EntitySetPostOperationHandler.cs
index 9a4ac62f..e93fc6c0 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/EntitySetPostOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/EntitySetPostOperationHandler.cs
@@ -133,10 +133,10 @@ protected override void AppendCustomParameters(OpenApiOperation operation)
         /// Get the entity content description.
         /// </summary>
         /// <returns>The entity content description.</returns>
-        private Dictionary<string, OpenApiMediaType> GetContentDescription()
+        private Dictionary<string, IOpenApiMediaType> GetContentDescription()
         {
             var schema = GetEntitySchema();
-            var content = new Dictionary<string, OpenApiMediaType>();
+            var content = new Dictionary<string, IOpenApiMediaType>();
 
             if (EntitySet is {EntityType.HasStream: true})
             {
@@ -145,7 +145,7 @@ private Dictionary<string, OpenApiMediaType> GetContentDescription()
                 {
                     foreach (string item in mediaTypes)
                     {
-                        content.Add(item, new());
+                        content.Add(item, new OpenApiMediaType());
                     }
                 }
                 else
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/EntityUpdateOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/EntityUpdateOperationHandler.cs
index 7d17f30d..7d38684c 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/EntityUpdateOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/EntityUpdateOperationHandler.cs
@@ -85,10 +85,10 @@ protected override void SetRequestBody(OpenApiOperation operation)
             base.SetRequestBody(operation);
         }
 
-        protected Dictionary<string, OpenApiMediaType> GetContent()
+        protected Dictionary<string, IOpenApiMediaType> GetContent()
         {
             var schema = GetOpenApiSchema();
-            var content = new Dictionary<string, OpenApiMediaType>();
+            var content = new Dictionary<string, IOpenApiMediaType>();
 
             // Add the annotated request content media types
             if (_updateRestrictions?.RequestContentTypes is {} mediaTypes)
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityOperationalHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityOperationalHandler.cs
index e131d1e1..7552b048 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityOperationalHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityOperationalHandler.cs
@@ -163,7 +163,7 @@ protected string GetOperationId(string prefix, string identifier)
         /// Gets a media entity content description.
         /// </summary>
         /// <returns>The entity content description.</returns>
-        protected Dictionary<string, OpenApiMediaType> GetContentDescription()
+        protected Dictionary<string, IOpenApiMediaType> GetContentDescription()
         {
             // Fetch the respective AcceptableMediaTypes
             (_, var property) = GetStreamElements();
@@ -174,7 +174,7 @@ protected Dictionary<string, OpenApiMediaType> GetContentDescription()
                 Format = "binary"
             };
 
-            var content = new Dictionary<string, OpenApiMediaType>();
+            var content = new Dictionary<string, IOpenApiMediaType>();
             if (property is not null &&
                 Context?.Model.GetCollection(property,
                     CoreConstants.AcceptableMediaTypes) is {} mediaTypes)
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/MetadataGetOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/MetadataGetOperationHandler.cs
index c15aa802..430764db 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/MetadataGetOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/MetadataGetOperationHandler.cs
@@ -63,7 +63,7 @@ protected override void SetResponses(OpenApiOperation operation)
                     new OpenApiResponse
                     {
                         Description = "Retrieved metadata document",
-                        Content = new Dictionary<string, OpenApiMediaType>
+                        Content = new Dictionary<string, IOpenApiMediaType>
                         {
                             {
                                 Constants.ApplicationXmlMediaType,
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyGetOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyGetOperationHandler.cs
index 5e420c73..9d025678 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyGetOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyGetOperationHandler.cs
@@ -126,7 +126,7 @@ protected override void SetResponses(OpenApiOperation operation)
                         new OpenApiResponse
                         {
                             Description = "Retrieved navigation property",
-                            Content = new Dictionary<string, OpenApiMediaType>
+                            Content = new Dictionary<string, IOpenApiMediaType>
                             {
                                 {
                                     Constants.ApplicationJsonMediaType,
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyOperationHandler.cs
index f06baede..ec9dd53d 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyOperationHandler.cs
@@ -205,10 +205,10 @@ protected override void SetExternalDocs(OpenApiOperation operation)
             }
         }
 
-        protected Dictionary<string, OpenApiMediaType> GetContent(IOpenApiSchema? schema = null, IEnumerable<string>? mediaTypes = null)
+        protected Dictionary<string, IOpenApiMediaType> GetContent(IOpenApiSchema? schema = null, IEnumerable<string>? mediaTypes = null)
         {
             schema ??= GetOpenApiSchema();
-            var content = new Dictionary<string, OpenApiMediaType>();
+            var content = new Dictionary<string, IOpenApiMediaType>();
 
             if (mediaTypes != null)
             {
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/OperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/OperationHandler.cs
index b78958d1..2a66ad06 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/OperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/OperationHandler.cs
@@ -341,7 +341,7 @@ internal void SetSingleResponse(OpenApiOperation operation, IOpenApiSchema schem
                     new OpenApiResponse
                     {
                         Description = "Entity result.",
-                        Content = new Dictionary<string, OpenApiMediaType>
+                        Content = new Dictionary<string, IOpenApiMediaType>
                         {
                             {
                                 Constants.ApplicationJsonMediaType,
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/RefGetOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/RefGetOperationHandler.cs
index 516aadce..c6484357 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/RefGetOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/RefGetOperationHandler.cs
@@ -115,7 +115,7 @@ protected override void SetResponses(OpenApiOperation operation)
                         new OpenApiResponse
                         {
                             Description = "Retrieved navigation property link",
-                            Content = new Dictionary<string, OpenApiMediaType>
+                            Content = new Dictionary<string, IOpenApiMediaType>
                             {
                                 {
                                     Constants.ApplicationJsonMediaType,
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/SingletonGetOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/SingletonGetOperationHandler.cs
index 5a7f9b64..0f7b9e7d 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/SingletonGetOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/SingletonGetOperationHandler.cs
@@ -116,7 +116,7 @@ protected override void SetResponses(OpenApiOperation operation)
                         new OpenApiResponse
                         {
                             Description = "Retrieved entity",
-                            Content = new Dictionary<string, OpenApiMediaType>
+                            Content = new Dictionary<string, IOpenApiMediaType>
                             {
                                 {
                                     Constants.ApplicationJsonMediaType,
diff --git a/src/Microsoft.OpenApi.OData.Reader/Operation/SingletonPatchOperationHandler.cs b/src/Microsoft.OpenApi.OData.Reader/Operation/SingletonPatchOperationHandler.cs
index f086c040..2f337861 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Operation/SingletonPatchOperationHandler.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Operation/SingletonPatchOperationHandler.cs
@@ -72,7 +72,7 @@ protected override void SetRequestBody(OpenApiOperation operation)
             {
                 Required = true,
                 Description = "New property values",
-                Content = new Dictionary<string, OpenApiMediaType>
+                Content = new Dictionary<string, IOpenApiMediaType>
                 {
                     {
                         Constants.ApplicationJsonMediaType, new OpenApiMediaType
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiResponseGeneratorTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiResponseGeneratorTests.cs
index b2269d47..0d140398 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiResponseGeneratorTests.cs
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiResponseGeneratorTests.cs
@@ -215,7 +215,7 @@ public void CreateResponseForEdmFunctionReturnCorrectResponses(bool isFunctionIm
 
             var response = responses["200"];
             Assert.NotNull(response.Content);
-            OpenApiMediaType mediaType = response.Content["application/json"];
+            OpenApiMediaType mediaType = Assert.IsType<OpenApiMediaType>(response.Content["application/json"]);
 // openApi version 2 should not use AnyOf
             if (specVersion == OpenApiSpecVersion.OpenApi2_0)
             {
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V3.1.json b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V3.1.json
index fdb7e7be..789386ea 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V3.1.json
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V3.1.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.1.1",
+  "openapi": "3.1.2",
   "info": {
     "title": "OData Service for namespace DefaultNs",
     "description": "This OData service is located at http://localhost",
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V3.1.yaml b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V3.1.yaml
index c0c61165..c27ab822 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V3.1.yaml
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V3.1.yaml
@@ -1,4 +1,4 @@
-openapi: '3.1.1'
+openapi: '3.1.2'
 info:
   title: OData Service for namespace DefaultNs
   description: This OData service is located at http://localhost
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V3.1.json b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V3.1.json
index 2fd7686d..47a98e4b 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V3.1.json
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V3.1.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.1.1",
+  "openapi": "3.1.2",
   "info": {
     "title": "OData Service for namespace ",
     "description": "This OData service is located at http://localhost",
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V3.1.yaml b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V3.1.yaml
index 3c6fb003..cc0c72f6 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V3.1.yaml
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Empty.OpenApi.V3.1.yaml
@@ -1,4 +1,4 @@
-openapi: '3.1.1'
+openapi: '3.1.2'
 info:
   title: 'OData Service for namespace '
   description: This OData service is located at http://localhost
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V3.1.json b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V3.1.json
index fe23ad38..90d241c0 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V3.1.json
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V3.1.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.1.1",
+  "openapi": "3.1.2",
   "info": {
     "title": "OData Service for namespace Default",
     "description": "This OData service is located at http://localhost",
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V3.1.yaml b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V3.1.yaml
index ea0aec89..25cf8723 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V3.1.yaml
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Multiple.Schema.OpenApi.V3.1.yaml
@@ -1,4 +1,4 @@
-openapi: '3.1.1'
+openapi: '3.1.2'
 info:
   title: OData Service for namespace Default
   description: This OData service is located at http://localhost
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V3.1.json b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V3.1.json
index 0d24d9d0..1df6da05 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V3.1.json
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V3.1.json
@@ -1,5 +1,5 @@
 {
-  "openapi": "3.1.1",
+  "openapi": "3.1.2",
   "info": {
     "title": "OData Service for namespace Microsoft.OData.Service.Sample.TrippinInMemory.Models",
     "description": "This OData service is located at http://services.odata.org/TrippinRESTierService",
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V3.1.yaml b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V3.1.yaml
index 2d5b53a6..3f4fd531 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V3.1.yaml
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/TripService.OpenApi.V3.1.yaml
@@ -1,4 +1,4 @@
-openapi: '3.1.1'
+openapi: '3.1.2'
 info:
   title: OData Service for namespace Microsoft.OData.Service.Sample.TrippinInMemory.Models
   description: This OData service is located at http://services.odata.org/TrippinRESTierService