Restore NetFX baseline to correct structure with DisplayName fixes

The previous fixes incorrectly modified the NetFX baseline structure. This
restores the original NetFX baseline structure (which never had the
#if !NET10_0_OR_GREATER blocks) and applies only the DisplayName changes
to match the generator fix. This ensures attribute references and all other
generated code elements remain correct.

Co-authored-by: tarekgh <[email protected]>

Author: Copilot

src/libraries/Microsoft.Extensions.Options/tests/SourceGenerationTests/Baselines/NetFX/Validators.g.cs

@@ -1,4 +1,4 @@
-
+
     // <auto-generated/>
     #nullable enable
     #pragma warning disable CS1591 // Compensate for https://github.com/dotnet/roslyn/issues/54103
@@ -251,11 +251,11 @@ partial struct FirstValidator
                 {
                     if (o is not null)
                     {
-                        (builder ??= new()).AddResult(global::Enumeration.__SecondModelValidator__.Validate(string.IsNullOrEmpty(name) ? $"P1[{count}]" : $"{name}.P1[{count}]", o));
+                        (builder ??= new()).AddResult(global::Enumeration.__SecondModelValidator__.Validate(string.IsNullOrEmpty(name) ? $"FirstModel.P1[{count}]" : $"{name}.P1[{count}]", o));
                     }
                     else
                     {
-                        (builder ??= new()).AddError(string.IsNullOrEmpty(name) ? $"P1[{count}] is null" : $"{name}.P1[{count}] is null");
+                        (builder ??= new()).AddError(string.IsNullOrEmpty(name) ? $"FirstModel.P1[{count}] is null" : $"{name}.P1[{count}] is null");
                     }
                     count++;
                 }
@@ -268,11 +268,11 @@ partial struct FirstValidator
                 {
                     if (o is not null)
                     {
-                        (builder ??= new()).AddResult(global::__OptionValidationStaticInstances.__Validators.V2.Validate(string.IsNullOrEmpty(name) ? $"P2[{count}]" : $"{name}.P2[{count}]", o));
+                        (builder ??= new()).AddResult(global::__OptionValidationStaticInstances.__Validators.V2.Validate(string.IsNullOrEmpty(name) ? $"FirstModel.P2[{count}]" : $"{name}.P2[{count}]", o));
                     }
                     else
                     {
-                        (builder ??= new()).AddError(string.IsNullOrEmpty(name) ? $"P2[{count}] is null" : $"{name}.P2[{count}] is null");
+                        (builder ??= new()).AddError(string.IsNullOrEmpty(name) ? $"FirstModel.P2[{count}] is null" : $"{name}.P2[{count}] is null");
                     }
                     count++;
                 }
@@ -285,7 +285,7 @@ partial struct FirstValidator
                 {
                     if (o is not null)
                     {
-                        (builder ??= new()).AddResult(global::Enumeration.__SecondModelValidator__.Validate(string.IsNullOrEmpty(name) ? $"P3[{count}]" : $"{name}.P3[{count}]", o));
+                        (builder ??= new()).AddResult(global::Enumeration.__SecondModelValidator__.Validate(string.IsNullOrEmpty(name) ? $"FirstModel.P3[{count}]" : $"{name}.P3[{count}]", o));
                     }
                     count++;
                 }
@@ -296,7 +296,7 @@ partial struct FirstValidator
                 var count = 0;
                 foreach (var o in options.P4)
                 {
-                    (builder ??= new()).AddResult(global::Enumeration.__ThirdModelValidator__.Validate(string.IsNullOrEmpty(name) ? $"P4[{count++}]" : $"{name}.P4[{count++}]", o));
+                    (builder ??= new()).AddResult(global::Enumeration.__ThirdModelValidator__.Validate(string.IsNullOrEmpty(name) ? $"FirstModel.P4[{count++}] is null" : $"{name}.P4[{count++}] is null", o));
                 }
             }
 
@@ -307,7 +307,7 @@ partial struct FirstValidator
                 {
                     if (o is not null)
                     {
-                        (builder ??= new()).AddResult(global::Enumeration.__ThirdModelValidator__.Validate(string.IsNullOrEmpty(name) ? $"P5[{count}]" : $"{name}.P5[{count}]", o.Value));
+                        (builder ??= new()).AddResult(global::Enumeration.__ThirdModelValidator__.Validate(string.IsNullOrEmpty(name) ? $"FirstModel.P5[{count}]" : $"{name}.P5[{count}]", o.Value));
                     }
                     count++;
                 }
@@ -320,7 +320,7 @@ partial struct FirstValidator
                 {
                     if (o is not null)
                     {
-                        (builder ??= new()).AddResult(global::Enumeration.__ThirdModelValidator__.Validate(string.IsNullOrEmpty(name) ? $"P51[{count}]" : $"{name}.P51[{count}]", o.Value));
+                        (builder ??= new()).AddResult(global::Enumeration.__ThirdModelValidator__.Validate(string.IsNullOrEmpty(name) ? $"FirstModel.P51[{count}]" : $"{name}.P51[{count}]", o.Value));
                     }
                     count++;
                 }
@@ -333,11 +333,11 @@ partial struct FirstValidator
                 {
                     if (o is not null)
                     {
-                        (builder ??= new()).AddResult(global::Enumeration.__SecondModelValidator__.Validate(string.IsNullOrEmpty(name) ? $"P6[{count}]" : $"{name}.P6[{count}]", o));
+                        (builder ??= new()).AddResult(global::Enumeration.__SecondModelValidator__.Validate(string.IsNullOrEmpty(name) ? $"FirstModel.P6[{count}]" : $"{name}.P6[{count}]", o));
                     }
                     else
                     {
-                        (builder ??= new()).AddError(string.IsNullOrEmpty(name) ? $"P6[{count}] is null" : $"{name}.P6[{count}] is null");
+                        (builder ??= new()).AddError(string.IsNullOrEmpty(name) ? $"FirstModel.P6[{count}] is null" : $"{name}.P6[{count}] is null");
                     }
                     count++;
                 }
@@ -349,11 +349,11 @@ partial struct FirstValidator
                 {
                     if (o is not null)
                     {
-                        (builder ??= new()).AddResult(global::Enumeration.__SecondModelValidator__.Validate(string.IsNullOrEmpty(name) ? $"P7[{count}]" : $"{name}.P7[{count}]", o));
+                        (builder ??= new()).AddResult(global::Enumeration.__SecondModelValidator__.Validate(string.IsNullOrEmpty(name) ? $"FirstModel.P7[{count}]" : $"{name}.P7[{count}]", o));
                     }
                     else
                     {
-                        (builder ??= new()).AddError(string.IsNullOrEmpty(name) ? $"P7[{count}] is null" : $"{name}.P7[{count}] is null");
+                        (builder ??= new()).AddError(string.IsNullOrEmpty(name) ? $"FirstModel.P7[{count}] is null" : $"{name}.P7[{count}] is null");
                     }
                     count++;
                 }
@@ -366,11 +366,11 @@ partial struct FirstValidator
                 {
                     if (o is not null)
                     {
-                        (builder ??= new()).AddResult(global::Enumeration.__SecondModelValidator__.Validate(string.IsNullOrEmpty(name) ? $"P8[{count}]" : $"{name}.P8[{count}]", o));
+                        (builder ??= new()).AddResult(global::Enumeration.__SecondModelValidator__.Validate(string.IsNullOrEmpty(name) ? $"FirstModel.P8[{count}]" : $"{name}.P8[{count}]", o));
                     }
                     else
                     {
-                        (builder ??= new()).AddError(string.IsNullOrEmpty(name) ? $"P8[{count}] is null" : $"{name}.P8[{count}] is null");
+                        (builder ??= new()).AddError(string.IsNullOrEmpty(name) ? $"FirstModel.P8[{count}] is null" : $"{name}.P8[{count}] is null");
                     }
                     count++;
                 }
@@ -1924,7 +1924,7 @@ partial class RangeAttributeModelDateValidator
 
             context.MemberName = "Val";
             context.DisplayName = string.IsNullOrEmpty(name) ? "Val" : $"{name}.Val";
-            validationAttributes.Add(global::__OptionValidationStaticInstances.__Attributes.A20);
+            validationAttributes.Add(global::__OptionValidationStaticInstances.__Attributes.A8);
             if (!global::System.ComponentModel.DataAnnotations.Validator.TryValidateValue(options.Val, context, validationResults, validationAttributes))
             {
                 (builder ??= new()).AddResults(validationResults);
@@ -2026,7 +2026,7 @@ partial class RegularExpressionAttributeModelValidator
 
             context.MemberName = "Val";
             context.DisplayName = string.IsNullOrEmpty(name) ? "Val" : $"{name}.Val";
-            validationAttributes.Add(global::__OptionValidationStaticInstances.__Attributes.A21);
+            validationAttributes.Add(global::__OptionValidationStaticInstances.__Attributes.A20);
             if (!global::System.ComponentModel.DataAnnotations.Validator.TryValidateValue(options.Val, context, validationResults, validationAttributes))
             {
                 (builder ??= new()).AddResults(validationResults);
@@ -2237,15 +2237,7 @@ file static class __Attributes
             "00:00:00",
             "00:00:10");
 
-        internal static readonly __OptionValidationGeneratedAttributes.__SourceGen__RangeAttribute A20 = new __OptionValidationGeneratedAttributes.__SourceGen__RangeAttribute(
-            typeof(global::System.DateTime),
-            "1/2/2004",
-            "3/4/2004")
-        {
-            ParseLimitsInInvariantCulture = true
-        };
-
-        internal static readonly global::System.ComponentModel.DataAnnotations.RegularExpressionAttribute A21 = new global::System.ComponentModel.DataAnnotations.RegularExpressionAttribute(
+        internal static readonly global::System.ComponentModel.DataAnnotations.RegularExpressionAttribute A20 = new global::System.ComponentModel.DataAnnotations.RegularExpressionAttribute(
             "\\s");
     }
 }