Skip to content

Commit 9bb1c29

Browse files
committed
Remove net9.0 tests
1 parent 67c22bc commit 9bb1c29

6 files changed

Lines changed: 6 additions & 100 deletions

File tree

.build/azure-templates/run-tests-on-os.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -107,31 +107,6 @@ steps:
107107
displayName: 'Use .NET SDK ${{ parameters.dotNetSdkVersion }} (x86)'
108108
condition: and(succeeded(), contains('${{ parameters.framework }}', 'net10.'), eq('${{ parameters.vsTestPlatform }}', 'x86'))
109109

110-
- task: UseDotNet@2
111-
displayName: 'Use .NET SDK 9.0.308'
112-
inputs:
113-
packageType: 'sdk'
114-
version: '9.0.308'
115-
performMultiLevelLookup: '${{ variables.PerformMultiLevelLookup }}'
116-
condition: and(succeeded(), contains('${{ parameters.framework }}', 'net8.'))
117-
118-
# Hack: .NET 8+ no longer installs the x86 bits and they must be installed separately. However, it is not
119-
# trivial to get it into the path and to get it to pass the minimum SDK version check in runbuild.ps1.
120-
# So, we install it afterward and set the environment variable so the above SDK can delegate to it.
121-
# This code only works on Windows.
122-
- pwsh: |
123-
$sdkVersion = '9.0.308'
124-
$architecture = '${{ parameters.vsTestPlatform }}'
125-
$installScriptPath = "${env:AGENT_TEMPDIRECTORY}/dotnet-install.ps1"
126-
$installScriptUrl = "https://raw.githubusercontent.com/dotnet/install-scripts/main/src/dotnet-install.ps1"
127-
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
128-
Invoke-WebRequest $installScriptUrl -OutFile $installScriptPath -TimeoutSec 60
129-
$installPath = "${env:ProgramFiles(x86)}/dotnet"
130-
& $installScriptPath -Version $sdkVersion -Architecture $architecture -InstallDir $installPath
131-
Write-Host "##vso[task.setvariable variable=DOTNET_ROOT_X86;]$installPath"
132-
displayName: 'Use .NET SDK 9.0.308 (x86)'
133-
condition: and(succeeded(), contains('${{ parameters.framework }}', 'net9.'), eq('${{ parameters.vsTestPlatform }}', 'x86'))
134-
135110
- task: UseDotNet@2
136111
displayName: 'Use .NET SDK 8.0.404'
137112
inputs:

Directory.Build.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<PublishDir Condition="'$(AlternatePublishRootDirectory)' != ''">$(AlternatePublishRootDirectory)/$(TargetFramework)/$(MSBuildProjectName)/</PublishDir>
3939
</PropertyGroup>
4040

41-
<!-- Features in .NET 9.x only -->
42-
<PropertyGroup Condition=" $(TargetFramework.StartsWith('net9.')) ">
41+
<!-- Features in .NET 9.x+ only -->
42+
<PropertyGroup Condition=" $(TargetFramework.StartsWith('net9.')) Or $(TargetFramework.StartsWith('net10.')) ">
4343

4444
<DefineConstants>$(DefineConstants);FEATURE_STREAM_READEXACTLY</DefineConstants>
4545

TestTargetFramework.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737

3838
<!-- Test Client to DLL target works as follows:
3939
Test Client | Target Under Test
40-
net9.0 | net8.0
40+
net10.0 | net10.0
4141
net8.0 | net8.0
4242
net48 | net462
4343
net472 | netstandard2.0
4444
-->
4545

46-
<TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' ">net10.0;net9.0;net8.0</TargetFrameworks>
46+
<TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' ">net10.0;net8.0</TargetFrameworks>
4747
<TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' AND $([MSBuild]::IsOsPlatform('Windows')) ">$(TargetFrameworks);net48;net472</TargetFrameworks>
4848
<TargetFramework Condition=" '$(TargetFrameworks)' != '' "></TargetFramework>
4949
</PropertyGroup>

azure-pipelines.yml

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -242,15 +242,6 @@ stages:
242242
configuration: '$(BuildConfiguration)'
243243
platform: '$(BuildPlatform)'
244244

245-
- template: '.build/azure-templates/publish-test-binaries.yml'
246-
parameters:
247-
publishDirectory: $(PublishDirectory)
248-
framework: 'net9.0'
249-
binaryArtifactName: '$(BinaryArtifactName)'
250-
testSettingsFilePath: '$(Build.ArtifactStagingDirectory)/$(TestSettingsFileName)'
251-
configuration: '$(BuildConfiguration)'
252-
platform: '$(BuildPlatform)'
253-
254245
- template: '.build/azure-templates/publish-test-binaries.yml'
255246
parameters:
256247
publishDirectory: $(PublishDirectory)
@@ -399,66 +390,6 @@ stages:
399390
maximumAllowedFailures: $(maximumAllowedFailures)
400391
dotNetSdkVersion: '$(DotNetSDKVersion)'
401392

402-
- job: Test_net9_0_x64
403-
condition: and(succeeded(), ne(variables['RunTests'], 'false'))
404-
strategy:
405-
matrix:
406-
Windows:
407-
osName: 'Windows'
408-
imageName: 'windows-latest'
409-
maximumParallelJobs: 8
410-
maximumAllowedFailures: 0 # Maximum allowed failures for a successful build
411-
Linux:
412-
osName: 'Linux'
413-
imageName: 'ubuntu-latest'
414-
maximumParallelJobs: 7
415-
maximumAllowedFailures: 0 # Maximum allowed failures for a successful build
416-
macOS:
417-
osName: 'macOS'
418-
imageName: 'macOS-latest'
419-
maximumParallelJobs: 7
420-
maximumAllowedFailures: 0 # Maximum allowed failures for a successful build
421-
displayName: 'Test net9.0,x64 on'
422-
pool:
423-
vmImage: $(imageName)
424-
steps:
425-
- template: '.build/azure-templates/run-tests-on-os.yml'
426-
parameters:
427-
osName: $(osName)
428-
framework: 'net9.0'
429-
vsTestPlatform: 'x64'
430-
testBinariesArtifactName: '$(TestBinariesArtifactName)'
431-
nugetArtifactName: '$(NuGetArtifactName)'
432-
testResultsArtifactName: '$(TestResultsArtifactName)'
433-
maximumParallelJobs: $(maximumParallelJobs)
434-
maximumAllowedFailures: $(maximumAllowedFailures)
435-
dotNetSdkVersion: '$(DotNetSDKVersion)'
436-
437-
- job: Test_net9_0_x86 # Only run Nightly or if explicitly enabled with RunX86Tests
438-
condition: and(succeeded(), ne(variables['RunTests'], 'false'), or(eq(variables['IsNightly'], 'true'), eq(variables['RunX86Tests'], 'true')))
439-
strategy:
440-
matrix:
441-
Windows:
442-
osName: 'Windows'
443-
imageName: 'windows-latest'
444-
maximumParallelJobs: 8
445-
maximumAllowedFailures: 0 # Maximum allowed failures for a successful build
446-
displayName: 'Test net9.0,x86 on'
447-
pool:
448-
vmImage: $(imageName)
449-
steps:
450-
- template: '.build/azure-templates/run-tests-on-os.yml'
451-
parameters:
452-
osName: $(osName)
453-
framework: 'net9.0'
454-
vsTestPlatform: 'x86'
455-
testBinariesArtifactName: '$(TestBinariesArtifactName)'
456-
nugetArtifactName: '$(NuGetArtifactName)'
457-
testResultsArtifactName: '$(TestResultsArtifactName)'
458-
maximumParallelJobs: $(maximumParallelJobs)
459-
maximumAllowedFailures: $(maximumAllowedFailures)
460-
dotNetSdkVersion: '$(DotNetSDKVersion)'
461-
462393
- job: Test_net8_0_x64
463394
condition: and(succeeded(), ne(variables['RunTests'], 'false'))
464395
strategy:

src/Lucene.Net.Tests.Analysis.OpenNLP/Lucene.Net.Tests.Analysis.OpenNLP.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<PropertyGroup>
2727
<!-- Allow specific target framework to flow in from TestTargetFrameworks.props -->
2828
<!--suppress MsbuildTargetFrameworkTagInspection - even though this only has one target right now, we need to use the plural version for the line below -->
29-
<TargetFrameworks Condition=" '$(TargetFramework)' == '' ">net10.0;net9.0;net8.0</TargetFrameworks>
29+
<TargetFrameworks Condition=" '$(TargetFramework)' == '' ">net10.0;net8.0</TargetFrameworks>
3030
<TargetFrameworks Condition=" '$(TargetFramework)' == '' AND $([MSBuild]::IsOsPlatform('Windows')) ">$(TargetFrameworks);net48</TargetFrameworks>
3131

3232
<AssemblyTitle>Lucene.Net.Tests.Analysis.OpenNLP</AssemblyTitle>

src/dotnet/tools/Lucene.Net.Tests.Cli/Lucene.Net.Tests.Cli.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
<PropertyGroup>
2727
<!-- Allow specific target framework to flow in from TestTargetFrameworks.props -->
28-
<TargetFrameworks Condition=" '$(TargetFramework)' == '' ">net10.0;net9.0;net8.0</TargetFrameworks>
28+
<TargetFrameworks Condition=" '$(TargetFramework)' == '' ">net10.0;net8.0</TargetFrameworks>
2929
<AssemblyTitle>Lucene.Net.Tests.Cli</AssemblyTitle>
3030
</PropertyGroup>
3131

0 commit comments

Comments
 (0)