Update System.CommandLine and update nullability to be set based on required

Author: CorruptComputer

.github/dependabot.yml

@@ -9,6 +9,9 @@ updates:
       nuget:
         patterns:
           - "*"
+    ignore:
+      - dependency-name: "Microsoft.CodeAnalysis.CSharp"
+      - dependency-name: "Microsoft.CodeAnalysis.Analyzers"
   - package-ecosystem: github-actions
     directory: "/"
     schedule:

.vscode/launch.json

@@ -0,0 +1,11 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Debug ReQuesty",
+            "type": "dotnet",
+            "request": "launch",
+            "projectPath": "${workspaceFolder}/ReQuesty/ReQuesty.csproj"
+        }
+    ]
+}

ReQuesty.Builder/CodeDOM/CodeIndexer.cs

@@ -1,33 +1,33 @@
 namespace ReQuesty.Builder.CodeDOM;
 public class CodeIndexer : CodeTerminal, IDocumentedElement, IDeprecableElement, ICloneable
 {
-#nullable disable // exposing property is required
-    private CodeTypeBase returnType;
-#nullable enable
+    private CodeTypeBase? returnType;
     public required CodeTypeBase ReturnType
     {
-        get => returnType; set
+        get => returnType!;
+        set
         {
             ArgumentNullException.ThrowIfNull(value);
             EnsureElementsAreChildren(value);
             returnType = value;
         }
     }
-#nullable disable // exposing property is required
-    private CodeParameter indexParameter;
-#nullable enable
+
+    private CodeParameter? indexParameter;
     /// <summary>
-    /// The parameter to use for the indexer.
+    ///   The parameter to use for the indexer.
     /// </summary>
     public required CodeParameter IndexParameter
     {
-        get => indexParameter; set
+        get => indexParameter!;
+        set
         {
             ArgumentNullException.ThrowIfNull(value);
             EnsureElementsAreChildren(value);
             indexParameter = value;
         }
     }
+
     public CodeDocumentation Documentation { get; set; } = new();
     /// <summary>
     /// The Path segment to use for the method name when using back-compatible methods.

ReQuesty.Builder/CodeDOM/CodeMethod.cs

@@ -141,18 +141,19 @@ public void AddAcceptedResponsesTypes(IEnumerable<string> types)
     public bool ShouldAddAcceptHeader => AcceptedResponseTypes.Any();
     public string AcceptHeaderValue => string.Join(", ", AcceptedResponseTypes);
     public AccessModifier Access { get; set; } = AccessModifier.Public;
-#nullable disable // exposing property is required
-    private CodeTypeBase returnType;
-#nullable enable
+
+    private CodeTypeBase? returnType;
     public required CodeTypeBase ReturnType
     {
-        get => returnType; set
+        get => returnType!;
+        set
         {
             ArgumentNullException.ThrowIfNull(value);
             EnsureElementsAreChildren(value);
             returnType = value;
         }
     }
+
     private readonly ConcurrentDictionary<string, CodeParameter> parameters = new();
     public void RemoveParametersByKind(params CodeParameterKind[] kinds)
     {

ReQuesty.Builder/CodeDOM/CodeParameter.cs

@@ -63,12 +63,11 @@ public enum CodeParameterKind
 
 public class CodeParameter : CodeTerminalWithKind<CodeParameterKind>, ICloneable, IDocumentedElement, IDeprecableElement
 {
-#nullable disable // exposing property is required
-    private CodeTypeBase type;
-#nullable enable
+    private CodeTypeBase? type;
     public required CodeTypeBase Type
     {
-        get => type; set
+        get => type!;
+        set
         {
             ArgumentNullException.ThrowIfNull(value);
             EnsureElementsAreChildren(value);

ReQuesty.Builder/CodeDOM/CodeTypeBase.cs

@@ -17,7 +17,7 @@ public bool ActionOf
     {
         get; set;
     }
-    public bool IsNullable { get; set; } = true;
+    public bool IsNullable { get; set; }
     public CodeTypeCollectionKind CollectionKind { get; set; } = CodeTypeCollectionKind.None;
     public bool IsCollection
     {

ReQuesty.Builder/CodeDOM/CodeUsing.cs

@@ -2,6 +2,7 @@
 public class CodeUsing : CodeElement, ICloneable
 {
     private CodeType? declaration;
+
     public CodeType? Declaration
     {
         get => declaration; set
@@ -10,15 +11,19 @@ public CodeType? Declaration
             declaration = value;
         }
     }
+
     public bool IsExternal
     {
         get => Declaration?.IsExternal ?? true;
     }
+
     public bool IsErasable
     {
         get; set;
     }
+
     public string Alias { get; set; } = string.Empty;
+
     public object Clone()
     {
         return new CodeUsing

ReQuesty.Builder/Extensions/OpenApiUrlTreeNodeExtensions.cs

@@ -41,9 +41,11 @@ public static string GetNodeNamespaceFromPath(this OpenApiUrlTreeNode currentNod
     //{id}, name(idParam={id}), name(idParam='{id}'), name(idParam='{id}',idParam2='{id2}')
     [GeneratedRegex(@"(?<prefix>\w+)?(?<equals>=?)'?\{(?<paramName>\w+)\}'?,?", RegexOptions.Singleline, 500)]
     private static partial Regex PathParametersRegex();
+
     // microsoft.graph.getRoleScopeTagsByIds(ids=@ids)
     [GeneratedRegex(@"=@(\w+)", RegexOptions.Singleline, 500)]
     private static partial Regex AtSignPathParameterRegex();
+
     private const char RequestParametersChar = '{';
     private const char RequestParametersEndChar = '}';
     private const string RequestParametersSectionChar = "(";

ReQuesty.Builder/LanguageInformation.cs

@@ -97,12 +97,7 @@ public record LanguageDependency : IOpenApiSerializable
 {
     public string Name { get; set; } = string.Empty;
     public string Version { get; set; } = string.Empty;
-    [JsonPropertyName("Type")]
-    public DependencyType? DependencyType
-    {
-        get; set;
-    }
-    private const string TypePropertyName = "type";
+
     public void SerializeAsV2(IOpenApiWriter writer) => SerializeAsV31(writer);
     public void SerializeAsV3(IOpenApiWriter writer) => SerializeAsV31(writer);
     public void SerializeAsV31(IOpenApiWriter writer)
@@ -111,10 +106,6 @@ public void SerializeAsV31(IOpenApiWriter writer)
         writer.WriteStartObject();
         writer.WriteProperty(nameof(Name).ToFirstCharacterLowerCase(), Name);
         writer.WriteProperty(nameof(Version).ToFirstCharacterLowerCase(), Version);
-        if (DependencyType is not null)
-        {
-            writer.WriteProperty(TypePropertyName, DependencyType.ToString());
-        }
         writer.WriteEndObject();
     }
     public static LanguageDependency Parse(JsonNode source)
@@ -135,10 +126,6 @@ public static LanguageDependency Parse(JsonNode source)
         {
             extension.Version = versionValue;
         }
-        if (rawObject.TryGetPropertyValue(TypePropertyName, out JsonNode? typeNode) && typeNode is JsonValue typeJsonValue && typeJsonValue.TryGetValue<string>(out string? typeValue) && Enum.TryParse<DependencyType>(typeValue, true, out DependencyType parsedTypeValue))
-        {
-            extension.DependencyType = parsedTypeValue;
-        }
         return extension;
     }
 }
@@ -156,13 +143,3 @@ public enum SupportExperience
     Microsoft,
     Community
 }
-
-public enum DependencyType
-{
-    Abstractions,
-    Serialization,
-    Authentication,
-    Http,
-    Bundle,
-    Additional
-}

ReQuesty.Builder/ReQuesty.Builder.csproj

@@ -25,7 +25,7 @@
   <ItemGroup>
     <PackageReference Include="AsyncKeyedLock" Version="7.1.6" />
     <PackageReference Include="DotNet.Glob" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.6" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
     <PackageReference Include="ReQuesty.Runtime" Version="0.0.3" />
     <PackageReference Include="Microsoft.OpenApi" Version="2.0.0" />
     <PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="2.0.0-preview5" />
@@ -38,12 +38,6 @@
     <PackageReference Include="YamlDotNet" Version="16.3.0" />
     <ProjectReference Include="..\ReQuesty.Generated\ReQuestyGenerated.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
-  <ItemGroup>
-    <AdditionalFiles Include="*.g.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="../README.md" Pack="true" PackagePath="" />
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\AdaptiveCardTemplate.json" />
   </ItemGroup>