Browse Source

.NET10支持

懒得勤快 2 weeks ago
parent
commit
89a8819fda

+ 8 - 5
Masuit.LuceneEFCore.SearchEngine/Masuit.LuceneEFCore.SearchEngine.csproj

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.1;net6;net7;net8;net9</TargetFrameworks>
+        <TargetFrameworks>netstandard2.1;net6;net7;net8;net9;net10.0</TargetFrameworks>
         <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
         <Authors>懒得勤快</Authors>
         <Company>懒得勤快</Company>
-        <Product>基于EntityFrameworkCore和Lucene.NET实现的全文检索搜索引擎,主键int版本</Product>
+        <Product>基于EntityFrameworkCore和Lucene.NET实现的全文检索搜索引擎,主键guid版本</Product>
         <Description>基于EntityFrameworkCore和Lucene.NET实现的全文检索搜索引擎</Description>
         <Copyright>懒得勤快</Copyright>
         <PackageProjectUrl>https://github.com/ldqk/Masuit.LuceneEFCore.SearchEngine</PackageProjectUrl>
-        <PackageId>Masuit.LuceneEFCore.SearchEngine_int</PackageId>
-        <Version>24.3</Version>
+        <PackageId>Masuit.LuceneEFCore.SearchEngine_guid</PackageId>
+        <Version>25.1</Version>
         <Configurations>Debug;Release;String版本;Guid版本;Long版本</Configurations>
         <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
         <RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
@@ -44,7 +44,7 @@
         <PackageReference Include="Lucene.JIEba.Segment.NetCore" Version="1.0" />
         <PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00017" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
         <PackageReference Include="TinyPinyin.Net" Version="1.0.2" />
     </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'net8'">
@@ -59,6 +59,9 @@
     <ItemGroup Condition=" '$(TargetFramework)' == 'net9'">
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.10" />
     </ItemGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net10.0'">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10" />
+    </ItemGroup>
     <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
         <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.32" />
     </ItemGroup>

+ 3 - 3
Masuit.LuceneEFCore.SearchEngine/SearchOptions.cs

@@ -39,9 +39,9 @@ namespace Masuit.LuceneEFCore.SearchEngine
         {
             get
             {
-                foreach (var field in Fields.Where(field => _boosts.All(x => x.Key.ToUpper() != field.ToUpper())))
+                foreach (var @field in Fields.Where(@field => _boosts.All(x => x.Key.ToUpper() != @field.ToUpper())))
                 {
-                    _boosts.Add(field, 2.0f);
+                    _boosts.Add(@field, 2.0f);
                 }
 
                 return _boosts;
@@ -170,4 +170,4 @@ namespace Masuit.LuceneEFCore.SearchEngine
             _boosts[field] = boost;
         }
     }
-}
+}

+ 4 - 4
WebSearchDemo/WebSearchDemo.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
     <Configurations>Debug;Release;String版本;Guid版本;Long版本</Configurations>
     <RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
@@ -10,9 +10,9 @@
     <DocumentationFile>D:\Private\Masuit.LuceneEFCore.SearchEngine\WebSearchDemo\WebSearchDemo.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.8" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="10.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="10.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Masuit.LuceneEFCore.SearchEngine\Masuit.LuceneEFCore.SearchEngine.csproj" />