lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nightowl...@apache.org
Subject [4/6] lucenenet git commit: Lucene.Net.ICU: Used new linked folder functionality to streamline the configuration and added the remaining files from Lucene.Net.Analysis.ICU (most commented until the features are completed)
Date Mon, 11 Sep 2017 01:49:11 GMT
Lucene.Net.ICU: Used new linked folder functionality to streamline the configuration and added
the remaining files from Lucene.Net.Analysis.ICU (most commented until the features are completed)


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/b3a2dd0b
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/b3a2dd0b
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/b3a2dd0b

Branch: refs/heads/master
Commit: b3a2dd0bb0bdf62b9659bf8a82d119a06f1ddaea
Parents: 84fdac0
Author: Shad Storhaug <shad@shadstorhaug.com>
Authored: Mon Sep 11 08:28:58 2017 +0700
Committer: Shad Storhaug <shad@shadstorhaug.com>
Committed: Mon Sep 11 08:28:58 2017 +0700

----------------------------------------------------------------------
 Lucene.Net.sln                                  | 26 ++++++++++----------
 README.md                                       |  2 +-
 .../Analysis/Th/ThaiTokenizer.cs                |  6 ++---
 .../Analysis/Th/ThaiWordFilter.cs               |  2 +-
 .../Icu/Segmentation/CharArrayIterator.cs       |  4 ++-
 .../PostingsHighlight/CambridgeMA.utf8          |  1 +
 .../Icu/Segmentation/TestCharArrayIterator.cs   |  4 ++-
 src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj | 26 +++++---------------
 .../Lucene.Net.Tests.ICU.csproj                 | 18 +++++---------
 .../Search/PostingsHighlight/CambridgeMA.utf8   |  1 -
 10 files changed, 37 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b3a2dd0b/Lucene.Net.sln
----------------------------------------------------------------------
diff --git a/Lucene.Net.sln b/Lucene.Net.sln
index 0438099..3de7a58 100644
--- a/Lucene.Net.sln
+++ b/Lucene.Net.sln
@@ -3,6 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26730.8
 MinimumVisualStudioVersion = 15.0.26730.8
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet", "dotnet", "{8CA61D33-3590-4024-A304-7B1F75B50653}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{4016BDAB-6C33-4D1E-9439-57B416EA45D5}"
+	ProjectSection(SolutionItems) = preProject
+		build.bat = build.bat
+		build\build.ps1 = build\build.ps1
+		src\CommonAssemblyInfo.cs = src\CommonAssemblyInfo.cs
+		TestTargetFramework.proj = TestTargetFramework.proj
+		Version.proj = Version.proj
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{4DF7EACE-2B25-43F6-B558-8520BF20BD76}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net", "src\Lucene.Net\Lucene.Net.csproj",
"{3A0AA37E-2B7B-4416-B528-DA4E0E6A6706}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Analysis.Common", "src\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj",
"{3D0366A8-515D-44F0-835F-4118853CFA14}"
@@ -97,21 +110,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Replicator",
"sr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Tests.Replicator", "src\Lucene.Net.Tests.Replicator\Lucene.Net.Tests.Replicator.csproj",
"{10D76AFD-AFE9-4C45-8452-E489FC6362B8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet", "dotnet", "{8CA61D33-3590-4024-A304-7B1F75B50653}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.Replicator.AspNetCore", "src\dotnet\Lucene.Net.Replicator.AspNetCore\Lucene.Net.Replicator.AspNetCore.csproj",
"{EFB2E31A-5917-49D5-A808-FE5061A550B4}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{4016BDAB-6C33-4D1E-9439-57B416EA45D5}"
-	ProjectSection(SolutionItems) = preProject
-		build.bat = build.bat
-		build\build.ps1 = build\build.ps1
-		src\CommonAssemblyInfo.cs = src\CommonAssemblyInfo.cs
-		TestTargetFramework.proj = TestTargetFramework.proj
-		Version.proj = Version.proj
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{4DF7EACE-2B25-43F6-B558-8520BF20BD76}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "lucene-cli", "src\dotnet\tools\lucene-cli\lucene-cli.csproj",
"{119BBACD-D4DB-4E3B-922F-3DA83E0B29E2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lucene.Net.ICU", "src\dotnet\Lucene.Net.ICU\Lucene.Net.ICU.csproj",
"{CF3A74CA-FEFD-4F41-961B-CC8CF8D96286}"

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b3a2dd0b/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 325b676..541ae3f 100644
--- a/README.md
+++ b/README.md
@@ -211,7 +211,7 @@ Then all you need to do is choose the `Lucene.Net Local Packages` feed
from the
 
 #### Prerequisites
 
-1. Visual Studio 2017
+1. Visual Studio 2017 version 15.3 or higher
 2. [.NET Core SDK 2.0 or higher](https://www.microsoft.com/net/download/core)
 3. [NUnit3 Test Adapter](https://marketplace.visualstudio.com/items?itemName=NUnitDevelopers.NUnit3TestAdapter)
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b3a2dd0b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizer.cs
index 855473d..e9b1ed6 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizer.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Analysis.Th
         /// If this is false, this tokenizer will not work at all!
         /// </summary>
         public static readonly bool DBBI_AVAILABLE;
-        private static readonly BreakIterator proto = new IcuBreakIterator(Icu.BreakIterator.UBreakIteratorType.WORD,
new CultureInfo("th"));
+        private static readonly BreakIterator proto = new IcuBreakIterator(global::Icu.BreakIterator.UBreakIteratorType.WORD,
new CultureInfo("th"));
         static ThaiTokenizer()
         {
             // check that we have a working dictionary-based break iterator for thai
@@ -73,13 +73,13 @@ namespace Lucene.Net.Analysis.Th
         /// <summary>
         /// Creates a new <see cref="ThaiTokenizer"/>, supplying the <see cref="Lucene.Net.Util.AttributeSource.AttributeFactory"/>
</summary>
         public ThaiTokenizer(AttributeFactory factory, TextReader reader)
-            : base(factory, reader, new IcuBreakIterator(Icu.BreakIterator.UBreakIteratorType.SENTENCE,
new CultureInfo("th")))
+            : base(factory, reader, new IcuBreakIterator(global::Icu.BreakIterator.UBreakIteratorType.SENTENCE,
new CultureInfo("th")))
         {
             if (!DBBI_AVAILABLE)
             {
                 throw new System.NotSupportedException("This JRE does not have support for
Thai segmentation");
             }
-            wordBreaker = new ThaiWordBreaker(new IcuBreakIterator(Icu.BreakIterator.UBreakIteratorType.WORD,
CultureInfo.InvariantCulture));
+            wordBreaker = new ThaiWordBreaker(new IcuBreakIterator(global::Icu.BreakIterator.UBreakIteratorType.WORD,
CultureInfo.InvariantCulture));
             termAtt = AddAttribute<ICharTermAttribute>();
             offsetAtt = AddAttribute<IOffsetAttribute>();
         }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b3a2dd0b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiWordFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiWordFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiWordFilter.cs
index 1e78ba2..2e162cf 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiWordFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiWordFilter.cs
@@ -53,7 +53,7 @@ namespace Lucene.Net.Analysis.Th
         /// If this is false, this filter will not work at all!
         /// </summary>
         public static readonly bool DBBI_AVAILABLE = ThaiTokenizer.DBBI_AVAILABLE;
-        private readonly ThaiWordBreaker breaker = new ThaiWordBreaker(new IcuBreakIterator(Icu.BreakIterator.UBreakIteratorType.WORD,
new CultureInfo("th")));
+        private readonly ThaiWordBreaker breaker = new ThaiWordBreaker(new IcuBreakIterator(global::Icu.BreakIterator.UBreakIteratorType.WORD,
new CultureInfo("th")));
         private readonly CharArrayIterator charIterator = CharArrayIterator.NewWordInstance();
 
         private readonly bool handlePosIncr;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/b3a2dd0b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/CharArrayIterator.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/CharArrayIterator.cs b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/CharArrayIterator.cs
index 209d583..e56194a 100644
--- a/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/CharArrayIterator.cs
+++ b/src/Lucene.Net.Analysis.ICU/Analysis/Icu/Segmentation/CharArrayIterator.cs
@@ -1,4 +1,5 @@
-´╗┐using Lucene.Net.Support;
+´╗┐#if FEATURE_BREAKITERATOR
+using Lucene.Net.Support;
 using System;
 using System.Diagnostics.CodeAnalysis;
 
@@ -132,3 +133,4 @@ namespace Lucene.Net.Analysis.Icu.Segmentation
         }
     }
 }
+#endif
\ No newline at end of file


Mime
View raw message