Harden nullability and index checks in generator

captainsafia · captainsafia · commit bac0c9586f55 · 2025-03-10T21:25:25.000-07:00
diff --git a/src/Http/Http.Abstractions/src/Validation/TypeExtensions.cs b/src/Http/Http.Abstractions/src/Validation/TypeExtensions.cs
@@ -88,7 +88,7 @@ public static bool TryGetRequiredAttribute(this ValidationAttribute[] attributes
     /// Gets all types that the specified type implements or inherits from, including itself.
     /// </summary>
     /// <param name="type">The type to analyze.</param>
-    /// <returns>A collection containing the type itself, all implemented interfaces, and all base types.</returns>
+    /// <returns>A collection containing all implemented interfaces and all base types of the given type.</returns>
     public static IEnumerable<Type> GetAllImplementedTypes([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)] this Type type)
     {
         ArgumentNullException.ThrowIfNull(type);
diff --git a/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.ValidationsGenerator/Emitters/ValidationsGenerator.Emitter.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.ValidationsGenerator/Emitters/ValidationsGenerator.Emitter.cs
@@ -163,7 +163,7 @@ _ when typeof(global::System.ComponentModel.DataAnnotations.ValidationAttribute)
                 }
                 else if (type == typeof(global::System.ComponentModel.DataAnnotations.StringLengthAttribute))
                 {
-                    if (args[0] is int maxLength)
+                    if (args.Length > 0 && args[0] is int maxLength)
                     {
                         attribute = new global::System.ComponentModel.DataAnnotations.StringLengthAttribute(maxLength);
                     }
@@ -327,9 +327,8 @@ private static string EmitValidationAttributeForCreate(ValidationAttribute attr)
         foreach (var arg in attr.Arguments)
         {
             // Handle different types of arguments
-            if (arg.StartsWith("\"", StringComparison.OrdinalIgnoreCase) && arg.EndsWith("\"", StringComparison.OrdinalIgnoreCase))
+            if (arg.StartsWith("\"", StringComparison.OrdinalIgnoreCase) && arg.EndsWith("\"", StringComparison.OrdinalIgnoreCase) && arg.Length >= 2)
             {
-                // String literal - remove quotes and pass as object
                 var stringValue = arg.Substring(1, arg.Length - 2).Replace("\\\"", "\"");
                 processedArgs.Add($"\"{stringValue}\"");
             }
diff --git a/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.ValidationsGenerator/Extensions/ITypeSymbolExtensions.cs b/src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.ValidationsGenerator/Extensions/ITypeSymbolExtensions.cs
@@ -35,7 +35,8 @@ public static bool ImplementsValidationAttribute(this ITypeSymbol typeSymbol, IN
 
     public static ITypeSymbol UnwrapType(this ITypeSymbol type, INamedTypeSymbol enumerable)
     {
-        if (type.OriginalDefinition.SpecialType == SpecialType.System_Nullable_T)
+        if (type.OriginalDefinition.SpecialType == SpecialType.System_Nullable_T &&
+            type is INamedTypeSymbol { TypeArguments.Length: 1 })
         {
             // Extract the T from a Nullable<T>
             type = ((INamedTypeSymbol)type).TypeArguments[0];
diff --git a/src/Http/Http.Extensions/test/ValidationsGenerator/snapshots/ValidationsGeneratorTests.CanValidateComplexTypes#ValidatableInfoResolver.g.verified.cs b/src/Http/Http.Extensions/test/ValidationsGenerator/snapshots/ValidationsGeneratorTests.CanValidateComplexTypes#ValidatableInfoResolver.g.verified.cs
@@ -1,4 +1,5 @@
 ﻿//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -52,7 +53,7 @@ public GeneratedValidatableTypeInfo(
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
     file class GeneratedValidatableInfoResolver : global::Microsoft.AspNetCore.Http.Validation.IValidatableInfoResolver
     {
-        public bool TryGetValidatableTypeInfo(global::System.Type type, out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo validatableInfo)
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo? validatableInfo)
         {
             validatableInfo = null;
         if (type == typeof(global::SubType))
@@ -75,7 +76,7 @@ public bool TryGetValidatableTypeInfo(global::System.Type type, out global::Micr
         }
 
         // No-ops, rely on runtime code for ParameterInfo-based resolution
-        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo validatableInfo)
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo? validatableInfo)
         {
             validatableInfo = null;
             return false;
@@ -227,7 +228,7 @@ private sealed record CacheKey(global::System.Type AttributeType, object[] Argum
                 var type = k.AttributeType;
                 var args = k.Arguments;
 
-                global::System.ComponentModel.DataAnnotations.ValidationAttribute attribute;
+                global::System.ComponentModel.DataAnnotations.ValidationAttribute? attribute;
 
                 if (args.Length == 0)
                 {
@@ -239,7 +240,8 @@ private sealed record CacheKey(global::System.Type AttributeType, object[] Argum
                         global::System.Type t when t == typeof(global::System.ComponentModel.DataAnnotations.UrlAttribute) => new global::System.ComponentModel.DataAnnotations.UrlAttribute(),
                         global::System.Type t when t == typeof(global::System.ComponentModel.DataAnnotations.CreditCardAttribute) => new global::System.ComponentModel.DataAnnotations.CreditCardAttribute(),
                         _ when typeof(global::System.ComponentModel.DataAnnotations.ValidationAttribute).IsAssignableFrom(type) =>
-                            (global::System.ComponentModel.DataAnnotations.ValidationAttribute)global::System.Activator.CreateInstance(type)!
+                            (global::System.ComponentModel.DataAnnotations.ValidationAttribute)global::System.Activator.CreateInstance(type)!,
+                        _ => throw new global::System.ArgumentException($"Unsupported validation attribute type: {type.FullName}")
                     };
                 }
                 else if (type == typeof(global::System.ComponentModel.DataAnnotations.CustomValidationAttribute) && args.Length == 2)
@@ -257,7 +259,7 @@ _ when typeof(global::System.ComponentModel.DataAnnotations.ValidationAttribute)
                 }
                 else if (type == typeof(global::System.ComponentModel.DataAnnotations.StringLengthAttribute))
                 {
-                    if (args[0] is int maxLength)
+                    if (args.Length > 0 && args[0] is int maxLength)
                     {
                         attribute = new global::System.ComponentModel.DataAnnotations.StringLengthAttribute(maxLength);
                     }
diff --git a/src/Http/Http.Extensions/test/ValidationsGenerator/snapshots/ValidationsGeneratorTests.CanValidateIValidatableObject#ValidatableInfoResolver.g.verified.cs b/src/Http/Http.Extensions/test/ValidationsGenerator/snapshots/ValidationsGeneratorTests.CanValidateIValidatableObject#ValidatableInfoResolver.g.verified.cs
@@ -1,4 +1,5 @@
 ﻿//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -52,7 +53,7 @@ public GeneratedValidatableTypeInfo(
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
     file class GeneratedValidatableInfoResolver : global::Microsoft.AspNetCore.Http.Validation.IValidatableInfoResolver
     {
-        public bool TryGetValidatableTypeInfo(global::System.Type type, out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo validatableInfo)
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo? validatableInfo)
         {
             validatableInfo = null;
         if (type == typeof(global::SubType))
@@ -75,7 +76,7 @@ public bool TryGetValidatableTypeInfo(global::System.Type type, out global::Micr
         }
 
         // No-ops, rely on runtime code for ParameterInfo-based resolution
-        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo validatableInfo)
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo? validatableInfo)
         {
             validatableInfo = null;
             return false;
@@ -185,7 +186,7 @@ private sealed record CacheKey(global::System.Type AttributeType, object[] Argum
                 var type = k.AttributeType;
                 var args = k.Arguments;
 
-                global::System.ComponentModel.DataAnnotations.ValidationAttribute attribute;
+                global::System.ComponentModel.DataAnnotations.ValidationAttribute? attribute;
 
                 if (args.Length == 0)
                 {
@@ -197,7 +198,8 @@ private sealed record CacheKey(global::System.Type AttributeType, object[] Argum
                         global::System.Type t when t == typeof(global::System.ComponentModel.DataAnnotations.UrlAttribute) => new global::System.ComponentModel.DataAnnotations.UrlAttribute(),
                         global::System.Type t when t == typeof(global::System.ComponentModel.DataAnnotations.CreditCardAttribute) => new global::System.ComponentModel.DataAnnotations.CreditCardAttribute(),
                         _ when typeof(global::System.ComponentModel.DataAnnotations.ValidationAttribute).IsAssignableFrom(type) =>
-                            (global::System.ComponentModel.DataAnnotations.ValidationAttribute)global::System.Activator.CreateInstance(type)!
+                            (global::System.ComponentModel.DataAnnotations.ValidationAttribute)global::System.Activator.CreateInstance(type)!,
+                        _ => throw new global::System.ArgumentException($"Unsupported validation attribute type: {type.FullName}")
                     };
                 }
                 else if (type == typeof(global::System.ComponentModel.DataAnnotations.CustomValidationAttribute) && args.Length == 2)
@@ -215,7 +217,7 @@ _ when typeof(global::System.ComponentModel.DataAnnotations.ValidationAttribute)
                 }
                 else if (type == typeof(global::System.ComponentModel.DataAnnotations.StringLengthAttribute))
                 {
-                    if (args[0] is int maxLength)
+                    if (args.Length > 0 && args[0] is int maxLength)
                     {
                         attribute = new global::System.ComponentModel.DataAnnotations.StringLengthAttribute(maxLength);
                     }
diff --git a/src/Http/Http.Extensions/test/ValidationsGenerator/snapshots/ValidationsGeneratorTests.CanValidateParameters#ValidatableInfoResolver.g.verified.cs b/src/Http/Http.Extensions/test/ValidationsGenerator/snapshots/ValidationsGeneratorTests.CanValidateParameters#ValidatableInfoResolver.g.verified.cs
@@ -1,4 +1,5 @@
 ﻿//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -52,15 +53,15 @@ public GeneratedValidatableTypeInfo(
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
     file class GeneratedValidatableInfoResolver : global::Microsoft.AspNetCore.Http.Validation.IValidatableInfoResolver
     {
-        public bool TryGetValidatableTypeInfo(global::System.Type type, out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo validatableInfo)
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo? validatableInfo)
         {
             validatableInfo = null;
 
             return false;
         }
 
         // No-ops, rely on runtime code for ParameterInfo-based resolution
-        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo validatableInfo)
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo? validatableInfo)
         {
             validatableInfo = null;
             return false;
@@ -104,7 +105,7 @@ private sealed record CacheKey(global::System.Type AttributeType, object[] Argum
                 var type = k.AttributeType;
                 var args = k.Arguments;
 
-                global::System.ComponentModel.DataAnnotations.ValidationAttribute attribute;
+                global::System.ComponentModel.DataAnnotations.ValidationAttribute? attribute;
 
                 if (args.Length == 0)
                 {
@@ -116,7 +117,8 @@ private sealed record CacheKey(global::System.Type AttributeType, object[] Argum
                         global::System.Type t when t == typeof(global::System.ComponentModel.DataAnnotations.UrlAttribute) => new global::System.ComponentModel.DataAnnotations.UrlAttribute(),
                         global::System.Type t when t == typeof(global::System.ComponentModel.DataAnnotations.CreditCardAttribute) => new global::System.ComponentModel.DataAnnotations.CreditCardAttribute(),
                         _ when typeof(global::System.ComponentModel.DataAnnotations.ValidationAttribute).IsAssignableFrom(type) =>
-                            (global::System.ComponentModel.DataAnnotations.ValidationAttribute)global::System.Activator.CreateInstance(type)!
+                            (global::System.ComponentModel.DataAnnotations.ValidationAttribute)global::System.Activator.CreateInstance(type)!,
+                        _ => throw new global::System.ArgumentException($"Unsupported validation attribute type: {type.FullName}")
                     };
                 }
                 else if (type == typeof(global::System.ComponentModel.DataAnnotations.CustomValidationAttribute) && args.Length == 2)
@@ -134,7 +136,7 @@ _ when typeof(global::System.ComponentModel.DataAnnotations.ValidationAttribute)
                 }
                 else if (type == typeof(global::System.ComponentModel.DataAnnotations.StringLengthAttribute))
                 {
-                    if (args[0] is int maxLength)
+                    if (args.Length > 0 && args[0] is int maxLength)
                     {
                         attribute = new global::System.ComponentModel.DataAnnotations.StringLengthAttribute(maxLength);
                     }
diff --git a/src/Http/Http.Extensions/test/ValidationsGenerator/snapshots/ValidationsGeneratorTests.CanValidatePolymorphicTypes#ValidatableInfoResolver.g.verified.cs b/src/Http/Http.Extensions/test/ValidationsGenerator/snapshots/ValidationsGeneratorTests.CanValidatePolymorphicTypes#ValidatableInfoResolver.g.verified.cs
@@ -1,4 +1,5 @@
 ﻿//HintName: ValidatableInfoResolver.g.cs
+#nullable enable annotations
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -52,7 +53,7 @@ public GeneratedValidatableTypeInfo(
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]
     file class GeneratedValidatableInfoResolver : global::Microsoft.AspNetCore.Http.Validation.IValidatableInfoResolver
     {
-        public bool TryGetValidatableTypeInfo(global::System.Type type, out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo validatableInfo)
+        public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo? validatableInfo)
         {
             validatableInfo = null;
         if (type == typeof(global::DerivedType))
@@ -85,7 +86,7 @@ public bool TryGetValidatableTypeInfo(global::System.Type type, out global::Micr
         }
 
         // No-ops, rely on runtime code for ParameterInfo-based resolution
-        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo validatableInfo)
+        public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo? validatableInfo)
         {
             validatableInfo = null;
             return false;
@@ -218,7 +219,7 @@ private sealed record CacheKey(global::System.Type AttributeType, object[] Argum
                 var type = k.AttributeType;
                 var args = k.Arguments;
 
-                global::System.ComponentModel.DataAnnotations.ValidationAttribute attribute;
+                global::System.ComponentModel.DataAnnotations.ValidationAttribute? attribute;
 
                 if (args.Length == 0)
                 {
@@ -230,7 +231,8 @@ private sealed record CacheKey(global::System.Type AttributeType, object[] Argum
                         global::System.Type t when t == typeof(global::System.ComponentModel.DataAnnotations.UrlAttribute) => new global::System.ComponentModel.DataAnnotations.UrlAttribute(),
                         global::System.Type t when t == typeof(global::System.ComponentModel.DataAnnotations.CreditCardAttribute) => new global::System.ComponentModel.DataAnnotations.CreditCardAttribute(),
                         _ when typeof(global::System.ComponentModel.DataAnnotations.ValidationAttribute).IsAssignableFrom(type) =>
-                            (global::System.ComponentModel.DataAnnotations.ValidationAttribute)global::System.Activator.CreateInstance(type)!
+                            (global::System.ComponentModel.DataAnnotations.ValidationAttribute)global::System.Activator.CreateInstance(type)!,
+                        _ => throw new global::System.ArgumentException($"Unsupported validation attribute type: {type.FullName}")
                     };
                 }
                 else if (type == typeof(global::System.ComponentModel.DataAnnotations.CustomValidationAttribute) && args.Length == 2)
@@ -248,7 +250,7 @@ _ when typeof(global::System.ComponentModel.DataAnnotations.ValidationAttribute)
                 }
                 else if (type == typeof(global::System.ComponentModel.DataAnnotations.StringLengthAttribute))
                 {
-                    if (args[0] is int maxLength)
+                    if (args.Length > 0 && args[0] is int maxLength)
                     {
                         attribute = new global::System.ComponentModel.DataAnnotations.StringLengthAttribute(maxLength);
                     }
diff --git a/src/Http/Http.Extensions/test/ValidationsGenerator/snapshots/ValidationsGeneratorTests.CanValidateRecursiveTypes#ValidatableInfoResolver.g.verified.cs b/src/Http/Http.Extensions/test/ValidationsGenerator/snapshots/ValidationsGeneratorTests.CanValidateRecursiveTypes#ValidatableInfoResolver.g.verified.cs
diff --git a/src/Http/Routing/src/RouteEndpointDataSource.cs b/src/Http/Routing/src/RouteEndpointDataSource.cs

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public static bool TryGetRequiredAttribute(this ValidationAttribute[] attributes`
`88`	`88`	`/// Gets all types that the specified type implements or inherits from, including itself.`
`89`	`89`	`/// </summary>`
`90`	`90`	`/// <param name="type">The type to analyze.</param>`
`91`		`- /// <returns>A collection containing the type itself, all implemented interfaces, and all base types.</returns>`
	`91`	`+ /// <returns>A collection containing all implemented interfaces and all base types of the given type.</returns>`
`92`	`92`	`public static IEnumerable<Type> GetAllImplementedTypes([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.Interfaces)] this Type type)`
`93`	`93`	`{`
`94`	`94`	`ArgumentNullException.ThrowIfNull(type);`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ _ when typeof(global::System.ComponentModel.DataAnnotations.ValidationAttribute)`
`163`	`163`	`}`
`164`	`164`	`else if (type == typeof(global::System.ComponentModel.DataAnnotations.StringLengthAttribute))`
`165`	`165`	`{`
`166`		`- if (args[0] is int maxLength)`
	`166`	`+ if (args.Length > 0 && args[0] is int maxLength)`
`167`	`167`	`{`
`168`	`168`	`attribute = new global::System.ComponentModel.DataAnnotations.StringLengthAttribute(maxLength);`
`169`	`169`	`}`
`@@ -327,9 +327,8 @@ private static string EmitValidationAttributeForCreate(ValidationAttribute attr)`
`327`	`327`	`foreach (var arg in attr.Arguments)`
`328`	`328`	`{`
`329`	`329`	`// Handle different types of arguments`
`330`		`- if (arg.StartsWith("\"", StringComparison.OrdinalIgnoreCase) && arg.EndsWith("\"", StringComparison.OrdinalIgnoreCase))`
	`330`	`+ if (arg.StartsWith("\"", StringComparison.OrdinalIgnoreCase) && arg.EndsWith("\"", StringComparison.OrdinalIgnoreCase) && arg.Length >= 2)`
`331`	`331`	`{`
`332`		`- // String literal - remove quotes and pass as object`
`333`	`332`	`var stringValue = arg.Substring(1, arg.Length - 2).Replace("\\\"", "\"");`
`334`	`333`	`processedArgs.Add($"\"{stringValue}\"");`
`335`	`334`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ public static bool ImplementsValidationAttribute(this ITypeSymbol typeSymbol, IN`
`35`	`35`
`36`	`36`	`public static ITypeSymbol UnwrapType(this ITypeSymbol type, INamedTypeSymbol enumerable)`
`37`	`37`	`{`
`38`		`- if (type.OriginalDefinition.SpecialType == SpecialType.System_Nullable_T)`
	`38`	`+ if (type.OriginalDefinition.SpecialType == SpecialType.System_Nullable_T &&`
	`39`	`+ type is INamedTypeSymbol { TypeArguments.Length: 1 })`
`39`	`40`	`{`
`40`	`41`	`// Extract the T from a Nullable<T>`
`41`	`42`	`type = ((INamedTypeSymbol)type).TypeArguments[0];`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`//HintName: ValidatableInfoResolver.g.cs`
	`2`	`+#nullable enable annotations`
`2`	`3`	`//------------------------------------------------------------------------------`
`3`	`4`	`// <auto-generated>`
`4`	`5`	`// This code was generated by a tool.`
`@@ -52,7 +53,7 @@ public GeneratedValidatableTypeInfo(`
`52`	`53`	`[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.AspNetCore.Http.ValidationsGenerator, Version=42.42.42.42, Culture=neutral, PublicKeyToken=adb9793829ddae60", "42.42.42.42")]`
`53`	`54`	`file class GeneratedValidatableInfoResolver : global::Microsoft.AspNetCore.Http.Validation.IValidatableInfoResolver`
`54`	`55`	`{`
`55`		`- public bool TryGetValidatableTypeInfo(global::System.Type type, out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo validatableInfo)`
	`56`	`+ public bool TryGetValidatableTypeInfo(global::System.Type type, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo? validatableInfo)`
`56`	`57`	`{`
`57`	`58`	`validatableInfo = null;`
`58`	`59`	`if (type == typeof(global::SubType))`
`@@ -75,7 +76,7 @@ public bool TryGetValidatableTypeInfo(global::System.Type type, out global::Micr`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`// No-ops, rely on runtime code for ParameterInfo-based resolution`
`78`		`- public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo validatableInfo)`
	`79`	`+ public bool TryGetValidatableParameterInfo(global::System.Reflection.ParameterInfo parameterInfo, [global::System.Diagnostics.CodeAnalysis.NotNullWhen(true)] out global::Microsoft.AspNetCore.Http.Validation.IValidatableInfo? validatableInfo)`
`79`	`80`	`{`
`80`	`81`	`validatableInfo = null;`
`81`	`82`	`return false;`
`@@ -227,7 +228,7 @@ private sealed record CacheKey(global::System.Type AttributeType, object[] Argum`
`227`	`228`	`var type = k.AttributeType;`
`228`	`229`	`var args = k.Arguments;`
`229`	`230`
`230`		`- global::System.ComponentModel.DataAnnotations.ValidationAttribute attribute;`
	`231`	`+ global::System.ComponentModel.DataAnnotations.ValidationAttribute? attribute;`
`231`	`232`
`232`	`233`	`if (args.Length == 0)`
`233`	`234`	`{`
`@@ -239,7 +240,8 @@ private sealed record CacheKey(global::System.Type AttributeType, object[] Argum`
`239`	`240`	`global::System.Type t when t == typeof(global::System.ComponentModel.DataAnnotations.UrlAttribute) => new global::System.ComponentModel.DataAnnotations.UrlAttribute(),`
`240`	`241`	`global::System.Type t when t == typeof(global::System.ComponentModel.DataAnnotations.CreditCardAttribute) => new global::System.ComponentModel.DataAnnotations.CreditCardAttribute(),`
`241`	`242`	`_ when typeof(global::System.ComponentModel.DataAnnotations.ValidationAttribute).IsAssignableFrom(type) =>`
`242`		`- (global::System.ComponentModel.DataAnnotations.ValidationAttribute)global::System.Activator.CreateInstance(type)!`
	`243`	`+ (global::System.ComponentModel.DataAnnotations.ValidationAttribute)global::System.Activator.CreateInstance(type)!,`
	`244`	`+ _ => throw new global::System.ArgumentException($"Unsupported validation attribute type: {type.FullName}")`
`243`	`245`	`};`
`244`	`246`	`}`
`245`	`247`	`else if (type == typeof(global::System.ComponentModel.DataAnnotations.CustomValidationAttribute) && args.Length == 2)`
`@@ -257,7 +259,7 @@ _ when typeof(global::System.ComponentModel.DataAnnotations.ValidationAttribute)`
`257`	`259`	`}`
`258`	`260`	`else if (type == typeof(global::System.ComponentModel.DataAnnotations.StringLengthAttribute))`
`259`	`261`	`{`
`260`		`- if (args[0] is int maxLength)`
	`262`	`+ if (args.Length > 0 && args[0] is int maxLength)`
`261`	`263`	`{`
`262`	`264`	`attribute = new global::System.ComponentModel.DataAnnotations.StringLengthAttribute(maxLength);`
`263`	`265`	`}`