fix: Small fixes.

src/libs/OpenApiGenerator.Core/Generation/Data.cs

@@ -220,7 +220,7 @@ .. includedTags.Select(x => PropertyData.Default with
                 .Select(x => new AnyOfData("AllOf", x.Items.AllOf.Count, settings.JsonSerializerType, isTrimming, "System", string.Empty, string.Empty, ImmutableArray<TypeData>.Empty)))
             .Distinct()
             .ToImmutableArray();
-        anyOfs = anyOfs
+        anyOfs = settings.GenerateSdk || settings.GenerateModels ? anyOfs
             .Concat(includedSchemas
                 .Where(x => x.Value.AnyOf is { Count: >0 })
                 .Select(schema => new AnyOfData(
@@ -232,8 +232,8 @@ .. includedTags.Select(x => PropertyData.Default with
                     schema.Key,
                     schema.Value.GetSummary(),
                     schema.Value.AnyOf.Select((x, i) => TypeData.FromSchema(x.UseReferenceIdOrKey(schema.Key + $"Variant{i + 1}"), settings)).ToImmutableArray())))
-            .ToImmutableArray();
-        oneOfs = oneOfs
+            .ToImmutableArray() : [];
+        oneOfs = settings.GenerateSdk || settings.GenerateModels ? oneOfs
             .Concat(includedSchemas
                 .Where(x => x.Value.OneOf is { Count: >0 })
                 .Select(schema => new AnyOfData(
@@ -245,8 +245,8 @@ .. includedTags.Select(x => PropertyData.Default with
                     schema.Key,
                     schema.Value.GetSummary(),
                     schema.Value.OneOf.Select((x, i) => TypeData.FromSchema(x.UseReferenceIdOrKey(schema.Key + $"Variant{i + 1}"), settings)).ToImmutableArray())))
-            .ToImmutableArray();
-        allOfs = allOfs
+            .ToImmutableArray() : [];
+        allOfs = settings.GenerateSdk || settings.GenerateModels ? allOfs
             .Concat(includedSchemas
                 .Where(x => x.Value.AllOf is { Count: >0 })
                 .Select(schema => new AnyOfData(
@@ -258,7 +258,7 @@ .. includedTags.Select(x => PropertyData.Default with
                     schema.Key,
                     schema.Value.GetSummary(),
                     schema.Value.AllOf.Select((x, i) => TypeData.FromSchema(x.UseReferenceIdOrKey(schema.Key + $"Variant{i + 1}"), settings)).ToImmutableArray())))
-            .ToImmutableArray();
+            .ToImmutableArray() : [];
 
         AnyOfData[] anyOfDatas =
         [

src/libs/OpenApiGenerator.Core/Generation/Sources.AnyOf.cs

@@ -57,7 +57,8 @@ public static string GenerateAnyOf(
         }}" : " ";
 
         return $@"using System.Linq;
-
+{(fixedTypes.IsEmpty ? "" : @"#pragma warning disable CS0618 // Type or member is obsolete
+")}
 #nullable enable
 
 namespace {@namespace}

src/libs/OpenApiGenerator.Core/Generation/Sources.JsonConverters.AnyOf.cs

@@ -43,7 +43,8 @@ public static string GenerateAnyOfJsonConverter(
             }).ToImmutableArray();
 
         return $@"#nullable enable
-
+{(fixedTypes.IsEmpty ? "" : @"#pragma warning disable CS0618 // Type or member is obsolete
+")}
 namespace OpenApiGenerator.JsonConverters
 {{
     /// <inheritdoc />

src/libs/OpenApiGenerator.Core/Generation/Sources.Methods.cs

@@ -104,7 +104,7 @@ public static string GenerateMethod(
                 requestUri: new global::System.Uri(_httpClient.BaseAddress?.AbsoluteUri + {endPoint.Path}, global::System.UriKind.RelativeOrAbsolute));
 {(string.IsNullOrWhiteSpace(endPoint.RequestType.CSharpType) ? " " : $@" 
             httpRequest.Content = new global::System.Net.Http.StringContent(
-                content: {jsonSerializer.GenerateSerializeCall(endPoint.RequestType.CSharpTypeWithoutNullability, endPoint.JsonSerializerContext)},
+                content: {jsonSerializer.GenerateSerializeCall(endPoint.RequestType, endPoint.JsonSerializerContext)},
                 encoding: global::System.Text.Encoding.UTF8,
                 mediaType: ""application/json"");")}
 
@@ -117,7 +117,7 @@ public static string GenerateMethod(
             var __content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
             return
-                {jsonSerializer.GenerateDeserializeCall(endPoint.ResponseType.CSharpTypeWithNullability, endPoint.JsonSerializerContext)} ??
+                {jsonSerializer.GenerateDeserializeCall(endPoint.ResponseType, endPoint.JsonSerializerContext)} ??
                 throw new global::System.InvalidOperationException($""Response deserialization failed for \""{{__content}}\"" "");")}
 {(endPoint.Stream ? $@"
             using var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
@@ -126,7 +126,7 @@ public static string GenerateMethod(
             while (!reader.EndOfStream && !cancellationToken.IsCancellationRequested)
             {{
                 var __content = await reader.ReadLineAsync().ConfigureAwait(false) ?? string.Empty;
-                var streamedResponse = {jsonSerializer.GenerateDeserializeCall(endPoint.ResponseType.CSharpTypeWithNullability, endPoint.JsonSerializerContext)} ??
+                var streamedResponse = {jsonSerializer.GenerateDeserializeCall(endPoint.ResponseType, endPoint.JsonSerializerContext)} ??
                                        throw new global::System.InvalidOperationException($""Response deserialization failed for \""{{__content}}\"" "");
 
                 yield return streamedResponse;

src/libs/OpenApiGenerator.Core/Json/IJsonSerializer.cs

@@ -1,12 +1,14 @@
+using OpenApiGenerator.Core.Models;
+
 namespace OpenApiGenerator.Core.Json;
 
 public interface IJsonSerializer
 {
     public string GeneratePropertyAttribute(string id, bool isRequired);
     string GenerateExtensionDataAttribute();
     string GenerateRequiredAttribute();
-    string GenerateDeserializeCall(string type, string jsonSerializerContext);
-    string GenerateSerializeCall(string type, string jsonSerializerContext);
+    string GenerateDeserializeCall(TypeData type, string jsonSerializerContext);
+    string GenerateSerializeCall(TypeData type, string jsonSerializerContext);
     string GenerateConverterAttribute(string type);
     string GetOptionsType();
     string CreateDefaultSettings(IReadOnlyList<string> converters);

src/libs/OpenApiGenerator.Core/Json/NewtonsoftJsonSerializer.cs

@@ -1,4 +1,5 @@
 using OpenApiGenerator.Core.Extensions;
+using OpenApiGenerator.Core.Models;
 
 namespace OpenApiGenerator.Core.Json;
 
@@ -37,13 +38,13 @@ public string GenerateConverterAttribute(string type)
         return string.Empty;
     }
 
-    public string GenerateSerializeCall(string type, string jsonSerializerContext)
+    public string GenerateSerializeCall(TypeData type, string jsonSerializerContext)
     {
         return "global::Newtonsoft.Json.JsonConvert.SerializeObject(request, _jsonSerializerOptions)";
     }
 
-    public string GenerateDeserializeCall(string type, string jsonSerializerContext)
+    public string GenerateDeserializeCall(TypeData type, string jsonSerializerContext)
     {
-        return $"global::Newtonsoft.Json.JsonConvert.DeserializeObject<{type}>(__content, _jsonSerializerOptions)";
+        return $"global::Newtonsoft.Json.JsonConvert.DeserializeObject<{type.CSharpTypeWithNullability}>(__content, _jsonSerializerOptions)";
     }
 }

src/libs/OpenApiGenerator.Core/Json/SystemTextJsonSerializer.cs

@@ -1,4 +1,5 @@
 using OpenApiGenerator.Core.Extensions;
+using OpenApiGenerator.Core.Models;
 
 namespace OpenApiGenerator.Core.Json;
 
@@ -93,21 +94,17 @@ public static string GetContextType(string type)
         return result;
     }
 
-    public string GenerateSerializeCall(string type, string jsonSerializerContext)
+    public string GenerateSerializeCall(TypeData type, string jsonSerializerContext)
     {
-        type = type ?? throw new ArgumentNullException(nameof(type));
-
         return string.IsNullOrWhiteSpace(jsonSerializerContext)
             ? "global::System.Text.Json.JsonSerializer.Serialize(request, _jsonSerializerOptions)"
-            : $"global::System.Text.Json.JsonSerializer.Serialize(request, global::{jsonSerializerContext}.Default.{GetContextType(type)})";
+            : $"global::System.Text.Json.JsonSerializer.Serialize(request, global::{jsonSerializerContext}.Default.{GetContextType(type.ShortCSharpTypeWithoutNullability)})";
     }
 
-    public string GenerateDeserializeCall(string type, string jsonSerializerContext)
+    public string GenerateDeserializeCall(TypeData type, string jsonSerializerContext)
     {
-        type = type ?? throw new ArgumentNullException(nameof(type));
-
         return string.IsNullOrWhiteSpace(jsonSerializerContext)
-            ? $"global::System.Text.Json.JsonSerializer.Deserialize<{type}>(__content, _jsonSerializerOptions)"
-            : $"global::System.Text.Json.JsonSerializer.Deserialize(__content, global::{jsonSerializerContext}.Default.{GetContextType(type)})";
+            ? $"global::System.Text.Json.JsonSerializer.Deserialize<{type.CSharpTypeWithNullability}>(__content, _jsonSerializerOptions)"
+            : $"global::System.Text.Json.JsonSerializer.Deserialize(__content, global::{jsonSerializerContext}.Default.{GetContextType(type.ShortCSharpTypeWithNullability)})";
     }
 }

src/libs/OpenApiGenerator.Core/Models/TypeData.cs

@@ -35,10 +35,12 @@ public readonly record struct TypeData(
 
     public string CSharpTypeWithoutNullability => CSharpType.TrimEnd('?');
     public string CSharpTypeWithNullability => CSharpTypeWithoutNullability + "?";
+    public string ShortCSharpTypeWithoutNullability => CSharpTypeWithoutNullability.Replace($"global::{Namespace}.", string.Empty);
+    public string ShortCSharpTypeWithNullability => ShortCSharpTypeWithoutNullability + "?";
     public bool IsAnyOf => AnyOfCount > 0 || OneOfCount > 0 || AllOfCount > 0;
 
     public string ConverterType => IsEnum
-        ? $"global::OpenApiGenerator.JsonConverters.{CSharpTypeWithoutNullability.Replace($"global::{Namespace}.", string.Empty)}JsonConverter"
+        ? $"global::OpenApiGenerator.JsonConverters.{ShortCSharpTypeWithoutNullability}JsonConverter"
         : AnyOfCount > 0
             ? $"global::OpenApiGenerator.JsonConverters.AnyOfJsonConverterFactory{AnyOfCount}"
             : OneOfCount > 0

src/tests/OpenApiGenerator.IntegrationTests.IpInfo/OpenApiGenerator.IntegrationTests.IpInfo.csproj

@@ -7,6 +7,7 @@
   <Import Project="../../libs/OpenApiGenerator/OpenApiGenerator.props" />
 
   <PropertyGroup>
+    <OpenApiGenerator_Namespace>OpenApiGenerator.IntegrationTests</OpenApiGenerator_Namespace>
     <OpenApiGenerator_GenerateSdk>false</OpenApiGenerator_GenerateSdk>
     <OpenApiGenerator_GenerateMethods>true</OpenApiGenerator_GenerateMethods>
     <OpenApiGenerator_GenerateConstructors>true</OpenApiGenerator_GenerateConstructors>

src/tests/OpenApiGenerator.IntegrationTests.Ollama/OpenApiGenerator.IntegrationTests.Ollama.csproj

@@ -7,6 +7,7 @@
   <Import Project="../../libs/OpenApiGenerator/OpenApiGenerator.props" />
 
   <PropertyGroup>
+    <OpenApiGenerator_Namespace>OpenApiGenerator.IntegrationTests</OpenApiGenerator_Namespace>
     <OpenApiGenerator_GenerateSdk>false</OpenApiGenerator_GenerateSdk>
     <OpenApiGenerator_GenerateMethods>true</OpenApiGenerator_GenerateMethods>
     <OpenApiGenerator_GenerateConstructors>true</OpenApiGenerator_GenerateConstructors>

src/tests/OpenApiGenerator.IntegrationTests.OpenAI/OpenApiGenerator.IntegrationTests.OpenAI.csproj

@@ -7,6 +7,7 @@
   <Import Project="../../libs/OpenApiGenerator/OpenApiGenerator.props" />
 
   <PropertyGroup>
+    <OpenApiGenerator_Namespace>OpenApiGenerator.IntegrationTests</OpenApiGenerator_Namespace>
     <OpenApiGenerator_GenerateSdk>false</OpenApiGenerator_GenerateSdk>
     <OpenApiGenerator_GenerateMethods>true</OpenApiGenerator_GenerateMethods>
     <OpenApiGenerator_GenerateConstructors>true</OpenApiGenerator_GenerateConstructors>

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.Models.CreateModelStatus.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.CreateModelStatus.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.Models.PullModelStatus.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.PullModelStatus.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/NewtonsoftJson/_#G.Models.PushModelStatus.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.PushModelStatus.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.Models.CreateModelStatus.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.CreateModelStatus.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.Models.PullModelStatus.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.PullModelStatus.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#G.Models.PushModelStatus.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.PushModelStatus.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#JsonConverters.CreateModelStatus.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: JsonConverters.CreateModelStatus.g.cs
 #nullable enable
+#pragma warning disable CS0618 // Type or member is obsolete
 
 namespace OpenApiGenerator.JsonConverters
 {

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#JsonConverters.PullModelStatus.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: JsonConverters.PullModelStatus.g.cs
 #nullable enable
+#pragma warning disable CS0618 // Type or member is obsolete
 
 namespace OpenApiGenerator.JsonConverters
 {

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/Ollama/SystemTextJson/_#JsonConverters.PushModelStatus.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: JsonConverters.PushModelStatus.g.cs
 #nullable enable
+#pragma warning disable CS0618 // Type or member is obsolete
 
 namespace OpenApiGenerator.JsonConverters
 {

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.Models.AssistantStreamEvent.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.AssistantStreamEvent.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.Models.AssistantsApiResponseFormatOption.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.AssistantsApiResponseFormatOption.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.Models.AssistantsApiToolChoiceOption.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.AssistantsApiToolChoiceOption.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.Models.ChatCompletionRequestMessage.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.ChatCompletionRequestMessage.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.Models.ChatCompletionRequestMessageContentPart.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.ChatCompletionRequestMessageContentPart.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.Models.ChatCompletionToolChoiceOption.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.ChatCompletionToolChoiceOption.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.Models.MessageStreamEvent.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.MessageStreamEvent.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.Models.RunStepStreamEvent.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.RunStepStreamEvent.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.Models.RunStreamEvent.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.RunStreamEvent.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/NewtonsoftJson/_#G.Models.ThreadStreamEvent.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.ThreadStreamEvent.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.Models.AssistantStreamEvent.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.AssistantStreamEvent.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.Models.AssistantsApiResponseFormatOption.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.AssistantsApiResponseFormatOption.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.Models.AssistantsApiToolChoiceOption.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.AssistantsApiToolChoiceOption.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.Models.ChatCompletionRequestMessage.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.ChatCompletionRequestMessage.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.Models.ChatCompletionRequestMessageContentPart.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.ChatCompletionRequestMessageContentPart.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.Models.ChatCompletionToolChoiceOption.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.ChatCompletionToolChoiceOption.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.Models.MessageStreamEvent.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.MessageStreamEvent.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.Models.RunStepStreamEvent.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.RunStepStreamEvent.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable
 

src/tests/OpenApiGenerator.SnapshotTests/Snapshots/OpenAi/SystemTextJson/_#G.Models.RunStreamEvent.g.verified.cs

@@ -1,5 +1,6 @@
 //HintName: G.Models.RunStreamEvent.g.cs
 using System.Linq;
+#pragma warning disable CS0618 // Type or member is obsolete
 
 #nullable enable