Skip to content

Commit

Permalink
SWEEP: Upgraded .NET Standard 2.0 test target from net461 to net472. …
Browse files Browse the repository at this point in the history
…Apparently NUnit3TestAdapter 4.5.0 doesn't support net461.
  • Loading branch information
NightOwl888 committed Apr 30, 2024
1 parent 170c60d commit a1b3c5d
Show file tree
Hide file tree
Showing 50 changed files with 132 additions and 131 deletions.
2 changes: 1 addition & 1 deletion .build/dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<SystemRuntimeInteropServicesRuntimeInformationPackageVersion>4.3.0</SystemRuntimeInteropServicesRuntimeInformationPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>6.0.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>4.3.0</SystemTextEncodingCodePagesPackageVersion>
<SystemTextEncodingCodePagesPackageVersion Condition=" '$(TargetFramework)' == 'net461' ">5.0.0</SystemTextEncodingCodePagesPackageVersion>
<SystemTextEncodingCodePagesPackageVersion Condition=" '$(TargetFramework)' == 'net472' ">5.0.0</SystemTextEncodingCodePagesPackageVersion>
<SystemTextJsonPackageVersion>6.0.6</SystemTextJsonPackageVersion>
<TimeZoneConverterPackageVersion>6.1.0</TimeZoneConverterPackageVersion>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Generate-TestWorkflows.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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'),

Expand Down Expand Up @@ -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'"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Lucene-Net-Tests-AllProjects.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Lucene-Net-Tests-Analysis-Common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Lucene-Net-Tests-Analysis-Phonetic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Lucene-Net-Tests-Analysis-SmartCn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Lucene-Net-Tests-Benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Lucene-Net-Tests-Classification.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Lucene-Net-Tests-Cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/Lucene-Net-Tests-CodeAnalysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Lucene-Net-Tests-Codecs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Lucene-Net-Tests-Demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Lucene-Net-Tests-Expressions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Lucene-Net-Tests-Facet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Lucene-Net-Tests-Grouping.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Loading

0 comments on commit a1b3c5d

Please sign in to comment.