Add .NET 10 target, #1219

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

@@ -107,31 +107,6 @@ steps:
   displayName: 'Use .NET SDK ${{ parameters.dotNetSdkVersion }} (x86)'
   condition: and(succeeded(), contains('${{ parameters.framework }}', 'net10.'), eq('${{ parameters.vsTestPlatform }}', 'x86'))
 
-- task: UseDotNet@2
-  displayName: 'Use .NET SDK 9.0.308'
-  inputs:
-    packageType: 'sdk'
-    version: '9.0.308'
-    performMultiLevelLookup: '${{ variables.PerformMultiLevelLookup }}'
-  condition: and(succeeded(), contains('${{ parameters.framework }}', 'net8.'))
-
-    # Hack: .NET 8+ no longer installs the x86 bits and they must be installed separately. However, it is not
-    # trivial to get it into the path and to get it to pass the minimum SDK version check in runbuild.ps1.
-    # So, we install it afterward and set the environment variable so the above SDK can delegate to it.
-  # This code only works on Windows.
-- pwsh: |
-    $sdkVersion = '9.0.308'
-    $architecture = '${{ parameters.vsTestPlatform }}'
-    $installScriptPath = "${env:AGENT_TEMPDIRECTORY}/dotnet-install.ps1"
-    $installScriptUrl = "https://raw.githubusercontent.com/dotnet/install-scripts/main/src/dotnet-install.ps1"
-    [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
-    Invoke-WebRequest $installScriptUrl -OutFile $installScriptPath -TimeoutSec 60
-    $installPath = "${env:ProgramFiles(x86)}/dotnet"
-    & $installScriptPath -Version $sdkVersion -Architecture $architecture -InstallDir $installPath
-    Write-Host "##vso[task.setvariable variable=DOTNET_ROOT_X86;]$installPath"
-  displayName: 'Use .NET SDK 9.0.308 (x86)'
-  condition: and(succeeded(), contains('${{ parameters.framework }}', 'net9.'), eq('${{ parameters.vsTestPlatform }}', 'x86'))
-
 - task: UseDotNet@2
   displayName: 'Use .NET SDK 8.0.404'
   inputs:

Directory.Build.targets

@@ -38,8 +38,8 @@
     <PublishDir Condition="'$(AlternatePublishRootDirectory)' != ''">$(AlternatePublishRootDirectory)/$(TargetFramework)/$(MSBuildProjectName)/</PublishDir>
   </PropertyGroup>
 
-  <!-- Features in .NET 9.x only -->
-  <PropertyGroup Condition=" $(TargetFramework.StartsWith('net9.')) ">
+  <!-- Features in .NET 9.x+ only -->
+  <PropertyGroup Condition=" $(TargetFramework.StartsWith('net9.')) Or $(TargetFramework.StartsWith('net10.')) ">
 
     <DefineConstants>$(DefineConstants);FEATURE_STREAM_READEXACTLY</DefineConstants>
 

TestTargetFramework.props

@@ -37,13 +37,13 @@
 
     <!-- Test Client to DLL target works as follows:
       Test Client       | Target Under Test
-      net9.0            | net8.0
+      net10.0           | net10.0
       net8.0            | net8.0
       net48             | net462
       net472            | netstandard2.0
     -->
 
-    <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' ">net10.0;net9.0;net8.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' ">net10.0;net8.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' AND $([MSBuild]::IsOsPlatform('Windows')) ">$(TargetFrameworks);net48;net472</TargetFrameworks>
     <TargetFramework Condition=" '$(TargetFrameworks)' != '' "></TargetFramework>
   </PropertyGroup>

azure-pipelines.yml

@@ -242,15 +242,6 @@ stages:
         configuration: '$(BuildConfiguration)'
         platform: '$(BuildPlatform)'
 
-    - template: '.build/azure-templates/publish-test-binaries.yml'
-      parameters:
-        publishDirectory: $(PublishDirectory)
-        framework: 'net9.0'
-        binaryArtifactName: '$(BinaryArtifactName)'
-        testSettingsFilePath: '$(Build.ArtifactStagingDirectory)/$(TestSettingsFileName)'
-        configuration: '$(BuildConfiguration)'
-        platform: '$(BuildPlatform)'
-
     - template: '.build/azure-templates/publish-test-binaries.yml'
       parameters:
         publishDirectory: $(PublishDirectory)
@@ -399,66 +390,6 @@ stages:
           maximumAllowedFailures: $(maximumAllowedFailures)
           dotNetSdkVersion: '$(DotNetSDKVersion)'
 
-  - job: Test_net9_0_x64
-    condition: and(succeeded(), ne(variables['RunTests'], 'false'))
-    strategy:
-      matrix:
-        Windows:
-          osName: 'Windows'
-          imageName: 'windows-latest'
-          maximumParallelJobs: 8
-          maximumAllowedFailures: 0 # Maximum allowed failures for a successful build
-        Linux:
-          osName: 'Linux'
-          imageName: 'ubuntu-latest'
-          maximumParallelJobs: 7
-          maximumAllowedFailures: 0 # Maximum allowed failures for a successful build
-        macOS:
-          osName: 'macOS'
-          imageName: 'macOS-latest'
-          maximumParallelJobs: 7
-          maximumAllowedFailures: 0 # Maximum allowed failures for a successful build
-    displayName: 'Test net9.0,x64 on'
-    pool:
-      vmImage: $(imageName)
-    steps:
-      - template: '.build/azure-templates/run-tests-on-os.yml'
-        parameters:
-          osName: $(osName)
-          framework: 'net9.0'
-          vsTestPlatform: 'x64'
-          testBinariesArtifactName: '$(TestBinariesArtifactName)'
-          nugetArtifactName: '$(NuGetArtifactName)'
-          testResultsArtifactName: '$(TestResultsArtifactName)'
-          maximumParallelJobs: $(maximumParallelJobs)
-          maximumAllowedFailures: $(maximumAllowedFailures)
-          dotNetSdkVersion: '$(DotNetSDKVersion)'
-
-  - job: Test_net9_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-latest'
-          maximumParallelJobs: 8
-          maximumAllowedFailures: 0 # Maximum allowed failures for a successful build
-    displayName: 'Test net9.0,x86 on'
-    pool:
-      vmImage: $(imageName)
-    steps:
-      - template: '.build/azure-templates/run-tests-on-os.yml'
-        parameters:
-          osName: $(osName)
-          framework: 'net9.0'
-          vsTestPlatform: 'x86'
-          testBinariesArtifactName: '$(TestBinariesArtifactName)'
-          nugetArtifactName: '$(NuGetArtifactName)'
-          testResultsArtifactName: '$(TestResultsArtifactName)'
-          maximumParallelJobs: $(maximumParallelJobs)
-          maximumAllowedFailures: $(maximumAllowedFailures)
-          dotNetSdkVersion: '$(DotNetSDKVersion)'
-
   - job: Test_net8_0_x64
     condition: and(succeeded(), ne(variables['RunTests'], 'false'))
     strategy:

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

@@ -26,7 +26,7 @@
   <PropertyGroup>
     <!-- Allow specific target framework to flow in from TestTargetFrameworks.props -->
     <!--suppress MsbuildTargetFrameworkTagInspection - even though this only has one target right now, we need to use the plural version for the line below -->
-    <TargetFrameworks Condition=" '$(TargetFramework)' == '' ">net10.0;net9.0;net8.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(TargetFramework)' == '' ">net10.0;net8.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(TargetFramework)' == '' AND $([MSBuild]::IsOsPlatform('Windows')) ">$(TargetFrameworks);net48</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Tests.Analysis.OpenNLP</AssemblyTitle>

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

@@ -25,7 +25,7 @@
 
   <PropertyGroup>
     <!-- Allow specific target framework to flow in from TestTargetFrameworks.props -->
-    <TargetFrameworks Condition=" '$(TargetFramework)' == '' ">net10.0;net9.0;net8.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(TargetFramework)' == '' ">net10.0;net8.0</TargetFrameworks>
     <AssemblyTitle>Lucene.Net.Tests.Cli</AssemblyTitle>
   </PropertyGroup>