feat: Improved generation for TargetFramework=net9.

Author: HavenDV

src/libs/AutoSDK.SourceGenerators/AutoSDK.SourceGenerators.props

@@ -28,6 +28,8 @@
     <CompilerVisibleProperty Include="AutoSDK_UseRequiredKeyword"/>
     <!-- InSupportedTargetFrameworks/Never/Always. Default: InSupportedTargetFrameworks -->
     <CompilerVisibleProperty Include="AutoSDK_UseExperimentalAttributes"/>
+    <!-- InSupportedTargetFrameworks/Never/Always. Default: InSupportedTargetFrameworks -->
+    <CompilerVisibleProperty Include="AutoSDK_UseSetsRequiredMembersAttributes"/>
 
     <!-- Methods generation -->
     <!-- true/false. Default: false -->

src/libs/AutoSDK.SourceGenerators/OptionsExtensions.cs

@@ -33,6 +33,7 @@ public static Settings GetSettings(
             JsonSerializerType: options.GetEnumGlobalOption<JsonSerializerType>(nameof(Settings.JsonSerializerType), prefix),
             UseRequiredKeyword: options.GetEnumGlobalOption<SdkFeatureUsage>(nameof(Settings.UseRequiredKeyword), prefix),
             UseExperimentalAttributes: options.GetEnumGlobalOption<SdkFeatureUsage>(nameof(Settings.UseExperimentalAttributes), prefix),
+            UseSetsRequiredMembersAttributes: options.GetEnumGlobalOption<SdkFeatureUsage>(nameof(Settings.UseSetsRequiredMembersAttributes), prefix),
 
             GenerateConstructors: options.GetBoolGlobalOption(nameof(Settings.GenerateConstructors), prefix),
             GroupByTags: options.GetBoolGlobalOption(nameof(Settings.GroupByTags), prefix, defaultValue: true),

src/libs/AutoSDK/Models/Settings.cs

@@ -13,6 +13,7 @@ public readonly record struct Settings(
     JsonSerializerType JsonSerializerType,
     SdkFeatureUsage UseRequiredKeyword,
     SdkFeatureUsage UseExperimentalAttributes,
+    SdkFeatureUsage UseSetsRequiredMembersAttributes,
 
     bool GenerateConstructors,
     bool GroupByTags,
@@ -54,6 +55,7 @@ public readonly record struct Settings(
         JsonSerializerType: default,
         UseRequiredKeyword: default,
         UseExperimentalAttributes: default,
+        UseSetsRequiredMembersAttributes: default,
         GenerateConstructors: false,
         GroupByTags: true,
         GenerateMethods: false,

src/libs/AutoSDK/Sources/Sources.Methods.cs

@@ -81,14 +81,9 @@ public partial interface I{endPoint.ClassName}
 }}".RemoveBlankLinesWhereOnlyWhitespaces();
     }
 
-    public static string GetHttpMethod(string targetFramework, OperationType operationType)
+    public static string GetHttpMethod(OperationType operationType)
     {
-        targetFramework = targetFramework ?? throw new ArgumentNullException(nameof(targetFramework));
-        
-        if (operationType == OperationType.Patch// &&
-            //(targetFramework.StartsWith("net4", StringComparison.OrdinalIgnoreCase) ||
-            //targetFramework.StartsWith("netstandard", StringComparison.OrdinalIgnoreCase))
-            )
+        if (operationType == OperationType.Patch)
         {
             return "new global::System.Net.Http.HttpMethod(\"PATCH\")";
         }
@@ -138,7 +133,7 @@ public static string GenerateMethod(
             }};").Inject() : " ")}
 {GeneratePathAndQuery(endPoint)}
             using var __httpRequest = new global::System.Net.Http.HttpRequestMessage(
-                method: {GetHttpMethod(endPoint.Settings.TargetFramework, endPoint.HttpMethod)},
+                method: {GetHttpMethod(endPoint.HttpMethod)},
                 requestUri: new global::System.Uri(__path, global::System.UriKind.RelativeOrAbsolute));
 #if NET6_0_OR_GREATER
 {           // Use HTTP/3.0 or HTTP/2.0 if available
@@ -349,9 +344,6 @@ public static string GenerateResponse(
         }
 
         var jsonSerializer = endPoint.Settings.JsonSerializerType.GetSerializer();
-        var cancellationTokenInsideReadAsync = endPoint.Settings.TargetFramework.StartsWith("net8", StringComparison.OrdinalIgnoreCase)
-            ? "cancellationToken"
-            : string.Empty;
 
         if (endPoint.Stream)
         {
@@ -374,7 +366,11 @@ public static string GenerateResponse(
                 }};
             }}
 
-            using var __stream = await __response.Content.ReadAsStreamAsync({cancellationTokenInsideReadAsync}).ConfigureAwait(false);
+            using var __stream = await __response.Content.ReadAsStreamAsync(
+#if NET5_0_OR_GREATER
+                cancellationToken
+#endif
+            ).ConfigureAwait(false);
             using var __reader = new global::System.IO.StreamReader(__stream);
 
             while (!__reader.EndOfStream && !cancellationToken.IsCancellationRequested)
@@ -445,7 +441,11 @@ public static string GenerateResponse(
                     ContentType.String => "String",
                     ContentType.Stream => "Stream",
                     _ => "ByteArray",
-                }}Async({cancellationTokenInsideReadAsync}).ConfigureAwait(false);
+                }}Async(
+#if NET5_0_OR_GREATER
+                    cancellationToken
+#endif
+                ).ConfigureAwait(false);
 
 {(endPoint.ContentType == ContentType.String ? @" 
                 ProcessResponseContent(
@@ -516,7 +516,11 @@ public static string GenerateResponse(
                     ContentType.String => "Stream",
                     ContentType.Stream => "Stream",
                     _ => "ByteArray",
-                }}Async({cancellationTokenInsideReadAsync}).ConfigureAwait(false);
+                }}Async(
+#if NET5_0_OR_GREATER
+                    cancellationToken
+#endif
+                ).ConfigureAwait(false);
 
 {(endPoint.ContentType == ContentType.String && endPoint.SuccessResponse.Type.CSharpTypeWithoutNullability is not "string" ? $@" 
                 return
@@ -662,7 +666,11 @@ SdkFeatureUsage.Always or
       SdkFeatureUsage.InSupportedTargetFrameworks &&
     !string.IsNullOrWhiteSpace(endPoint.ExperimentalStage)
             ? $@" 
-        [global::System.Diagnostics.CodeAnalysis.Experimental(diagnosticId: ""{endPoint.Settings.Namespace.Replace(".", "_").ToUpperInvariant()}_{endPoint.ExperimentalStage.ToUpperInvariant()}_001"")]"
+{(endPoint.Settings.UseExperimentalAttributes is SdkFeatureUsage.InSupportedTargetFrameworks ? @" 
+#if NET8_0_OR_GREATER" : " ")}
+        [global::System.Diagnostics.CodeAnalysis.Experimental(diagnosticId: ""{endPoint.Settings.Namespace.Replace(".", "_").ToUpperInvariant()}_{endPoint.ExperimentalStage.ToUpperInvariant()}_001"")]
+{(endPoint.Settings.UseExperimentalAttributes is SdkFeatureUsage.InSupportedTargetFrameworks ? @" 
+#endif" : " ")}"
             : " ")}";
     }
 }

src/libs/AutoSDK/Sources/Sources.Models.cs

@@ -53,6 +53,8 @@ private static bool IsSupported(SdkFeatureUsage usage, string targetFramework)
             SdkFeatureUsage.Always => true,
             SdkFeatureUsage.InSupportedTargetFrameworks
                 when targetFramework.StartsWith("net8", StringComparison.OrdinalIgnoreCase) => true,
+            SdkFeatureUsage.InSupportedTargetFrameworks
+                when targetFramework.StartsWith("net9", StringComparison.OrdinalIgnoreCase) => true,
             _ => false,
         };
     }
@@ -120,7 +122,13 @@ public static string GenerateClassModel(
         /// </summary>
 {properties.Where(static x => x.IsRequired || !x.IsDeprecated).Select(x => $@"
         {x.Summary.ToXmlDocumentationForParam(x.ParameterName, level: 8)}").Inject()}
-        {(modelData.Settings.TargetFramework.StartsWith("net8", StringComparison.OrdinalIgnoreCase) ? "[global::System.Diagnostics.CodeAnalysis.SetsRequiredMembers]" : " ")}
+{(modelData.Settings.UseSetsRequiredMembersAttributes is SdkFeatureUsage.Always or SdkFeatureUsage.InSupportedTargetFrameworks ? @$" 
+{(modelData.Settings.UseExperimentalAttributes is SdkFeatureUsage.InSupportedTargetFrameworks ? @" 
+#if NET7_0_OR_GREATER" : " ")}
+        [global::System.Diagnostics.CodeAnalysis.SetsRequiredMembers]
+{(modelData.Settings.UseExperimentalAttributes is SdkFeatureUsage.InSupportedTargetFrameworks ? @" 
+#endif" : " ")}
+ " : " ")}
         public {modelData.ClassName}(
  {string.Join(",",
      properties.Where(static x => x.IsRequired).Select(x => $@"

src/tests/AutoSDK.SnapshotTests/AutoSDK.SnapshotTests.csproj

@@ -21,7 +21,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.MSTest" Version="1.1.2" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.12.0" />
     <PackageReference Include="System.Formats.Asn1" Version="9.0.1" />
-    <PackageReference Include="Verify.MSTest" Version="28.9.0" />
+    <PackageReference Include="Verify.MSTest" Version="28.10.1" />
     <PackageReference Include="Verify.SourceGenerators" Version="2.5.0" />
     <PackageReference Include="H.Resources.Generator" Version="1.6.1">
       <PrivateAssets>all</PrivateAssets>

src/tests/AutoSDK.SnapshotTests/Snapshots/ai21/NewtonsoftJson/_#G.Api.ConvertDocumentFileStudioV1ChatFilesConvertPost.g.verified.cs

@@ -124,7 +124,11 @@ partial void ProcessConvertDocumentFileStudioV1ChatFilesConvertPostResponseConte
 
             if (ReadResponseAsString)
             {
-                var __content = await __response.Content.ReadAsStringAsync().ConfigureAwait(false);
+                var __content = await __response.Content.ReadAsStringAsync(
+#if NET5_0_OR_GREATER
+                    cancellationToken
+#endif
+                ).ConfigureAwait(false);
 
                 ProcessResponseContent(
                     client: HttpClient,
@@ -176,7 +180,11 @@ partial void ProcessConvertDocumentFileStudioV1ChatFilesConvertPostResponseConte
                     };
                 }
 
-                var __content = await __response.Content.ReadAsStringAsync().ConfigureAwait(false);
+                var __content = await __response.Content.ReadAsStringAsync(
+#if NET5_0_OR_GREATER
+                    cancellationToken
+#endif
+                ).ConfigureAwait(false);
 
                 return __content;
             }

src/tests/AutoSDK.SnapshotTests/Snapshots/ai21/NewtonsoftJson/_#G.Api.GenerateOrgTokenStudioV1ConnectorsConnectedUsersOrganizationIdTokensPost.g.verified.cs

@@ -111,7 +111,11 @@ partial void ProcessGenerateOrgTokenStudioV1ConnectorsConnectedUsersOrganization
 
             if (ReadResponseAsString)
             {
-                var __content = await __response.Content.ReadAsStringAsync().ConfigureAwait(false);
+                var __content = await __response.Content.ReadAsStringAsync(
+#if NET5_0_OR_GREATER
+                    cancellationToken
+#endif
+                ).ConfigureAwait(false);
 
                 ProcessResponseContent(
                     client: HttpClient,
@@ -165,7 +169,11 @@ partial void ProcessGenerateOrgTokenStudioV1ConnectorsConnectedUsersOrganization
                     };
                 }
 
-                using var __content = await __response.Content.ReadAsStreamAsync().ConfigureAwait(false);
+                using var __content = await __response.Content.ReadAsStreamAsync(
+#if NET5_0_OR_GREATER
+                    cancellationToken
+#endif
+                ).ConfigureAwait(false);
 
                 return
                     await global::G.ConnectorsToken.FromJsonStreamAsync(__content, JsonSerializerOptions).ConfigureAwait(false) ??

src/tests/AutoSDK.SnapshotTests/Snapshots/ai21/NewtonsoftJson/_#G.Api.GetDataSourceStatusStudioV1ConnectorsConnectedUsersOrganizationIdDataSourcesDataSourceStatusGet.g.verified.cs

@@ -117,7 +117,11 @@ partial void ProcessGetDataSourceStatusStudioV1ConnectorsConnectedUsersOrganizat
 
             if (ReadResponseAsString)
             {
-                var __content = await __response.Content.ReadAsStringAsync().ConfigureAwait(false);
+                var __content = await __response.Content.ReadAsStringAsync(
+#if NET5_0_OR_GREATER
+                    cancellationToken
+#endif
+                ).ConfigureAwait(false);
 
                 ProcessResponseContent(
                     client: HttpClient,
@@ -171,7 +175,11 @@ partial void ProcessGetDataSourceStatusStudioV1ConnectorsConnectedUsersOrganizat
                     };
                 }
 
-                using var __content = await __response.Content.ReadAsStreamAsync().ConfigureAwait(false);
+                using var __content = await __response.Content.ReadAsStreamAsync(
+#if NET5_0_OR_GREATER
+                    cancellationToken
+#endif
+                ).ConfigureAwait(false);
 
                 return
                     await global::G.ConnectorsStatus.FromJsonStreamAsync(__content, JsonSerializerOptions).ConfigureAwait(false) ??

src/tests/AutoSDK.SnapshotTests/Snapshots/ai21/NewtonsoftJson/_#G.Api.GetOrgDataSourcesInfoStudioV1ConnectorsConnectedUsersOrganizationIdDataSourcesGet.g.verified.cs

@@ -111,7 +111,11 @@ partial void ProcessGetOrgDataSourcesInfoStudioV1ConnectorsConnectedUsersOrganiz
 
             if (ReadResponseAsString)
             {
-                var __content = await __response.Content.ReadAsStringAsync().ConfigureAwait(false);
+                var __content = await __response.Content.ReadAsStringAsync(
+#if NET5_0_OR_GREATER
+                    cancellationToken
+#endif
+                ).ConfigureAwait(false);
 
                 ProcessResponseContent(
                     client: HttpClient,
@@ -165,7 +169,11 @@ partial void ProcessGetOrgDataSourcesInfoStudioV1ConnectorsConnectedUsersOrganiz
                     };
                 }
 
-                using var __content = await __response.Content.ReadAsStreamAsync().ConfigureAwait(false);
+                using var __content = await __response.Content.ReadAsStreamAsync(
+#if NET5_0_OR_GREATER
+                    cancellationToken
+#endif
+                ).ConfigureAwait(false);
 
                 return
                     await global::G.ConnectorsDataSources.FromJsonStreamAsync(__content, JsonSerializerOptions).ConfigureAwait(false) ??