Learning/AntSK
1
0
Fork 0
mirror of https://github.com/AIDotNet/AntSK.git synced 2026-02-17 14:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 升级至dotnet9

Browse Source
This commit is contained in:
zyxucp
2025-06-10 14:29:33 +08:00
parent e6456a2c86
commit 8a19f61689
12 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@@ -1,5 +1,5 @@
# Build stage # Build stage
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
WORKDIR /src WORKDIR /src
# Copy csproj and restore as distinct layers # Copy csproj and restore as distinct layers
@@ -13,7 +13,7 @@ RUN dotnet build "AntSK.csproj" -c Release -o /app/build
RUN dotnet publish "AntSK.csproj" -c Release -o /app/publish RUN dotnet publish "AntSK.csproj" -c Release -o /app/publish
# Runtime stage # Runtime stage
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
WORKDIR /service WORKDIR /service
EXPOSE 5000 EXPOSE 5000

4
Dockerfile-py
View File

@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
WORKDIR /src WORKDIR /src
COPY ["src/AntSK/AntSK.csproj", "AntSK/"] COPY ["src/AntSK/AntSK.csproj", "AntSK/"]
RUN dotnet restore "AntSK/AntSK.csproj" RUN dotnet restore "AntSK/AntSK.csproj"
@@ -7,7 +7,7 @@ WORKDIR "/src/AntSK"
RUN dotnet build "AntSK.csproj" -c Release -o /app/build RUN dotnet build "AntSK.csproj" -c Release -o /app/build
RUN dotnet publish "AntSK.csproj" -c Release -o /app/publish RUN dotnet publish "AntSK.csproj" -c Release -o /app/publish
FROM registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk-base:v1.0.0 AS final FROM registry.cn-hangzhou.aliyuncs.com/xuzeyu91/antsk-base:9.0.0 AS final
WORKDIR /app WORKDIR /app
COPY --from=build /app/publish . COPY --from=build /app/publish .

8
src/AntSK.Domain/AntSK.Domain.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<DocumentationFile>AntSK.Domain.xml</DocumentationFile> <DocumentationFile>AntSK.Domain.xml</DocumentationFile>
@@ -13,13 +13,13 @@
<PackageReference Include="BlazorComponents.Terminal" Version="0.6.0" /> <PackageReference Include="BlazorComponents.Terminal" Version="0.6.0" />
<PackageReference Include="Blazored.LocalStorage" Version="4.5.0" /> <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
<PackageReference Include="pythonnet" Version="3.0.4" /> <PackageReference Include="pythonnet" Version="3.0.5" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="7.3.1" />
<PackageReference Include="AutoMapper" Version="8.1.0" /> <PackageReference Include="AutoMapper" Version="8.1.0" />
<PackageReference Include="BCrypt.Net-Next" Version="4.0.3" /> <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
<PackageReference Include="Markdig" Version="0.40.0" /> <PackageReference Include="Markdig" Version="0.41.1" />
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftVersion)" /> <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftVersion)" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.187" /> <PackageReference Include="SqlSugarCore" Version="5.1.4.187" />
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" /> <PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />

16
src/AntSK.Domain/Domain/Service/KernelService.cs
View File

@@ -102,21 +102,21 @@ namespace AntSK.Domain.Domain.Service
var settings = chatModel.ModelKey.Split("|"); var settings = chatModel.ModelKey.Split("|");
Sdcb.SparkDesk.ModelVersion modelVersion = Sdcb.SparkDesk.ModelVersion.V3_5; Sdcb.SparkDesk.ModelVersion modelVersion = Sdcb.SparkDesk.ModelVersion.Lite;
switch (chatModel.ModelName) switch (chatModel.ModelName)
{ {
case "V3_5": case "Max":
modelVersion = Sdcb.SparkDesk.ModelVersion.V3_5; modelVersion = Sdcb.SparkDesk.ModelVersion.Max;
break; break;
case "V3": case "Pro":
modelVersion = Sdcb.SparkDesk.ModelVersion.V3; modelVersion = Sdcb.SparkDesk.ModelVersion.Pro;
break; break;
case "V2": case "V2":
modelVersion = Sdcb.SparkDesk.ModelVersion.V2; modelVersion = Sdcb.SparkDesk.ModelVersion.V2_0;
break; break;
case "V1_5": case "Lite":
modelVersion = Sdcb.SparkDesk.ModelVersion.V1_5; modelVersion = Sdcb.SparkDesk.ModelVersion.Lite;
break; break;
} }

8
src/AntSK.LLM/AntSK.LLM.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
@@ -11,9 +11,9 @@
<PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftVersion)" /> <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftVersion)" />
<PackageReference Include="RestSharp" Version="$(RestSharpVersion)" /> <PackageReference Include="RestSharp" Version="$(RestSharpVersion)" />
<PackageReference Include="Cnblogs.KernelMemory.AI.DashScope" Version="0.3.0" /> <PackageReference Include="Cnblogs.KernelMemory.AI.DashScope" Version="0.3.0" />
<PackageReference Include="Cnblogs.SemanticKernel.Connectors.DashScope" Version="0.3.2" /> <PackageReference Include="Cnblogs.SemanticKernel.Connectors.DashScope" Version="0.4.0" />
<PackageReference Include="Sdcb.SparkDesk" Version="3.0.0" /> <PackageReference Include="Sdcb.SparkDesk" Version="3.1.0" />
<PackageReference Include="System.Drawing.Common" Version="8.0.0" /> <PackageReference Include="System.Drawing.Common" Version="$(NetVersion)" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
src/AntSK.LLamaFactory/AntSK.LLamaFactory.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>

12
src/AntSK.OCR/AntSK.OCR.csproj
View File

@@ -1,19 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.KernelMemory.Core" Version="$(KMVersion)" /> <PackageReference Include="Microsoft.KernelMemory.Core" Version="$(KMVersion)" />
<PackageReference Include="OpenCvSharp4.runtime.win" Version="4.9.0.20240103" /> <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.10.0.20241108" />
<PackageReference Include="Sdcb.OpenCvSharp4.mini.runtime.debian.12-x64" Version="4.8.0.20231125" /> <PackageReference Include="Sdcb.OpenCvSharp4.mini.runtime.debian.12-x64" Version="4.8.0.20231125" />
<PackageReference Include="Sdcb.OpenVINO" Version="0.6.6" /> <PackageReference Include="Sdcb.OpenVINO" Version="0.6.10" />
<PackageReference Include="Sdcb.OpenVINO.PaddleOCR.Models.Online" Version="0.6.2" /> <PackageReference Include="Sdcb.OpenVINO.PaddleOCR.Models.Online" Version="0.6.2" />
<PackageReference Include="Sdcb.OpenVINO.PaddleOCR" Version="0.6.3" /> <PackageReference Include="Sdcb.OpenVINO.PaddleOCR" Version="0.6.8" />
<PackageReference Include="Sdcb.OpenVINO.runtime.ubuntu.22.04-x64" Version="2024.2.0" /> <PackageReference Include="Sdcb.OpenVINO.runtime.ubuntu.22.04-x64" Version="2025.0.0" />
<PackageReference Include="Sdcb.OpenVINO.runtime.win-x64" Version="2024.2.0" /> <PackageReference Include="Sdcb.OpenVINO.runtime.win-x64" Version="2025.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/AntSK.Test/AntSK.Test.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>

12
src/AntSK/AntSK.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<DocumentationFile>AntSK.xml</DocumentationFile> <DocumentationFile>AntSK.xml</DocumentationFile>
@@ -19,11 +19,11 @@
<Content Include="AntSKlogo.ico" /> <Content Include="AntSKlogo.ico" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="8.0.6" /> <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="$(NetVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="8.0.6" /> <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="$(NetVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="8.0.6" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="$(NetVersion)" />
<PackageReference Include="System.Net.Http.Json" Version="8.0.0" /> <PackageReference Include="System.Net.Http.Json" Version="$(NetVersion)" />
<PackageReference Include="Downloader" Version="3.0.6" /> <PackageReference Include="Downloader" Version="3.3.4" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

1
src/AntSK/README.md
View File

@@ -1 +0,0 @@
# AntSK

1
src/Directory.Build.props
View File

@@ -5,5 +5,6 @@
<NewtonsoftVersion>13.0.3</NewtonsoftVersion> <NewtonsoftVersion>13.0.3</NewtonsoftVersion>
<RestSharpVersion>112.1.0</RestSharpVersion> <RestSharpVersion>112.1.0</RestSharpVersion>
<SKVersion>1.17.2</SKVersion> <SKVersion>1.17.2</SKVersion>
<NetVersion>9.0.0</NetVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
src/MiddleWare/AntSK.BackgroundTask/AntSK.BackgroundTask.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<AssemblyName>AntSK.BackgroundTask</AssemblyName> <AssemblyName>AntSK.BackgroundTask</AssemblyName>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo> <GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<TargetFramework>netstandard2.1</TargetFramework> <TargetFramework>net9.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<LangVersion>Preview</LangVersion> <LangVersion>Preview</LangVersion>