From a1b3c5dc52ea5e98ac2a83ccf4d7a4b881278189 Mon Sep 17 00:00:00 2001 From: Shad Storhaug Date: Tue, 30 Apr 2024 17:45:50 +0700 Subject: [PATCH] SWEEP: Upgraded .NET Standard 2.0 test target from net461 to net472. Apparently NUnit3TestAdapter 4.5.0 doesn't support net461. --- .build/dependencies.props | 2 +- .github/workflows/Generate-TestWorkflows.ps1 | 6 +++--- .../Lucene - Backup-Net-Tests-Analysis-OpenNLP.yml | 4 ++-- .github/workflows/Lucene-Net-Tests-AllProjects.yml | 6 +++--- .../workflows/Lucene-Net-Tests-Analysis-Common.yml | 6 +++--- .../Lucene-Net-Tests-Analysis-Kuromoji.yml | 6 +++--- .../Lucene-Net-Tests-Analysis-Morfologik.yml | 6 +++--- .../Lucene-Net-Tests-Analysis-OpenNLP.yml | 4 ++-- .../Lucene-Net-Tests-Analysis-Phonetic.yml | 6 +++--- .../Lucene-Net-Tests-Analysis-SmartCn.yml | 6 +++--- .../Lucene-Net-Tests-Analysis-Stempel.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-Benchmark.yml | 6 +++--- .../workflows/Lucene-Net-Tests-Classification.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-Cli.yml | 4 ++-- .../workflows/Lucene-Net-Tests-CodeAnalysis.yml | 4 ++-- .github/workflows/Lucene-Net-Tests-Codecs.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-Demo.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-Expressions.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-Facet.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-Grouping.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-Highlighter.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-ICU.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-Join.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-Memory.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-Misc.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-Queries.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-QueryParser.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-Replicator.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-Sandbox.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-Spatial.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-Suggest.yml | 6 +++--- ...Net-Tests-TestFramework-DependencyInjection.yml | 6 +++--- .../workflows/Lucene-Net-Tests-TestFramework.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-_A-D.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-_E-I.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-_I-J.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-_J-S.yml | 6 +++--- .github/workflows/Lucene-Net-Tests-_T-Z.yml | 6 +++--- Directory.Build.targets | 4 ++-- TestTargetFramework.props | 8 ++++---- azure-pipelines.yml | 14 +++++++------- .../Lucene.Net.Tests.Analysis.Common.csproj | 2 +- .../Lucene.Net.Tests.Analysis.Kuromoji.csproj | 2 +- .../Lucene.Net.Tests.Analysis.OpenNLP.csproj | 5 +++-- .../Lucene.Net.Tests.Analysis.SmartCn.csproj | 2 +- .../Lucene.Net.Tests.Benchmark.csproj | 2 +- .../Lucene.Net.Tests._J-S.csproj | 2 +- .../Lucene.Net.Tests._T-Z.csproj | 2 +- .../Lucene.Net.Replicator.AspNetCore.csproj | 2 +- .../Lucene.Net.Tests.ICU.csproj | 2 +- 50 files changed, 132 insertions(+), 131 deletions(-) diff --git a/.build/dependencies.props b/.build/dependencies.props index 0c25d5729e..091543206e 100644 --- a/.build/dependencies.props +++ b/.build/dependencies.props @@ -81,7 +81,7 @@ 4.3.0 6.0.1 4.3.0 - 5.0.0 + 5.0.0 6.0.6 6.1.0 diff --git a/.github/workflows/Generate-TestWorkflows.ps1 b/.github/workflows/Generate-TestWorkflows.ps1 index 64c12acae2..6d3bdf64fd 100644 --- a/.github/workflows/Generate-TestWorkflows.ps1 +++ b/.github/workflows/Generate-TestWorkflows.ps1 @@ -68,7 +68,7 @@ param( [string]$RepoRoot = (Split-Path (Split-Path $PSScriptRoot)), - [string[]]$TestFrameworks = @('net8.0', 'net5.0','net461','net48'), # targets under test: net6.0, netstandard2.1, netstanard2.0, net462 + [string[]]$TestFrameworks = @('net8.0', 'net5.0','net472','net48'), # targets under test: net6.0, netstandard2.1, netstanard2.0, net462 [string[]]$OperatingSystems = @('windows-latest', 'ubuntu-latest'), @@ -251,11 +251,11 @@ jobs: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: '$projectRelativePath'" diff --git a/.github/workflows/Lucene - Backup-Net-Tests-Analysis-OpenNLP.yml b/.github/workflows/Lucene - Backup-Net-Tests-Analysis-OpenNLP.yml index 51eb4ffd0b..e414578071 100644 --- a/.github/workflows/Lucene - Backup-Net-Tests-Analysis-OpenNLP.yml +++ b/.github/workflows/Lucene - Backup-Net-Tests-Analysis-OpenNLP.yml @@ -63,11 +63,11 @@ jobs: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Analysis.OpenNLP/Lucene - Backup.Net.Tests.Analysis.OpenNLP.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-AllProjects.yml b/.github/workflows/Lucene-Net-Tests-AllProjects.yml index a75c33f53f..63c6780863 100644 --- a/.github/workflows/Lucene-Net-Tests-AllProjects.yml +++ b/.github/workflows/Lucene-Net-Tests-AllProjects.yml @@ -72,18 +72,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.AllProjects/Lucene.Net.Tests.AllProjects.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Common.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Common.yml index 22cbf16fec..696e3e3fe7 100644 --- a/.github/workflows/Lucene-Net-Tests-Analysis-Common.yml +++ b/.github/workflows/Lucene-Net-Tests-Analysis-Common.yml @@ -56,18 +56,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml index b059207c72..f496463591 100644 --- a/.github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml +++ b/.github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml @@ -53,18 +53,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Analysis.Kuromoji/Lucene.Net.Tests.Analysis.Kuromoji.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml index ddafa6852a..9d15552a41 100644 --- a/.github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml +++ b/.github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml @@ -53,18 +53,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Analysis.Morfologik/Lucene.Net.Tests.Analysis.Morfologik.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml b/.github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml index e8f0617e01..e05c686501 100644 --- a/.github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml +++ b/.github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml @@ -63,11 +63,11 @@ jobs: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Analysis.OpenNLP/Lucene.Net.Tests.Analysis.OpenNLP.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Phonetic.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Phonetic.yml index acec3a345d..b4d206efb8 100644 --- a/.github/workflows/Lucene-Net-Tests-Analysis-Phonetic.yml +++ b/.github/workflows/Lucene-Net-Tests-Analysis-Phonetic.yml @@ -50,18 +50,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Analysis.Phonetic/Lucene.Net.Tests.Analysis.Phonetic.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-SmartCn.yml b/.github/workflows/Lucene-Net-Tests-Analysis-SmartCn.yml index e28ce5f3be..91f289e032 100644 --- a/.github/workflows/Lucene-Net-Tests-Analysis-SmartCn.yml +++ b/.github/workflows/Lucene-Net-Tests-Analysis-SmartCn.yml @@ -54,18 +54,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml index f2abe2e6df..30830529b1 100644 --- a/.github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml +++ b/.github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml @@ -51,18 +51,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Analysis.Stempel/Lucene.Net.Tests.Analysis.Stempel.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Benchmark.yml b/.github/workflows/Lucene-Net-Tests-Benchmark.yml index 5aa33e2cfb..196e9dde79 100644 --- a/.github/workflows/Lucene-Net-Tests-Benchmark.yml +++ b/.github/workflows/Lucene-Net-Tests-Benchmark.yml @@ -63,18 +63,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Classification.yml b/.github/workflows/Lucene-Net-Tests-Classification.yml index 2d432006af..babf81d9ff 100644 --- a/.github/workflows/Lucene-Net-Tests-Classification.yml +++ b/.github/workflows/Lucene-Net-Tests-Classification.yml @@ -51,18 +51,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Classification/Lucene.Net.Tests.Classification.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Cli.yml b/.github/workflows/Lucene-Net-Tests-Cli.yml index 3f82b73144..3bb4dd59b6 100644 --- a/.github/workflows/Lucene-Net-Tests-Cli.yml +++ b/.github/workflows/Lucene-Net-Tests-Cli.yml @@ -77,11 +77,11 @@ jobs: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj' project_under_test_path: './src/dotnet/tools/lucene-cli/lucene-cli.csproj' diff --git a/.github/workflows/Lucene-Net-Tests-CodeAnalysis.yml b/.github/workflows/Lucene-Net-Tests-CodeAnalysis.yml index 821e7ef425..886a49b90d 100644 --- a/.github/workflows/Lucene-Net-Tests-CodeAnalysis.yml +++ b/.github/workflows/Lucene-Net-Tests-CodeAnalysis.yml @@ -56,11 +56,11 @@ jobs: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/dotnet/Lucene.Net.Tests.CodeAnalysis/Lucene.Net.Tests.CodeAnalysis.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Codecs.yml b/.github/workflows/Lucene-Net-Tests-Codecs.yml index b9cd99e23b..1d00f94f1f 100644 --- a/.github/workflows/Lucene-Net-Tests-Codecs.yml +++ b/.github/workflows/Lucene-Net-Tests-Codecs.yml @@ -49,18 +49,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Codecs/Lucene.Net.Tests.Codecs.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Demo.yml b/.github/workflows/Lucene-Net-Tests-Demo.yml index c34659f8f5..7cf76b9ebd 100644 --- a/.github/workflows/Lucene-Net-Tests-Demo.yml +++ b/.github/workflows/Lucene-Net-Tests-Demo.yml @@ -58,18 +58,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Demo/Lucene.Net.Tests.Demo.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Expressions.yml b/.github/workflows/Lucene-Net-Tests-Expressions.yml index 4821700c09..b35efd4ccf 100644 --- a/.github/workflows/Lucene-Net-Tests-Expressions.yml +++ b/.github/workflows/Lucene-Net-Tests-Expressions.yml @@ -51,18 +51,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Expressions/Lucene.Net.Tests.Expressions.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Facet.yml b/.github/workflows/Lucene-Net-Tests-Facet.yml index d1cd95e113..3fdb6b2be7 100644 --- a/.github/workflows/Lucene-Net-Tests-Facet.yml +++ b/.github/workflows/Lucene-Net-Tests-Facet.yml @@ -53,18 +53,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Facet/Lucene.Net.Tests.Facet.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Grouping.yml b/.github/workflows/Lucene-Net-Tests-Grouping.yml index 29cfa0098e..02d5bfed6b 100644 --- a/.github/workflows/Lucene-Net-Tests-Grouping.yml +++ b/.github/workflows/Lucene-Net-Tests-Grouping.yml @@ -51,18 +51,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Grouping/Lucene.Net.Tests.Grouping.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Highlighter.yml b/.github/workflows/Lucene-Net-Tests-Highlighter.yml index 90abcb78b1..b28f01fee5 100644 --- a/.github/workflows/Lucene-Net-Tests-Highlighter.yml +++ b/.github/workflows/Lucene-Net-Tests-Highlighter.yml @@ -53,18 +53,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Highlighter/Lucene.Net.Tests.Highlighter.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-ICU.yml b/.github/workflows/Lucene-Net-Tests-ICU.yml index 297f243147..81d1bffff5 100644 --- a/.github/workflows/Lucene-Net-Tests-ICU.yml +++ b/.github/workflows/Lucene-Net-Tests-ICU.yml @@ -66,18 +66,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/dotnet/Lucene.Net.Tests.ICU/Lucene.Net.Tests.ICU.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Join.yml b/.github/workflows/Lucene-Net-Tests-Join.yml index 2ef3c5abf1..494294b135 100644 --- a/.github/workflows/Lucene-Net-Tests-Join.yml +++ b/.github/workflows/Lucene-Net-Tests-Join.yml @@ -52,18 +52,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Join/Lucene.Net.Tests.Join.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Memory.yml b/.github/workflows/Lucene-Net-Tests-Memory.yml index 5167bc3575..6f8bf21de9 100644 --- a/.github/workflows/Lucene-Net-Tests-Memory.yml +++ b/.github/workflows/Lucene-Net-Tests-Memory.yml @@ -54,18 +54,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Memory/Lucene.Net.Tests.Memory.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Misc.yml b/.github/workflows/Lucene-Net-Tests-Misc.yml index d804bc795b..ba0ac9796a 100644 --- a/.github/workflows/Lucene-Net-Tests-Misc.yml +++ b/.github/workflows/Lucene-Net-Tests-Misc.yml @@ -50,18 +50,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Misc/Lucene.Net.Tests.Misc.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Queries.yml b/.github/workflows/Lucene-Net-Tests-Queries.yml index c34a1cb197..e0e98a11c7 100644 --- a/.github/workflows/Lucene-Net-Tests-Queries.yml +++ b/.github/workflows/Lucene-Net-Tests-Queries.yml @@ -50,18 +50,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-QueryParser.yml b/.github/workflows/Lucene-Net-Tests-QueryParser.yml index f56c8ab1e9..7e63026fb7 100644 --- a/.github/workflows/Lucene-Net-Tests-QueryParser.yml +++ b/.github/workflows/Lucene-Net-Tests-QueryParser.yml @@ -56,18 +56,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.QueryParser/Lucene.Net.Tests.QueryParser.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Replicator.yml b/.github/workflows/Lucene-Net-Tests-Replicator.yml index e613b5ae23..849a20bfd2 100644 --- a/.github/workflows/Lucene-Net-Tests-Replicator.yml +++ b/.github/workflows/Lucene-Net-Tests-Replicator.yml @@ -55,18 +55,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Replicator/Lucene.Net.Tests.Replicator.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Sandbox.yml b/.github/workflows/Lucene-Net-Tests-Sandbox.yml index b4571a0fd2..434fd5c3e5 100644 --- a/.github/workflows/Lucene-Net-Tests-Sandbox.yml +++ b/.github/workflows/Lucene-Net-Tests-Sandbox.yml @@ -51,18 +51,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Sandbox/Lucene.Net.Tests.Sandbox.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Spatial.yml b/.github/workflows/Lucene-Net-Tests-Spatial.yml index 51b90a028d..be51aac267 100644 --- a/.github/workflows/Lucene-Net-Tests-Spatial.yml +++ b/.github/workflows/Lucene-Net-Tests-Spatial.yml @@ -52,18 +52,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Spatial/Lucene.Net.Tests.Spatial.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-Suggest.yml b/.github/workflows/Lucene-Net-Tests-Suggest.yml index f4decc1ed0..2483301516 100644 --- a/.github/workflows/Lucene-Net-Tests-Suggest.yml +++ b/.github/workflows/Lucene-Net-Tests-Suggest.yml @@ -53,18 +53,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.Suggest/Lucene.Net.Tests.Suggest.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-TestFramework-DependencyInjection.yml b/.github/workflows/Lucene-Net-Tests-TestFramework-DependencyInjection.yml index 1cb70bdd17..eeda1abd12 100644 --- a/.github/workflows/Lucene-Net-Tests-TestFramework-DependencyInjection.yml +++ b/.github/workflows/Lucene-Net-Tests-TestFramework-DependencyInjection.yml @@ -49,18 +49,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.TestFramework.DependencyInjection/Lucene.Net.Tests.TestFramework.DependencyInjection.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-TestFramework.yml b/.github/workflows/Lucene-Net-Tests-TestFramework.yml index dc653ee48d..b9be141b8e 100644 --- a/.github/workflows/Lucene-Net-Tests-TestFramework.yml +++ b/.github/workflows/Lucene-Net-Tests-TestFramework.yml @@ -51,18 +51,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests.TestFramework/Lucene.Net.Tests.TestFramework.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-_A-D.yml b/.github/workflows/Lucene-Net-Tests-_A-D.yml index 16536f7ee9..f647a03377 100644 --- a/.github/workflows/Lucene-Net-Tests-_A-D.yml +++ b/.github/workflows/Lucene-Net-Tests-_A-D.yml @@ -60,18 +60,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests._A-D/Lucene.Net.Tests._A-D.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-_E-I.yml b/.github/workflows/Lucene-Net-Tests-_E-I.yml index a3607c46e6..7ee39f46e4 100644 --- a/.github/workflows/Lucene-Net-Tests-_E-I.yml +++ b/.github/workflows/Lucene-Net-Tests-_E-I.yml @@ -70,18 +70,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests._E-I/Lucene.Net.Tests._E-I.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-_I-J.yml b/.github/workflows/Lucene-Net-Tests-_I-J.yml index e5f8e8647f..0e92f32d0c 100644 --- a/.github/workflows/Lucene-Net-Tests-_I-J.yml +++ b/.github/workflows/Lucene-Net-Tests-_I-J.yml @@ -75,18 +75,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests._I-J/Lucene.Net.Tests._I-J.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-_J-S.yml b/.github/workflows/Lucene-Net-Tests-_J-S.yml index c3e3d28e72..d2684149b0 100644 --- a/.github/workflows/Lucene-Net-Tests-_J-S.yml +++ b/.github/workflows/Lucene-Net-Tests-_J-S.yml @@ -62,18 +62,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests._J-S/Lucene.Net.Tests._J-S.csproj' run_slow_tests: 'false' diff --git a/.github/workflows/Lucene-Net-Tests-_T-Z.yml b/.github/workflows/Lucene-Net-Tests-_T-Z.yml index 2c245aeaf0..e3229466d1 100644 --- a/.github/workflows/Lucene-Net-Tests-_T-Z.yml +++ b/.github/workflows/Lucene-Net-Tests-_T-Z.yml @@ -57,18 +57,18 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net8.0, net5.0, net48, net461] + framework: [net8.0, net5.0, net48, net472] platform: [x64] configuration: [Release] exclude: - os: ubuntu-latest framework: net48 - os: ubuntu-latest - framework: net461 + framework: net472 - os: macos-latest framework: net48 - os: macos-latest - framework: net461 + framework: net472 env: project_path: './src/Lucene.Net.Tests._T-Z/Lucene.Net.Tests._T-Z.csproj' run_slow_tests: 'false' diff --git a/Directory.Build.targets b/Directory.Build.targets index c0b906ecc4..2e25939523 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -136,8 +136,8 @@ - - + + $(DefineConstants);FEATURE_OPENNLP diff --git a/TestTargetFramework.props b/TestTargetFramework.props index 3b863803db..023e64dc36 100644 --- a/TestTargetFramework.props +++ b/TestTargetFramework.props @@ -26,7 +26,7 @@ - + @@ -42,17 +42,17 @@ net6.0 | net6.0 net5.0 | netstandard2.1 net48 | net462 - net461 | netstandard2.0 + net472 | netstandard2.0 --> net8.0;net6.0;net5.0 - $(TargetFrameworks);net48;net461 + $(TargetFrameworks);net48;net472 - TargetFramework=netstandard2.0 + TargetFramework=netstandard2.0 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 074e8861e0..28ad38afa8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -253,7 +253,7 @@ stages: - template: '.build/azure-templates/publish-test-binaries.yml' parameters: publishDirectory: $(PublishTempDirectory) - framework: 'net461' + framework: 'net472' binaryArtifactName: '$(BinaryArtifactName)' testSettingsFilePath: '$(Build.ArtifactStagingDirectory)/$(TestSettingsFileName)' @@ -505,7 +505,7 @@ stages: maximumAllowedFailures: $(maximumAllowedFailures) dotNetSdkVersion: '$(DotNetSDKVersion)' - - job: Test_net461_x64 + - job: Test_net472_x64 condition: and(succeeded(), ne(variables['RunTests'], 'false')) strategy: matrix: @@ -514,14 +514,14 @@ stages: imageName: 'windows-2019' maximumParallelJobs: 8 maximumAllowedFailures: 0 # Maximum allowed failures for a successful build - displayName: 'Test net461,x64 on' + displayName: 'Test net472,x64 on' pool: vmImage: $(imageName) steps: - template: '.build/azure-templates/run-tests-on-os.yml' parameters: osName: $(osName) - framework: 'net461' + framework: 'net472' vsTestPlatform: 'x64' testBinariesArtifactName: '$(TestBinariesArtifactName)' nugetArtifactName: '$(NuGetArtifactName)' @@ -530,7 +530,7 @@ stages: maximumAllowedFailures: $(maximumAllowedFailures) dotNetSdkVersion: '$(DotNetSDKVersion)' - - job: Test_net461_x86 # Only run Nightly or if explicitly enabled with RunX86Tests + - job: Test_net472_x86 # Only run Nightly or if explicitly enabled with RunX86Tests condition: and(succeeded(), ne(variables['RunTests'], 'false'), or(eq(variables['IsNightly'], 'true'), eq(variables['RunX86Tests'], 'true'))) strategy: matrix: @@ -539,14 +539,14 @@ stages: imageName: 'windows-2019' maximumParallelJobs: 8 maximumAllowedFailures: 0 # Maximum allowed failures for a successful build - displayName: 'Test net461,x86 on' + displayName: 'Test net472,x86 on' pool: vmImage: $(imageName) steps: - template: '.build/azure-templates/run-tests-on-os.yml' parameters: osName: $(osName) - framework: 'net461' + framework: 'net472' vsTestPlatform: 'x86' testBinariesArtifactName: '$(TestBinariesArtifactName)' nugetArtifactName: '$(NuGetArtifactName)' 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 7e9dc8f820..189bb7e168 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 @@ -61,7 +61,7 @@ - + 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 671c0424a8..77e03862da 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 @@ -53,7 +53,7 @@ - + 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 d68830caeb..1ebe908be9 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 @@ -32,13 +32,14 @@ Lucene.Net.Analysis.OpenNlp - + + false false net8.0 - net48 + net48 diff --git a/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj b/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj index 0a455525ff..79d6f9a7ae 100644 --- a/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj +++ b/src/Lucene.Net.Tests.Analysis.SmartCn/Lucene.Net.Tests.Analysis.SmartCn.csproj @@ -63,7 +63,7 @@ - + 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 3763508ed4..afca29a4b9 100644 --- a/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj +++ b/src/Lucene.Net.Tests.Benchmark/Lucene.Net.Tests.Benchmark.csproj @@ -91,7 +91,7 @@ - + diff --git a/src/Lucene.Net.Tests._J-S/Lucene.Net.Tests._J-S.csproj b/src/Lucene.Net.Tests._J-S/Lucene.Net.Tests._J-S.csproj index 581118541d..22b6666d5b 100644 --- a/src/Lucene.Net.Tests._J-S/Lucene.Net.Tests._J-S.csproj +++ b/src/Lucene.Net.Tests._J-S/Lucene.Net.Tests._J-S.csproj @@ -77,7 +77,7 @@ - + diff --git a/src/Lucene.Net.Tests._T-Z/Lucene.Net.Tests._T-Z.csproj b/src/Lucene.Net.Tests._T-Z/Lucene.Net.Tests._T-Z.csproj index b52b2e0613..8075f02e80 100644 --- a/src/Lucene.Net.Tests._T-Z/Lucene.Net.Tests._T-Z.csproj +++ b/src/Lucene.Net.Tests._T-Z/Lucene.Net.Tests._T-Z.csproj @@ -77,7 +77,7 @@ - + diff --git a/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj b/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj index 17fd672a46..946defd1e3 100644 --- a/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj +++ b/src/dotnet/Lucene.Net.Replicator.AspNetCore/Lucene.Net.Replicator.AspNetCore.csproj @@ -25,7 +25,7 @@ - net6.0;netstandard2.1;netstandard2.0;net461 + net6.0;netstandard2.1;netstandard2.0;net462 Lucene.Net.Replicator.AspNetCore AspNetCore integration of Lucene.Net.Replicator for the Lucene.Net full-text search engine library from The Apache Software Foundation. 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 14d951cdf0..94873e7db8 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 @@ -88,7 +88,7 @@ - +