fix: defaults to oas 3.1

Signed-off-by: Vincent Biret <vibiret@microsoft.com>

Author: baywet

src/Microsoft.OpenApi.OData.Reader/OpenApiConvertSettings.cs

@@ -66,7 +66,7 @@ public class OpenApiConvertSettings
         /// Gets/sets a value indicating whether the version of openApi to serialize to is v2.
         /// Currently only impacts nullable references for EdmTypeSchemaGenerator
         /// </summary>
-        public OpenApiSpecVersion OpenApiSpecVersion { get; set; } = OpenApiSpecVersion.OpenApi3_0;
+        public OpenApiSpecVersion OpenApiSpecVersion { get; set; } = OpenApiSpecVersion.OpenApi3_1;
 
         /// <summary>
         /// Gets/sets a value indicating to set the OperationId on Open API operation.

src/OoasGui/MainForm.cs

@@ -27,7 +27,7 @@ public partial class MainForm : Form
     {
         private OpenApiFormat Format { get; set; } = OpenApiFormat.Json;
 
-        private OpenApiSpecVersion Version { get; set; } = OpenApiSpecVersion.OpenApi3_0;
+        private OpenApiSpecVersion Version { get; set; } = OpenApiSpecVersion.OpenApi3_1;
 
         private OpenApiConvertSettings Settings = new OpenApiConvertSettings();
 

src/OoasUtil/ComLineProcesser.cs

@@ -245,7 +245,7 @@ public bool Process()
 
             if (Version == null)
             {
-                Version = OpenApiSpecVersion.OpenApi3_0;
+                Version = OpenApiSpecVersion.OpenApi3_1;
             }
 
             if (KeyAsSegment == null)
@@ -432,7 +432,7 @@ private bool ProcessTarget(int version)
                 return false;
             }
 
-            Version = version == 2 ? OpenApiSpecVersion.OpenApi2_0 : OpenApiSpecVersion.OpenApi3_0;
+            Version = version == 2 ? OpenApiSpecVersion.OpenApi2_0 : OpenApiSpecVersion.OpenApi3_1;
             return true;
         }
 

tool/UpdateDocs/Program.cs

@@ -22,9 +22,11 @@ static async Task<int> Main(string[] args)
         {
             // we assume the path are existed for simplicity.
             string path = Directory.GetCurrentDirectory();
-            string csdl = path + "/../../../../../docs/csdl";
-            string oas20 = path + "/../../../../../docs/oas_2_0";
-            string oas30 = path + "/../../../../../docs/oas3_0_0";
+            string parentPath = Path.Combine(path, "..", "..", "..", "..", "..");
+            string csdl = Path.Combine(parentPath, "docs", "csdl");
+            string oas20 = Path.Combine(parentPath, "docs", "oas_2_0");
+            string oas30 = Path.Combine(parentPath, "docs", "oas3_0_0");
+            string oas31 = Path.Combine(parentPath, "docs", "oas3_1_0");
 
             foreach (var filePath in Directory.GetFiles(csdl, "*.xml"))
             {
@@ -53,11 +55,14 @@ static async Task<int> Main(string[] args)
 
                 settings.EnableKeyAsSegment = true;
                 settings.EnableUnqualifiedCall = true;
-                var output = oas30 + "/" + fileName + ".json";
+                var output = Path.Combine(oas31, fileName + ".json");
                 var document = model.ConvertToOpenApi(settings);
+                await File.WriteAllTextAsync(output, await document.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1));
+
+                output = Path.Combine(oas30, fileName + ".json");
                 await File.WriteAllTextAsync(output, await document.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0));
 
-                output = oas20 + "/" + fileName + ".json";
+                output = Path.Combine(oas20, fileName + ".json");
                 await File.WriteAllTextAsync(output, await document.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0));
 
                 Console.WriteLine("Output [ " + fileName + " ] Successful!");