[BCL] improve #if for ListLayout and DictionaryLayout.

reegeek · reegeek · commit 1b54c831a2b6 · 2021-06-18T09:15:53.000+02:00
Should fix net6.0 usage.
diff --git a/src/StructLinq/Dictionary/DictionaryLayout.cs b/src/StructLinq/Dictionary/DictionaryLayout.cs
@@ -7,34 +7,32 @@ internal class DictionaryLayout<TKey, TValue>
         public Entry<TKey, TValue>[] Entries;
     }
 
-#if (NETCOREAPP3_0 || NETCOREAPP3_1)
+#if (NET5_0_OR_GREATER)
     
     internal struct Entry<TKey, TValue>
     {
-        public int Next;
         public uint HashCode;
+        public int Next;
         internal TKey Key;           // Key of entry
         internal TValue Value;         // Value of entry
     }
-#else 
-#if (NET5_0)
-    
+#elif NETCOREAPP3_0_OR_GREATER
+
     internal struct Entry<TKey, TValue>
     {
-        public uint HashCode;
         public int Next;
+        public uint HashCode;
         internal TKey Key;           // Key of entry
         internal TValue Value;         // Value of entry
     }
-#else
+#else 
     internal struct Entry<TKey, TValue>
     {
         public int HashCode;
         public int Next;
         internal TKey Key;           // Key of entry
         internal TValue Value;         // Value of entry
     }
-    #endif
 #endif
 }
 #endif
diff --git a/src/StructLinq/List/ListLayout.cs b/src/StructLinq/List/ListLayout.cs
@@ -5,7 +5,7 @@
 
 namespace StructLinq.List
 {
-#if (NETCOREAPP3_0 || NETCOREAPP3_1 || NET5_0)
+#if (NETCOREAPP3_0_OR_GREATER)
     
     internal class ListLayout<T>
     {

Original file line number	Diff line number	Diff line change
`@@ -7,34 +7,32 @@ internal class DictionaryLayout<TKey, TValue>`
`7`	`7`	`public Entry<TKey, TValue>[] Entries;`
`8`	`8`	`}`
`9`	`9`
`10`		`-#if (NETCOREAPP3_0 \|\| NETCOREAPP3_1)`
	`10`	`+#if (NET5_0_OR_GREATER)`
`11`	`11`
`12`	`12`	`internal struct Entry<TKey, TValue>`
`13`	`13`	`{`
`14`		`- public int Next;`
`15`	`14`	`public uint HashCode;`
	`15`	`+ public int Next;`
`16`	`16`	`internal TKey Key; // Key of entry`
`17`	`17`	`internal TValue Value; // Value of entry`
`18`	`18`	`}`
`19`		`-#else`
`20`		`-#if (NET5_0)`
`21`		`-`
	`19`	`+#elif NETCOREAPP3_0_OR_GREATER`
	`20`	`+`
`22`	`21`	`internal struct Entry<TKey, TValue>`
`23`	`22`	`{`
`24`		`- public uint HashCode;`
`25`	`23`	`public int Next;`
	`24`	`+ public uint HashCode;`
`26`	`25`	`internal TKey Key; // Key of entry`
`27`	`26`	`internal TValue Value; // Value of entry`
`28`	`27`	`}`
`29`		`-#else`
	`28`	`+#else`
`30`	`29`	`internal struct Entry<TKey, TValue>`
`31`	`30`	`{`
`32`	`31`	`public int HashCode;`
`33`	`32`	`public int Next;`
`34`	`33`	`internal TKey Key; // Key of entry`
`35`	`34`	`internal TValue Value; // Value of entry`
`36`	`35`	`}`
`37`		`- #endif`
`38`	`36`	`#endif`
`39`	`37`	`}`
`40`	`38`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace StructLinq.List`
`7`	`7`	`{`
`8`		`-#if (NETCOREAPP3_0 \|\| NETCOREAPP3_1 \|\| NET5_0)`
	`8`	`+#if (NETCOREAPP3_0_OR_GREATER)`
`9`	`9`
`10`	`10`	`internal class ListLayout<T>`
`11`	`11`	`{`