Fix returning properties from NpgsqlConnectionStringBuilder.GetProperties (#6290)

vonzshik · web-flow · commit ce11aaa601ca · 2025-11-06T13:39:57.000+03:00
Fixes #6289
diff --git a/src/Npgsql/NpgsqlConnectionStringBuilder.cs b/src/Npgsql/NpgsqlConnectionStringBuilder.cs
@@ -1673,9 +1673,22 @@ protected override void GetProperties(Hashtable propertyDescriptors)
         foreach (var value in propertyDescriptors.Values)
         {
             var d = (PropertyDescriptor)value;
+            var isConnectionStringProperty = false;
+            var isObsolete = false;
             foreach (var attribute in d.Attributes)
-                if (attribute is NpgsqlConnectionStringPropertyAttribute or ObsoleteAttribute)
-                    toRemove.Add(d);
+            {
+                if (attribute is NpgsqlConnectionStringPropertyAttribute)
+                {
+                    isConnectionStringProperty = true;
+                }
+                else if (attribute is ObsoleteAttribute)
+                {
+                    isObsolete = true;
+                }
+            }
+
+            if (!isConnectionStringProperty || isObsolete)
+                toRemove.Add(d);
         }
 
         foreach (var o in toRemove)
