Skip to content

Commit 739441d

Browse files
author
Yanan Wang
committed
resolve conflict when merge from development
2 parents 616480a + d089401 commit 739441d

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Directory.Packages.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
</PropertyGroup>
77
<ItemGroup>
88
<PackageVersion Include="CsvHelper" Version="33.1.0" />
9-
<PackageVersion Include="EntityFramework" Version="6.4.4" />
109
<PackageVersion Include="FuzzySharp" Version="2.0.2" />
11-
<PackageVersion Include="Google_GenerativeAI" Version="3.3.0" />
12-
<PackageVersion Include="Google_GenerativeAI.Live" Version="3.3.0" />
10+
<PackageVersion Include="EntityFramework" Version="6.4.4" />
11+
<PackageVersion Include="Google_GenerativeAI" Version="3.4.0" />
12+
<PackageVersion Include="Google_GenerativeAI.Live" Version="3.4.0" />
1313
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="$(AspNetCoreVersion)" />
1414
<PackageVersion Include="Microsoft.AspNetCore.StaticFiles" Version="$(AspNetCoreVersion)" />
1515
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
@@ -40,15 +40,15 @@
4040
<PackageVersion Include="Nanoid" Version="3.1.0" />
4141
<PackageVersion Include="Swashbuckle.AspNetCore" Version="8.1.2" />
4242
<PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
43-
<PackageVersion Include="Anthropic.SDK" Version="5.7.1" />
43+
<PackageVersion Include="Anthropic.SDK" Version="5.8.0" />
4444
<PackageVersion Include="Microsoft.AspNetCore.Mvc" Version="2.2.0" />
4545
<PackageVersion Include="NAudio" Version="2.2.1" />
4646
<PackageVersion Include="NAudio.Core" Version="2.2.1" />
4747
<PackageVersion Include="Whisper.net" Version="1.8.1" />
4848
<PackageVersion Include="Whisper.net.Runtime" Version="1.8.1" />
4949
<PackageVersion Include="NCrontab" Version="3.3.3" />
5050
<PackageVersion Include="Azure.AI.OpenAI" Version="2.5.0-beta.1" />
51-
<PackageVersion Include="OpenAI" Version="2.5.0" />
51+
<PackageVersion Include="OpenAI" Version="2.6.0" />
5252
<PackageVersion Include="MailKit" Version="4.11.0" />
5353
<PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.8" />
5454
<PackageVersion Include="MySql.Data" Version="9.0.0" />
@@ -67,8 +67,8 @@
6767
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
6868
<PackageVersion Include="MongoDB.Driver" Version="3.1.0" />
6969
<PackageVersion Include="Docnet.Core" Version="2.7.0-alpha.1" />
70-
<PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="13.8.0" />
71-
<PackageVersion Include="Magick.NET.Core" Version="13.8.0" />
70+
<PackageVersion Include="Magick.NET-Q16-AnyCPU" Version="14.9.1" />
71+
<PackageVersion Include="Magick.NET.Core" Version="14.9.1" />
7272
<PackageVersion Include="OpenCvSharp4.runtime.win" Version="4.9.0.20240103" />
7373
<PackageVersion Include="Sdcb.PaddleInference" Version="2.5.0.1" />
7474
<PackageVersion Include="Sdcb.PaddleInference.runtime.win64.mkl" Version="2.5.1" />

0 commit comments

Comments
 (0)