Update NJS preview

RicoSuter · Oct 17, 2023 · 271d7f6 · 271d7f6
1 parent 66a733d
commit 271d7f6
Show file tree

Hide file tree

Showing 18 changed files with 34 additions and 27 deletions.
diff --git a/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj b/src/NSwag.AspNet.WebApi/NSwag.AspNet.WebApi.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNet.WebApi.Core" Version="5.2.3" />
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.3" />
-    <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.0-preview003" />
+    <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.0-preview004" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj b/src/NSwag.CodeGeneration.CSharp/NSwag.CodeGeneration.CSharp.csproj
@@ -16,6 +16,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="11.0.0-preview003" />
+    <PackageReference Include="NJsonSchema.CodeGeneration.CSharp" Version="11.0.0-preview004" />
   </ItemGroup>
 </Project>
diff --git a/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj b/src/NSwag.CodeGeneration.Tests/NSwag.CodeGeneration.Tests.csproj
@@ -5,7 +5,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.0-preview003" />
+    <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.0-preview004" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
   </ItemGroup>

diff --git a/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj b/src/NSwag.CodeGeneration.TypeScript/NSwag.CodeGeneration.TypeScript.csproj
@@ -16,6 +16,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NJsonSchema.CodeGeneration.TypeScript" Version="11.0.0-preview003" />
+    <PackageReference Include="NJsonSchema.CodeGeneration.TypeScript" Version="11.0.0-preview004" />
   </ItemGroup>
 </Project>
diff --git a/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj b/src/NSwag.CodeGeneration/NSwag.CodeGeneration.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NJsonSchema.CodeGeneration" Version="11.0.0-preview003" />
+    <PackageReference Include="NJsonSchema.CodeGeneration" Version="11.0.0-preview004" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NSwag.Commands/Commands/CodeGeneration/OpenApiToTypeScriptClientCommand.cs b/src/NSwag.Commands/Commands/CodeGeneration/OpenApiToTypeScriptClientCommand.cs
@@ -7,6 +7,7 @@
 //-----------------------------------------------------------------------
 
 using System;
+using System.IO;
 using System.Threading.Tasks;
 using NConsole;
 using NJsonSchema.CodeGeneration.TypeScript;
@@ -405,9 +406,9 @@ public override async Task<object> RunAsync(CommandLineProcessor processor, ICon
         public async Task<string> RunAsync()
         {
             var additionalCode = ExtensionCode ?? string.Empty;
-            if (DynamicApis.FileExists(additionalCode))
+            if (File.Exists(additionalCode))
             {
-                additionalCode = DynamicApis.FileReadAllText(additionalCode);
+                additionalCode = File.ReadAllText(additionalCode);
             }
 
             Settings.TypeScriptGeneratorSettings.ExtensionCode = additionalCode;

diff --git a/src/NSwag.Commands/Commands/Document/CreateDocumentCommand.cs b/src/NSwag.Commands/Commands/Document/CreateDocumentCommand.cs
@@ -6,9 +6,9 @@
 // <author>Rico Suter, [email protected]</author>
 //-----------------------------------------------------------------------
 
+using System.IO;
 using System.Threading.Tasks;
 using NConsole;
-using NJsonSchema.Infrastructure;
 using NSwag.Commands.CodeGeneration;
 
 #pragma warning disable 1591
@@ -20,7 +20,7 @@ public class CreateDocumentCommand : IConsoleCommand
     {
         public async Task<object> RunAsync(CommandLineProcessor processor, IConsoleHost host)
         {
-            if (!DynamicApis.FileExists("nswag.json"))
+            if (!File.Exists("nswag.json"))
             {
                 await CreateDocumentAsync("nswag.json");
                 host.WriteMessage("nswag.json file created.");

diff --git a/src/NSwag.Commands/Commands/Document/ExecuteDocumentCommand.cs b/src/NSwag.Commands/Commands/Document/ExecuteDocumentCommand.cs
@@ -7,6 +7,7 @@
 //-----------------------------------------------------------------------
 
 using System;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using NConsole;
@@ -33,14 +34,14 @@ public async Task<object> RunAsync(CommandLineProcessor processor, IConsoleHost
             }
             else
             {
-                var hasNSwagJson = DynamicApis.FileExists("nswag.json");
+                var hasNSwagJson = File.Exists("nswag.json");
                 if (hasNSwagJson)
                 {
                     await ExecuteDocumentAsync(host, "nswag.json");
                 }
 
-                var currentDirectory = DynamicApis.DirectoryGetCurrentDirectory();
-                var files = DynamicApis.DirectoryGetFiles(currentDirectory, "*.nswag");
+                var currentDirectory = Directory.GetCurrentDirectory();
+                var files = Directory.GetFiles(currentDirectory, "*.nswag");
                 if (files.Any())
                 {
                     foreach (var file in files)

diff --git a/src/NSwag.Commands/Commands/InputOutputCommandBase.cs b/src/NSwag.Commands/Commands/InputOutputCommandBase.cs
@@ -7,6 +7,7 @@
 //-----------------------------------------------------------------------
 
 using System;
+using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using NConsole;
@@ -81,7 +82,7 @@ protected async Task<JsonSchema> GetJsonSchemaAsync()
                 return await JsonSchema.FromJsonAsync(input).ConfigureAwait(false);
             }
 
-            if (DynamicApis.FileExists(input))
+            if (File.Exists(input))
             {
                 return await JsonSchema.FromFileAsync(input).ConfigureAwait(false);
             }

diff --git a/src/NSwag.Commands/Commands/OutputCommandExtensions.cs b/src/NSwag.Commands/Commands/OutputCommandExtensions.cs
@@ -7,6 +7,7 @@
 //-----------------------------------------------------------------------
 
 using System;
+using System.IO;
 using System.Threading.Tasks;
 using NConsole;
 using NJsonSchema.Infrastructure;
@@ -32,10 +33,10 @@ public static Task<bool> TryWriteFileOutputAsync(this IOutputCommand command, st
         {
             if (!string.IsNullOrEmpty(path))
             {
-                var directory = DynamicApis.PathGetDirectoryName(path);
-                if (!string.IsNullOrEmpty(directory) && DynamicApis.DirectoryExists(directory) == false)
+                var directory = Path.GetDirectoryName(path);
+                if (!string.IsNullOrEmpty(directory) && Directory.Exists(directory) == false)
                 {
-                    DynamicApis.DirectoryCreateDirectory(directory);
+                    Directory.CreateDirectory(directory);
                 }
 
                 var data = generator();
@@ -44,9 +45,9 @@ public static Task<bool> TryWriteFileOutputAsync(this IOutputCommand command, st
                 data = newLineBehavior == NewLineBehavior.Auto ? data.Replace("\n", Environment.NewLine) :
                        newLineBehavior == NewLineBehavior.CRLF ? data.Replace("\n", "\r\n") : data;
 
-                if (!DynamicApis.FileExists(path) || DynamicApis.FileReadAllText(path) != data)
+                if (!File.Exists(path) || File.ReadAllText(path) != data)
                 {
-                    DynamicApis.FileWriteAllText(path, data);
+                    File.WriteAllText(path, data);
 
                     host?.WriteMessage("Code has been successfully written to file.\n");
                 }

diff --git a/src/NSwag.Commands/NSwagCommandProcessor.cs b/src/NSwag.Commands/NSwagCommandProcessor.cs
@@ -8,6 +8,7 @@
 
 using System;
 using System.Diagnostics;
+using System.IO;
 using System.Reflection;
 using System.Threading.Tasks;
 using NConsole;
@@ -88,7 +89,7 @@ private void WriteBinDirectory()
                     entryAssembly = typeof(NSwagCommandProcessor).GetTypeInfo().Assembly;
                 }
 
-                var binDirectory = DynamicApis.PathGetDirectoryName(new Uri(entryAssembly.CodeBase).LocalPath);
+                var binDirectory = Path.GetDirectoryName(new Uri(entryAssembly.CodeBase).LocalPath);
                 _host.WriteMessage("NSwag bin directory: " + binDirectory + "\n");
             }
             catch (Exception exception)

diff --git a/src/NSwag.Commands/NSwagDocumentBase.cs b/src/NSwag.Commands/NSwagDocumentBase.cs
@@ -170,7 +170,7 @@ protected static async Task<TDocument> LoadAsync<TDocument>(
             bool applyTransformations)
             where TDocument : NSwagDocumentBase, new()
         {
-            var data = DynamicApis.FileReadAllText(filePath);
+            var data = File.ReadAllText(filePath);
             data = TransformLegacyDocument(data, out var requiredLegacyTransformations);
 
             if (requiredLegacyTransformations)
@@ -236,7 +236,7 @@ public static TDocument FromJson<TDocument>(string filePath, string data)
         /// <returns>The task.</returns>
         public Task SaveAsync()
         {
-            DynamicApis.FileWriteAllText(Path, ToJsonWithRelativePaths());
+            File.WriteAllText(Path, ToJsonWithRelativePaths());
             _latestData = JsonConvert.SerializeObject(this, Formatting.Indented, GetSerializerSettings());
             return Task.CompletedTask;
         }

diff --git a/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj b/src/NSwag.Core.Yaml/NSwag.Core.Yaml.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NJsonSchema.Yaml" Version="11.0.0-preview003" />
+    <PackageReference Include="NJsonSchema.Yaml" Version="11.0.0-preview004" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NSwag.Core.Yaml/OpenApiYamlDocument.cs b/src/NSwag.Core.Yaml/OpenApiYamlDocument.cs
@@ -94,7 +94,7 @@ public static string ToYaml(this OpenApiDocument document)
         /// <returns>The <see cref="OpenApiDocument" />.</returns>
         public static async Task<OpenApiDocument> FromFileAsync(string filePath, CancellationToken cancellationToken = default)
         {
-            var data = DynamicApis.FileReadAllText(filePath);
+            var data = File.ReadAllText(filePath);
             return await FromYamlAsync(data, filePath, cancellationToken).ConfigureAwait(false);
         }
 

diff --git a/src/NSwag.Core/NSwag.Core.csproj b/src/NSwag.Core/NSwag.Core.csproj
@@ -9,6 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NJsonSchema" Version="11.0.0-preview003" />
+    <PackageReference Include="NJsonSchema" Version="11.0.0-preview004" />
   </ItemGroup>
 </Project>
diff --git a/src/NSwag.Core/OpenApiDocument.cs b/src/NSwag.Core/OpenApiDocument.cs
@@ -9,6 +9,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
@@ -221,7 +222,7 @@ public static async Task<OpenApiDocument> FromJsonAsync(string data, string docu
         /// <returns>The <see cref="OpenApiDocument" />.</returns>
         public static async Task<OpenApiDocument> FromFileAsync(string filePath, CancellationToken cancellationToken = default)
         {
-            var data = DynamicApis.FileReadAllText(filePath);
+            var data = File.ReadAllText(filePath);
             return await FromJsonAsync(data, filePath, cancellationToken).ConfigureAwait(false);
         }
 

diff --git a/src/NSwag.Generation/NSwag.Generation.csproj b/src/NSwag.Generation/NSwag.Generation.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.0-preview003" />
+    <PackageReference Include="NJsonSchema.NewtonsoftJson" Version="11.0.0-preview004" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NSwagStudio/ViewModels/SwaggerGenerators/SwaggerInputViewModel.cs b/src/NSwagStudio/ViewModels/SwaggerGenerators/SwaggerInputViewModel.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Input;
@@ -27,7 +28,7 @@ await RunTaskAsync(async () =>
             {
                 json = url.StartsWith("http://", StringComparison.InvariantCultureIgnoreCase) ||
                        url.StartsWith("https://", StringComparison.InvariantCultureIgnoreCase) ?
-                    await DynamicApis.HttpGetAsync(url, CancellationToken.None) : DynamicApis.FileReadAllText(url);
+                    await DynamicApis.HttpGetAsync(url, CancellationToken.None) : File.ReadAllText(url);
 
                 if (json.StartsWith("{"))
                 {