Remove version increment from Dictionary<K,V>.Remove overloads (#18854)

* remove version increment from Remove overloads

* add temporary test exclusions

* fixup test exclusion names

* modify test exclusions

diff --git a/src/System.Private.CoreLib/shared/System/Collections/Generic/Dictionary.cs b/src/System.Private.CoreLib/shared/System/Collections/Generic/Dictionary.cs
index ece6f44f33b952ae698757010008cf075b67e3d1..8f7ad70e29abdcac23ec01e0d05dfc2119146abb 100644 (file)
--- a/src/System.Private.CoreLib/shared/System/Collections/Generic/Dictionary.cs
+++ b/src/System.Private.CoreLib/shared/System/Collections/Generic/Dictionary.cs
@@ -796,7 +796,6 @@ namespace System.Collections.Generic
                         }
                         _freeList = i;
                         _freeCount++;
-                        _version++;
                         return true;
                     }
 
@@ -865,7 +864,6 @@ namespace System.Collections.Generic
                         }
                         _freeList = i;
                         _freeCount++;
-                        _version++;
                         return true;
                     }
 

diff --git a/tests/CoreFX/TopN.CoreFX.x64.Unix.issues.json b/tests/CoreFX/TopN.CoreFX.x64.Unix.issues.json
index 005326b88763165e0c9a61e9d56495f76a7865ef..420e668dc5b74a3693e9d2d0123681f62fa57bf5 100644 (file)
--- a/tests/CoreFX/TopN.CoreFX.x64.Unix.issues.json
+++ b/tests/CoreFX/TopN.CoreFX.x64.Unix.issues.json
@@ -204,5 +204,112 @@
                 }
             ]
         }
+    },
+    {
+        "name": "System.Collections.Tests",
+        "enabled": true,
+        "exclusions": {
+            "namespaces": null,
+            "classes": null,
+            "methods": [
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_string_string.IEnumerable_Generic_Enumerator_Reset_ModifiedBeforeEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_string_string.IEnumerable_Generic_Enumerator_Reset_ModifiedAfterEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_string_string.IEnumerable_Generic_Enumerator_MoveNext_ModifiedAfterEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_string_string.IEnumerable_Generic_Enumerator_MoveNext_ModifiedBeforeEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_string_string.IEnumerable_Generic_Enumerator_Reset_ModifiedDuringEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_string_string.IEnumerable_Generic_Enumerator_MoveNext_ModifiedDuringEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_SimpleInt_int_With_Comparer_WrapStructural_SimpleInt.IEnumerable_Generic_Enumerator_Reset_ModifiedBeforeEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_SimpleInt_int_With_Comparer_WrapStructural_SimpleInt.IEnumerable_Generic_Enumerator_MoveNext_ModifiedDuringEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_SimpleInt_int_With_Comparer_WrapStructural_SimpleInt.IEnumerable_Generic_Enumerator_MoveNext_ModifiedBeforeEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_SimpleInt_int_With_Comparer_WrapStructural_SimpleInt.IEnumerable_Generic_Enumerator_Reset_ModifiedDuringEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_SimpleInt_int_With_Comparer_WrapStructural_SimpleInt.IEnumerable_Generic_Enumerator_Reset_ModifiedAfterEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_SimpleInt_int_With_Comparer_WrapStructural_SimpleInt.IEnumerable_Generic_Enumerator_MoveNext_ModifiedAfterEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_int_int.IEnumerable_Generic_Enumerator_Reset_ModifiedDuringEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_int_int.IEnumerable_Generic_Enumerator_MoveNext_ModifiedAfterEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_int_int.IEnumerable_Generic_Enumerator_MoveNext_ModifiedBeforeEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_int_int.IEnumerable_Generic_Enumerator_Reset_ModifiedBeforeEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_int_int.IEnumerable_Generic_Enumerator_Reset_ModifiedAfterEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_int_int.IEnumerable_Generic_Enumerator_MoveNext_ModifiedDuringEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_IDictionary_NonGeneric_Tests.IEnumerable_NonGeneric_Enumerator_MoveNext_ModifiedBeforeEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_IDictionary_NonGeneric_Tests.IEnumerable_NonGeneric_Enumerator_Reset_ModifiedBeforeEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_IDictionary_NonGeneric_Tests.IEnumerable_NonGeneric_Enumerator_Reset_ModifiedDuringEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_IDictionary_NonGeneric_Tests.IEnumerable_NonGeneric_Enumerator_MoveNext_ModifiedDuringEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_IDictionary_NonGeneric_Tests.IEnumerable_NonGeneric_Enumerator_Reset_ModifiedAfterEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_IDictionary_NonGeneric_Tests.IEnumerable_NonGeneric_Enumerator_MoveNext_ModifiedAfterEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                }
+            ]
+        }
     }
-]
\ No newline at end of file
+]

diff --git a/tests/CoreFX/TopN.CoreFX.x64.Windows.issues.json b/tests/CoreFX/TopN.CoreFX.x64.Windows.issues.json
index a67a2762cf7cf6882f5c869827dfad00285f5910..63d0aa2dc03bff76ad827e0437ec18b6a3d36925 100644 (file)
--- a/tests/CoreFX/TopN.CoreFX.x64.Windows.issues.json
+++ b/tests/CoreFX/TopN.CoreFX.x64.Windows.issues.json
@@ -2,7 +2,7 @@
 [
     {
         "name": "System.Console.Tests",
-        "enabled": true, 
+        "enabled": true,
         "exclusions": {
             "namespaces": null,
             "classes": null,
@@ -20,7 +20,7 @@
     },
     {
         "name": "System.Drawing.Common.Tests",
-        "enabled": true, 
+        "enabled": true,
         "exclusions": {
             "namespaces": null,
             "classes": null,
@@ -70,7 +70,8 @@
     },
     {
         "name": "System.Security.Cryptography.X509Certificates.Tests",
-        "enabled": true, "exclusions": {
+        "enabled": true,
+        "exclusions": {
             "namespaces": null,
             "classes": null,
             "methods": [
@@ -110,7 +111,7 @@
     },
     {
         "name": "System.Threading.Tests",
-        "enabled": true, 
+        "enabled": true,
         "exclusions": {
             "namespaces": null,
             "classes": null,
@@ -124,7 +125,7 @@
     },
     {
         "name": "System.Xml.Xsl.XslTransformApi.Tests",
-        "enabled": true, 
+        "enabled": true,
         "exclusions": {
             "namespaces": null,
             "classes": null,
@@ -139,5 +140,112 @@
                 }
             ]
         }
+    },
+    {
+        "name": "System.Collections.Tests",
+        "enabled": true,
+        "exclusions": {
+            "namespaces": null,
+            "classes": null,
+            "methods": [
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_string_string.IEnumerable_Generic_Enumerator_Reset_ModifiedBeforeEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_string_string.IEnumerable_Generic_Enumerator_Reset_ModifiedAfterEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_string_string.IEnumerable_Generic_Enumerator_MoveNext_ModifiedAfterEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_string_string.IEnumerable_Generic_Enumerator_MoveNext_ModifiedBeforeEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_string_string.IEnumerable_Generic_Enumerator_Reset_ModifiedDuringEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_string_string.IEnumerable_Generic_Enumerator_MoveNext_ModifiedDuringEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_SimpleInt_int_With_Comparer_WrapStructural_SimpleInt.IEnumerable_Generic_Enumerator_Reset_ModifiedBeforeEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_SimpleInt_int_With_Comparer_WrapStructural_SimpleInt.IEnumerable_Generic_Enumerator_MoveNext_ModifiedDuringEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_SimpleInt_int_With_Comparer_WrapStructural_SimpleInt.IEnumerable_Generic_Enumerator_MoveNext_ModifiedBeforeEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_SimpleInt_int_With_Comparer_WrapStructural_SimpleInt.IEnumerable_Generic_Enumerator_Reset_ModifiedDuringEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_SimpleInt_int_With_Comparer_WrapStructural_SimpleInt.IEnumerable_Generic_Enumerator_Reset_ModifiedAfterEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_SimpleInt_int_With_Comparer_WrapStructural_SimpleInt.IEnumerable_Generic_Enumerator_MoveNext_ModifiedAfterEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_int_int.IEnumerable_Generic_Enumerator_Reset_ModifiedDuringEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_int_int.IEnumerable_Generic_Enumerator_MoveNext_ModifiedAfterEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_int_int.IEnumerable_Generic_Enumerator_MoveNext_ModifiedBeforeEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_int_int.IEnumerable_Generic_Enumerator_Reset_ModifiedBeforeEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_int_int.IEnumerable_Generic_Enumerator_Reset_ModifiedAfterEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_Generic_Tests_int_int.IEnumerable_Generic_Enumerator_MoveNext_ModifiedDuringEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_IDictionary_NonGeneric_Tests.IEnumerable_NonGeneric_Enumerator_MoveNext_ModifiedBeforeEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_IDictionary_NonGeneric_Tests.IEnumerable_NonGeneric_Enumerator_Reset_ModifiedBeforeEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_IDictionary_NonGeneric_Tests.IEnumerable_NonGeneric_Enumerator_Reset_ModifiedDuringEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_IDictionary_NonGeneric_Tests.IEnumerable_NonGeneric_Enumerator_MoveNext_ModifiedDuringEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_IDictionary_NonGeneric_Tests.IEnumerable_NonGeneric_Enumerator_Reset_ModifiedAfterEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                },
+                {
+                    "name": "System.Collections.Tests.Dictionary_IDictionary_NonGeneric_Tests.IEnumerable_NonGeneric_Enumerator_MoveNext_ModifiedAfterEnumeration_ThrowsInvalidOperationException",
+                    "reason": "Assert.All() Failure: 1 out of 4 items in the collection did not pass.\r\n"
+                }
+            ]
+        }
     }
 ]