From 1823406daa5923089892170aa209b90dc21b58e0 Mon Sep 17 00:00:00 2001
From: "Luis E. Fraguada" <luis@mcneel.com>
Date: Mon, 13 Apr 2026 12:13:46 +0200
Subject: [PATCH 1/2] let RhinoInside find Rhino when RhinoSystemDir is not set
 in the Config file

---
 src/Rhino.Testing/Configs.cs   |  3 ---
 src/Rhino.Testing/RhinoCore.cs | 12 +++++++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/Rhino.Testing/Configs.cs b/src/Rhino.Testing/Configs.cs
index 0e05764..c9f52fa 100644
--- a/src/Rhino.Testing/Configs.cs
+++ b/src/Rhino.Testing/Configs.cs
@@ -86,9 +86,6 @@ static Configs()
                     return;
                 }
 
-                Current.RhinoSystemDir = Path.GetFullPath(
-                        Path.Combine(Path.GetDirectoryName(cfgFile), Current.RhinoSystemDir)
-                    );
             }
         }
 
diff --git a/src/Rhino.Testing/RhinoCore.cs b/src/Rhino.Testing/RhinoCore.cs
index 025cfeb..3d9d240 100644
--- a/src/Rhino.Testing/RhinoCore.cs
+++ b/src/Rhino.Testing/RhinoCore.cs
@@ -33,12 +33,18 @@ public static void Initialize()
                 return;
             }
 
-            if (!Directory.Exists(Configs.Current.RhinoSystemDir))
+            // Do not require the RhinoSystemDir to be set, as the RhinoInside resolver can find Rhino in the "vanilla" installation locations.
+            if (string.IsNullOrEmpty(Configs.Current.RhinoSystemDir) || !Directory.Exists(Configs.Current.RhinoSystemDir))
+                RhinoInside.Resolver.Initialize();
+            else
             {
-                throw new DirectoryNotFoundException(Configs.Current.RhinoSystemDir);
+                if (!Directory.Exists(Configs.Current.RhinoSystemDir))
+                {
+                    throw new DirectoryNotFoundException(Configs.Current.RhinoSystemDir);
+                }
+                RhinoInside.Resolver.Initialize(Configs.Current.RhinoSystemDir);
             }
 
-            RhinoInside.Resolver.Initialize(Configs.Current.RhinoSystemDir);
             Configs.Current.RhinoSystemDir = RhinoInside.Resolver.RhinoSystemDirectory;
 
             TestContext.WriteLine("Loading rhino core");

From 275cbd077bb44676a1b9b7a6b039da3210062c55 Mon Sep 17 00:00:00 2001
From: "Luis E. Fraguada" <luis@mcneel.com>
Date: Mon, 13 Apr 2026 12:15:14 +0200
Subject: [PATCH 2/2] changelog

---
 CHANGELOG.md              | 3 +++
 src/Directory.Build.props | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 632d347..9e4d265 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## [9.0.8-beta] - 2026-04-13
+- Allow Rhino.Inside to find Rhino when RhinoSystemDir is not set in the config file
+
 ## [9.0.7-beta] - 2026-04-10
 - Fix broken GH Tests
 - Find GH on Linux
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 12f38d5..c7fc683 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <RhinoTestingVersion>9.0.7</RhinoTestingVersion>
+    <RhinoTestingVersion>9.0.8</RhinoTestingVersion>
     <RhinoInsideVersion>9.0.26084.13070-beta</RhinoInsideVersion>
     <RhinoAPIVersion>9.0.25350.305-wip</RhinoAPIVersion>
     <SourceDir>$(MSBuildThisFileDirectory)src\</SourceDir>