Skip to content

chore: remove json ref on net8.0 #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 4, 2025
Merged

chore: remove json ref on net8.0 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5765c5
feat: add net8.0 into target frameworks
ikesnowy Dec 4, 2025
0d40372
fix: run full tests on net8.0
ikesnowy Dec 4, 2025
9977a28
fix: update test command
ikesnowy Dec 4, 2025
de80227
fix: remove net6 framework settings
ikesnowy Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ jobs:
- name: Checkout
uses: actions/checkout@v4
- name: Build
run: dotnet build src/Cnblogs.DashScope.AspNetCore -c Release
run: dotnet build src/Cnblogs.DashScope.AspNetCore -c Release -p:TargetFrameworks=net6.0
- name: Test
run: dotnet test test/Cnblogs.DashScope.Sdk.UnitTests -c Release
run: dotnet test test/Cnblogs.DashScope.Sdk.UnitTests -c Release -p:TargetFrameworks=net6.0
test-net8:
runs-on: ubuntu-latest
container: mcr.microsoft.com/dotnet/sdk:8.0
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Build
run: dotnet build src/Cnblogs.DashScope.AI -c Release
run: dotnet build src/Cnblogs.DashScope.AI -c Release -p:TargetFrameworks=net8.0
- name: Test
run: dotnet test test/Cnblogs.DashScope.AI.UnitTests -c Release
run: dotnet test test/Cnblogs.DashScope.AI.UnitTests -c Release -p:TargetFrameworks=net8.0 && dotnet test test/Cnblogs.DashScope.Sdk.UnitTests -c Release -p:TargetFrameworks=net8.0

2 changes: 1 addition & 1 deletion Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Authors>Cnblogs</Authors>
Expand Down
2 changes: 1 addition & 1 deletion sample/Cnblogs.DashScope.Sample/Cnblogs.DashScope.Sample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFrameworks>net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
1 change: 1 addition & 0 deletions src/Cnblogs.DashScope.AI/Cnblogs.DashScope.AI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0</TargetFrameworks>
<Product>Cnblogs.DashScope.AI</Product>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageTags>Cnblogs;Dashscope;Microsoft.Extensions.AI;Sdk;Embedding;</PackageTags>
Expand Down
3 changes: 3 additions & 0 deletions src/Cnblogs.DashScope.Core/Cnblogs.DashScope.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@

<ItemGroup>
<PackageReference Include="Microsoft.DeepDev.TokenizerLib" Version="1.3.3" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="System.Text.Json" Version="8.0.6" />
</ItemGroup>

Expand Down
35 changes: 19 additions & 16 deletions src/Cnblogs.DashScope.Core/DashScopeClientCore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,28 +552,31 @@ private async IAsyncEnumerable<TResponse> StreamAsync<TResponse>(
HttpCompletionOption.ResponseHeadersRead,
cancellationToken);
using StreamReader reader = new(await response.Content.ReadAsStreamAsync(cancellationToken), Encoding.UTF8);
while (!reader.EndOfStream)
while (await reader.ReadLineAsync() is { } line)
{
if (cancellationToken.IsCancellationRequested)
{
throw new TaskCanceledException();
}

if (line.StartsWith("data:") == false)
{
continue;
}

var line = await reader.ReadLineAsync();
if (line != null && line.StartsWith("data:"))
var data = line["data:".Length..];
if (data.StartsWith("{\"code\":"))
{
var data = line["data:".Length..];
if (data.StartsWith("{\"code\":"))
{
var error =
JsonSerializer.Deserialize<DashScopeError>(data, DashScopeDefaults.SerializationOptions)!;
throw new DashScopeException(
message.RequestUri?.ToString(),
(int)response.StatusCode,
error,
error.Message);
}

yield return JsonSerializer.Deserialize<TResponse>(data, DashScopeDefaults.SerializationOptions)!;
var error =
JsonSerializer.Deserialize<DashScopeError>(data, DashScopeDefaults.SerializationOptions)!;
throw new DashScopeException(
message.RequestUri?.ToString(),
(int)response.StatusCode,
error,
error.Message);
}

yield return JsonSerializer.Deserialize<TResponse>(data, DashScopeDefaults.SerializationOptions)!;
}
}

Expand Down
2 changes: 1 addition & 1 deletion test/Cnblogs.DashScope.AI.UnitTests/Cnblogs.DashScope.AI.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFrameworks>net8.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
Expand Down
3 changes: 1 addition & 2 deletions test/Cnblogs.DashScope.Sdk.UnitTests/Cnblogs.DashScope.Sdk.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
</PropertyGroup>
Expand All @@ -13,7 +12,7 @@
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0"/>
<PackageReference Include="NSubstitute" Version="5.3.0"/>
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
3 changes: 1 addition & 2 deletions test/Cnblogs.DashScope.Tests.Shared/Cnblogs.DashScope.Tests.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NSubstitute" Version="5.3.0"/>
<PackageReference Include="System.Linq.Async" Version="6.0.3" />
<PackageReference Include="System.Linq.Async" Version="7.0.0" />
<PackageReference Include="JsonSchema.Net.Generation" Version="4.6.0" />
<PackageReference Include="xunit" Version="2.9.3" />
</ItemGroup>
Expand Down