Fix codegen

Author: MelbourneDeveloper

RestClient.Net.OpenApiGenerator.Cli/Program.cs

@@ -191,8 +191,7 @@ await response.Content.ReadAsStringAsync(ct).ConfigureAwait(false),
         @namespace: config.Namespace,
         className: config.ClassName,
         outputPath: config.OutputPath,
-        baseUrlOverride: config.BaseUrl,
-        versionOverride: config.Version
+        baseUrlOverride: config.BaseUrl
     );
 
     Console.WriteLine(

RestClient.Net.OpenApiGenerator/OpenApiCodeGenerator.cs

@@ -1,4 +1,5 @@
 using Microsoft.OpenApi.Readers;
+using Microsoft.OpenApi.Validations;
 using ErrorUrl = Outcome.Result<(string, string), string>.Error<(string, string), string>;
 using OkUrl = Outcome.Result<(string, string), string>.Ok<(string, string), string>;
 
@@ -13,34 +14,24 @@ public static class OpenApiCodeGenerator
     /// <param name="className">The class name for extension methods.</param>
     /// <param name="outputPath">The directory path where generated files will be saved.</param>
     /// <param name="baseUrlOverride">Optional base URL override. Use this when the OpenAPI spec has a relative server URL.</param>
-    /// <param name="versionOverride">Optional OpenAPI version override (e.g., "3.0.2"). Use this when the spec declares the wrong version.</param>
     /// <returns>The generated code result.</returns>
 #pragma warning disable CA1054
     public static GeneratorResult Generate(
         string openApiContent,
         string @namespace,
         string className,
         string outputPath,
-        string? baseUrlOverride = null,
-        string? versionOverride = null
+        string? baseUrlOverride = null
     )
 #pragma warning restore CA1054
     {
-        // Apply version override if specified
-        if (!string.IsNullOrEmpty(versionOverride))
-        {
-#pragma warning disable SYSLIB1045
-            openApiContent = System.Text.RegularExpressions.Regex.Replace(
-                openApiContent,
-                @"^openapi:\s*[\d\.]+",
-                $"openapi: {versionOverride}",
-                System.Text.RegularExpressions.RegexOptions.Multiline
-            );
-#pragma warning restore SYSLIB1045
-        }
-
-        var reader = new OpenApiStringReader();
-        var document = reader.Read(openApiContent, out var diagnostic);
+        var document = new OpenApiStringReader(
+            new OpenApiReaderSettings
+            {
+                ReferenceResolution = ReferenceResolutionSetting.ResolveLocalReferences,
+                RuleSet = ValidationRuleSet.GetDefaultRuleSet(),
+            }
+        ).Read(openApiContent, out var diagnostic);
 
         if (diagnostic.Errors.Count > 0)
         {

Samples/RestClient.OpenApiGenerator.Sample.JSONPlaceholder/RestClient.OpenApiGenerator.Sample.JSONPlaceholder.csproj

@@ -9,7 +9,7 @@
     <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
     <PackageReference Include="Urls" Version="1.0.0" />
   </ItemGroup>
-  <Target Name="GenerateOpenApiCode" BeforeTargets="BeforeBuild">
-    <Exec Command="dotnet run --project $(MSBuildThisFileDirectory)../../RestClient.Net.OpenApiGenerator.Cli/RestClient.Net.OpenApiGenerator.Cli.csproj -- -u $(MSBuildThisFileDirectory)../RestClient.OpenApiGenerator.Sample/jsonplaceholder-openapi.json -o $(MSBuildThisFileDirectory)Generated -n JSONPlaceholder.Generated -c JSONPlaceholderApiExtensions -b https://jsonplaceholder.typicode.com" />
+  <Target Name="GenerateOpenApiCode" BeforeTargets="CoreCompile" DependsOnTargets="ResolveProjectReferences">
+    <Exec Command="dotnet $(MSBuildThisFileDirectory)../../RestClient.Net.OpenApiGenerator.Cli/bin/$(Configuration)/net9.0/RestClient.Net.OpenApiGenerator.Cli.dll -u $(MSBuildThisFileDirectory)../RestClient.OpenApiGenerator.Sample/jsonplaceholder-openapi.json -o $(MSBuildThisFileDirectory)Generated -n JSONPlaceholder.Generated -c JSONPlaceholderApiExtensions -b https://jsonplaceholder.typicode.com" />
   </Target>
 </Project>