SWEEP: Removed dependency on icu.net from Lucene.Net.Analysis.Common and Lucene.Net.Highlighter and disabled FEATURE_BREAKITERATOR
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/63c599ed Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/63c599ed Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/63c599ed Branch: refs/heads/api-work Commit: 63c599ed13e1a029b0d4a66d9c6ea7aba8f723a2 Parents: ddc93f1 Author: Shad Storhaug <[email protected]> Authored: Sun Apr 16 22:05:09 2017 +0700 Committer: Shad Storhaug <[email protected]> Committed: Sun Apr 16 22:05:09 2017 +0700 ---------------------------------------------------------------------- .../Lucene.Net.Analysis.Common.csproj | 2 +- .../Lucene.Net.Analysis.Common.project.json | 3 --- src/Lucene.Net.Analysis.Common/project.json | 5 +---- src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj | 2 +- src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.project.json | 3 --- src/Lucene.Net.Highlighter/project.json | 5 +---- .../Lucene.Net.Tests.Analysis.Common.csproj | 2 +- .../Lucene.Net.Tests.Analysis.Common.project.json | 1 - src/Lucene.Net.Tests.Analysis.Common/project.json | 6 +----- .../Lucene.Net.Tests.Highlighter.csproj | 2 +- .../Lucene.Net.Tests.Highlighter.project.json | 1 - src/Lucene.Net.Tests.Highlighter/project.json | 6 +----- src/Lucene.Net.Tests/Lucene.Net.Tests.csproj | 2 +- src/Lucene.Net.Tests/project.json | 2 +- src/Lucene.Net/Lucene.Net.csproj | 2 +- src/Lucene.Net/project.json | 1 - 16 files changed, 11 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/63c599ed/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj index c5ead38..fb403aa 100644 --- a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj +++ b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj @@ -31,7 +31,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <PropertyGroup> - <DefineConstants>$(DefineConstants);FEATURE_BREAKITERATOR;FEATURE_CLONEABLE;FEATURE_DTD_PROCESSING;FEATURE_SERIALIZABLE</DefineConstants> + <DefineConstants>$(DefineConstants);FEATURE_CLONEABLE;FEATURE_DTD_PROCESSING;FEATURE_SERIALIZABLE</DefineConstants> </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.VisualBasic" /> http://git-wip-us.apache.org/repos/asf/lucenenet/blob/63c599ed/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.project.json b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.project.json index 74d9d80..86d1c12 100644 --- a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.project.json +++ b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.project.json @@ -2,9 +2,6 @@ "runtimes": { "win": {} }, - "dependencies": { - "icu.net": "54.1.1-alpha" - }, "frameworks": { "net451": {} } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/63c599ed/src/Lucene.Net.Analysis.Common/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Analysis.Common/project.json b/src/Lucene.Net.Analysis.Common/project.json index 7b2777d..ca771a3 100644 --- a/src/Lucene.Net.Analysis.Common/project.json +++ b/src/Lucene.Net.Analysis.Common/project.json @@ -49,7 +49,7 @@ }, "buildOptions": { "debugType": "portable", - "define": [ "FEATURE_BREAKITERATOR", "FEATURE_CLONEABLE", "FEATURE_DTD_PROCESSING", "FEATURE_SERIALIZABLE" ], + "define": [ "FEATURE_CLONEABLE", "FEATURE_DTD_PROCESSING", "FEATURE_SERIALIZABLE" ], "compile": { "includeFiles": [ "../CommonAssemblyInfo.cs", @@ -67,9 +67,6 @@ "Analysis/Compound/Hyphenation/hyphenation.dtd" ] } - }, - "dependencies": { - "icu.net": "2.1.1-beta0003" } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/63c599ed/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj index c362f23..31ac251 100644 --- a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj +++ b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj @@ -31,7 +31,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <PropertyGroup> - <DefineConstants>$(DefineConstants);FEATURE_BREAKITERATOR;FEATURE_SERIALIZABLE</DefineConstants> + <DefineConstants>$(DefineConstants);FEATURE_SERIALIZABLE</DefineConstants> </PropertyGroup> <ItemGroup> <Reference Include="System" /> http://git-wip-us.apache.org/repos/asf/lucenenet/blob/63c599ed/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.project.json b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.project.json index af28fc8..e33edda 100644 --- a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.project.json +++ b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.project.json @@ -2,9 +2,6 @@ "runtimes": { "win": {} }, - "dependencies": { - "icu.net": "54.1.1-alpha" - }, "frameworks": { "net451": {} } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/63c599ed/src/Lucene.Net.Highlighter/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Highlighter/project.json b/src/Lucene.Net.Highlighter/project.json index dfc0a1e..5016f93 100644 --- a/src/Lucene.Net.Highlighter/project.json +++ b/src/Lucene.Net.Highlighter/project.json @@ -37,16 +37,13 @@ "net451": { "buildOptions": { "debugType": "portable", - "define": [ "FEATURE_BREAKITERATOR", "FEATURE_SERIALIZABLE" ], + "define": [ "FEATURE_SERIALIZABLE" ], "compile": { "includeFiles": [ "../CommonAssemblyInfo.cs", "../IcuBreakIterator.cs" ] } - }, - "dependencies": { - "icu.net": "2.1.1-beta0003" } } } http://git-wip-us.apache.org/repos/asf/lucenenet/blob/63c599ed/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj index 9cf1542..4ca6bfc 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj +++ b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj @@ -33,7 +33,7 @@ <PlatformTarget>AnyCPU</PlatformTarget> </PropertyGroup> <PropertyGroup> - <DefineConstants>$(DefineConstants);FEATURE_BREAKITERATOR;FEATURE_SERIALIZABLE</DefineConstants> + <DefineConstants>$(DefineConstants);FEATURE_SERIALIZABLE</DefineConstants> </PropertyGroup> <ItemGroup> <Reference Include="System" /> http://git-wip-us.apache.org/repos/asf/lucenenet/blob/63c599ed/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.project.json b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.project.json index 36faa44..8c631ab 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.project.json +++ b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.project.json @@ -3,7 +3,6 @@ "win": {} }, "dependencies": { - "icu.net": "54.1.1-alpha", "NUnit": "3.5.0" }, "frameworks": { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/63c599ed/src/Lucene.Net.Tests.Analysis.Common/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Analysis.Common/project.json b/src/Lucene.Net.Tests.Analysis.Common/project.json index 569ba9b..55e945d 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/project.json +++ b/src/Lucene.Net.Tests.Analysis.Common/project.json @@ -117,7 +117,7 @@ "net451": { "buildOptions": { "debugType": "portable", - "define": [ "FEATURE_BREAKITERATOR", "FEATURE_SERIALIZABLE" ], + "define": [ "FEATURE_SERIALIZABLE" ], "compile": { "includeFiles": [ "../CommonAssemblyInfo.cs" @@ -207,10 +207,6 @@ "Analysis/Compound/da_compoundDictionary.txt" ] } - }, - "dependencies": { - "icu.net": "2.1.1-beta0003", - "Icu4c.Win.Full.Lib": "56.1.21" } } }, http://git-wip-us.apache.org/repos/asf/lucenenet/blob/63c599ed/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj b/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj index ea8768b..3ed7239 100644 --- a/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj +++ b/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj @@ -31,7 +31,7 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <PropertyGroup> - <DefineConstants>$(DefineConstants);FEATURE_BREAKITERATOR;FEATURE_SERIALIZABLE</DefineConstants> + <DefineConstants>$(DefineConstants);FEATURE_SERIALIZABLE</DefineConstants> </PropertyGroup> <ItemGroup> <Reference Include="System" /> http://git-wip-us.apache.org/repos/asf/lucenenet/blob/63c599ed/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.project.json b/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.project.json index eb0a370..e3dbf4c 100644 --- a/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.project.json +++ b/src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.project.json @@ -3,7 +3,6 @@ "win": {} }, "dependencies": { - "icu.net": "54.1.1-alpha", "NUnit": "3.5.0" }, "frameworks": { http://git-wip-us.apache.org/repos/asf/lucenenet/blob/63c599ed/src/Lucene.Net.Tests.Highlighter/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests.Highlighter/project.json b/src/Lucene.Net.Tests.Highlighter/project.json index 198dbc1..6caafe2 100644 --- a/src/Lucene.Net.Tests.Highlighter/project.json +++ b/src/Lucene.Net.Tests.Highlighter/project.json @@ -39,7 +39,7 @@ "net451": { "buildOptions": { "debugType": "portable", - "define": [ "FEATURE_BREAKITERATOR", "FEATURE_SERIALIZABLE" ], + "define": [ "FEATURE_SERIALIZABLE" ], "compile": { "includeFiles": [ "../CommonAssemblyInfo.cs" @@ -50,10 +50,6 @@ "PostingsHighlight/CambridgeMA.utf8" ] } - }, - "dependencies": { - "icu.net": "2.1.1-beta0003", - "Icu4c.Win.Full.Lib": "56.1.21" } } }, http://git-wip-us.apache.org/repos/asf/lucenenet/blob/63c599ed/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj b/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj index a7d79bc..1ce7638 100644 --- a/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj +++ b/src/Lucene.Net.Tests/Lucene.Net.Tests.csproj @@ -34,7 +34,7 @@ </PropertyGroup> <PropertyGroup> <RootNamespace>Lucene.Net.Tests</RootNamespace> - <DefineConstants>$(DefineConstants);FEATURE_BREAKITERATOR;FEATURE_CONCURRENTMERGESCHEDULER;FEATURE_SERIALIZABLE</DefineConstants> + <DefineConstants>$(DefineConstants);FEATURE_CONCURRENTMERGESCHEDULER;FEATURE_SERIALIZABLE</DefineConstants> </PropertyGroup> <PropertyGroup> <StartupObject /> http://git-wip-us.apache.org/repos/asf/lucenenet/blob/63c599ed/src/Lucene.Net.Tests/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/project.json b/src/Lucene.Net.Tests/project.json index 36f288f..b838d2b 100644 --- a/src/Lucene.Net.Tests/project.json +++ b/src/Lucene.Net.Tests/project.json @@ -84,7 +84,7 @@ "net451": { "buildOptions": { "debugType": "portable", - "define": [ "FEATURE_BREAKITERATOR", "FEATURE_CONCURRENTMERGESCHEDULER", "FEATURE_SERIALIZABLE" ], + "define": [ "FEATURE_CONCURRENTMERGESCHEDULER", "FEATURE_SERIALIZABLE" ], "compile": { "includeFiles": [ "../CommonAssemblyInfo.cs" http://git-wip-us.apache.org/repos/asf/lucenenet/blob/63c599ed/src/Lucene.Net/Lucene.Net.csproj ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj index d2afed0..1e3f970 100644 --- a/src/Lucene.Net/Lucene.Net.csproj +++ b/src/Lucene.Net/Lucene.Net.csproj @@ -33,7 +33,7 @@ <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> <PropertyGroup> - <DefineConstants>$(DefineConstants);FEATURE_BREAKITERATOR;FEATURE_CLONEABLE;FEATURE_CONCURRENTMERGESCHEDULER;FEATURE_SERIALIZABLE;FEATURE_THREADPOOL_UNSAFEQUEUEWORKITEM</DefineConstants> + <DefineConstants>$(DefineConstants);FEATURE_CLONEABLE;FEATURE_CONCURRENTMERGESCHEDULER;FEATURE_SERIALIZABLE;FEATURE_THREADPOOL_UNSAFEQUEUEWORKITEM</DefineConstants> </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.CSharp" /> http://git-wip-us.apache.org/repos/asf/lucenenet/blob/63c599ed/src/Lucene.Net/project.json ---------------------------------------------------------------------- diff --git a/src/Lucene.Net/project.json b/src/Lucene.Net/project.json index 47d2d6e..8be0747 100644 --- a/src/Lucene.Net/project.json +++ b/src/Lucene.Net/project.json @@ -50,7 +50,6 @@ "buildOptions": { "debugType": "portable", "define": [ - "FEATURE_BREAKITERATOR", "FEATURE_CLONEABLE", "FEATURE_CONCURRENTMERGESCHEDULER", "FEATURE_SERIALIZABLE",
