Fix Order{,Descending} preventing GitLab CI from building tests

TASEmulators · Dec 11, 2024 · 56e5105 · 56e5105
1 parent 2b71ff9
commit 56e5105
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/BizHawk.Common/Extensions/CollectionExtensions.cs b/src/BizHawk.Common/Extensions/CollectionExtensions.cs
@@ -234,6 +234,7 @@ public static int IndexOf<T>(this IReadOnlyList<T> list, T elem)
 			return null;
 		}
 
+#if !NET7_0_OR_GREATER
 		/// <remarks>shorthand for <c>this.OrderBy(static e => e)</c>, backported from .NET 7</remarks>
 		public static IOrderedEnumerable<T> Order<T>(this IEnumerable<T> source)
 			where T : IComparable<T>
@@ -243,6 +244,7 @@ public static IOrderedEnumerable<T> Order<T>(this IEnumerable<T> source)
 		public static IOrderedEnumerable<T> OrderDescending<T>(this IEnumerable<T> source)
 			where T : IComparable<T>
 			=> source.OrderByDescending(ReturnSelf);
+#endif
 
 		/// <inheritdoc cref="List{T}.RemoveAll"/>
 		/// <remarks>

diff --git a/src/BizHawk.Tests/Emulation.Common/Database/FirmwareDatabaseTests.cs b/src/BizHawk.Tests/Emulation.Common/Database/FirmwareDatabaseTests.cs
@@ -1,7 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 
+#if !NET7_0_OR_GREATER
 using BizHawk.Common.CollectionExtensions;
+#endif
 using BizHawk.Common.StringExtensions;
 using BizHawk.Emulation.Common;