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 58c93bbcdb2ba7f99fe21c7453c8149e6e01bc21 Author: Shad Storhaug <[email protected]> AuthorDate: Thu Aug 19 05:11:45 2021 +0700 SWEEP: Optimized embedded resource references using glob patterns --- .../Lucene.Net.Analysis.Common.csproj | 5 +++-- .../Lucene.Net.Analysis.Kuromoji.csproj | 3 ++- .../Lucene.Net.Analysis.Morfologik.csproj | 16 +--------------- .../Lucene.Net.Analysis.Phonetic.csproj | 4 ++-- .../Lucene.Net.Analysis.SmartCn.csproj | 5 ++--- .../Lucene.Net.Analysis.Stempel.csproj | 2 +- src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj | 2 +- .../Lucene.Net.Tests.Analysis.Kuromoji.csproj | 4 +++- .../Lucene.Net.Tests.Analysis.Morfologik.csproj | 12 +++--------- .../Lucene.Net.Tests.Analysis.OpenNLP.csproj | 19 ++----------------- .../Lucene.Net.Tests.Benchmark.csproj | 6 ++++-- .../Lucene.Net.Tests.Memory.csproj | 2 +- .../Lucene.Net.Tests.QueryParser.csproj | 4 +++- .../Lucene.Net.Tests.Spatial.csproj | 2 +- src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj | 1 - .../Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj | 11 ++++++----- 16 files changed, 35 insertions(+), 63 deletions(-) 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 2eb6dbb..62530a0 100644 --- a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj +++ b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj @@ -35,8 +35,9 @@ </PropertyGroup> <ItemGroup> - <EmbeddedResource Include="Analysis\Gl\galician.rslp;Analysis\Pt\portuguese.rslp;Analysis\Compound\Hyphenation\hyphenation.dtd" /> - <EmbeddedResource Include="Analysis\**\stopwords.txt;Analysis\Snowball\*_stop.txt" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" /> + <EmbeddedResource Include="**/*.rslp" Exclude="bin/**/*;obj/**/*" Label="RSLP Test Data" /> + <EmbeddedResource Include="**/*.dtd" Exclude="bin/**/*;obj/**/*" Label="DTD Test Data" /> + <EmbeddedResource Include="**/*.txt" Exclude="bin/**/*;obj/**/*" Label="Text Test Data" /> </ItemGroup> <ItemGroup> diff --git a/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj b/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj index 4733cbd..643c847 100644 --- a/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj +++ b/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj @@ -35,7 +35,8 @@ </PropertyGroup> <ItemGroup> - <EmbeddedResource Include="stoptags.txt;stopwords.txt;Dict\CharacterDefinition.dat;Dict\ConnectionCosts.dat;Dict\TokenInfoDictionary$buffer.dat;Dict\TokenInfoDictionary$fst.dat;Dict\TokenInfoDictionary$posDict.dat;Dict\TokenInfoDictionary$targetMap.dat;Dict\UnknownDictionary$buffer.dat;Dict\UnknownDictionary$posDict.dat;Dict\UnknownDictionary$targetMap.dat" /> + <EmbeddedResource Include="**/*.txt" Exclude="bin/**/*;obj/**/*" Label="Text Test Data" /> + <EmbeddedResource Include="**/*.dat" Exclude="bin/**/*;obj/**/*" Label="DAT Test Data" /> </ItemGroup> <ItemGroup> diff --git a/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj b/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj index 0e8d860..9668a39 100644 --- a/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj +++ b/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj @@ -40,21 +40,7 @@ </ItemGroup> <ItemGroup> - <None Remove="Uk\mapping_uk.txt" /> - <None Remove="Uk\README" /> - <None Remove="Uk\stopwords.txt" /> - <None Remove="Uk\tagset.txt" /> - <None Remove="Uk\ukrainian.dict" /> - <None Remove="Uk\ukrainian.info" /> - </ItemGroup> - - <ItemGroup> - <EmbeddedResource Include="Uk\mapping_uk.txt" /> - <EmbeddedResource Include="Uk\README" /> - <EmbeddedResource Include="Uk\stopwords.txt" /> - <EmbeddedResource Include="Uk\tagset.txt" /> - <EmbeddedResource Include="Uk\ukrainian.dict" /> - <EmbeddedResource Include="Uk\ukrainian.info" /> + <EmbeddedResource Include="Uk/**/*" Exclude="*.cs" /> </ItemGroup> <ItemGroup> diff --git a/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj b/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj index dc3ec07..4bf3e01 100644 --- a/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj +++ b/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj @@ -35,8 +35,8 @@ </PropertyGroup> <ItemGroup> - <EmbeddedResource Include="Language\Bm\lang.txt;Language\dmrules.txt" /> - <EmbeddedResource Include="Language\Bm\ash_*.txt;Language\Bm\gen_*.txt;Language\Bm\sep_*.txt" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" /> + <EmbeddedResource Include="Language\*.txt" /> + <EmbeddedResource Include="Language\Bm\*" Exclude="*.cs" /> </ItemGroup> <ItemGroup> 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 c21700c..d59b8b3 100644 --- a/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj +++ b/src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj @@ -36,9 +36,8 @@ </PropertyGroup> <ItemGroup> - <EmbeddedResource Include="stopwords.txt" /> - <EmbeddedResource Include="Hhmm\bigramdict.mem" /> - <EmbeddedResource Include="Hhmm\coredict.mem" /> + <EmbeddedResource Include="Hhmm/*.mem" Label="Dict Test Data" /> + <EmbeddedResource Include="**/*.txt" Exclude="bin/**/*;obj/**/*" Label="Text Test Data" /> </ItemGroup> <ItemGroup> diff --git a/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj b/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj index ece92b9..e038c76 100644 --- a/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj +++ b/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj @@ -35,7 +35,7 @@ </PropertyGroup> <ItemGroup> - <EmbeddedResource Include="Pl\stemmer_20000.tbl;Pl\stopwords.txt" /> + <EmbeddedResource Include="Pl\*.tbl;Pl\*.txt" /> </ItemGroup> <ItemGroup> diff --git a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj index d836730..86e065c 100644 --- a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj +++ b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj @@ -35,7 +35,7 @@ </PropertyGroup> <ItemGroup> - <ProjectReference Include="..\dotnet\Lucene.Net.ICU\Lucene.Net.ICU.csproj" /> + <ProjectReference Include="..\dotnet\Lucene.Net.ICU\Lucene.Net.ICU.csproj" /> <ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" /> <ProjectReference Include="..\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj" /> <ProjectReference Include="..\Lucene.Net.Facet\Lucene.Net.Facet.csproj" /> diff --git a/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj b/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj index 1ca3b15..4581bbb 100644 --- a/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj +++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj @@ -28,7 +28,9 @@ </PropertyGroup> <ItemGroup> - <EmbeddedResource Include="bocchan.utf-8;search-segmentation-tests.txt;userdict.txt;Tools\custom-dictionary-input.zip" /> + <EmbeddedResource Include="**/*.utf-8" Exclude="bin/**/*;obj/**/*" Label="UTF-8 Test Data" /> + <EmbeddedResource Include="**/*.txt" Exclude="bin/**/*;obj/**/*" Label="Text Test Data" /> + <EmbeddedResource Include="**/*.zip" Exclude="bin/**/*;obj/**/*" Label="Zip Test Data" /> </ItemGroup> <ItemGroup> diff --git a/src/Lucene.Net.Tests.Analysis.Morfologik/Lucene.Net.Tests.Analysis.Morfologik.csproj b/src/Lucene.Net.Tests.Analysis.Morfologik/Lucene.Net.Tests.Analysis.Morfologik.csproj index fd94a1b..8968150 100644 --- a/src/Lucene.Net.Tests.Analysis.Morfologik/Lucene.Net.Tests.Analysis.Morfologik.csproj +++ b/src/Lucene.Net.Tests.Analysis.Morfologik/Lucene.Net.Tests.Analysis.Morfologik.csproj @@ -29,15 +29,9 @@ </PropertyGroup> <ItemGroup> - <None Remove="Morfologik\custom-dictionary.dict" /> - <None Remove="Morfologik\custom-dictionary.info" /> - <None Remove="Morfologik\custom-dictionary.input" /> - </ItemGroup> - - <ItemGroup> - <EmbeddedResource Include="Morfologik\custom-dictionary.dict" /> - <EmbeddedResource Include="Morfologik\custom-dictionary.info" /> - <EmbeddedResource Include="Morfologik\custom-dictionary.input" /> + <EmbeddedResource Include="**/*.dict" Exclude="bin/**/*;obj/**/*" Label="Dict Test Data" /> + <EmbeddedResource Include="**/*.info" Exclude="bin/**/*;obj/**/*" Label="Info Test Data" /> + <EmbeddedResource Include="**/*.input" Exclude="bin/**/*;obj/**/*" Label="Input Test Data" /> </ItemGroup> <ItemGroup> diff --git a/src/Lucene.Net.Tests.Analysis.OpenNLP/Lucene.Net.Tests.Analysis.OpenNLP.csproj b/src/Lucene.Net.Tests.Analysis.OpenNLP/Lucene.Net.Tests.Analysis.OpenNLP.csproj index eb4b023..75312cb 100644 --- a/src/Lucene.Net.Tests.Analysis.OpenNLP/Lucene.Net.Tests.Analysis.OpenNLP.csproj +++ b/src/Lucene.Net.Tests.Analysis.OpenNLP/Lucene.Net.Tests.Analysis.OpenNLP.csproj @@ -35,23 +35,8 @@ </PropertyGroup> <ItemGroup> - <None Remove="en-test-chunker.bin" /> - <None Remove="en-test-lemmas.dict" /> - <None Remove="en-test-lemmatizer.bin" /> - <None Remove="en-test-ner.bin" /> - <None Remove="en-test-pos-maxent.bin" /> - <None Remove="en-test-sent.bin" /> - <None Remove="en-test-tokenizer.bin" /> - </ItemGroup> - - <ItemGroup> - <EmbeddedResource Include="en-test-chunker.bin" /> - <EmbeddedResource Include="en-test-lemmas.dict" /> - <EmbeddedResource Include="en-test-lemmatizer.bin" /> - <EmbeddedResource Include="en-test-ner.bin" /> - <EmbeddedResource Include="en-test-pos-maxent.bin" /> - <EmbeddedResource Include="en-test-sent.bin" /> - <EmbeddedResource Include="en-test-tokenizer.bin" /> + <EmbeddedResource Include="**/*.dict" Exclude="bin/**/*;obj/**/*" Label="Dict Test Data" /> + <EmbeddedResource Include="**/*.bin" Exclude="bin/**/*;obj/**/*" Label="Bin Test Data" /> </ItemGroup> <ItemGroup> 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 52df7a2..21717e5 100644 --- a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj +++ b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -28,7 +28,9 @@ </PropertyGroup> <ItemGroup> - <EmbeddedResource Include="ByTask\Feeds\trecdocs.zip;ByTask\conf.zip;ByTask\reuters.first20.lines.txt;ByTask\test-mapping-ISOLatin1Accent-partial.txt;Quality\reuters.578.lines.txt.bz2;Quality\trecQRels.txt;Quality\trecTopics.txt" /> + <EmbeddedResource Include="**/*.zip" Exclude="bin/**/*;obj/**/*" Label="Zip Test Data" /> + <EmbeddedResource Include="**/*.txt" Exclude="bin/**/*;obj/**/*" Label="Text Test Data" /> + <EmbeddedResource Include="**/*.bz2" Exclude="bin/**/*;obj/**/*" Label="BZ2 Test Data" /> </ItemGroup> <ItemGroup> diff --git a/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj b/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj index ced1a15..bcfb7c8 100644 --- a/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj +++ b/src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj @@ -28,7 +28,7 @@ </PropertyGroup> <ItemGroup> - <EmbeddedResource Include="Index\Memory\testqueries.txt;Index\Memory\testqueries2.txt" /> + <EmbeddedResource Include="**/*.txt" Exclude="bin/**/*;obj/**/*" Label="Text Test Data" /> </ItemGroup> <ItemGroup> diff --git a/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj b/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj index 52d4966..dead83d 100644 --- a/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj +++ b/src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj @@ -36,7 +36,9 @@ <ItemGroup> <!-- For testing whether we can get an image from a localized resource --> <EmbeddedResource Include="Support\Flexible\Core\Messages\lucene-net-icon-32x32.png" /> - <EmbeddedResource Include="Xml\albumBooleanQuery.xsl;Xml\albumFilteredQuery.xsl;Xml\albumLuceneClassicQuery.xsl;Xml\BooleanFilter.xml;Xml\BooleanQuery.xml;Xml\BoostingQuery.xml;Xml\BoostingTermQuery.xml;Xml\CachedFilter.xml;Xml\ConstantScoreQuery.xml;Xml\DisjunctionMaxQuery.xml;Xml\DuplicateFilterQuery.xml;Xml\FuzzyLikeThisQuery.xml;Xml\LikeThisQuery.xml;Xml\MatchAllDocsQuery.xml;Xml\NestedBooleanQuery.xml;Xml\NumericRangeFilterQuery.xml;Xml\NumericRangeQueryQuery.xml;Xml\RangeFilter [...] + <EmbeddedResource Include="**/*.xml" Exclude="bin/**/*;obj/**/*" Label="XML Test Data" /> + <EmbeddedResource Include="**/*.xsl" Exclude="bin/**/*;obj/**/*" Label="XSL Test Data" /> + <EmbeddedResource Include="**/*.txt" Exclude="bin/**/*;obj/**/*" Label="Text Test Data" /> </ItemGroup> <ItemGroup> diff --git a/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj b/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj index a77e208..3d7dddc 100644 --- a/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj +++ b/src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj @@ -28,7 +28,7 @@ </PropertyGroup> <ItemGroup> - <EmbeddedResource Include="Test-Files\cities-Intersects-BBox.txt;Test-Files\Data\countries-bbox.txt;Test-Files\Data\countries-poly.txt;Test-Files\Data\geonames-IE.txt;Test-Files\Data\LUCENE-4464.txt;Test-Files\Data\simple-bbox.txt;Test-Files\Data\states-bbox.txt;Test-Files\Data\states-poly.txt;Test-Files\Data\world-cities-points.txt;Test-Files\simple-Queries-BBox.txt;Test-Files\states-Intersects-BBox.txt;Test-Files\states-IsWithin-BBox.txt" /> + <EmbeddedResource Include="Test-Files\**\*" /> </ItemGroup> <ItemGroup> diff --git a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj index 0c8bc3b..2609630 100644 --- a/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj +++ b/src/dotnet/Lucene.Net.ICU/Lucene.Net.ICU.csproj @@ -51,7 +51,6 @@ <EmbeddedResource Include="..\..\Lucene.Net.Analysis.ICU\Analysis\**\*.nrm" LinkBase="Analysis" /> <EmbeddedResource Include="..\..\Lucene.Net.Analysis.ICU\Analysis\**\*.brk" LinkBase="Analysis" /> <EmbeddedResource Include="..\..\Lucene.Net.Highlighter\PostingsHighlight\**\*.brk" LinkBase="Search\PostingsHighlight" /> - <None Remove="Support\*.brk" /> </ItemGroup> <ItemGroup Label="Documentation"> 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 50d6248..cee02a1 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 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <!-- Licensed to the Apache Software Foundation (ASF) under one @@ -33,15 +33,16 @@ <Compile Include="..\..\Lucene.Net.Tests.Analysis.Common\Analysis\Util\TestCharArrayIterator.cs" Link="Analysis\Util\TestCharArrayIterator.cs" /> <Compile Include="..\..\Lucene.Net.Tests.Analysis.Common\Analysis\Util\TestSegmentingTokenizerBase.cs" Link="Analysis\Util\TestSegmentingTokenizerBase.cs" /> <Compile Include="..\..\Lucene.Net.Tests.Analysis.ICU\Analysis\**\*.cs" LinkBase="Analysis" /> - <EmbeddedResource Include="..\..\Lucene.Net.Tests.Analysis.ICU\Analysis\Icu\Segmentation\*.rbbi" LinkBase="Analysis\Icu\Segmentation" /> <Compile Include="..\..\Lucene.Net.Tests.Analysis.ICU\Collation\**\*.cs" LinkBase="Collation" /> <Compile Include="..\..\Lucene.Net.Tests.Highlighter\PostingsHighlight\**\*.cs" LinkBase="Search\PostingsHighlight" /> - <None Remove="Support\jdksent.brk" /> - <None Remove="Support\jdkword.brk" /> + <Compile Include="..\..\Lucene.Net.Tests.Highlighter\VectorHighlight\BreakIteratorBoundaryScannerTest.cs" Link="Search\VectorHighlight\BreakIteratorBoundaryScannerTest.cs" /> + </ItemGroup> + + <ItemGroup> + <EmbeddedResource Include="..\..\Lucene.Net.Tests.Analysis.ICU\Analysis\Icu\Segmentation\*.rbbi" LinkBase="Analysis\Icu\Segmentation" /> <EmbeddedResource Include="..\..\Lucene.Net.Tests.Highlighter\PostingsHighlight\CambridgeMA.utf8" Link="Search\PostingsHighlight\CambridgeMA.utf8" /> <EmbeddedResource Include="Support\jdksent.brk" /> <EmbeddedResource Include="Support\jdkword.brk" /> - <Compile Include="..\..\Lucene.Net.Tests.Highlighter\VectorHighlight\BreakIteratorBoundaryScannerTest.cs" Link="Search\VectorHighlight\BreakIteratorBoundaryScannerTest.cs" /> </ItemGroup> <ItemGroup>
