Merge pull request #339 from awaescher/copilot/update-projects-to-dotnet10

awaescher · web-flow · commit ca69bd19ff02 · 2025-11-11T22:49:07.000+01:00
Add .NET 10 multitargeting support
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,6 +37,7 @@ jobs:
         dotnet-version: | 
           8.0.x
           9.0.x
+          10.0.x
 
     - name: Restore dependencies
       run: dotnet restore OllamaSharp.slnx
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,22 +4,22 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="coverlet.collector" Version="6.0.4" />
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.14.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
-    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.10.0" />
-    <PackageVersion Include="Microsoft.Extensions.AI" Version="9.10.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.AI" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
     <PackageVersion Include="Moq" Version="4.20.72" />
-    <PackageVersion Include="NUnit.Analyzers" Version="4.10.0" />
+    <PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
     <PackageVersion Include="NUnit" Version="4.4.0" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="5.1.0" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" />
     <PackageVersion Include="Shouldly" Version="4.3.0" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.11" />
-    <PackageVersion Include="Spectre.Console.ImageSharp" Version="0.51.1" />
-    <PackageVersion Include="Spectre.Console" Version="0.51.1" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.12" />
+    <PackageVersion Include="Spectre.Console" Version="0.53.0" />
+    <PackageVersion Include="Spectre.Console.ImageSharp" Version="0.53.0" />
     <PackageVersion Include="System.Linq.Async" Version="6.0.3" />
     <PackageVersion Include="ModelContextProtocol" Version="0.2.0-preview.3" />
   </ItemGroup>
diff --git a/demo/OllamaApiConsole.csproj b/demo/OllamaApiConsole.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
 
diff --git a/demo/OllamaConsole.cs b/demo/OllamaConsole.cs
@@ -75,14 +75,14 @@ protected void WriteChatInstructionHint()
 	{
 		AnsiConsole.MarkupLine($"[{HintTextColor}]Enter [{AccentTextColor}]{START_NEW_COMMAND}[/] to start over or [{AccentTextColor}]{EXIT_COMMAND}[/] to leave.[/]");
 		AnsiConsole.MarkupLine($"[{HintTextColor}]Begin with [{AccentTextColor}]{Markup.Escape(MULTILINE_OPEN.ToString())}[/] to start multiline input. Sumbmit it by ending with [{AccentTextColor}]{Markup.Escape(MULTILINE_CLOSE.ToString())}[/].[/]");
-		AnsiConsole.MarkupLine($"[{HintTextColor}]Think mode is [{AccentTextColor}]{Think?.ToString().ToLower() ?? "(null)"}[/]. Type [{AccentTextColor}]{TOGGLETHINK_COMMAND}[/] to change.[/]");
+		AnsiConsole.MarkupLine($"[{HintTextColor}]Think mode is [{AccentTextColor}]{Think?.ToString()?.ToLower() ?? "(null)"}[/]. Type [{AccentTextColor}]{TOGGLETHINK_COMMAND}[/] to change.[/]");
 	}
 
 	internal void ToggleThink()
 	{
 		// null -> false -> true -> null -> ...
 		Think = Think == null ? false : ((bool?)Think == false ? true : ((bool?)Think == true ? null : false));
-		AnsiConsole.MarkupLine($"[{HintTextColor}]Think mode is [{AccentTextColor}]{Think?.ToString().ToLower() ?? "(null)"}[/].[/]");
+		AnsiConsole.MarkupLine($"[{HintTextColor}]Think mode is [{AccentTextColor}]{Think?.ToString()?.ToLower() ?? "(null)"}[/].[/]");
 	}
 
 	protected async Task<string> SelectModel(string prompt, string additionalInformation = "")
diff --git a/src/OllamaSharp.ModelContextProtocol/OllamaSharp.ModelContextProtocol.csproj b/src/OllamaSharp.ModelContextProtocol/OllamaSharp.ModelContextProtocol.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-   	<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+   	<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<Title>OllamaSharp.ModelContextProtocol</Title>
diff --git a/src/OllamaSharp/MicrosoftAi/AbstractionMapper.cs b/src/OllamaSharp/MicrosoftAi/AbstractionMapper.cs
@@ -344,10 +344,12 @@ public static ChatResponseUpdate ToChatResponseUpdate(ChatResponseStream? respon
 			GetAIContentsFromMessage(response.Message);
 		
 		if (response is ChatDoneResponseStream done)
-		{
-			contents.Add(new UsageContent(ParseOllamaChatResponseUsage(done)));
-			
-			return new ChatResponseUpdate(ToAbstractionRole(done.Message.Role), contents)
+	{
+		var usage = ParseOllamaChatResponseUsage(done);
+		if (usage is not null)
+			contents.Add(new UsageContent(usage));
+		
+		return new ChatResponseUpdate(ToAbstractionRole(done.Message.Role), contents)
 			{
 				CreatedAt = done.CreatedAt,
 				FinishReason = done.DoneReason is null ? null : new ChatFinishReason(done.DoneReason),
diff --git a/src/OllamaSharp/Models/ErrorResponse.cs b/src/OllamaSharp/Models/ErrorResponse.cs
@@ -8,6 +8,9 @@ namespace OllamaSharp.Models;
 /// </summary>
 public class ErrorResponse
 {
+	/// <summary>
+	/// The error message
+	/// </summary>
 	[JsonPropertyName(Application.Error)]
-	public string Message { get; set; }
+	public string Message { get; set; } = string.Empty;
 }
diff --git a/src/OllamaSharp/OllamaApiClient.cs b/src/OllamaSharp/OllamaApiClient.cs
@@ -324,10 +324,8 @@ private StringContent GetJsonContent<TRequest>(TRequest ollamaRequest) where TRe
 			var line = await reader.ReadLineAsync().ConfigureAwait(false) ?? "";
 
 			var error = JsonSerializer.Deserialize<ErrorResponse?>(line, IncomingJsonSerializerOptions);
-			if ((error?.Message ?? null) is not null)
-			{
-				throw new ResponseError(error.Message);
-			}
+			if (!string.IsNullOrEmpty(error?.Message))
+				throw new ResponseError(error!.Message);
 
 			yield return JsonSerializer
 				.Deserialize<TLine?>(
diff --git a/src/OllamaSharp/OllamaSharp.csproj b/src/OllamaSharp/OllamaSharp.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 		<GenerateDocumentationFile>True</GenerateDocumentationFile>
 		<Title>OllamaSharp</Title>
diff --git a/src/OllamaSharp/Tools/DefaultToolInvoker.cs b/src/OllamaSharp/Tools/DefaultToolInvoker.cs
@@ -34,6 +34,6 @@ public async Task<ToolResult> InvokeAsync(Message.ToolCall toolCall, IEnumerable
 		else if (tool is IAsyncInvokableTool ai)
 			toolResult = await ai.InvokeMethodAsync(normalizedArguments).ConfigureAwait(false);
 
-		return new ToolResult(Tool: tool, ToolCall: toolCall, Result: toolResult);
+		return new ToolResult(Tool: tool!, ToolCall: toolCall!, Result: toolResult);
 	}
 }
diff --git a/test/ChatTests.cs b/test/ChatTests.cs
@@ -59,7 +59,7 @@ public async Task Sends_Assistant_ToolsCall_To_Streamer()
 					}
 				});
 
-			var chat = new Chat(ollama) { ToolInvoker = null }; // we have no tool implementation in this test
+			var chat = new Chat(ollama) { ToolInvoker = null! }; // we have no tool implementation in this test
 			chat.AllowRecursiveToolCalls = false; // this is required because the expected chat response contains a tool call that would cause an infinite loop
 			await chat.SendAsync("How is the weather in LA?", CancellationToken.None).StreamToEndAsync();
 
diff --git a/test/Tests.csproj b/test/Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<NoWarn>$(NoWarn);CS8604;CS8602</NoWarn>
 		<IsPackable>false</IsPackable>
 		<IsTestProject>true</IsTestProject>
@@ -24,7 +24,9 @@
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="System.Linq.Async" />
+	</ItemGroup>
+
+	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.AI" />
 	</ItemGroup>
 
diff --git a/tests/OllamaSharp.ModelContextProtocol.Tests/OllamaSharp.ModelContextProtocol.Tests.csproj b/tests/OllamaSharp.ModelContextProtocol.Tests/OllamaSharp.ModelContextProtocol.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>
 

Original file line number	Diff line number	Diff line change
`@@ -75,14 +75,14 @@ protected void WriteChatInstructionHint()`
`75`	`75`	`{`
`76`	`76`	`AnsiConsole.MarkupLine($"[{HintTextColor}]Enter [{AccentTextColor}]{START_NEW_COMMAND}[/] to start over or [{AccentTextColor}]{EXIT_COMMAND}[/] to leave.[/]");`
`77`	`77`	`AnsiConsole.MarkupLine($"[{HintTextColor}]Begin with [{AccentTextColor}]{Markup.Escape(MULTILINE_OPEN.ToString())}[/] to start multiline input. Sumbmit it by ending with [{AccentTextColor}]{Markup.Escape(MULTILINE_CLOSE.ToString())}[/].[/]");`
`78`		`- AnsiConsole.MarkupLine($"[{HintTextColor}]Think mode is [{AccentTextColor}]{Think?.ToString().ToLower() ?? "(null)"}[/]. Type [{AccentTextColor}]{TOGGLETHINK_COMMAND}[/] to change.[/]");`
	`78`	`+ AnsiConsole.MarkupLine($"[{HintTextColor}]Think mode is [{AccentTextColor}]{Think?.ToString()?.ToLower() ?? "(null)"}[/]. Type [{AccentTextColor}]{TOGGLETHINK_COMMAND}[/] to change.[/]");`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`internal void ToggleThink()`
`82`	`82`	`{`
`83`	`83`	`// null -> false -> true -> null -> ...`
`84`	`84`	`Think = Think == null ? false : ((bool?)Think == false ? true : ((bool?)Think == true ? null : false));`
`85`		`- AnsiConsole.MarkupLine($"[{HintTextColor}]Think mode is [{AccentTextColor}]{Think?.ToString().ToLower() ?? "(null)"}[/].[/]");`
	`85`	`+ AnsiConsole.MarkupLine($"[{HintTextColor}]Think mode is [{AccentTextColor}]{Think?.ToString()?.ToLower() ?? "(null)"}[/].[/]");`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`protected async Task<string> SelectModel(string prompt, string additionalInformation = "")`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,9 @@ namespace OllamaSharp.Models;`
`8`	`8`	`/// </summary>`
`9`	`9`	`public class ErrorResponse`
`10`	`10`	`{`
	`11`	`+ /// <summary>`
	`12`	`+ /// The error message`
	`13`	`+ /// </summary>`
`11`	`14`	`[JsonPropertyName(Application.Error)]`
`12`		`- public string Message { get; set; }`
	`15`	`+ public string Message { get; set; } = string.Empty;`
`13`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,6 @@ public async Task<ToolResult> InvokeAsync(Message.ToolCall toolCall, IEnumerable`
`34`	`34`	`else if (tool is IAsyncInvokableTool ai)`
`35`	`35`	`toolResult = await ai.InvokeMethodAsync(normalizedArguments).ConfigureAwait(false);`
`36`	`36`
`37`		`- return new ToolResult(Tool: tool, ToolCall: toolCall, Result: toolResult);`
	`37`	`+ return new ToolResult(Tool: tool!, ToolCall: toolCall!, Result: toolResult);`
`38`	`38`	`}`
`39`	`39`	`}`