Add .NET 10 target, #1219

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

@@ -105,7 +105,7 @@ steps:
     & $installScriptPath -Version $sdkVersion -Architecture $architecture -InstallDir $installPath
     Write-Host "##vso[task.setvariable variable=DOTNET_ROOT_X86;]$installPath"
   displayName: 'Use .NET SDK ${{ parameters.dotNetSdkVersion }} (x86)'
-  condition: and(succeeded(), contains('${{ parameters.framework }}', 'net9.'), eq('${{ parameters.vsTestPlatform }}', 'x86'))
+  condition: and(succeeded(), contains('${{ parameters.framework }}', 'net10.'), eq('${{ parameters.vsTestPlatform }}', 'x86'))
 
 - task: UseDotNet@2
   displayName: 'Use .NET SDK 8.0.404'
@@ -132,6 +132,31 @@ steps:
   displayName: 'Use .NET SDK 8.0.404 (x86)'
   condition: and(succeeded(), contains('${{ parameters.framework }}', 'net8.'), 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 }}', 'net9.'))
+
+    # 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'))
+
 
 #- template: 'show-all-files.yml' # Uncomment for debugging
 - pwsh: |

.build/dependencies.props

@@ -22,7 +22,7 @@
   <PropertyGroup Label="NuGet Package Reference Versions">
     <Antlr4CodeGeneratorPackageVersion>4.6.6</Antlr4CodeGeneratorPackageVersion>
     <Antlr4RuntimeStandardPackageVersion>4.13.1</Antlr4RuntimeStandardPackageVersion>
-    <Antlr4BuildTasksPackageVersion>12.8.0</Antlr4BuildTasksPackageVersion>
+    <Antlr4BuildTasksPackageVersion>12.11.0</Antlr4BuildTasksPackageVersion>
     <!-- LUCENENET TODO: When ICU4N is released to production,
         be sure to lock down the version range below. The resource
         files in Lucene.Net.ICU are not compatible with any other

.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
-    @('net9.0','net8.0','net6.0','net472','net48').
+    @('net10.0','net8.0','net472','net48').
 
  .PARAMETER OperatingSystems
     A string array of Github Actions operating system monikers to run the tests on.
@@ -51,9 +51,9 @@
  .PARAMETER Configurations
     A string array of build configurations to run the tests on. The default is @('Release').
 
- .PARAMETER DotNet9SDKVersion
-    The SDK version of .NET 9.x to install on the build agent to be used for building and
-    testing. This SDK is always installed on the build agent. The default is 9.0.x.
+ .PARAMETER DotNet10SDKVersion
+    The SDK version of .NET 10.x to install on the build agent to be used for building and
+    testing. This SDK is always installed on the build agent. The default is 10.0.x.
 
  .PARAMETER DotNet8SDKVersion
     The SDK version of .NET 8.x to install on the build agent to be used for building and
@@ -65,15 +65,15 @@ param(
 
     [string]$RepoRoot = (Split-Path (Split-Path $PSScriptRoot)),
 
-    [string[]]$TestFrameworks = @('net9.0','net8.0','net472','net48'), # targets under test: net8.0, net8.0, netstandard2.0, net462
+    [string[]]$TestFrameworks = @('net10.0', 'net8.0', 'net472', 'net48'), # targets under test: net10.0, net8.0, netstandard2.0, net462
 
     [string[]]$OperatingSystems = @('windows-latest', 'ubuntu-latest'),
 
     [string[]]$TestPlatforms = @('x64'),
 
     [string[]]$Configurations = @('Release'),
 
-    [string]$DotNet9SDKVersion = '9.0.x',
+    [string]$DotNet10SDKVersion = '10.0.x',
 
     [string]$DotNet8SDKVersion = '8.0.x'
 )
@@ -155,7 +155,7 @@ function Write-TestWorkflow(
     [string[]]$TestFrameworks = @('net6.0', 'net48'),
     [string[]]$TestPlatforms = @('x64'),
     [string[]]$OperatingSystems = @('windows-latest', 'ubuntu-latest', 'macos-latest'),
-    [string]$DotNet9SDKVersion = $DotNet9SDKVersion,
+    [string]$DotNet10SDKVersion = $DotNet10SDKVersion,
     [string]$DotNet8SDKVersion = $DotNet8SDKVersion) {
 
     $dependencies = New-Object System.Collections.Generic.HashSet[string]
@@ -280,10 +280,10 @@ jobs:
           dotnet-version: '$DotNet8SDKVersion'
         if: `${{ startswith(matrix.framework, 'net8.') }}
 
-      - name: Setup .NET 9 SDK
+      - name: Setup .NET 10 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '$DotNet9SDKVersion'
+          dotnet-version: '$DotNet10SDKVersion'
 
       - name: Cache NuGet Packages
         uses: actions/cache@v4

.github/workflows/Lucene-Net-Tests-AllProjects.yml

@@ -73,7 +73,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net9.0, net8.0, net48, net472]
+        framework: [net10.0, net8.0, net48, net472]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -102,13 +102,13 @@ jobs:
       - name: Setup .NET 8 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.0.415'
+          dotnet-version: '8.0.x'
         if: ${{ startswith(matrix.framework, 'net8.') }}
 
-      - name: Setup .NET 9 SDK
+      - name: Setup .NET 10 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '9.0.306'
+          dotnet-version: '10.0.x'
 
       - name: Cache NuGet Packages
         uses: actions/cache@v4

.github/workflows/Lucene-Net-Tests-Analysis-Common.yml

@@ -57,7 +57,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net9.0, net8.0, net48, net472]
+        framework: [net10.0, net8.0, net48, net472]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -86,13 +86,13 @@ jobs:
       - name: Setup .NET 8 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.0.415'
+          dotnet-version: '8.0.x'
         if: ${{ startswith(matrix.framework, 'net8.') }}
 
-      - name: Setup .NET 9 SDK
+      - name: Setup .NET 10 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '9.0.306'
+          dotnet-version: '10.0.x'
 
       - name: Cache NuGet Packages
         uses: actions/cache@v4

.github/workflows/Lucene-Net-Tests-Analysis-Kuromoji.yml

@@ -54,7 +54,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net9.0, net8.0, net48, net472]
+        framework: [net10.0, net8.0, net48, net472]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -83,13 +83,13 @@ jobs:
       - name: Setup .NET 8 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.0.415'
+          dotnet-version: '8.0.x'
         if: ${{ startswith(matrix.framework, 'net8.') }}
 
-      - name: Setup .NET 9 SDK
+      - name: Setup .NET 10 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '9.0.306'
+          dotnet-version: '10.0.x'
 
       - name: Cache NuGet Packages
         uses: actions/cache@v4

.github/workflows/Lucene-Net-Tests-Analysis-Morfologik.yml

@@ -54,7 +54,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net9.0, net8.0, net48, net472]
+        framework: [net10.0, net8.0, net48, net472]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -83,13 +83,13 @@ jobs:
       - name: Setup .NET 8 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.0.415'
+          dotnet-version: '8.0.x'
         if: ${{ startswith(matrix.framework, 'net8.') }}
 
-      - name: Setup .NET 9 SDK
+      - name: Setup .NET 10 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '9.0.306'
+          dotnet-version: '10.0.x'
 
       - name: Cache NuGet Packages
         uses: actions/cache@v4

.github/workflows/Lucene-Net-Tests-Analysis-OpenNLP.yml

@@ -57,7 +57,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net9.0, net8.0, net48]
+        framework: [net10.0, net8.0, net48]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -86,13 +86,13 @@ jobs:
       - name: Setup .NET 8 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.0.415'
+          dotnet-version: '8.0.x'
         if: ${{ startswith(matrix.framework, 'net8.') }}
 
-      - name: Setup .NET 9 SDK
+      - name: Setup .NET 10 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '9.0.306'
+          dotnet-version: '10.0.x'
 
       - name: Cache NuGet Packages
         uses: actions/cache@v4

.github/workflows/Lucene-Net-Tests-Analysis-Phonetic.yml

@@ -51,7 +51,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net9.0, net8.0, net48, net472]
+        framework: [net10.0, net8.0, net48, net472]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -80,13 +80,13 @@ jobs:
       - name: Setup .NET 8 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.0.415'
+          dotnet-version: '8.0.x'
         if: ${{ startswith(matrix.framework, 'net8.') }}
 
-      - name: Setup .NET 9 SDK
+      - name: Setup .NET 10 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '9.0.306'
+          dotnet-version: '10.0.x'
 
       - name: Cache NuGet Packages
         uses: actions/cache@v4

.github/workflows/Lucene-Net-Tests-Analysis-SmartCn.yml

@@ -33,6 +33,7 @@ on:
     - 'src/Lucene.Net.Tests.Analysis.SmartCn/Directory.Build.*'
     - 'src/Directory.Build.*'
     - 'Directory.Build.*'
+    - 'src/Lucene.Net.Tests.Analysis.SmartCn/**/*.zip'
 
     # Dependencies
     - 'src/Lucene.Net/**/*'
@@ -55,7 +56,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net9.0, net8.0, net48, net472]
+        framework: [net10.0, net8.0, net48, net472]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -84,13 +85,13 @@ jobs:
       - name: Setup .NET 8 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.0.415'
+          dotnet-version: '8.0.x'
         if: ${{ startswith(matrix.framework, 'net8.') }}
 
-      - name: Setup .NET 9 SDK
+      - name: Setup .NET 10 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '9.0.306'
+          dotnet-version: '10.0.x'
 
       - name: Cache NuGet Packages
         uses: actions/cache@v4

.github/workflows/Lucene-Net-Tests-Analysis-Stempel.yml

@@ -52,7 +52,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net9.0, net8.0, net48, net472]
+        framework: [net10.0, net8.0, net48, net472]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -81,13 +81,13 @@ jobs:
       - name: Setup .NET 8 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.0.415'
+          dotnet-version: '8.0.x'
         if: ${{ startswith(matrix.framework, 'net8.') }}
 
-      - name: Setup .NET 9 SDK
+      - name: Setup .NET 10 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '9.0.306'
+          dotnet-version: '10.0.x'
 
       - name: Cache NuGet Packages
         uses: actions/cache@v4

.github/workflows/Lucene-Net-Tests-Benchmark.yml

@@ -64,7 +64,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net9.0, net8.0, net48, net472]
+        framework: [net10.0, net8.0, net48, net472]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -93,13 +93,13 @@ jobs:
       - name: Setup .NET 8 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.0.415'
+          dotnet-version: '8.0.x'
         if: ${{ startswith(matrix.framework, 'net8.') }}
 
-      - name: Setup .NET 9 SDK
+      - name: Setup .NET 10 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '9.0.306'
+          dotnet-version: '10.0.x'
 
       - name: Cache NuGet Packages
         uses: actions/cache@v4

.github/workflows/Lucene-Net-Tests-Classification.yml

@@ -52,7 +52,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, ubuntu-latest]
-        framework: [net9.0, net8.0, net48, net472]
+        framework: [net10.0, net8.0, net48, net472]
         platform: [x64]
         configuration: [Release]
         exclude:
@@ -81,13 +81,13 @@ jobs:
       - name: Setup .NET 8 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '8.0.415'
+          dotnet-version: '8.0.x'
         if: ${{ startswith(matrix.framework, 'net8.') }}
 
-      - name: Setup .NET 9 SDK
+      - name: Setup .NET 10 SDK
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: '9.0.306'
+          dotnet-version: '10.0.x'
 
       - name: Cache NuGet Packages
         uses: actions/cache@v4