Add feature for .NET 6+ Random methods and change #if to use it, #259

apache · Jan 22, 2024 · c553ccb · c553ccb
1 parent 5d70518
commit c553ccb
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -26,6 +26,7 @@
   <PropertyGroup Condition=" $(TargetFramework.StartsWith('net6.')) Or $(TargetFramework.StartsWith('net7.')) ">
 
     <DefineConstants>$(DefineConstants);FEATURE_SPANFORMATTABLE</DefineConstants>
+    <DefineConstants>$(DefineConstants);FEATURE_RANDOM_NEXTINT64_NEXTSINGLE</DefineConstants>
 
   </PropertyGroup>
 

diff --git a/src/Lucene.Net.Tests/Util/Fst/Test2BFST.cs b/src/Lucene.Net.Tests/Util/Fst/Test2BFST.cs
@@ -5,7 +5,7 @@
 using Console = Lucene.Net.Util.SystemConsole;
 using Int64 = J2N.Numerics.Int64;
 
-#if !NET6_0_OR_GREATER
+#if !FEATURE_RANDOM_NEXTINT64_NEXTSINGLE
 using RandomizedTesting.Generators; // for Random.NextInt64 extension method
 #endif
 

diff --git a/src/Lucene.Net.Tests/Util/Test2BPagedBytes.cs b/src/Lucene.Net.Tests/Util/Test2BPagedBytes.cs
@@ -4,7 +4,7 @@
 using System;
 using Assert = Lucene.Net.TestFramework.Assert;
 
-#if !NET6_0_OR_GREATER
+#if !FEATURE_RANDOM_NEXTINT64_NEXTSINGLE
 using RandomizedTesting.Generators; // for Random.NextInt64 extension method
 #endif
 

diff --git a/src/Lucene.Net.Tests/Util/TestMergedIterator.cs b/src/Lucene.Net.Tests/Util/TestMergedIterator.cs
@@ -4,7 +4,7 @@
 using JCG = J2N.Collections.Generic;
 using Assert = Lucene.Net.TestFramework.Assert;
 
-#if !NET6_0_OR_GREATER
+#if !FEATURE_RANDOM_NEXTINT64_NEXTSINGLE
 using RandomizedTesting.Generators; // for Random.NextInt64 extension method
 #endif
 

diff --git a/src/Lucene.Net.Tests/Util/TestSetOnce.cs b/src/Lucene.Net.Tests/Util/TestSetOnce.cs
@@ -4,7 +4,7 @@
 using System.Globalization;
 using Assert = Lucene.Net.TestFramework.Assert;
 
-#if !NET6_0_OR_GREATER
+#if !FEATURE_RANDOM_NEXTINT64_NEXTSINGLE
 using RandomizedTesting.Generators; // for Random.NextInt64 extension method
 #endif