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 7c96de946e403176d02fa5d94e534f10bf34f64b Author: Shad Storhaug <[email protected]> AuthorDate: Thu Jul 11 18:22:22 2019 +0700 Upgraded icu.net to the stable version on NuGet, 59.1.15 --- NuGet.config | 29 ---------------------- build/Dependencies.props | 3 ++- .../Collation/ICUCollationAttributeFactory.cs | 2 +- .../Collation/ICUCollationDocValuesField.cs | 2 +- .../Collation/ICUCollationKeyAnalyzer.cs | 2 +- .../Collation/ICUCollationKeyFilter.cs | 2 +- .../ICUCollatedTermAttributeImpl.cs | 2 +- .../Lucene.Net.Analysis.SmartCn.csproj | 6 +++++ .../Lucene.Net.Benchmark.csproj | 2 +- .../Analysis/Th/TestThaiAnalyzer.cs | 14 ----------- .../Lucene.Net.Tests.Benchmark.csproj | 4 +++ src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj | 2 +- .../Lucene.Net.Tests.ICU.csproj | 4 +++ src/dotnet/tools/lucene-cli/lucene-cli.csproj | 4 +++ 14 files changed, 27 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config deleted file mode 100644 index c5a8e9c..0000000 --- a/NuGet.config +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. - ---> -<configuration> - <packageSources> - <clear /> - <add key="icunet" value="https://www.myget.org/F/icu-dotnet/api/v2"; /> - <add key="dotnet-cat" value="https://www.myget.org/F/dotnetcat/api/v2"; /> - <add key="nugetorg" value="https://www.nuget.org/api/v2"; /> - </packageSources> -</configuration> diff --git a/build/Dependencies.props b/build/Dependencies.props index 2fd72bc..54cd085 100644 --- a/build/Dependencies.props +++ b/build/Dependencies.props @@ -1,7 +1,8 @@ <Project> <PropertyGroup Label="NuGet Package Reference Versions"> <Antlr3RuntimePackageVersion>3.5.1</Antlr3RuntimePackageVersion> - <IcuNetPackageVersion>54.1.1-alpha</IcuNetPackageVersion> + <Icu4cWinFullLibPackageVersion>59.1.15</Icu4cWinFullLibPackageVersion> + <IcuNetPackageVersion>2.5.4</IcuNetPackageVersion> <MicrosoftAspNetCoreHttpAbstractionsPackageVersion>1.0.3</MicrosoftAspNetCoreHttpAbstractionsPackageVersion> <MicrosoftAspNetCoreTestHostPackageVersion>1.0.3</MicrosoftAspNetCoreTestHostPackageVersion> <MicrosoftCSharpPackageVersion>4.4.0</MicrosoftCSharpPackageVersion> diff --git a/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationAttributeFactory.cs b/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationAttributeFactory.cs index 38d871a..7728267 100644 --- a/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationAttributeFactory.cs +++ b/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationAttributeFactory.cs @@ -4,7 +4,7 @@ using Lucene.Net.Support; using Lucene.Net.Util; using System.Reflection; #if NETSTANDARD -using SortKey = Icu.ObjectModel.SortKey; +using SortKey = Icu.SortKey; #else using SortKey = System.Globalization.SortKey; #endif diff --git a/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationDocValuesField.cs b/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationDocValuesField.cs index f87b2f6..6b7e11c 100644 --- a/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationDocValuesField.cs +++ b/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationDocValuesField.cs @@ -3,7 +3,7 @@ using Lucene.Net.Documents; using Lucene.Net.Support; using Lucene.Net.Util; #if NETSTANDARD -using SortKey = Icu.ObjectModel.SortKey; +using SortKey = Icu.SortKey; #else using SortKey = System.Globalization.SortKey; #endif diff --git a/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationKeyAnalyzer.cs b/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationKeyAnalyzer.cs index 7aae15e..18ab503 100644 --- a/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationKeyAnalyzer.cs +++ b/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationKeyAnalyzer.cs @@ -6,7 +6,7 @@ using Lucene.Net.Util; using System; using System.IO; #if NETSTANDARD -using SortKey = Icu.ObjectModel.SortKey; +using SortKey = Icu.SortKey; #else using SortKey = System.Globalization.SortKey; #endif diff --git a/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationKeyFilter.cs b/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationKeyFilter.cs index 42affe2..afc92f7 100644 --- a/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationKeyFilter.cs +++ b/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationKeyFilter.cs @@ -5,7 +5,7 @@ using Lucene.Net.Support; using Lucene.Net.Util; using System; #if NETSTANDARD -using SortKey = Icu.ObjectModel.SortKey; +using SortKey = Icu.SortKey; #else using SortKey = System.Globalization.SortKey; #endif diff --git a/src/Lucene.Net.Analysis.ICU/Collation/TokenAttributes/ICUCollatedTermAttributeImpl.cs b/src/Lucene.Net.Analysis.ICU/Collation/TokenAttributes/ICUCollatedTermAttributeImpl.cs index ca99bd3..1dc44f8 100644 --- a/src/Lucene.Net.Analysis.ICU/Collation/TokenAttributes/ICUCollatedTermAttributeImpl.cs +++ b/src/Lucene.Net.Analysis.ICU/Collation/TokenAttributes/ICUCollatedTermAttributeImpl.cs @@ -3,7 +3,7 @@ using Lucene.Net.Analysis.TokenAttributes; using Lucene.Net.Support; using Lucene.Net.Util; #if NETSTANDARD -using SortKey = Icu.ObjectModel.SortKey; +using SortKey = Icu.SortKey; #else using SortKey = System.Globalization.SortKey; #endif diff --git a/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj b/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj index faf9cf5..e34310f 100644 --- a/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj +++ b/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj @@ -30,6 +30,8 @@ <AssemblyTitle>Lucene.Net.Analysis.SmartCn</AssemblyTitle> <Description>Analyzer for indexing Chinese for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description> + <PackageReleaseNotes>This package runs natively on Linux. To run on Windows, install the Icu4c.Win.Full.Lib NuGet package into your application. See: https://github.com/sillsdev/icu-dotnet#windows-1.</PackageReleaseNotes> + <PackageTags>$(PackageTags);analysis;chinese;smart</PackageTags> <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile> <NoWarn>$(NoWarn);1591;1573</NoWarn> @@ -51,6 +53,10 @@ <PackageReference Include="icu.net" Version="$(IcuNetPackageVersion)" /> </ItemGroup> + <ItemGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))"> + <PackageReference Include="Icu4c.Win.Full.Lib" Version="$(Icu4cWinFullLibPackageVersion)" /> + </ItemGroup> + <!--<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" /> </ItemGroup> diff --git a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj index bd795aa..3b1ab2a 100644 --- a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj +++ b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj @@ -31,7 +31,7 @@ <AssemblyTitle>Lucene.Net.Benchmark</AssemblyTitle> <Description>System for benchmarking the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description> <PackageTags>$(PackageTags);benchmark</PackageTags> - <PackageReleaseNotes>This package depends on a temporary version of icu.net hosted on MyGet until official .NET Core support is added. To install, copy the NuGet.config file from https://github.com/apache/lucenenet/blob/master/NuGet.config into your project and then install this package via Package Manager Console as usual.</PackageReleaseNotes> + <PackageReleaseNotes>This package runs natively on Linux. To run on Windows, install the Icu4c.Win.Full.Lib NuGet package into your application. See: https://github.com/sillsdev/icu-dotnet#windows-1.</PackageReleaseNotes> <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile> <NoWarn>$(NoWarn);1591;1573</NoWarn> </PropertyGroup> diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiAnalyzer.cs index 56d8404..f6d7d9f 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiAnalyzer.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiAnalyzer.cs @@ -131,32 +131,18 @@ namespace Lucene.Net.Analysis.Th /// <summary> /// blast some random strings through the analyzer </summary> -#if !NETSTANDARD - // LUCENENET: There is no Timeout on NUnit for .NET Core. - [Timeout(120000)] // LUCENENET TODO: Sometimes doesn't finish on .NET 4.5.1 -#endif [Test] public virtual void TestRandomStrings() { -#if NETSTANDARD - fail("LUCENENET TODO: AccessViolationException being thrown from icu-dotnet"); -#endif CheckRandomData(Random(), new ThaiAnalyzer(TEST_VERSION_CURRENT), 1000 * RANDOM_MULTIPLIER); } /// <summary> /// blast some random large strings through the analyzer </summary> /// -#if !NETSTANDARD - // LUCENENET: There is no Timeout on NUnit for .NET Core. - [Timeout(120000)] // LUCENENET TODO: Sometimes doesn't finish on .NET 4.5.1 -#endif [Test] public virtual void TestRandomHugeStrings() { -#if NETSTANDARD - fail("LUCENENET TODO: AccessViolationException being thrown from icu-dotnet"); -#endif Random random = Random(); CheckRandomData(random, new ThaiAnalyzer(TEST_VERSION_CURRENT), 100 * RANDOM_MULTIPLIER, 8192); } diff --git a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj index 4340456..2daeb57 100644 --- a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj +++ b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj @@ -49,6 +49,10 @@ <ItemGroup> <PackageReference Include="icu.net" Version="$(IcuNetPackageVersion)" /> </ItemGroup> + + <ItemGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))"> + <PackageReference Include="Icu4c.Win.Full.Lib" Version="$(Icu4cWinFullLibPackageVersion)" /> + </ItemGroup> <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' "> <DebugType>portable</DebugType> diff --git a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj index b88dc71..9541229 100644 --- a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj +++ b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj @@ -31,7 +31,7 @@ <AssemblyTitle>Lucene.Net.ICU</AssemblyTitle> <Description>International Components for Unicode-based features including Thai analyzer support, an international postings highlighter, and BreakIterator support for the vector highlighter for the Lucene.Net full-text search engine library from The Apache Software Foundation.</Description> <PackageTags>$(PackageTags);icu;international;unicode</PackageTags> - <PackageReleaseNotes>This package depends on a temporary version of icu.net hosted on MyGet until official .NET Core support is added. To install, copy the NuGet.config file from https://github.com/apache/lucenenet/blob/master/NuGet.config into your project and then install this package via Package Manager Console as usual.</PackageReleaseNotes> + <PackageReleaseNotes>This package runs natively on Linux. To run on Windows, install the Icu4c.Win.Full.Lib NuGet package into your application. See: https://github.com/sillsdev/icu-dotnet#windows-1.</PackageReleaseNotes> <DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile> <NoWarn>$(NoWarn);1591;1573</NoWarn> <DefineConstants>$(DefineConstants);FEATURE_BREAKITERATOR</DefineConstants> diff --git a/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj b/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj index f34ad67..808c106 100644 --- a/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj +++ b/src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj @@ -59,6 +59,10 @@ <PackageReference Include="icu.net" Version="$(IcuNetPackageVersion)" /> </ItemGroup> + <ItemGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))"> + <PackageReference Include="Icu4c.Win.Full.Lib" Version="$(Icu4cWinFullLibPackageVersion)" /> + </ItemGroup> + <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' "> <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" /> <PackageReference Include="System.Xml.XmlDocument" Version="$(SystemXmlXmlDocumentPackageVersion)" /> diff --git a/src/dotnet/tools/lucene-cli/lucene-cli.csproj b/src/dotnet/tools/lucene-cli/lucene-cli.csproj index 3cac201..48b6e8c 100644 --- a/src/dotnet/tools/lucene-cli/lucene-cli.csproj +++ b/src/dotnet/tools/lucene-cli/lucene-cli.csproj @@ -59,4 +59,8 @@ <ProjectReference Include="..\..\..\Lucene.Net.QueryParser\Lucene.Net.QueryParser.csproj" /> </ItemGroup> + <ItemGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))"> + <PackageReference Include="Icu4c.Win.Full.Lib" Version="$(Icu4cWinFullLibPackageVersion)" /> + </ItemGroup> + </Project>
