This is an automated email from the ASF dual-hosted git repository. nightowl888 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit dd62c71c9c9ec3388f2cea1b1afc6670b4f97cb2 Author: Shad Storhaug <[email protected]> AuthorDate: Fri Sep 11 12:00:34 2020 +0700 Directory.Build.targets: Renamed NETSTANDARD1_6 to NETSTANDARD1_X so it isn't dependent on the minor version number --- Directory.Build.targets | 2 +- src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs | 4 ++-- src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs | 2 +- src/Lucene.Net/Support/Compatibility/NullableAttributes.cs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 9f0325b..480032b 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -85,7 +85,7 @@ <!-- Features in .NET Standard 1.x and .NET Core 1.x --> <PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard1.')) Or $(TargetFramework.StartsWith('netcoreapp1.')) "> - <DefineConstants>$(DefineConstants);NETSTANDARD1_6</DefineConstants> + <DefineConstants>$(DefineConstants);NETSTANDARD1_X</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_STACKTRACE</DefineConstants> </PropertyGroup> diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs index 32ab341..06e03c5 100644 --- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs +++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs @@ -2050,7 +2050,7 @@ namespace Lucene.Net.Util public static CultureInfo RandomCulture(Random random) // LUCENENET specific renamed from RandomLocale { ICollection<CultureInfo> systemCultures = CultureInfoSupport.GetNeutralAndSpecificCultures(); -#if NETSTANDARD1_6 +#if NETSTANDARD1_X // .NET Core 1.0 on macOS seems to be flakey here and not return results occasionally, so compensate by // returning CultureInfo.InvariantCulture when it happens. if (systemCultures.Count == 0) @@ -2067,7 +2067,7 @@ namespace Lucene.Net.Util public static TimeZoneInfo RandomTimeZone(Random random) { var systemTimeZones = TimeZoneInfo.GetSystemTimeZones(); -#if NETSTANDARD1_6 +#if NETSTANDARD1_X // .NET Core 1.0 on macOS seems to be flakey here and not return results occasionally, so compensate by // returning TimeZoneInfo.Local when it happens. if (systemTimeZones.Count == 0) diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs index 58ce2a2..d5c0c1a 100644 --- a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs +++ b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs @@ -2518,7 +2518,7 @@ namespace Lucene.Net.Index } } -#if NETSTANDARD1_6 +#if NETSTANDARD1_X [Slow] #endif [Test] diff --git a/src/Lucene.Net/Support/Compatibility/NullableAttributes.cs b/src/Lucene.Net/Support/Compatibility/NullableAttributes.cs index fbfb4b9..e6db6d9 100644 --- a/src/Lucene.Net/Support/Compatibility/NullableAttributes.cs +++ b/src/Lucene.Net/Support/Compatibility/NullableAttributes.cs @@ -1,6 +1,6 @@ #pragma warning disable MA0048 // File name must match type name #define INTERNAL_NULLABLE_ATTRIBUTES -#if NETSTANDARD1_6 || NETSTANDARD2_0 || NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 || NET45 || NET451 || NET452 || NET6 || NET461 || NET462 || NET47 || NET471 || NET472 || NET48 +#if NETSTANDARD1_X || NETSTANDARD2_0 || NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 || NET45 || NET451 || NET452 || NET6 || NET461 || NET462 || NET47 || NET471 || NET472 || NET48 // https://github.com/dotnet/corefx/blob/48363ac826ccf66fbe31a5dcb1dc2aab9a7dd768/src/Common/src/CoreLib/System/Diagnostics/CodeAnalysis/NullableAttributes.cs
