Merge remote-tracking branch 'origin/main' into codex/fix-msbuild-project-specification-error-5h26ws

# Conflicts:
#	.github/workflows/ci.yml
#	MLXSharp.slnx
#	README.md
#	src/MLXSharp.Native/README.md
#	src/MLXSharp/MLXSharp.csproj

Author: KSemenenko

.github/workflows/ci.yml

@@ -23,10 +23,10 @@ jobs:
         run: dotnet --info
 
       - name: Restore dependencies
-        run: dotnet restore MLXSharp.slnx
+        run: dotnet restore 
 
       - name: Build C# projects (initial validation)
-        run: dotnet build MLXSharp.slnx --configuration Release --no-restore
+        run: dotnet build  --configuration Release --no-restore
 
       - name: Install CMake
         run: brew install cmake
@@ -41,7 +41,7 @@ jobs:
           ls -la src/MLXSharp.Native/runtimes/osx-arm64/native/
 
       - name: Rebuild solution with native libraries
-        run: dotnet build MLXSharp.slnx --configuration Release --no-restore
+        run: dotnet build --configuration Release --no-restore
 
       - name: Setup Python for HuggingFace
         uses: actions/setup-python@v5
@@ -66,7 +66,7 @@ jobs:
           ls -la "$TEST_OUTPUT/runtimes/osx-arm64/native/"
 
       - name: Run tests
-        run: dotnet test MLXSharp.slnx --configuration Release --no-build --logger "trx;LogFileName=TestResults.trx" --results-directory artifacts/test-results
+        run: dotnet test --configuration Release --no-build --logger "trx;LogFileName=TestResults.trx" --results-directory artifacts/test-results
         env:
           MLXSHARP_MODEL_PATH: ${{ github.workspace }}/models/Qwen1.5-0.5B-Chat-4bit
 

MLXSharp.slnx

@@ -1,11 +1,5 @@
 <Solution>
-  <Configurations>
-    <Platform Name="Any CPU" />
-    <Platform Name="x64" />
-    <Platform Name="x86" />
-  </Configurations>
   <Folder Name="/src/">
-    <Project Path="src/MLXSharp.Native/MLXSharp.Native.csproj" />
     <Project Path="src/MLXSharp.SemanticKernel/MLXSharp.SemanticKernel.csproj" />
     <Project Path="src/MLXSharp.Tests/MLXSharp.Tests.csproj" />
     <Project Path="src/MLXSharp/MLXSharp.csproj" />

README.md

@@ -17,8 +17,7 @@ The design mirrors the packaging approach from projects such as [LLamaSharp](htt
 ```
 ├── extern/mlx                      # Git submodule with the official MLX sources
 ├── native/                         # Native wrapper scaffold (CMake project)
-├── src/MLXSharp/                   # Managed library with Microsoft.Extensions.AI adapters
-├── src/MLXSharp.Native/            # Native runtime packaging project with stub binaries
+├── src/MLXSharp/                   # Managed library with Microsoft.Extensions.AI adapters + packaged runtimes
 ├── src/MLXSharp.SemanticKernel/    # Semantic Kernel integration (separate package)
 └── src/MLXSharp.Tests/             # Integration tests covering DI and Semantic Kernel
 ```
@@ -100,7 +99,7 @@ This package depends on MLXSharp and adds Semantic Kernel chat completion servic
 
 GitHub Actions automatically:
 1. Compiles native wrapper with MLX submodule
-2. Copies `libmlxsharp.dylib` to `src/MLXSharp.Native/runtimes/osx-arm64/native/`
+2. Copies `libmlxsharp.dylib` to `src/MLXSharp/runtimes/osx-arm64/native/`
 3. Packs managed + native together in NuGet package
 
 At runtime `MlxNativeLibrary` automatically finds the right library:

TESTING.md

@@ -16,7 +16,7 @@ dotnet test
 brew install cmake
 cmake -S native -B native/build -DCMAKE_BUILD_TYPE=Release
 cmake --build native/build --target mlxsharp
-cp native/build/libmlxsharp.dylib src/MLXSharp.Native/runtimes/osx-arm64/native/
+cp native/build/libmlxsharp.dylib src/MLXSharp/runtimes/osx-arm64/native/
 ```
 
 Stub версія лінкується з MLX але повертає тестові дані замість реальних результатів моделі.

src/MLXSharp.Native/MLXSharp.Native.csproj

@@ -7,19 +7,9 @@
     <PackageReference Include="Microsoft.Extensions.AI" Version="9.9.1" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\MLXSharp.Native\MLXSharp.Native.csproj"
-                      ReferenceOutputAssembly="false"
-                      PrivateAssets="all"
-                      IncludeAssets="none" />
-  </ItemGroup>
-
   <PropertyGroup>
-    <MLXSharpProjectDirectory>$(MSBuildThisFileDirectory)</MLXSharpProjectDirectory>
-    <MLXSharpNativeRuntimeRoot>$(MLXSharpProjectDirectory)..\MLXSharp.Native\runtimes</MLXSharpNativeRuntimeRoot>
-    <MLXSharpMacNativeBinary Condition="'$(MLXSharpMacNativeBinary)' == ''">$(MLXSharpProjectDirectory)..\..\native\build\libmlxsharp.dylib</MLXSharpMacNativeBinary>
-    <MLXSharpMacNativeDestination>$(MLXSharpNativeRuntimeRoot)\osx-arm64\native\libmlxsharp.dylib</MLXSharpMacNativeDestination>
-    <MLXSharpMacNativeDestinationDir>$([System.IO.Path]::GetDirectoryName('$(MLXSharpMacNativeDestination)'))</MLXSharpMacNativeDestinationDir>
+    <MLXSharpMacNativeBinary Condition="'$(MLXSharpMacNativeBinary)' == ''">$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)','..','..','native','build','libmlxsharp.dylib'))</MLXSharpMacNativeBinary>
+    <MLXSharpMacNativeDestination>$([System.IO.Path]::Combine('$(MSBuildProjectDirectory)','runtimes','osx-arm64','native','libmlxsharp.dylib'))</MLXSharpMacNativeDestination>
     <MLXSharpSkipMacNativeValidation Condition="'$(MLXSharpSkipMacNativeValidation)' == ''">false</MLXSharpSkipMacNativeValidation>
   </PropertyGroup>
 
@@ -53,9 +43,9 @@
            Text="libmlxsharp.dylib is missing. Build the native library or supply MLXSharpMacNativeBinary before packing." />
   </Target>
 
-  <!-- Include native binaries from MLXSharp.Native project into this package -->
+  <!-- Include native binaries embedded in this project -->
   <ItemGroup>
-    <None Include="..\MLXSharp.Native\runtimes\**\*.*"
+    <None Include="runtimes\**\*.*"
           Pack="true"
           PackagePath="runtimes/%(RecursiveDir)%(Filename)%(Extension)"
           CopyToOutputDirectory="PreserveNewest"