Replacing HashSet with Dictionary on .NET Standard 2.0

Author: julkiewicz

src/ECS/Archetype/EntityStore.Archetype.cs

@@ -4,7 +4,6 @@
 // Hard rule: this file MUST NOT use type: Entity
 
 using System;
-using Friflo.Engine.ECS.Compat;
 
 // ReSharper disable InlineTemporaryVariable
 // ReSharper disable ArrangeTrailingCommaInMultilineLists
@@ -187,7 +186,11 @@ internal static void AddArchetype (EntityStoreBase store, Archetype archetype)
         }
         store.archs[store.archsCount] = archetype;
         store.archsCount++;
+#if NETSTANDARD && !NETSTANDARD2_1_OR_GREATER
+        store.archSet.Add(archetype.key, archetype.key);
+#else
         store.archSet.Add(archetype.key);
+#endif
     }
     #endregion
 }

src/ECS/Archetype/EntityStore.cs

@@ -78,7 +78,11 @@ public abstract partial class EntityStoreBase
     // --- archetypes
     [Browse(Never)] internal            Archetype[]             archs;              //  8   - array of all archetypes. never null
     [Browse(Never)] private             int                     archsCount;         //  4   - number of archetypes
+#if NETSTANDARD && !NETSTANDARD2_1_OR_GREATER
+    [Browse(Never)] private  readonly   Dictionary<ArchetypeKey, ArchetypeKey> archSet; //  8   - Set<> to get archetypes by key
+#else
     [Browse(Never)] private  readonly   HashSet<ArchetypeKey>   archSet;            //  8   - Set<> to get archetypes by key
+#endif
     /// <summary>The default <see cref="Archetype"/> has no <see cref="Archetype.ComponentTypes"/> and <see cref="Archetype.Tags"/>.<br/>
     /// Its <see cref="Archetype"/>.<see cref="Archetype.archIndex"/> is always 0 (<see cref="Static.DefaultArchIndex"/>).</summary>
     [Browse(Never)] internal readonly   Archetype               defaultArchetype;   //  8   - default archetype. has no components & tags
@@ -142,7 +146,11 @@ internal static class Static
     protected EntityStoreBase()
     {
         archs               = new Archetype[2];
+#if NETSTANDARD && !NETSTANDARD2_1_OR_GREATER
+        archSet             = new Dictionary<ArchetypeKey, ArchetypeKey>(ArchetypeKeyEqualityComparer.Instance);
+#else
         archSet             = new HashSet<ArchetypeKey>(ArchetypeKeyEqualityComparer.Instance);
+#endif
         var config          = GetArchetypeConfig(this);
         defaultArchetype    = new Archetype(config);
         searchKey           = new ArchetypeKey();