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 f6ac6f42b5dbe90c056bcb21b90f9470bea103f0 Author: Shad Storhaug <[email protected]> AuthorDate: Fri Sep 11 05:04:29 2020 +0700 Directory.Build.targets: Added FEATURE_CULTUREINFO_GETCULTURES and implemented throughout solution --- Directory.Build.targets | 1 + src/Lucene.Net.TestFramework/Support/CultureInfoSupport.cs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 9086060..36489df 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -49,6 +49,7 @@ <PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) Or $(TargetFramework.StartsWith('netstandard2.')) Or $(TargetFramework.StartsWith('netcoreapp2.')) Or $(TargetFramework.StartsWith('netcoreapp3.')) "> <DefineConstants>$(DefineConstants);FEATURE_CONCURRENTMERGESCHEDULER</DefineConstants> + <DefineConstants>$(DefineConstants);FEATURE_CULTUREINFO_GETCULTURES</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_DTD_PROCESSING</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_FILESTREAM_LOCK</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_SERIALIZABLE</DefineConstants> diff --git a/src/Lucene.Net.TestFramework/Support/CultureInfoSupport.cs b/src/Lucene.Net.TestFramework/Support/CultureInfoSupport.cs index 02dbdb3..3b2cea5 100644 --- a/src/Lucene.Net.TestFramework/Support/CultureInfoSupport.cs +++ b/src/Lucene.Net.TestFramework/Support/CultureInfoSupport.cs @@ -21,7 +21,7 @@ namespace Lucene.Net.Util public static class CultureInfoSupport { -#if NETSTANDARD1_6 +#if !FEATURE_CULTUREINFO_GETCULTURES #region culturePool private static readonly string[] specificCulturePool = @@ -632,7 +632,7 @@ namespace Lucene.Net.Util public static CultureInfo[] GetNeutralAndSpecificCultures() { -#if NETSTANDARD1_6 +#if !FEATURE_CULTUREINFO_GETCULTURES return supportedSpecificCultures.Union(supportedNeutralCultures).ToArray(); #else return CultureInfo.GetCultures(CultureTypes.SpecificCultures | CultureTypes.NeutralCultures);
