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 69fc48ebd0372302d6d359cb6715e63779770e90 Author: Shad Storhaug <[email protected]> AuthorDate: Sat Sep 25 00:31:01 2021 +0700 SWEEP: Added tests for net6.0 --- .github/workflows/Generate-TestWorkflows.ps1 | 17 +++-- .github/workflows/Lucene-Net-Tests-AllProjects.yml | 8 ++- .../workflows/Lucene-Net-Tests-Analysis-Common.yml | 8 ++- .../Lucene-Net-Tests-Analysis-Kuromoji.yml | 8 ++- .../Lucene-Net-Tests-Analysis-Morfologik.yml | 8 ++- .../Lucene-Net-Tests-Analysis-OpenNLP.yml | 6 ++ .../Lucene-Net-Tests-Analysis-Phonetic.yml | 8 ++- .../Lucene-Net-Tests-Analysis-SmartCn.yml | 8 ++- .../Lucene-Net-Tests-Analysis-Stempel.yml | 8 ++- .github/workflows/Lucene-Net-Tests-Benchmark.yml | 8 ++- .../workflows/Lucene-Net-Tests-Classification.yml | 8 ++- .github/workflows/Lucene-Net-Tests-Cli.yml | 6 ++ .../workflows/Lucene-Net-Tests-CodeAnalysis.yml | 6 ++ .github/workflows/Lucene-Net-Tests-Codecs.yml | 8 ++- .github/workflows/Lucene-Net-Tests-Demo.yml | 10 ++- .github/workflows/Lucene-Net-Tests-Expressions.yml | 12 +++- .github/workflows/Lucene-Net-Tests-Facet.yml | 12 +++- .github/workflows/Lucene-Net-Tests-Grouping.yml | 12 +++- .github/workflows/Lucene-Net-Tests-Highlighter.yml | 12 +++- .github/workflows/Lucene-Net-Tests-ICU.yml | 12 +++- .github/workflows/Lucene-Net-Tests-Join.yml | 12 +++- .github/workflows/Lucene-Net-Tests-Memory.yml | 12 +++- .github/workflows/Lucene-Net-Tests-Misc.yml | 10 ++- .github/workflows/Lucene-Net-Tests-Queries.yml | 10 ++- .github/workflows/Lucene-Net-Tests-QueryParser.yml | 10 ++- .github/workflows/Lucene-Net-Tests-Replicator.yml | 12 +++- .github/workflows/Lucene-Net-Tests-Sandbox.yml | 10 ++- .github/workflows/Lucene-Net-Tests-Spatial.yml | 12 +++- .github/workflows/Lucene-Net-Tests-Suggest.yml | 12 +++- ...Net-Tests-TestFramework-DependencyInjection.yml | 8 ++- .../workflows/Lucene-Net-Tests-TestFramework.yml | 8 ++- .github/workflows/Lucene-Net-Tests-_A-D.yml | 10 ++- .github/workflows/Lucene-Net-Tests-_E-I.yml | 10 ++- .github/workflows/Lucene-Net-Tests-_I-J.yml | 10 ++- .github/workflows/Lucene-Net-Tests-_J-S.yml | 10 ++- .github/workflows/Lucene-Net-Tests-_T-Z.yml | 10 ++- Directory.Build.targets | 20 +++--- TestTargetFramework.props | 3 +- azure-pipelines.yml | 80 +++++++++++++++++++++- build/azure-templates/run-tests-on-os.yml | 7 ++ build/build.ps1 | 4 +- 41 files changed, 384 insertions(+), 81 deletions(-) diff --git a/.github/workflows/Generate-TestWorkflows.ps1 b/.github/workflows/Generate-TestWorkflows.ps1 index df44360..3efb378 100644 --- a/.github/workflows/Generate-TestWorkflows.ps1 +++ b/.github/workflows/Generate-TestWorkflows.ps1 @@ -38,7 +38,7 @@ .PARAMETER TestFrameworks A string array of Dotnet target framework monikers to run the tests on. The default is - @('net5.0','net461','net48'). + @('net6.0', 'net5.0','net461','net48'). .PARAMETER OperatingSystems A string array of Github Actions operating system monikers to run the tests on. @@ -65,7 +65,7 @@ param( [string]$RepoRoot = (Split-Path (Split-Path $PSScriptRoot)), - [string[]]$TestFrameworks = @('net5.0','net461','net48'), # targets under test: netstanrd2.1, netstanard2.0, net45 + [string[]]$TestFrameworks = @('net6.0', 'net5.0','net461','net48'), # targets under test: net6.0, netstandard2.1, netstanard2.0, net45 [string[]]$OperatingSystems = @('windows-latest', 'ubuntu-latest'), @@ -73,6 +73,8 @@ param( [string[]]$Configurations = @('Release'), + [string]$DotNet6SDKVersion = '6.0.100-rc.1.21463.6', + [string]$DotNet5SDKVersion = '5.0.400', [string]$DotNetCore3SDKVersion = '3.1.412' @@ -155,6 +157,7 @@ function Write-TestWorkflow( [string[]]$TestFrameworks = @('net5.0', 'net48'), [string[]]$TestPlatforms = @('x64'), [string[]]$OperatingSystems = @('windows-latest', 'ubuntu-latest', 'macos-latest'), + [string]$DotNet6SDKVersion = $DotNet6SDKVersion, [string]$DotNet5SDKVersion = $DotNet5SDKVersion, [string]$DotNetCore3SDKVersion = $DotNetCore3SDKVersion) { @@ -263,6 +266,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '$DotNet5SDKVersion' + if: `${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '$DotNet6SDKVersion' - run: | `$project_name = [System.IO.Path]::GetFileNameWithoutExtension(`$env:project_path) @@ -307,7 +316,7 @@ try { Pop-Location } -#Write-TestWorkflow -OutputDirectory $OutputDirectory -ProjectPath $projectPath -RelativeRoot $repoRoot -TestFrameworks @('net5.0','netcoreapp3.1') -OperatingSystems $OperatingSystems -TestPlatforms $TestPlatforms -Configurations $Configurations -DotNet5SDKVersion $DotNet5SDKVersion -DotNetCore3SDKVersion $DotNetCore3SDKVersion +#Write-TestWorkflow -OutputDirectory $OutputDirectory -ProjectPath $projectPath -RelativeRoot $repoRoot -TestFrameworks @('net5.0','netcoreapp3.1') -OperatingSystems $OperatingSystems -TestPlatforms $TestPlatforms -Configurations $Configurations -DotNet6SDKVersion $DotNet6SDKVersion -DotNet5SDKVersion $DotNet5SDKVersion -DotNetCore3SDKVersion $DotNetCore3SDKVersion #Write-Host $TestProjects @@ -331,5 +340,5 @@ foreach ($testProject in $TestProjects) { } #Write-Host "Project: $projectName" - Write-TestWorkflow -OutputDirectory $OutputDirectory -ProjectPath $testProject -RelativeRoot $RepoRoot -TestFrameworks $frameworks -OperatingSystems $OperatingSystems -TestPlatforms $TestPlatforms -Configurations $Configurations -DotNet5SDKVersion $DotNet5SDKVersion -DotNetCore3SDKVersion $DotNetCore3SDKVersion + Write-TestWorkflow -OutputDirectory $OutputDirectory -ProjectPath $testProject -RelativeRoot $RepoRoot -TestFrameworks $frameworks -OperatingSystems $OperatingSystems -TestPlatforms $TestPlatforms -Configurations $Configurations -DotNet6SDKVersion $DotNet6SDKVersion -DotNet5SDKVersion $DotNet5SDKVersion -DotNetCore3SDKVersion $DotNetCore3SDKVersion } \ No newline at end of file diff --git a/.github/workflows/Lucene-Net-Tests-AllProjects.yml b/.github/workflows/Lucene-Net-Tests-AllProjects.yml index 4bce2a0..0f97f64 100644 --- a/.github/workflows/Lucene-Net-Tests-AllProjects.yml +++ b/.github/workflows/Lucene-Net-Tests-AllProjects.yml @@ -72,7 +72,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -102,6 +102,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Common.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Common.yml index 206bf71..450191a 100644 --- a/.github/workflows/Lucene-Net-Tests-Analysis-Common.yml +++ b/.github/workflows/Lucene-Net-Tests-Analysis-Common.yml @@ -56,7 +56,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -86,6 +86,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml index 3e65046..c3e698b 100644 --- a/.github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml +++ b/.github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml @@ -53,7 +53,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -83,6 +83,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml index 2ff1bb5..d91f265 100644 --- a/.github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml +++ b/.github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml @@ -53,7 +53,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -83,6 +83,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml b/.github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml index 1f6210b..aea383e 100644 --- a/.github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml +++ b/.github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml @@ -86,6 +86,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Phonetic.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Phonetic.yml index 2fba3cf..595d977 100644 --- a/.github/workflows/Lucene-Net-Tests-Analysis-Phonetic.yml +++ b/.github/workflows/Lucene-Net-Tests-Analysis-Phonetic.yml @@ -50,7 +50,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -80,6 +80,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-SmartCn.yml b/.github/workflows/Lucene-Net-Tests-Analysis-SmartCn.yml index 1a447a3..b153a47 100644 --- a/.github/workflows/Lucene-Net-Tests-Analysis-SmartCn.yml +++ b/.github/workflows/Lucene-Net-Tests-Analysis-SmartCn.yml @@ -54,7 +54,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -84,6 +84,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml b/.github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml index a36c32b..2bbe813 100644 --- a/.github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml +++ b/.github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml @@ -51,7 +51,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -81,6 +81,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Benchmark.yml b/.github/workflows/Lucene-Net-Tests-Benchmark.yml index 783e4fa..563106c 100644 --- a/.github/workflows/Lucene-Net-Tests-Benchmark.yml +++ b/.github/workflows/Lucene-Net-Tests-Benchmark.yml @@ -63,7 +63,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -93,6 +93,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Classification.yml b/.github/workflows/Lucene-Net-Tests-Classification.yml index d2653ff..ba9d164 100644 --- a/.github/workflows/Lucene-Net-Tests-Classification.yml +++ b/.github/workflows/Lucene-Net-Tests-Classification.yml @@ -51,7 +51,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -81,6 +81,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Cli.yml b/.github/workflows/Lucene-Net-Tests-Cli.yml index 5b466f7..722010b 100644 --- a/.github/workflows/Lucene-Net-Tests-Cli.yml +++ b/.github/workflows/Lucene-Net-Tests-Cli.yml @@ -100,6 +100,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-CodeAnalysis.yml b/.github/workflows/Lucene-Net-Tests-CodeAnalysis.yml index 1ff21a9..731c5be 100644 --- a/.github/workflows/Lucene-Net-Tests-CodeAnalysis.yml +++ b/.github/workflows/Lucene-Net-Tests-CodeAnalysis.yml @@ -79,6 +79,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Codecs.yml b/.github/workflows/Lucene-Net-Tests-Codecs.yml index 742ea70..9941f67 100644 --- a/.github/workflows/Lucene-Net-Tests-Codecs.yml +++ b/.github/workflows/Lucene-Net-Tests-Codecs.yml @@ -49,7 +49,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -79,6 +79,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Demo.yml b/.github/workflows/Lucene-Net-Tests-Demo.yml index 309b905..ebc2850 100644 --- a/.github/workflows/Lucene-Net-Tests-Demo.yml +++ b/.github/workflows/Lucene-Net-Tests-Demo.yml @@ -37,6 +37,7 @@ on: # Dependencies - 'src/Lucene.Net/**/*' - 'src/Lucene.Net.Analysis.Common/**/*' + - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.Queries/**/*' - 'src/Lucene.Net.Expressions/**/*' - 'src/Lucene.Net.Grouping/**/*' @@ -45,7 +46,6 @@ on: - 'src/Lucene.Net.Sandbox/**/*' - 'src/Lucene.Net.QueryParser/**/*' - 'src/Lucene.Net.Demo/**/*' - - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.TestFramework/**/*' - '!**/*.md' @@ -58,7 +58,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -88,6 +88,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Expressions.yml b/.github/workflows/Lucene-Net-Tests-Expressions.yml index 59070e4..4556796 100644 --- a/.github/workflows/Lucene-Net-Tests-Expressions.yml +++ b/.github/workflows/Lucene-Net-Tests-Expressions.yml @@ -35,10 +35,10 @@ on: # Dependencies - 'src/Lucene.Net/**/*' - - 'src/Lucene.Net.Queries/**/*' - - 'src/Lucene.Net.Expressions/**/*' - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.Codecs/**/*' + - 'src/Lucene.Net.Queries/**/*' + - 'src/Lucene.Net.Expressions/**/*' - 'src/Lucene.Net.TestFramework/**/*' - '!**/*.md' @@ -51,7 +51,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -81,6 +81,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Facet.yml b/.github/workflows/Lucene-Net-Tests-Facet.yml index ed1f5ad..845b253 100644 --- a/.github/workflows/Lucene-Net-Tests-Facet.yml +++ b/.github/workflows/Lucene-Net-Tests-Facet.yml @@ -35,12 +35,12 @@ on: # Dependencies - 'src/Lucene.Net/**/*' + - 'src/Lucene.Net.Analysis.Common/**/*' + - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.Queries/**/*' - 'src/Lucene.Net.Grouping/**/*' - 'src/Lucene.Net.Join/**/*' - 'src/Lucene.Net.Facet/**/*' - - 'src/Lucene.Net.Analysis.Common/**/*' - - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.TestFramework/**/*' - '!**/*.md' @@ -53,7 +53,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -83,6 +83,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Grouping.yml b/.github/workflows/Lucene-Net-Tests-Grouping.yml index 6bff3c9..3a1082e 100644 --- a/.github/workflows/Lucene-Net-Tests-Grouping.yml +++ b/.github/workflows/Lucene-Net-Tests-Grouping.yml @@ -35,10 +35,10 @@ on: # Dependencies - 'src/Lucene.Net/**/*' - - 'src/Lucene.Net.Queries/**/*' - - 'src/Lucene.Net.Grouping/**/*' - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.Codecs/**/*' + - 'src/Lucene.Net.Queries/**/*' + - 'src/Lucene.Net.Grouping/**/*' - 'src/Lucene.Net.TestFramework/**/*' - '!**/*.md' @@ -51,7 +51,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -81,6 +81,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Highlighter.yml b/.github/workflows/Lucene-Net-Tests-Highlighter.yml index 43a9f1b..0f7f47b 100644 --- a/.github/workflows/Lucene-Net-Tests-Highlighter.yml +++ b/.github/workflows/Lucene-Net-Tests-Highlighter.yml @@ -36,11 +36,11 @@ on: # Dependencies - 'src/Lucene.Net/**/*' + - 'src/Lucene.Net.Analysis.Common/**/*' + - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.Memory/**/*' - 'src/Lucene.Net.Queries/**/*' - 'src/Lucene.Net.Highlighter/**/*' - - 'src/Lucene.Net.Analysis.Common/**/*' - - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.TestFramework/**/*' - '!**/*.md' @@ -53,7 +53,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -83,6 +83,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-ICU.yml b/.github/workflows/Lucene-Net-Tests-ICU.yml index b9836b1..1289ebb 100644 --- a/.github/workflows/Lucene-Net-Tests-ICU.yml +++ b/.github/workflows/Lucene-Net-Tests-ICU.yml @@ -36,6 +36,7 @@ on: - '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.Common/Analysis/Util/BaseTokenStreamFactoryTestCase.cs' - 'src/Lucene.Net.Tests.Analysis.ICU/Analysis/**/*.cs' - 'src/Lucene.Net.Tests.Analysis.ICU/Collation/**/*.cs' - 'src/Lucene.Net.Tests.Highlighter/PostingsHighlight/**/*.cs' @@ -48,13 +49,12 @@ on: # Dependencies - 'src/Lucene.Net/**/*' - 'src/Lucene.Net.Analysis.Common/**/*' + - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.Memory/**/*' - 'src/Lucene.Net.Queries/**/*' - 'src/Lucene.Net.Highlighter/**/*' - 'src/dotnet/Lucene.Net.ICU/**/*' - - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.TestFramework/**/*' - - 'src/Lucene.Net.Tests.Analysis.Common/**/*' - '!**/*.md' @@ -66,7 +66,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -96,6 +96,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Join.yml b/.github/workflows/Lucene-Net-Tests-Join.yml index 1f4cfb8..b74c40f 100644 --- a/.github/workflows/Lucene-Net-Tests-Join.yml +++ b/.github/workflows/Lucene-Net-Tests-Join.yml @@ -35,11 +35,11 @@ on: # Dependencies - 'src/Lucene.Net/**/*' + - 'src/Lucene.Net.Analysis.Common/**/*' + - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.Queries/**/*' - 'src/Lucene.Net.Grouping/**/*' - 'src/Lucene.Net.Join/**/*' - - 'src/Lucene.Net.Analysis.Common/**/*' - - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.TestFramework/**/*' - '!**/*.md' @@ -52,7 +52,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -82,6 +82,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Memory.yml b/.github/workflows/Lucene-Net-Tests-Memory.yml index 9fc87fc..90d64b2 100644 --- a/.github/workflows/Lucene-Net-Tests-Memory.yml +++ b/.github/workflows/Lucene-Net-Tests-Memory.yml @@ -36,12 +36,12 @@ on: # Dependencies - 'src/Lucene.Net/**/*' - - 'src/Lucene.Net.Memory/**/*' - 'src/Lucene.Net.Analysis.Common/**/*' + - 'src/Lucene.Net.Codecs/**/*' + - 'src/Lucene.Net.Memory/**/*' - 'src/Lucene.Net.Queries/**/*' - 'src/Lucene.Net.Sandbox/**/*' - 'src/Lucene.Net.QueryParser/**/*' - - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.TestFramework/**/*' - '!**/*.md' @@ -54,7 +54,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -84,6 +84,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Misc.yml b/.github/workflows/Lucene-Net-Tests-Misc.yml index a87942c..b99fe3f 100644 --- a/.github/workflows/Lucene-Net-Tests-Misc.yml +++ b/.github/workflows/Lucene-Net-Tests-Misc.yml @@ -35,9 +35,9 @@ on: # Dependencies - 'src/Lucene.Net/**/*' - - 'src/Lucene.Net.Misc/**/*' - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.Codecs/**/*' + - 'src/Lucene.Net.Misc/**/*' - 'src/Lucene.Net.TestFramework/**/*' - '!**/*.md' @@ -50,7 +50,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -80,6 +80,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Queries.yml b/.github/workflows/Lucene-Net-Tests-Queries.yml index 97ddb9d..9ac7737 100644 --- a/.github/workflows/Lucene-Net-Tests-Queries.yml +++ b/.github/workflows/Lucene-Net-Tests-Queries.yml @@ -35,9 +35,9 @@ on: # Dependencies - 'src/Lucene.Net/**/*' - - 'src/Lucene.Net.Queries/**/*' - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.Codecs/**/*' + - 'src/Lucene.Net.Queries/**/*' - 'src/Lucene.Net.TestFramework/**/*' - '!**/*.md' @@ -50,7 +50,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -80,6 +80,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-QueryParser.yml b/.github/workflows/Lucene-Net-Tests-QueryParser.yml index 24447a8..7d1614b 100644 --- a/.github/workflows/Lucene-Net-Tests-QueryParser.yml +++ b/.github/workflows/Lucene-Net-Tests-QueryParser.yml @@ -39,11 +39,11 @@ on: # Dependencies - 'src/Lucene.Net/**/*' + - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.Queries/**/*' - 'src/Lucene.Net.Sandbox/**/*' - 'src/Lucene.Net.QueryParser/**/*' - - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.TestFramework/**/*' - '!**/*.md' @@ -56,7 +56,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -86,6 +86,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Replicator.yml b/.github/workflows/Lucene-Net-Tests-Replicator.yml index 15085bf..f12abcf 100644 --- a/.github/workflows/Lucene-Net-Tests-Replicator.yml +++ b/.github/workflows/Lucene-Net-Tests-Replicator.yml @@ -35,14 +35,14 @@ on: # Dependencies - 'src/Lucene.Net/**/*' + - 'src/Lucene.Net.Analysis.Common/**/*' + - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.Queries/**/*' - 'src/Lucene.Net.Grouping/**/*' - 'src/Lucene.Net.Join/**/*' - 'src/Lucene.Net.Facet/**/*' - 'src/Lucene.Net.Replicator/**/*' - 'src/dotnet/Lucene.Net.Replicator.AspNetCore/**/*' - - 'src/Lucene.Net.Analysis.Common/**/*' - - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.TestFramework/**/*' - '!**/*.md' @@ -55,7 +55,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -85,6 +85,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Sandbox.yml b/.github/workflows/Lucene-Net-Tests-Sandbox.yml index a00a9af..89dce7c 100644 --- a/.github/workflows/Lucene-Net-Tests-Sandbox.yml +++ b/.github/workflows/Lucene-Net-Tests-Sandbox.yml @@ -36,9 +36,9 @@ on: # Dependencies - 'src/Lucene.Net/**/*' + - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.Sandbox/**/*' - - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.TestFramework/**/*' - '!**/*.md' @@ -51,7 +51,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -81,6 +81,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Spatial.yml b/.github/workflows/Lucene-Net-Tests-Spatial.yml index 4538a60..8b862e3 100644 --- a/.github/workflows/Lucene-Net-Tests-Spatial.yml +++ b/.github/workflows/Lucene-Net-Tests-Spatial.yml @@ -36,10 +36,10 @@ on: # Dependencies - 'src/Lucene.Net/**/*' - - 'src/Lucene.Net.Queries/**/*' - - 'src/Lucene.Net.Spatial/**/*' - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.Codecs/**/*' + - 'src/Lucene.Net.Queries/**/*' + - 'src/Lucene.Net.Spatial/**/*' - 'src/Lucene.Net.TestFramework/**/*' - '!**/*.md' @@ -52,7 +52,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -82,6 +82,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-Suggest.yml b/.github/workflows/Lucene-Net-Tests-Suggest.yml index 43b01ae..08a80ec 100644 --- a/.github/workflows/Lucene-Net-Tests-Suggest.yml +++ b/.github/workflows/Lucene-Net-Tests-Suggest.yml @@ -37,10 +37,10 @@ on: # Dependencies - 'src/Lucene.Net/**/*' - 'src/Lucene.Net.Analysis.Common/**/*' - - 'src/Lucene.Net.Queries/**/*' + - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.Misc/**/*' + - 'src/Lucene.Net.Queries/**/*' - 'src/Lucene.Net.Suggest/**/*' - - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.TestFramework/**/*' - '!**/*.md' @@ -53,7 +53,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -83,6 +83,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-TestFramework-DependencyInjection.yml b/.github/workflows/Lucene-Net-Tests-TestFramework-DependencyInjection.yml index 2effe4d..65679cd 100644 --- a/.github/workflows/Lucene-Net-Tests-TestFramework-DependencyInjection.yml +++ b/.github/workflows/Lucene-Net-Tests-TestFramework-DependencyInjection.yml @@ -49,7 +49,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -79,6 +79,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-TestFramework.yml b/.github/workflows/Lucene-Net-Tests-TestFramework.yml index 56da0f0..02b7913 100644 --- a/.github/workflows/Lucene-Net-Tests-TestFramework.yml +++ b/.github/workflows/Lucene-Net-Tests-TestFramework.yml @@ -51,7 +51,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -81,6 +81,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-_A-D.yml b/.github/workflows/Lucene-Net-Tests-_A-D.yml index ed3de18..69205e3 100644 --- a/.github/workflows/Lucene-Net-Tests-_A-D.yml +++ b/.github/workflows/Lucene-Net-Tests-_A-D.yml @@ -40,12 +40,12 @@ on: # Dependencies - 'src/Lucene.Net/**/*' + - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.Queries/**/*' - 'src/Lucene.Net.Grouping/**/*' - 'src/Lucene.Net.Join/**/*' - 'src/Lucene.Net.Facet/**/*' - - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.Sandbox/**/*' - 'src/Lucene.Net.QueryParser/**/*' - 'src/Lucene.Net.TestFramework/**/*' @@ -60,7 +60,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -90,6 +90,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-_E-I.yml b/.github/workflows/Lucene-Net-Tests-_E-I.yml index 658e9fc..3096a4e 100644 --- a/.github/workflows/Lucene-Net-Tests-_E-I.yml +++ b/.github/workflows/Lucene-Net-Tests-_E-I.yml @@ -50,12 +50,12 @@ on: # Dependencies - 'src/Lucene.Net/**/*' + - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.Queries/**/*' - 'src/Lucene.Net.Grouping/**/*' - 'src/Lucene.Net.Join/**/*' - 'src/Lucene.Net.Facet/**/*' - - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.Sandbox/**/*' - 'src/Lucene.Net.QueryParser/**/*' - 'src/Lucene.Net.TestFramework/**/*' @@ -70,7 +70,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -100,6 +100,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-_I-J.yml b/.github/workflows/Lucene-Net-Tests-_I-J.yml index ad9bce4..45af465 100644 --- a/.github/workflows/Lucene-Net-Tests-_I-J.yml +++ b/.github/workflows/Lucene-Net-Tests-_I-J.yml @@ -55,12 +55,12 @@ on: # Dependencies - 'src/Lucene.Net/**/*' + - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.Queries/**/*' - 'src/Lucene.Net.Grouping/**/*' - 'src/Lucene.Net.Join/**/*' - 'src/Lucene.Net.Facet/**/*' - - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.Sandbox/**/*' - 'src/Lucene.Net.QueryParser/**/*' - 'src/Lucene.Net.TestFramework/**/*' @@ -75,7 +75,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -105,6 +105,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-_J-S.yml b/.github/workflows/Lucene-Net-Tests-_J-S.yml index 49f6aa8..717932f 100644 --- a/.github/workflows/Lucene-Net-Tests-_J-S.yml +++ b/.github/workflows/Lucene-Net-Tests-_J-S.yml @@ -42,12 +42,12 @@ on: # Dependencies - 'src/Lucene.Net/**/*' + - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.Queries/**/*' - 'src/Lucene.Net.Grouping/**/*' - 'src/Lucene.Net.Join/**/*' - 'src/Lucene.Net.Facet/**/*' - - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.Sandbox/**/*' - 'src/Lucene.Net.QueryParser/**/*' - 'src/Lucene.Net.TestFramework/**/*' @@ -62,7 +62,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -92,6 +92,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/.github/workflows/Lucene-Net-Tests-_T-Z.yml b/.github/workflows/Lucene-Net-Tests-_T-Z.yml index 2cc13fb..259fcd3 100644 --- a/.github/workflows/Lucene-Net-Tests-_T-Z.yml +++ b/.github/workflows/Lucene-Net-Tests-_T-Z.yml @@ -37,12 +37,12 @@ on: # Dependencies - 'src/Lucene.Net/**/*' + - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.Codecs/**/*' - 'src/Lucene.Net.Queries/**/*' - 'src/Lucene.Net.Grouping/**/*' - 'src/Lucene.Net.Join/**/*' - 'src/Lucene.Net.Facet/**/*' - - 'src/Lucene.Net.Analysis.Common/**/*' - 'src/Lucene.Net.Sandbox/**/*' - 'src/Lucene.Net.QueryParser/**/*' - 'src/Lucene.Net.TestFramework/**/*' @@ -57,7 +57,7 @@ jobs: fail-fast: false matrix: os: [windows-latest, ubuntu-latest] - framework: [net5.0, net461, net48] + framework: [net6.0, net5.0, net461, net48] platform: [x64] configuration: [Release] exclude: @@ -87,6 +87,12 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: '5.0.400' + if: ${{ startswith(matrix.framework, 'net5.') }} + + - name: Setup .NET 6 SDK + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '6.0.100-rc.1.21463.6' - run: | $project_name = [System.IO.Path]::GetFileNameWithoutExtension($env:project_path) diff --git a/Directory.Build.targets b/Directory.Build.targets index 0a9bad4..186c314 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -20,16 +20,16 @@ --> <Project> - <!-- Features in .NET Core 3.x and .NET 5.x only --> - <PropertyGroup Condition=" $(TargetFramework.StartsWith('netcoreapp3.')) Or $(TargetFramework.StartsWith('net5.')) "> + <!-- Features in .NET Core 3.x, .NET 5.x, and .NET 6.x only --> + <PropertyGroup Condition=" $(TargetFramework.StartsWith('netcoreapp3.')) Or $(TargetFramework.StartsWith('net5.')) Or '$(TargetFramework)' == 'net6.0' "> <DefineConstants>$(DefineConstants);FEATURE_ARGITERATOR</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_DICTIONARY_REMOVE_CONTINUEENUMERATION</DefineConstants> </PropertyGroup> - <!-- Features in .NET Standard, .NET Core, and .NET 5 only (no .NET Framework support) --> - <PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard')) Or $(TargetFramework.StartsWith('netcoreapp')) Or '$(TargetFramework)' == 'net5.0' "> + <!-- Features in .NET Standard, .NET Core, .NET 5.x, and .NET 6.x only (no .NET Framework support) --> + <PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard')) Or $(TargetFramework.StartsWith('netcoreapp')) Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0' "> <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_ARRAYEMPTY</DefineConstants> @@ -39,8 +39,8 @@ <DebugType>portable</DebugType> </PropertyGroup> - <!-- Features in .NET Standard 2.1 only --> - <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' Or $(TargetFramework.StartsWith('netcoreapp3.')) Or '$(TargetFramework)' == 'net5.0' "> + <!-- Features in .NET Standard 2.1, .NET 5.x, and .NET 6.x only --> + <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' Or $(TargetFramework.StartsWith('netcoreapp3.')) Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0' "> <DefineConstants>$(DefineConstants);FEATURE_CONDITIONALWEAKTABLE_ENUMERATOR</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_CONDITIONALWEAKTABLE_ADDORUPDATE</DefineConstants> @@ -48,15 +48,15 @@ </PropertyGroup> - <!-- Features in .NET Standard 2.x, .NET Core 2.x, .NET Core 3.x, and .NET 5 --> - <PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard2.')) Or $(TargetFramework.StartsWith('netcoreapp2.')) Or $(TargetFramework.StartsWith('netcoreapp3.')) Or '$(TargetFramework)' == 'net5.0' "> + <!-- Features in .NET Standard 2.x, .NET Core 2.x, .NET Core 3.x, .NET 5.x, and .NET 6.x --> + <PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard2.')) Or $(TargetFramework.StartsWith('netcoreapp2.')) Or $(TargetFramework.StartsWith('netcoreapp3.')) Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0' "> <DefineConstants>$(DefineConstants);FEATURE_ICONFIGURATIONROOT_PROVIDERS</DefineConstants> </PropertyGroup> - <!-- Features in .NET Framework 4.5+, .NET Standard 2.x, .NET Core 2.x, .NET Core 3.x, and .NET 5 --> - <PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) Or $(TargetFramework.StartsWith('netstandard2.')) Or $(TargetFramework.StartsWith('netcoreapp2.')) Or $(TargetFramework.StartsWith('netcoreapp3.')) Or '$(TargetFramework)' == 'net5.0' "> + <!-- Features in .NET Framework 4.5+, .NET Standard 2.x, .NET Core 2.x, .NET Core 3.x, .NET 5.x, and .NET 6.x --> + <PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) Or $(TargetFramework.StartsWith('netstandard2.')) Or $(TargetFramework.StartsWith('netcoreapp2.')) Or $(TargetFramework.StartsWith('netcoreapp3.')) Or '$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0' "> <DefineConstants>$(DefineConstants);FEATURE_APPDOMAIN_BASEDIRECTORY</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_APPDOMAIN_GETASSEMBLIES</DefineConstants> diff --git a/TestTargetFramework.props b/TestTargetFramework.props index 10b3b47..88c4d5d 100644 --- a/TestTargetFramework.props +++ b/TestTargetFramework.props @@ -30,11 +30,12 @@ <!--<TargetFramework>net48</TargetFramework>--> <!--<TargetFramework>netcoreapp3.1</TargetFramework>--> <TargetFramework>net5.0</TargetFramework> + <!--<TargetFramework>net6.0</TargetFramework>--> <!-- Allow the build script to pass in the test frameworks to build for. This overrides the above TargetFramework setting. LUCENENET TODO: Due to a parsing bug, we cannot pass a string with a ; to dotnet msbuild, so passing true as a workaround --> - <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' ">net5.0;netcoreapp3.1</TargetFrameworks> + <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' ">net6.0;net5.0;netcoreapp3.1</TargetFrameworks> <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' AND $([MSBuild]::IsOsPlatform('Windows')) ">$(TargetFrameworks);net48;net461</TargetFrameworks> <TargetFramework Condition=" '$(TargetFrameworks)' != '' "></TargetFramework> </PropertyGroup> diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4d18c79..16468f6 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -121,9 +121,10 @@ stages: displayName: 'Setup Default Variable Values' - task: UseDotNet@2 - displayName: 'Use .NET Core sdk 5.0.400' + displayName: 'Use .NET Core sdk 6.0.100-rc.1' inputs: - version: 5.0.400 + packageType: 'sdk' + version: '6.0.100-rc.1.21463.6' - pwsh: | Import-Module "$(BuildDirectory)/psake.psm1" @@ -236,6 +237,13 @@ stages: - template: 'build/azure-templates/publish-test-binaries.yml' parameters: publishDirectory: $(PublishTempDirectory) + framework: 'net6.0' + binaryArtifactName: '$(BinaryArtifactName)' + testSettingsFilePath: '$(Build.ArtifactStagingDirectory)/$(TestSettingsFileName)' + + - template: 'build/azure-templates/publish-test-binaries.yml' + parameters: + publishDirectory: $(PublishTempDirectory) framework: 'net5.0' binaryArtifactName: '$(BinaryArtifactName)' testSettingsFilePath: '$(Build.ArtifactStagingDirectory)/$(TestSettingsFileName)' @@ -318,6 +326,74 @@ stages: displayName: 'Test Stage:' jobs: + - job: Test_net6_0_x64 + condition: and(succeeded(), ne(variables['RunTests'], 'false')) + strategy: + matrix: + Windows: + osName: 'Windows' + imageName: 'windows-2019' + maximumParallelJobs: 8 + maximumAllowedFailures: 4 # Maximum allowed failures for a successful build + Linux: + osName: 'Linux' + imageName: 'ubuntu-latest' + maximumParallelJobs: 7 + maximumAllowedFailures: 4 # Maximum allowed failures for a successful build + macOS: + osName: 'macOS' + imageName: 'macOS-latest' + maximumParallelJobs: 7 + maximumAllowedFailures: 4 # Maximum allowed failures for a successful build + displayName: 'Test net6.0,x64 on' + pool: + vmImage: $(imageName) + steps: + - template: 'build/azure-templates/run-tests-on-os.yml' + parameters: + osName: $(osName) + framework: 'net6.0' + vsTestPlatform: 'x64' + testBinariesArtifactName: '$(TestBinariesArtifactName)' + nugetArtifactName: '$(NuGetArtifactName)' + testResultsArtifactName: '$(TestResultsArtifactName)' + maximumParallelJobs: $(maximumParallelJobs) + maximumAllowedFailures: $(maximumAllowedFailures) + + - job: Test_net6_0_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: + Windows: + osName: 'Windows' + imageName: 'windows-2019' + maximumParallelJobs: 8 + maximumAllowedFailures: 4 # Maximum allowed failures for a successful build + Linux: + osName: 'Linux' + imageName: 'ubuntu-latest' + maximumParallelJobs: 7 + maximumAllowedFailures: 4 # Maximum allowed failures for a successful build + macOS: + osName: 'macOS' + imageName: 'macOS-latest' + maximumParallelJobs: 7 + maximumAllowedFailures: 4 # Maximum allowed failures for a successful build + displayName: 'Test net6.0,x86 on' + pool: + vmImage: $(imageName) + steps: + - template: 'build/azure-templates/run-tests-on-os.yml' + parameters: + osName: $(osName) + framework: 'net6.0' + vsTestPlatform: 'x86' + testBinariesArtifactName: '$(TestBinariesArtifactName)' + nugetArtifactName: '$(NuGetArtifactName)' + testResultsArtifactName: '$(TestResultsArtifactName)' + maximumParallelJobs: $(maximumParallelJobs) + maximumAllowedFailures: $(maximumAllowedFailures) + - job: Test_net5_0_x64 condition: and(succeeded(), ne(variables['RunTests'], 'false')) strategy: diff --git a/build/azure-templates/run-tests-on-os.yml b/build/azure-templates/run-tests-on-os.yml index d578ab0..2436432 100644 --- a/build/azure-templates/run-tests-on-os.yml +++ b/build/azure-templates/run-tests-on-os.yml @@ -83,6 +83,13 @@ steps: displayName: 'Use .NET sdk 5.0.400' inputs: version: 5.0.400 + condition: and(succeeded(), contains('${{ parameters.framework }}', 'net5.')) + +- task: UseDotNet@2 + displayName: 'Use .NET Core sdk 6.0.100-rc.1' + inputs: + packageType: 'sdk' + version: '6.0.100-rc.1.21463.6' #- template: 'show-all-files.yml' # Uncomment for debugging - pwsh: | diff --git a/build/build.ps1 b/build/build.ps1 index 52ea7a3..123172e 100644 --- a/build/build.ps1 +++ b/build/build.ps1 @@ -27,7 +27,7 @@ properties { [string]$publish_directory = "$release_directory/Publish" [string]$solutionFile = "$base_directory/Lucene.Net.sln" [string]$sdkPath = "$env:programfiles/dotnet/sdk" - [string]$sdkVersion = "5.0.400" + [string]$sdkVersion = "6.0.100-rc.1.21463.6" [bool]$skipSdkInstallation = $false [string]$globalJsonFile = "$base_directory/global.json" [string]$versionPropsFile = "$base_directory/Version.props" @@ -49,7 +49,7 @@ properties { [int]$maximumParalellJobs = 8 #test paramters - [string]$frameworks_to_test = "net5.0,netcoreapp3.1,net48,net461" + [string]$frameworks_to_test = "net6.0,net5.0,netcoreapp3.1,net48,net461" [string]$where = "" }
