You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2021/08/18 22:25:44 UTC

[lucenenet] branch master updated (1cd3943 -> 265ab1b)

This is an automated email from the ASF dual-hosted git repository.

nightowl888 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git.


    from 1cd3943  Merge pull request #517 from rclabo/2021_08_Improved_README_md
     new 58c93bb  SWEEP: Optimized embedded resource references using glob patterns
     new 265ab1b  .github/workflows/Generate-TestWorkflows.ps1: Fixed trigger for GitHub Action paths to include all externally referenced CS and embedded resource files

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/Generate-TestWorkflows.ps1       | 39 ++++++++++++++++++----
 .github/workflows/Lucene-Net-Tests-AllProjects.yml |  1 +
 .../workflows/Lucene-Net-Tests-Analysis-Common.yml |  7 ++++
 .../Lucene-Net-Tests-Analysis-Kuromoji.yml         |  3 ++
 .../Lucene-Net-Tests-Analysis-Morfologik.yml       |  3 ++
 .../Lucene-Net-Tests-Analysis-OpenNLP.yml          |  2 ++
 .../Lucene-Net-Tests-Analysis-Stempel.yml          |  1 +
 .github/workflows/Lucene-Net-Tests-Benchmark.yml   |  3 ++
 .github/workflows/Lucene-Net-Tests-Cli.yml         |  2 ++
 .github/workflows/Lucene-Net-Tests-Demo.yml        |  1 +
 .github/workflows/Lucene-Net-Tests-Highlighter.yml |  1 +
 .github/workflows/Lucene-Net-Tests-ICU.yml         | 11 ++++++
 .github/workflows/Lucene-Net-Tests-Memory.yml      |  1 +
 .github/workflows/Lucene-Net-Tests-QueryParser.yml |  4 +++
 .github/workflows/Lucene-Net-Tests-Sandbox.yml     |  1 +
 .github/workflows/Lucene-Net-Tests-Spatial.yml     |  1 +
 .github/workflows/Lucene-Net-Tests-Suggest.yml     |  1 +
 .../workflows/Lucene-Net-Tests-TestFramework.yml   |  2 ++
 .github/workflows/Lucene-Net-Tests-_A-D.yml        |  5 +++
 .github/workflows/Lucene-Net-Tests-_E-I.yml        | 15 +++++++++
 .github/workflows/Lucene-Net-Tests-_I-J.yml        | 20 +++++++++++
 .github/workflows/Lucene-Net-Tests-_J-S.yml        |  7 ++++
 .github/workflows/Lucene-Net-Tests-_T-Z.yml        |  2 ++
 .../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 +-
 .../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.csproj                    | 11 +++---
 39 files changed, 161 insertions(+), 70 deletions(-)

[lucenenet] 02/02: .github/workflows/Generate-TestWorkflows.ps1: Fixed trigger for GitHub Action paths to include all externally referenced CS and embedded resource files

Posted by ni...@apache.org.
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 265ab1b4450ed4fb2be486aeb76585bfc4f895c9
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Thu Aug 19 05:19:36 2021 +0700

    .github/workflows/Generate-TestWorkflows.ps1: Fixed trigger for GitHub Action paths to include all externally referenced CS and embedded resource files
---
 .github/workflows/Generate-TestWorkflows.ps1       | 39 ++++++++++++++++++----
 .github/workflows/Lucene-Net-Tests-AllProjects.yml |  1 +
 .../workflows/Lucene-Net-Tests-Analysis-Common.yml |  7 ++++
 .../Lucene-Net-Tests-Analysis-Kuromoji.yml         |  3 ++
 .../Lucene-Net-Tests-Analysis-Morfologik.yml       |  3 ++
 .../Lucene-Net-Tests-Analysis-OpenNLP.yml          |  2 ++
 .../Lucene-Net-Tests-Analysis-Stempel.yml          |  1 +
 .github/workflows/Lucene-Net-Tests-Benchmark.yml   |  3 ++
 .github/workflows/Lucene-Net-Tests-Cli.yml         |  2 ++
 .github/workflows/Lucene-Net-Tests-Demo.yml        |  1 +
 .github/workflows/Lucene-Net-Tests-Highlighter.yml |  1 +
 .github/workflows/Lucene-Net-Tests-ICU.yml         | 11 ++++++
 .github/workflows/Lucene-Net-Tests-Memory.yml      |  1 +
 .github/workflows/Lucene-Net-Tests-QueryParser.yml |  4 +++
 .github/workflows/Lucene-Net-Tests-Sandbox.yml     |  1 +
 .github/workflows/Lucene-Net-Tests-Spatial.yml     |  1 +
 .github/workflows/Lucene-Net-Tests-Suggest.yml     |  1 +
 .../workflows/Lucene-Net-Tests-TestFramework.yml   |  2 ++
 .github/workflows/Lucene-Net-Tests-_A-D.yml        |  5 +++
 .github/workflows/Lucene-Net-Tests-_E-I.yml        | 15 +++++++++
 .github/workflows/Lucene-Net-Tests-_I-J.yml        | 20 +++++++++++
 .github/workflows/Lucene-Net-Tests-_J-S.yml        |  7 ++++
 .github/workflows/Lucene-Net-Tests-_T-Z.yml        |  2 ++
 23 files changed, 126 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/Generate-TestWorkflows.ps1 b/.github/workflows/Generate-TestWorkflows.ps1
index aeac403..faafde8 100644
--- a/.github/workflows/Generate-TestWorkflows.ps1
+++ b/.github/workflows/Generate-TestWorkflows.ps1
@@ -1,4 +1,4 @@
-# -----------------------------------------------------------------------------------
+# -----------------------------------------------------------------------------------
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -99,10 +99,7 @@ function Get-ProjectDependencies([string]$ProjectPath, [string]$RelativeRoot, [S
     $resolvedProjectPath = $ProjectPath
     $rootPath = [System.IO.Path]::GetDirectoryName($resolvedProjectPath)
     [xml]$project = Get-Content $resolvedProjectPath
-    foreach ($name in $project.SelectNodes("//Project/ItemGroup/ProjectReference") | ForEach-Object { $_.Include -split ';'}) {
-        #Write-Host "$rootPath"
-        #Write-Host "$name"
-        #Write-Host [System.IO.Path]::Combine($rootPath, $name)
+    foreach ($name in $project.SelectNodes("//Project/ItemGroup/ProjectReference") | Where-Object { $_.Include -notmatch '^$' } | ForEach-Object { $_.Include -split ';'}) {
         $dependencyFullPath = [System.IO.Path]::GetFullPath([System.IO.Path]::Combine($rootPath, $name))
         Get-ProjectDependencies $dependencyFullPath $RelativeRoot $Result
         $dependency = Resolve-RelativePath $RelativeRoot $dependencyFullPath
@@ -110,6 +107,28 @@ function Get-ProjectDependencies([string]$ProjectPath, [string]$RelativeRoot, [S
     }
 }
 
+function Get-ProjectExternalPaths([string]$ProjectPath, [string]$RelativeRoot, [System.Collections.Generic.HashSet[string]]$Result) {
+    $resolvedProjectPath = $ProjectPath
+    $rootPath = [System.IO.Path]::GetDirectoryName($resolvedProjectPath)
+    [xml]$project = Get-Content $resolvedProjectPath
+    foreach ($name in $project.SelectNodes("//Project/ItemGroup/Compile") | Where-Object { $_.Include -notmatch '^$' } | ForEach-Object { $_.Include -split ';'}) {
+        # Temporarily override wildcard patterns so we can resolve the path and then put them back.
+        $name = $name -replace '\\\*\*\\\*', 'Wildcard1' -replace '\*', 'Wildcard2'
+        $dependencyFullPath = [System.IO.Path]::GetFullPath([System.IO.Path]::Combine($rootPath, $name)) -replace 'Wildcard1', '\**\*' -replace 'Wildcard2', '*'
+        # Make the path relative to the repo root.
+        $dependency = $($($dependencyFullPath.Replace($RelativeRoot, '.')) -replace '\\', '/').TrimStart('./')
+        $result.Add($dependency) | Out-Null
+    }
+    foreach ($name in $project.SelectNodes("//Project/ItemGroup/EmbeddedResource") | Where-Object { $_.Include -notmatch '^$' } | ForEach-Object { $_.Include -split ';'}) {
+        # Temporarily override wildcard patterns so we can resolve the path and then put them back.
+        $name = $name -replace '\\\*\*\\\*', 'Wildcard1' -replace '\*', 'Wildcard2'
+        $dependencyFullPath = [System.IO.Path]::GetFullPath([System.IO.Path]::Combine($rootPath, $name)) -replace 'Wildcard1', '\**\*' -replace 'Wildcard2', '*'
+        # Make the path relative to the repo root.
+        $dependency = $($($dependencyFullPath.Replace($RelativeRoot, '.')) -replace '\\', '/').TrimStart('./')
+        $result.Add($dependency) | Out-Null
+    }
+}
+
 function Get-ProjectPathDirectories([string]$ProjectPath, [string]$RelativeRoot, [System.Collections.Generic.HashSet[string]]$Result) {
     $currentPath = New-Object System.IO.DirectoryInfo([System.IO.Path]::GetDirectoryName($ProjectPath))
     $currentRelativePath = Resolve-RelativePath $RelativeRoot $currentPath.FullName
@@ -173,6 +192,13 @@ function Write-TestWorkflow(
         $directoryBuildPaths += "    - '$relativeDirectory'" + [System.Environment]::NewLine
     }
 
+    $paths = New-Object System.Collections.Generic.HashSet[string]
+    Get-ProjectExternalPaths $ProjectPath $RelativeRoot $paths
+
+    foreach ($path in $paths) {
+        $directoryBuildPaths += "    - '$path'" + [System.Environment]::NewLine
+    }
+
     $fileText = "####################################################################################
 # DO NOT EDIT: This file was automatically generated by Generate-TestWorkflows.ps1
 ####################################################################################
@@ -291,8 +317,7 @@ try {
     Pop-Location
 }
 
-
-#Write-TestWorkflow -OutputDirectory $OutputDirectory -ProjectPath $projectPath -RelativeRoot $repoRoot -TestFrameworks @('net5.0','netcoreapp3.1') -TestPlatforms $TestPlatforms
+#Write-TestWorkflow -OutputDirectory $OutputDirectory -ProjectPath $projectPath -RelativeRoot $repoRoot -TestFrameworks @('net5.0','netcoreapp3.1') -OperatingSystems $OperatingSystems -TestPlatforms $TestPlatforms -Configurations $Configurations -DotNet5SDKVersion $DotNet5SDKVersion -DotNetCore3SDKVersion $DotNetCore3SDKVersion -DotNetCore2SDKVersion $DotNetCore2SDKVersion
 
 #Write-Host $TestProjects
 
diff --git a/.github/workflows/Lucene-Net-Tests-AllProjects.yml b/.github/workflows/Lucene-Net-Tests-AllProjects.yml
index b966a2b..182bcc6 100644
--- a/.github/workflows/Lucene-Net-Tests-AllProjects.yml
+++ b/.github/workflows/Lucene-Net-Tests-AllProjects.yml
@@ -32,6 +32,7 @@ on:
     - 'src/Lucene.Net.Tests.AllProjects/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests/Support/ExceptionHandling/**/*.cs'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Common.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Common.yml
index 6d9b140..0ab03f6 100644
--- a/.github/workflows/Lucene-Net-Tests-Analysis-Common.yml
+++ b/.github/workflows/Lucene-Net-Tests-Analysis-Common.yml
@@ -32,6 +32,13 @@ on:
     - 'src/Lucene.Net.Tests.Analysis.Common/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests.Analysis.Common/**/*.dic'
+    - 'src/Lucene.Net.Tests.Analysis.Common/**/*.aff'
+    - 'src/Lucene.Net.Tests.Analysis.Common/**/*.zip'
+    - 'src/Lucene.Net.Tests.Analysis.Common/**/*.txt'
+    - 'src/Lucene.Net.Tests.Analysis.Common/**/*.htm'
+    - 'src/Lucene.Net.Tests.Analysis.Common/**/*.html'
+    - 'src/Lucene.Net.Tests.Analysis.Common/**/*.xml'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml
index 1a77f2d..a7c395c 100644
--- a/.github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml
+++ b/.github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml
@@ -32,6 +32,9 @@ on:
     - 'src/Lucene.Net.Tests.Analysis.Kuromoji/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests.Analysis.Kuromoji/**/*.utf-8'
+    - 'src/Lucene.Net.Tests.Analysis.Kuromoji/**/*.txt'
+    - 'src/Lucene.Net.Tests.Analysis.Kuromoji/**/*.zip'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml
index 59514be..09c7f5b 100644
--- a/.github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml
+++ b/.github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml
@@ -32,6 +32,9 @@ on:
     - 'src/Lucene.Net.Tests.Analysis.Morfologik/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests.Analysis.Morfologik/**/*.dict'
+    - 'src/Lucene.Net.Tests.Analysis.Morfologik/**/*.info'
+    - 'src/Lucene.Net.Tests.Analysis.Morfologik/**/*.input'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml b/.github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml
index 37c6817..18ab605 100644
--- a/.github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml
+++ b/.github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml
@@ -32,6 +32,8 @@ on:
     - 'src/Lucene.Net.Tests.Analysis.OpenNLP/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests.Analysis.OpenNLP/**/*.dict'
+    - 'src/Lucene.Net.Tests.Analysis.OpenNLP/**/*.bin'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml
index 8995e6d..a54884f 100644
--- a/.github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml
+++ b/.github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml
@@ -32,6 +32,7 @@ on:
     - 'src/Lucene.Net.Tests.Analysis.Stempel/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests.Analysis.Stempel/Egothor.Stemmer/testRules.txt'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-Benchmark.yml b/.github/workflows/Lucene-Net-Tests-Benchmark.yml
index d461397..b487ebf 100644
--- a/.github/workflows/Lucene-Net-Tests-Benchmark.yml
+++ b/.github/workflows/Lucene-Net-Tests-Benchmark.yml
@@ -32,6 +32,9 @@ on:
     - 'src/Lucene.Net.Tests.Benchmark/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests.Benchmark/**/*.zip'
+    - 'src/Lucene.Net.Tests.Benchmark/**/*.txt'
+    - 'src/Lucene.Net.Tests.Benchmark/**/*.bz2'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-Cli.yml b/.github/workflows/Lucene-Net-Tests-Cli.yml
index ffa32dc..6fd32e8 100644
--- a/.github/workflows/Lucene-Net-Tests-Cli.yml
+++ b/.github/workflows/Lucene-Net-Tests-Cli.yml
@@ -34,6 +34,8 @@ on:
     - 'src/dotnet/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/dotnet/tools/Lucene.Net.Tests.Cli/Configuration/appsettings.json'
+    - 'src/dotnet/tools/Lucene.Net.Tests.Cli/SourceCode/TestInputForParser.cs'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-Demo.yml b/.github/workflows/Lucene-Net-Tests-Demo.yml
index 85d4609..9a80a1e 100644
--- a/.github/workflows/Lucene-Net-Tests-Demo.yml
+++ b/.github/workflows/Lucene-Net-Tests-Demo.yml
@@ -32,6 +32,7 @@ on:
     - 'src/Lucene.Net.Tests.Demo/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests.Demo/Test-Files/Docs/*'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-Highlighter.yml b/.github/workflows/Lucene-Net-Tests-Highlighter.yml
index 092a2bd..e66f384 100644
--- a/.github/workflows/Lucene-Net-Tests-Highlighter.yml
+++ b/.github/workflows/Lucene-Net-Tests-Highlighter.yml
@@ -32,6 +32,7 @@ on:
     - 'src/Lucene.Net.Tests.Highlighter/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests.Highlighter/PostingsHighlight/CambridgeMA.utf8'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-ICU.yml b/.github/workflows/Lucene-Net-Tests-ICU.yml
index 901a9cc..70c1d17 100644
--- a/.github/workflows/Lucene-Net-Tests-ICU.yml
+++ b/.github/workflows/Lucene-Net-Tests-ICU.yml
@@ -33,6 +33,17 @@ on:
     - 'src/dotnet/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/**/*.cs'
+    - 'src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArrayIterator.cs'
+    - 'src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestSegmentingTokenizerBase.cs'
+    - 'src/Lucene.Net.Tests.Analysis.ICU/Analysis/**/*.cs'
+    - 'src/Lucene.Net.Tests.Analysis.ICU/Collation/**/*.cs'
+    - 'src/Lucene.Net.Tests.Highlighter/PostingsHighlight/**/*.cs'
+    - 'src/Lucene.Net.Tests.Highlighter/VectorHighlight/BreakIteratorBoundaryScannerTest.cs'
+    - 'src/Lucene.Net.Tests.Analysis.ICU/Analysis/Icu/Segmentation/*.rbbi'
+    - 'src/Lucene.Net.Tests.Highlighter/PostingsHighlight/CambridgeMA.utf8'
+    - 'src/dotnet/Lucene.Net.Tests.ICU/Support/jdksent.brk'
+    - 'src/dotnet/Lucene.Net.Tests.ICU/Support/jdkword.brk'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-Memory.yml b/.github/workflows/Lucene-Net-Tests-Memory.yml
index 297dc23..c81ea44 100644
--- a/.github/workflows/Lucene-Net-Tests-Memory.yml
+++ b/.github/workflows/Lucene-Net-Tests-Memory.yml
@@ -32,6 +32,7 @@ on:
     - 'src/Lucene.Net.Tests.Memory/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests.Memory/**/*.txt'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-QueryParser.yml b/.github/workflows/Lucene-Net-Tests-QueryParser.yml
index 63ae0aa..a7af843 100644
--- a/.github/workflows/Lucene-Net-Tests-QueryParser.yml
+++ b/.github/workflows/Lucene-Net-Tests-QueryParser.yml
@@ -32,6 +32,10 @@ on:
     - 'src/Lucene.Net.Tests.QueryParser/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests.QueryParser/Support/Flexible/Core/Messages/lucene-net-icon-32x32.png'
+    - 'src/Lucene.Net.Tests.QueryParser/**/*.xml'
+    - 'src/Lucene.Net.Tests.QueryParser/**/*.xsl'
+    - 'src/Lucene.Net.Tests.QueryParser/**/*.txt'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-Sandbox.yml b/.github/workflows/Lucene-Net-Tests-Sandbox.yml
index f426fbc..190699b 100644
--- a/.github/workflows/Lucene-Net-Tests-Sandbox.yml
+++ b/.github/workflows/Lucene-Net-Tests-Sandbox.yml
@@ -32,6 +32,7 @@ on:
     - 'src/Lucene.Net.Tests.Sandbox/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests.Sandbox/Queries/fuzzyTestData.txt'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-Spatial.yml b/.github/workflows/Lucene-Net-Tests-Spatial.yml
index 3e1791f..89f8521 100644
--- a/.github/workflows/Lucene-Net-Tests-Spatial.yml
+++ b/.github/workflows/Lucene-Net-Tests-Spatial.yml
@@ -32,6 +32,7 @@ on:
     - 'src/Lucene.Net.Tests.Spatial/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests.Spatial/Test-Files/**/*'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-Suggest.yml b/.github/workflows/Lucene-Net-Tests-Suggest.yml
index 64257c7..47b7240 100644
--- a/.github/workflows/Lucene-Net-Tests-Suggest.yml
+++ b/.github/workflows/Lucene-Net-Tests-Suggest.yml
@@ -32,6 +32,7 @@ on:
     - 'src/Lucene.Net.Tests.Suggest/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests.Suggest/Suggest/Top50KWiki.utf8'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-TestFramework.yml b/.github/workflows/Lucene-Net-Tests-TestFramework.yml
index be10f3c..3903649 100644
--- a/.github/workflows/Lucene-Net-Tests-TestFramework.yml
+++ b/.github/workflows/Lucene-Net-Tests-TestFramework.yml
@@ -32,6 +32,8 @@ on:
     - 'src/Lucene.Net.Tests.TestFramework/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests.TestFramework/Configuration/lucene.testsettings.mock.json'
+    - 'src/Lucene.Net.Tests.TestFramework/Configuration/parent.lucene.testsettings.mock.json'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-_A-D.yml b/.github/workflows/Lucene-Net-Tests-_A-D.yml
index abb53e4..a3c0a02 100644
--- a/.github/workflows/Lucene-Net-Tests-_A-D.yml
+++ b/.github/workflows/Lucene-Net-Tests-_A-D.yml
@@ -32,6 +32,11 @@ on:
     - 'src/Lucene.Net.Tests._A-D/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests/Properties/AssemblyInfo.cs'
+    - 'src/Lucene.Net.Tests/*.cs'
+    - 'src/Lucene.Net.Tests/Analysis/**/*.cs'
+    - 'src/Lucene.Net.Tests/Codecs/**/*.cs'
+    - 'src/Lucene.Net.Tests/Document/**/*.cs'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-_E-I.yml b/.github/workflows/Lucene-Net-Tests-_E-I.yml
index 93dfe95..ae8780d 100644
--- a/.github/workflows/Lucene-Net-Tests-_E-I.yml
+++ b/.github/workflows/Lucene-Net-Tests-_E-I.yml
@@ -32,6 +32,21 @@ on:
     - 'src/Lucene.Net.Tests._E-I/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests/Properties/AssemblyInfo.cs'
+    - 'src/Lucene.Net.Tests/Index/BinaryTokenStream.cs'
+    - 'src/Lucene.Net.Tests/Index/Test2*.cs'
+    - 'src/Lucene.Net.Tests/Index/Test4*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestA*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestB*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestC*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestD*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestE*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestF*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestG*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestH*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestI*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestJ*.cs'
+    - 'src/Lucene.Net.Tests/Index/*.zip'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-_I-J.yml b/.github/workflows/Lucene-Net-Tests-_I-J.yml
index 661d2c7..8be71ec 100644
--- a/.github/workflows/Lucene-Net-Tests-_I-J.yml
+++ b/.github/workflows/Lucene-Net-Tests-_I-J.yml
@@ -32,6 +32,26 @@ on:
     - 'src/Lucene.Net.Tests._I-J/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests/Properties/AssemblyInfo.cs'
+    - 'src/Lucene.Net.Tests/Index/TestBinaryDocValuesUpdates.cs'
+    - 'src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs'
+    - 'src/Lucene.Net.Tests/Index/TestIndexWriter.cs'
+    - 'src/Lucene.Net.Tests/Index/TestK*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestL*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestM*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestN*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestO*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestP*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestQ*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestR*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestS*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestT*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestU*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestV*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestW*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestX*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestY*.cs'
+    - 'src/Lucene.Net.Tests/Index/TestZ*.cs'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-_J-S.yml b/.github/workflows/Lucene-Net-Tests-_J-S.yml
index 1fad742..d67cbf0 100644
--- a/.github/workflows/Lucene-Net-Tests-_J-S.yml
+++ b/.github/workflows/Lucene-Net-Tests-_J-S.yml
@@ -32,6 +32,13 @@ on:
     - 'src/Lucene.Net.Tests._J-S/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests/Properties/AssemblyInfo.cs'
+    - 'src/Lucene.Net.Tests/Index/TestIndexWriterReader.cs'
+    - 'src/Lucene.Net.Tests/Search/**/*.cs'
+    - 'src/Lucene.Net.Tests/Store/**/*.cs'
+    - 'src/Lucene.Net.Tests/Support/**/*.cs'
+    - 'src/Lucene.Net.Tests/Util/TestNumericUtils.cs'
+    - 'src/Lucene.Net.Tests/Store/LUCENENET521.zip'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
diff --git a/.github/workflows/Lucene-Net-Tests-_T-Z.yml b/.github/workflows/Lucene-Net-Tests-_T-Z.yml
index 1841b4b..984770d 100644
--- a/.github/workflows/Lucene-Net-Tests-_T-Z.yml
+++ b/.github/workflows/Lucene-Net-Tests-_T-Z.yml
@@ -32,6 +32,8 @@ on:
     - 'src/Lucene.Net.Tests._T-Z/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests/Properties/AssemblyInfo.cs'
+    - 'src/Lucene.Net.Tests/Util/**/*.cs'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'

[lucenenet] 01/02: SWEEP: Optimized embedded resource references using glob patterns

Posted by ni...@apache.org.
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 <sh...@shadstorhaug.com>
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>