adds support for .NET 8.0

.pipelines/templates/build-cs-steps.yml

@@ -36,11 +36,13 @@ steps:
       Write-Host "##vso[task.setvariable variable=repoRoot]$repoRoot"
       Write-Host "##vso[task.setvariable variable=testDataDir]$testDataDir"
 
+# Using the latest SDK does not prevent us from targeting other platforms.
+# It ensures that we've got the latest tooling, fixes, and performance enhancements.
 - task: UseDotNet@2
-  displayName: 'Use .NET 9 SDK'
+  displayName: 'Use .NET 10 SDK'
   inputs:
     packageType: sdk
-    version: '9.0.x'
+    version: '10.0.x'
 
 # Read version from the version-info artifact produced by compute_version stage.
 - task: PowerShell@2
@@ -127,7 +129,7 @@ steps:
     targetType: inline
     script: |
       $base = "$(repoRoot)/sdk/cs/src/bin/Release"
-      # The SDK targets net9.0 (standard) or net9.0-windows10.0.26100.0 (WinML).
+      # The SDK targets netstandard2.0 and any compatible runtime.
       # Find whichever TFM directory was produced by the build.
       $tfmDir = Get-ChildItem $base -Directory | Select-Object -First 1
       if (-not $tfmDir) { throw "No target framework directory found under $base" }

sdk/cs/src/Detail/CoreInterop.cs

@@ -42,8 +42,8 @@
         // need to load ORT first as the winml GenAI library redirects and tries to load a winml onnxruntime.dll,
         // which will not have the EPs we expect/require. if/when we don't bundle our own onnxruntime.dll we need to
         // revisit this.
         var loadedOrt = NativeLibrary.TryLoad(ortPath, out ortLibHandle);
         var loadedGenAI = NativeLibrary.TryLoad(genaiPath, out genaiLibHandle);
 
 #if DEBUG
         Console.WriteLine($"Loaded ORT:{loadedOrt} handle={ortLibHandle}");
@@ -53,7 +53,7 @@
 
     static CoreInterop()
     {
         NativeLibrary.SetDllImportResolver(typeof(CoreInterop).Assembly, (libraryName, assembly, searchPath) =>
         {
             if (libraryName == LibraryName)
             {
@@ -156,41 +156,81 @@
     private unsafe delegate void ExecuteCommandDelegate(RequestBuffer* req, ResponseBuffer* resp);
 
     // Import the function from the AOT-compiled library
+#if NET7_0_OR_GREATER
     [LibraryImport(LibraryName, EntryPoint = "execute_command")]
     [UnmanagedCallConv(CallConvs = new[] { typeof(System.Runtime.CompilerServices.CallConvCdecl) })]
     private static unsafe partial void CoreExecuteCommand(RequestBuffer* request, ResponseBuffer* response);
+#else
+    [DllImport(LibraryName, EntryPoint = "execute_command", CallingConvention = CallingConvention.Cdecl)]
+    private static unsafe extern void CoreExecuteCommand(RequestBuffer* request, ResponseBuffer* response);
+#endif
 
+#if NET7_0_OR_GREATER
     [LibraryImport(LibraryName, EntryPoint = "execute_command_with_callback")]
     [UnmanagedCallConv(CallConvs = new[] { typeof(System.Runtime.CompilerServices.CallConvCdecl) })]
     private static unsafe partial void CoreExecuteCommandWithCallback(RequestBuffer* nativeRequest,
                                                                       ResponseBuffer* nativeResponse,
                                                                       nint callbackPtr, // NativeCallbackFn pointer
                                                                       nint userData);
+#else
+    [DllImport(LibraryName, EntryPoint = "execute_command_with_callback", CallingConvention = CallingConvention.Cdecl)]
+    private static unsafe extern void CoreExecuteCommandWithCallback(RequestBuffer* nativeRequest,
+                                                                     ResponseBuffer* nativeResponse,
+                                                                     nint callbackPtr,
+                                                                     nint userData);
+#endif
 
+#if NET7_0_OR_GREATER
     [LibraryImport(LibraryName, EntryPoint = "execute_command_with_binary")]
     [UnmanagedCallConv(CallConvs = new[] { typeof(System.Runtime.CompilerServices.CallConvCdecl) })]
     private static unsafe partial void CoreExecuteCommandWithBinary(StreamingRequestBuffer* nativeRequest,
                                                                      ResponseBuffer* nativeResponse);
+#else
+    [DllImport(LibraryName, EntryPoint = "execute_command_with_binary", CallingConvention = CallingConvention.Cdecl)]
+    private static unsafe extern void CoreExecuteCommandWithBinary(StreamingRequestBuffer* nativeRequest,
+                                                                    ResponseBuffer* nativeResponse);
+#endif
 
     // --- Audio streaming P/Invoke imports (kept for future dedicated entry points) ---
 
+#if NET7_0_OR_GREATER
     [LibraryImport(LibraryName, EntryPoint = "audio_stream_start")]
     [UnmanagedCallConv(CallConvs = new[] { typeof(System.Runtime.CompilerServices.CallConvCdecl) })]
     private static unsafe partial void CoreAudioStreamStart(
         RequestBuffer* request,
         ResponseBuffer* response);
+#else
+    [DllImport(LibraryName, EntryPoint = "audio_stream_start", CallingConvention = CallingConvention.Cdecl)]
+    private static unsafe extern void CoreAudioStreamStart(
+        RequestBuffer* request,
+        ResponseBuffer* response);
+#endif
 
+#if NET7_0_OR_GREATER
     [LibraryImport(LibraryName, EntryPoint = "audio_stream_push")]
     [UnmanagedCallConv(CallConvs = new[] { typeof(System.Runtime.CompilerServices.CallConvCdecl) })]
     private static unsafe partial void CoreAudioStreamPush(
         StreamingRequestBuffer* request,
         ResponseBuffer* response);
+#else
+    [DllImport(LibraryName, EntryPoint = "audio_stream_push", CallingConvention = CallingConvention.Cdecl)]
+    private static unsafe extern void CoreAudioStreamPush(
+        StreamingRequestBuffer* request,
+        ResponseBuffer* response);
+#endif
 
+#if NET7_0_OR_GREATER
     [LibraryImport(LibraryName, EntryPoint = "audio_stream_stop")]
     [UnmanagedCallConv(CallConvs = new[] { typeof(System.Runtime.CompilerServices.CallConvCdecl) })]
     private static unsafe partial void CoreAudioStreamStop(
         RequestBuffer* request,
         ResponseBuffer* response);
+#else
+    [DllImport(LibraryName, EntryPoint = "audio_stream_stop", CallingConvention = CallingConvention.Cdecl)]
+    private static unsafe extern void CoreAudioStreamStop(
+        RequestBuffer* request,
+        ResponseBuffer* response);
+#endif
 
     // helper to capture exceptions in callbacks
     internal class CallbackHelper
@@ -323,7 +363,7 @@
 
             if (response.Error != IntPtr.Zero && response.ErrorLength > 0)
             {
                 result.Error = Marshal.PtrToStringUTF8(response.Error, response.ErrorLength)!;
                 _logger.LogDebug($"Input:{commandInput ?? "null"}");
                 _logger.LogDebug($"Command: {commandName} Error: {result.Error}");
             }

sdk/cs/src/Detail/ICoreInterop.cs

@@ -22,7 +22,7 @@ internal record Response
     public delegate void CallbackFn(string callbackData);
 
     [StructLayout(LayoutKind.Sequential)]
-    protected unsafe struct RequestBuffer
+    public unsafe struct RequestBuffer
     {
         public nint Command;
         public int CommandLength;
@@ -31,7 +31,7 @@ protected unsafe struct RequestBuffer
     }
 
     [StructLayout(LayoutKind.Sequential)]
-    protected unsafe struct ResponseBuffer
+    public unsafe struct ResponseBuffer
     {
         public nint Data;
         public int DataLength;
@@ -42,7 +42,7 @@ protected unsafe struct ResponseBuffer
     // native callback function signature
     // Return: 0 = continue, 1 = cancel
     [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-    protected unsafe delegate int NativeCallbackFn(nint data, int length, nint userData);
+    public unsafe delegate int NativeCallbackFn(nint data, int length, nint userData);
 
     Response ExecuteCommand(string commandName, CoreInteropRequest? commandInput = null);
     Response ExecuteCommandWithCallback(string commandName, CoreInteropRequest? commandInput, CallbackFn callback);
@@ -56,7 +56,7 @@ Task<Response> ExecuteCommandWithCallbackAsync(string commandName, CoreInteropRe
     // --- Audio streaming session support ---
 
     [StructLayout(LayoutKind.Sequential)]
-    protected unsafe struct StreamingRequestBuffer
+    public unsafe struct StreamingRequestBuffer
     {
         public nint Command;
         public int CommandLength;

sdk/cs/src/Microsoft.AI.Foundry.Local.csproj

@@ -13,16 +13,15 @@
       <RepositoryUrl>https://github.com/microsoft/Foundry-Local</RepositoryUrl>
       <RepositoryType>git</RepositoryType>
 
-      <TargetFramework>net9.0</TargetFramework>
+      <TargetFrameworks>netstandard2.0</TargetFrameworks>
       <RuntimeIdentifiers>win-x64;win-arm64;linux-x64;linux-arm64;osx-arm64</RuntimeIdentifiers> 
 
       <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
       <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
       <ImplicitUsings>enable</ImplicitUsings>
-      <IsAotCompatible>True</IsAotCompatible>
-      <IsTrimmable>True</IsTrimmable>
+      <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">True</IsAotCompatible>
       <Nullable>enable</Nullable>
-      <WarningsAsErrors />
+      <LangVersion>latest</LangVersion>
 
       <IncludeSymbols>true</IncludeSymbols>
       <SymbolPackageFormat>snupkg</SymbolPackageFormat>
@@ -88,7 +87,7 @@
       <PackageId>Microsoft.AI.Foundry.Local.WinML</PackageId>
       <AssemblyName>Microsoft.AI.Foundry.Local.WinML</AssemblyName>
       <DefineConstants>$(DefineConstants);IS_WINML</DefineConstants>
-      <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework> <!-- override -->
+      <TargetFrameworks>net8.0-windows10.0.26100.0</TargetFrameworks>
       <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
       <!-- TODO: Should we define this here to make it explicit? What minimnum is actually supported? -->
       <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
@@ -128,6 +127,8 @@
 
       <PackageReference Include="Betalgo.Ranul.OpenAI" Version="9.1.0" />
       <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.9" />
+      <PackageReference Include="PolySharp" Version="1.15.0" PrivateAssets="all" />
+      <PackageReference Include="System.Threading.Channels" Version="8.0.0" />
       <!-- specify PrivateAssets to exclude from nuget dependencies -->
       <PackageReference Include="IDisposableAnalyzers" Version="4.0.8" PrivateAssets="all"/>
     </ItemGroup>

sdk/cs/test/FoundryLocal.Tests/Microsoft.AI.Foundry.Local.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net462;net8.0;</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(UseWinML)'=='true'">
-    <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
+    <TargetFrameworks>net8.0-windows10.0.26100.0;</TargetFrameworks>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <WindowsPackageType>None</WindowsPackageType>
   </PropertyGroup>