Cleanup

Author: PawelGerr

Directory.Build.props

@@ -2,7 +2,7 @@
 
    <PropertyGroup>
       <Copyright>(c) $([System.DateTime]::Now.Year), Pawel Gerr. All rights reserved.</Copyright>
-      <VersionPrefix>6.0.0</VersionPrefix>
+      <VersionPrefix>6.0.1</VersionPrefix>
       <Authors>Pawel Gerr</Authors>
       <GenerateDocumentationFile>true</GenerateDocumentationFile>
       <PackageProjectUrl>https://github.com/PawelGerr/Thinktecture.Runtime.Extensions</PackageProjectUrl>

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/Constants.cs

@@ -12,5 +12,6 @@ public static class ComparerAccessor
    public static class Methods
    {
       public const string CREATE_INVALID_ITEM = "CreateInvalidItem";
+      public const string VALIDATE_FACTORY_ARGUMENTS = "ValidateFactoryArguments";
    }
 }

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/ValueObjects/ValueObjectCodeGenerator.cs

@@ -451,7 +451,7 @@ private void GenerateValidateMethod(bool allowNullKeyMemberInput, bool allowNull
       if (_state.FactoryValidationReturnType is not null)
          _sb.Append("var ").Append(_FACTORY_ARGUMENTS_VALIDATION_RESULT).Append(" = ");
 
-      _sb.Append(@"ValidateFactoryArguments(ref validationResult");
+      _sb.Append(Constants.Methods.VALIDATE_FACTORY_ARGUMENTS).Append("(ref validationResult");
 
       _sb.RenderArguments(fieldsAndProperties, "ref ", true);
 
@@ -491,7 +491,7 @@ private void GenerateValidateFactoryArguments()
       if (_state.FactoryValidationReturnType is not null)
          _sb.Append("private ");
 
-      _sb.Append("static partial ").Append(_state.FactoryValidationReturnType ?? "void").Append(" ValidateFactoryArguments(ref global::System.ComponentModel.DataAnnotations.ValidationResult? validationResult");
+      _sb.Append("static partial ").Append(_state.FactoryValidationReturnType ?? "void").Append(" ").Append(Constants.Methods.VALIDATE_FACTORY_ARGUMENTS).Append("(ref global::System.ComponentModel.DataAnnotations.ValidationResult? validationResult");
 
       _sb.RenderArgumentsWithType(fieldsAndProperties, "ref ", leadingComma: true);
 

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/ValueObjects/ValueObjectSourceGeneratorState.cs

@@ -7,7 +7,7 @@ public sealed class ValueObjectSourceGeneratorState : ITypeInformation, IEquatab
 {
    public string TypeFullyQualified { get; }
    public string TypeFullyQualifiedNullable { get; }
-   public string TypeFullyQualifiedNullAnnotated { get; }
+   public string TypeFullyQualifiedNullAnnotated => IsReferenceType ? TypeFullyQualifiedNullable : TypeFullyQualified;
    public string TypeMinimallyQualified { get; }
 
    public string? Namespace { get; }
@@ -39,16 +39,17 @@ public ValueObjectSourceGeneratorState(
       Namespace = type.ContainingNamespace?.IsGlobalNamespace == true ? null : type.ContainingNamespace?.ToString();
       TypeFullyQualified = type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
       TypeFullyQualifiedNullable = $"{TypeFullyQualified}?";
-      TypeFullyQualifiedNullAnnotated = type.IsReferenceType ? TypeFullyQualifiedNullable : TypeFullyQualified;
       TypeMinimallyQualified = type.ToDisplayString(SymbolDisplayFormat.MinimallyQualifiedFormat);
       IsReferenceType = type.IsReferenceType;
       AssignableInstanceFieldsAndProperties = type.GetAssignableFieldsAndPropertiesAndCheckForReadOnly(factory, true, true, cancellationToken).ToList();
       EqualityMembers = GetEqualityMembers();
 
-      var factoryValidationReturnType = type.GetMembers()
-                                            .OfType<IMethodSymbol>()
-                                            .FirstOrDefault(m => m.IsStatic && m.ReturnType.SpecialType != SpecialType.System_Void && m.Name == "ValidateFactoryArguments")?
-                                            .ReturnType;
+      var members = type.GetMembers();
+      var factoryValidationReturnType = members.IsDefaultOrEmpty
+                                           ? null
+                                           : members.OfType<IMethodSymbol>()
+                                                    .FirstOrDefault(m => m.IsStatic && m.ReturnType.SpecialType != SpecialType.System_Void && m.Name == Constants.Methods.VALIDATE_FACTORY_ARGUMENTS)?
+                                                    .ReturnType;
 
       if (factoryValidationReturnType is not null)
       {