add rid logic

Author: chtenb

Rubjerg.Graphviz/GraphvizCommand.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Reflection;
 using System.Text;
+using System.Runtime.InteropServices;
 
 namespace Rubjerg.Graphviz;
 
@@ -11,6 +12,27 @@ namespace Rubjerg.Graphviz;
 /// </summary>
 public class GraphvizCommand
 {
+    internal static string Rid
+    {
+        get
+        {
+            var os = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "win"
+                   : RuntimeInformation.IsOSPlatform(OSPlatform.OSX)     ? "osx"
+                   : "linux";   // default
+
+            var arch = RuntimeInformation.ProcessArchitecture switch
+            {
+                Architecture.X64   => "x64",
+                Architecture.Arm64 => "arm64",
+                Architecture.X86   => "x86",
+                Architecture.Arm   => "arm",
+                _                  => "unknown"
+            };
+
+            return $"{os}-{arch}";
+        }
+    }
+
     public static RootGraph CreateLayout(Graph input, string engine = LayoutEngines.Dot, CoordinateSystem coordinateSystem = CoordinateSystem.BottomLeft)
     {
         var (stdout, stderr) = Exec(input, engine: engine);
@@ -34,7 +56,7 @@ public static string ConvertBytesOutputToString(byte[] data)
     /// <returns>stderr may contain warnings, stdout is in utf8 encoding</returns>
     public static (byte[] stdout, string stderr) Exec(Graph input, string format = "xdot", string? outputPath = null, string engine = LayoutEngines.Dot)
     {
-        string exeName = "dot";
+        var exeName  = Path.Combine(AppContext.BaseDirectory, "runtimes", Rid, "native", "dot");
         string arguments = $"-T{format} -K{engine}";
         if (outputPath != null)
         {

Rubjerg.Graphviz/Rubjerg.Graphviz.csproj

@@ -27,12 +27,17 @@
     <RepositoryUrl>https://github.com/Rubjerg/Graphviz.NetWrapper</RepositoryUrl>
     <PackageProjectUrl>https://github.com/Rubjerg/Graphviz.NetWrapper</PackageProjectUrl>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    
+    <Rid Condition=" '$(OS)' == 'Windows_NT' ">win-x64</Rid>
+    <Rid Condition=" '$(OS)' != 'Windows_NT' ">linux-x64</Rid>
   </PropertyGroup>
 
-  <!-- Platform‑specific compilation constant for Windows code paths -->
-  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-    <DefineConstants>_WINDOWS</DefineConstants>
-  </PropertyGroup>
+  <ItemGroup>
+    <None Include="..\LICENSE">
+      <Pack>true</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -44,34 +49,23 @@
     </ProjectReference>
   </ItemGroup>
 
-  <!--
-       *****  Native assets *****
-       All files under Resources/ are copied to bin/ at build time *and* packed into
-       runtimes/<rid>/native so consumers only get the bits for their platform.
-  -->
+  <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
+    <DefineConstants>_WINDOWS</DefineConstants>
+  </PropertyGroup>
 
   <ItemGroup>
-    <!-- Top‑level executables / libraries -->
     <None Include="Resources/*" Exclude="Resources/graphviz/**">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>%(RecursiveDir)/%(Filename)%(Extension)</Link>
+      <TargetPath>runtimes/$(Rid)/native/%(Filename)%(Extension)</TargetPath>
       <Pack>true</Pack>
-      <PackagePath>runtimes/linux-x64/native/</PackagePath>
+      <PackagePath>runtimes/$(Rid)/native/</PackagePath>
     </None>
-    <!-- Graphviz plug‑ins & sub‑folder -->
+
     <None Include="Resources/graphviz/**">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Link>%(RecursiveDir)/graphviz/%(Filename)%(Extension)</Link>
-      <Pack>true</Pack>
-      <PackagePath>runtimes/linux-x64/native/graphviz/%(RecursiveDir)</PackagePath>
-    </None>
-  </ItemGroup>
-
-  <!-- Shared assets such as the licence file -->
-  <ItemGroup>
-    <None Include="..\LICENSE">
+      <TargetPath>runtimes/$(Rid)/native/graphviz/%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
       <Pack>true</Pack>
-      <PackagePath></PackagePath>
+      <PackagePath>runtimes/$(Rid)/native/graphviz/%(RecursiveDir)</PackagePath>
     </None>
   </ItemGroup>