PR feedback

Author: paulirwin

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

@@ -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: |

Directory.Build.props

@@ -26,11 +26,24 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <LangVersion>14.0</LangVersion>
+    <LangVersion>11.0</LangVersion>
     <GitHubOrganization>apache</GitHubOrganization>
     <GitHubProject>lucenenet</GitHubProject>
   </PropertyGroup>
 
+  <PropertyGroup Label="Centralized Target Frameworks">
+    <!-- Base frameworks without net10.0 -->
+    <LibraryTargetFrameworksBase>net8.0;netstandard2.0;net462</LibraryTargetFrameworksBase>
+    <NetCoreOnlyTargetFrameworksBase>net8.0</NetCoreOnlyTargetFrameworksBase>
+
+    <!-- Add net10.0 conditionally based on VS version (VS2024+ = 18.0) -->
+    <LibraryTargetFrameworks Condition=" '$(VisualStudioVersion)' &gt;= '18.0' ">net10.0;$(LibraryTargetFrameworksBase)</LibraryTargetFrameworks>
+    <LibraryTargetFrameworks Condition=" '$(VisualStudioVersion)' &lt; '18.0' Or '$(VisualStudioVersion)' == '' ">$(LibraryTargetFrameworksBase)</LibraryTargetFrameworks>
+
+    <NetCoreOnlyTargetFrameworks Condition=" '$(VisualStudioVersion)' &gt;= '18.0' ">net10.0;$(NetCoreOnlyTargetFrameworksBase)</NetCoreOnlyTargetFrameworks>
+    <NetCoreOnlyTargetFrameworks Condition=" '$(VisualStudioVersion)' &lt; '18.0' Or '$(VisualStudioVersion)' == '' ">$(NetCoreOnlyTargetFrameworksBase)</NetCoreOnlyTargetFrameworks>
+  </PropertyGroup>
+
   <!-- IMPORTANT: When these values are changed, the CI counter number should also be reset. -->
   <PropertyGroup Label="Version of Builds">
     <!-- IMPORTANT: VersionPrefix must always be the same as the Lucene version this is based on.

TestTargetFramework.props

@@ -29,7 +29,9 @@
     <!--<TargetFramework>net472</TargetFramework>-->
     <!--<TargetFramework>net48</TargetFramework>-->
     <!--<TargetFramework>net8.0</TargetFramework>-->
-    <TargetFramework>net10.0</TargetFramework>
+    <!-- Default for local development - conditional based on VS version (VS2024+ = 18.0) -->
+    <TargetFramework Condition=" '$(VisualStudioVersion)' &gt;= '18.0' ">net10.0</TargetFramework>
+    <TargetFramework Condition=" '$(VisualStudioVersion)' &lt; '18.0' Or '$(VisualStudioVersion)' == '' ">net8.0</TargetFramework>
 
     <!-- Allow the build script to pass in the test frameworks to build for.
       This overrides the above TargetFramework setting.
@@ -43,7 +45,9 @@
       net472            | netstandard2.0
     -->
 
-    <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' ">net10.0;net8.0</TargetFrameworks>
+    <!-- CI builds - conditional based on VS version -->
+    <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' And '$(VisualStudioVersion)' &gt;= '18.0' ">net10.0;net8.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' And ('$(VisualStudioVersion)' &lt; '18.0' Or '$(VisualStudioVersion)' == '') ">net8.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(TestFrameworks)' == 'true' AND $([MSBuild]::IsOsPlatform('Windows')) ">$(TargetFrameworks);net48;net472</TargetFrameworks>
     <TargetFramework Condition=" '$(TargetFrameworks)' != '' "></TargetFramework>
   </PropertyGroup>

src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj

@@ -30,7 +30,7 @@
   <Import Project="$(SolutionDir).build/nuget.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net8.0;netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>$(LibraryTargetFrameworks)</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Analysis.Common</AssemblyTitle>
     <PackageTags>$(PackageTags);analysis</PackageTags>

src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj

@@ -30,7 +30,7 @@
   <Import Project="$(SolutionDir).build/nuget.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net8.0;netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>$(LibraryTargetFrameworks)</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Analysis.Kuromoji</AssemblyTitle>
     <PackageTags>$(PackageTags);analysis;japanese</PackageTags>

src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj

@@ -30,7 +30,7 @@
   <Import Project="$(SolutionDir).build/nuget.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net8.0;netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>$(LibraryTargetFrameworks)</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Analysis.Morfologik</AssemblyTitle>
     <RootNamespace>Lucene.Net.Analysis</RootNamespace>

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

@@ -32,7 +32,9 @@
   <PropertyGroup>
     <!-- Currently, IKVM doesn't officially support building NetFX on anything but Windows, so we skip it for contributors who may be on various platforms.
         We can remove the condition once that has been addressed. See: https://github.com/ikvmnet/ikvm-maven/issues/49 -->
-    <TargetFrameworks>net10.0;net8.0</TargetFrameworks>
+    <!-- net10.0 is conditional on VS version (VS2024+ = 18.0) -->
+    <TargetFrameworks Condition=" '$(VisualStudioVersion)' &gt;= '18.0' ">net10.0;net8.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(VisualStudioVersion)' &lt; '18.0' Or '$(VisualStudioVersion)' == '' ">net8.0</TargetFrameworks>
     <TargetFrameworks Condition="$([MSBuild]::IsOsPlatform('Windows'))">$(TargetFrameworks);net472</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Analysis.OpenNLP</AssemblyTitle>

src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj

@@ -30,7 +30,7 @@
   <Import Project="$(SolutionDir).build/nuget.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net8.0;netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>$(LibraryTargetFrameworks)</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Analysis.Phonetic</AssemblyTitle>
     <PackageTags>$(PackageTags);analysis;soundex;double;metaphone;sounds;like;beider;morse;cologne;caverphone;nysiis;match;rating</PackageTags>

src/Lucene.Net.Analysis.SmartCn/Lucene.Net.Analysis.SmartCn.csproj

@@ -30,7 +30,7 @@
   <Import Project="$(SolutionDir).build/nuget.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net8.0;netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>$(LibraryTargetFrameworks)</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Analysis.SmartCn</AssemblyTitle>
     <PackageTags>$(PackageTags);analysis;chinese;smart</PackageTags>

src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj

@@ -30,7 +30,7 @@
   <Import Project="$(SolutionDir).build/nuget.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net10.0;net8.0;netstandard2.0;net462</TargetFrameworks>
+    <TargetFrameworks>$(LibraryTargetFrameworks)</TargetFrameworks>
 
     <AssemblyTitle>Lucene.Net.Analysis.Stempel</AssemblyTitle>
     <PackageTags>$(PackageTags);analysis;polish</PackageTags>