Address the feedback

src/libraries/Microsoft.Extensions.Options/gen/Emitter.cs

@@ -190,8 +190,7 @@ private void GenModelSelfValidationIfNecessary(ValidatedModel modelToValidate)
         {
             if (modelToValidate.SelfValidates)
             {
-                OutLn($"builder ??= new global::Microsoft.Extensions.Options.ValidateOptionsResultBuilder();");
-                OutLn($"builder.AddResults(((global::System.ComponentModel.DataAnnotations.IValidatableObject)options).Validate(context));");
+                OutLn($"(builder ??= new()).AddResults(((global::System.ComponentModel.DataAnnotations.IValidatableObject)options).Validate(context));");
                 OutLn();
             }
         }
@@ -270,8 +269,7 @@ private void GenMemberValidation(ValidatedMember vm, string modelName, ref Dicti
 
             OutLn($"if (!global::System.ComponentModel.DataAnnotations.Validator.TryValidateValue(options.{vm.Name}{_TryGetValueNullableAnnotation}, context, validationResults, validationAttributes))");
             OutOpenBrace();
-            OutLn($"builder ??= new global::Microsoft.Extensions.Options.ValidateOptionsResultBuilder();");
-            OutLn($"builder.AddResults(validationResults);");
+            OutLn($"(builder ??= new()).AddResults(validationResults);");
             OutCloseBrace();
         }
 
@@ -357,14 +355,12 @@ private void GenTransitiveValidation(ValidatedMember vm, string modelName, ref D
             {
                 OutLn($"if (options.{vm.Name} is not null)");
                 OutOpenBrace();
-                OutLn($"builder ??= new global::Microsoft.Extensions.Options.ValidateOptionsResultBuilder();");
-                OutLn($"builder.AddResult({callSequence}.Validate({baseName}, options.{vm.Name}{valueAccess}));");
+                OutLn($"(builder ??= new()).AddResult({callSequence}.Validate({baseName}, options.{vm.Name}{valueAccess}));");
                 OutCloseBrace();
             }
             else
             {
-                OutLn($"builder ??= new global::Microsoft.Extensions.Options.ValidateOptionsResultBuilder();");
-                OutLn($"builder.AddResult({callSequence}.Validate({baseName}, options.{vm.Name}{valueAccess}));");
+                OutLn($"(builder ??= new()).AddResult({callSequence}.Validate({baseName}, options.{vm.Name}{valueAccess}));");
             }
         }
 
@@ -400,17 +396,15 @@ private void GenEnumerationValidation(ValidatedMember vm, string modelName, ref
                 OutLn($"if (o is not null)");
                 OutOpenBrace();
                 var propertyName = $"string.IsNullOrEmpty(name) ? $\"{modelName}.{vm.Name}[{{count}}]\" : $\"{{name}}.{vm.Name}[{{count}}]\"";
-                OutLn($"builder ??= new global::Microsoft.Extensions.Options.ValidateOptionsResultBuilder();");
-                OutLn($"builder.AddResult({callSequence}.Validate({propertyName}, o{enumeratedValueAccess}));");
+                OutLn($"(builder ??= new()).AddResult({callSequence}.Validate({propertyName}, o{enumeratedValueAccess}));");
                 OutCloseBrace();
 
                 if (!vm.EnumeratedMayBeNull)
                 {
                     OutLn($"else");
                     OutOpenBrace();
                     var error = $"string.IsNullOrEmpty(name) ? $\"{modelName}.{vm.Name}[{{count}}] is null\" : $\"{{name}}.{vm.Name}[{{count}}] is null\"";
-                    OutLn($"builder ??= new global::Microsoft.Extensions.Options.ValidateOptionsResultBuilder();");
-                    OutLn($"builder.AddError({error});");
+                    OutLn($"(builder ??= new()).AddError({error});");
                     OutCloseBrace();
                 }
 
@@ -419,8 +413,7 @@ private void GenEnumerationValidation(ValidatedMember vm, string modelName, ref
             else
             {
                 var propertyName = $"string.IsNullOrEmpty(name) ? $\"{modelName}.{vm.Name}[{{count++}}] is null\" : $\"{{name}}.{vm.Name}[{{count++}}] is null\"";
-                OutLn($"builder ??= new global::Microsoft.Extensions.Options.ValidateOptionsResultBuilder();");
-                OutLn($"builder.AddResult({callSequence}.Validate({propertyName}, o{enumeratedValueAccess}));");
+                OutLn($"(builder ??= new()).AddResult({callSequence}.Validate({propertyName}, o{enumeratedValueAccess}));");
             }
 
             OutCloseBrace();

src/libraries/Microsoft.Extensions.Options/tests/SourceGeneration.Unit.Tests/Main.cs

@@ -80,8 +80,7 @@ partial struct MyOptionsValidator
             validationAttributes.Add(global::__OptionValidationStaticInstances.__Attributes.A1);
             if (!global::System.ComponentModel.DataAnnotations.Validator.TryValidateValue(options.Val1, context, validationResults, validationAttributes))
             {
-                builder ??= new global::Microsoft.Extensions.Options.ValidateOptionsResultBuilder();
-                builder.AddResults(validationResults);
+                (builder ??= new()).AddResults(validationResults);
             }
 
             context.MemberName = "Val2";
@@ -91,8 +90,7 @@ partial struct MyOptionsValidator
             validationAttributes.Add(global::__OptionValidationStaticInstances.__Attributes.A2);
             if (!global::System.ComponentModel.DataAnnotations.Validator.TryValidateValue(options.Val2, context, validationResults, validationAttributes))
             {
-                builder ??= new global::Microsoft.Extensions.Options.ValidateOptionsResultBuilder();
-                builder.AddResults(validationResults);
+                (builder ??= new()).AddResults(validationResults);
             }
 
             return builder is null ? global::Microsoft.Extensions.Options.ValidateOptionsResult.Success : builder.Build();