Merge branch 'develop' into fix/cli-runner-paths-9680

sanzoghenzo · Jan 24, 2025 · 94394d8 · 94394d8
2 parents ad5f62a + e70ba0b
commit 94394d8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/dev/pyRevitLabs/pyRevitCLI/PyRevitCLI.cs b/dev/pyRevitLabs/pyRevitCLI/PyRevitCLI.cs
@@ -89,6 +89,21 @@ public static string CLIInfoVersion  {
 
         // cli entry point:
         static void Main(string[] args) {
+            AppDomain.CurrentDomain.AssemblyResolve += (sender, args) =>
+            {
+                if (args.Name.StartsWith("Newtonsoft.Json,"))
+                {
+                    var assemblyPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "pyRevitLabs.Json.dll");
+                    logger.Debug($"Looking for Newtonsoft.Json assembly at: {assemblyPath}");
+                    if (File.Exists(assemblyPath))
+                    {
+                        var assembly = Assembly.LoadFrom(assemblyPath);
+                        logger.Debug($"Successfully loaded Newtonsoft.Json assembly from: {assemblyPath}");
+                        return assembly;
+                    }
+                }
+                return null;
+            };
             // process arguments for logging level
             var argsList = new List<string>(args);
 

diff --git a/docs/dev-guide.md b/docs/dev-guide.md
@@ -22,6 +22,7 @@ Install Visual Studio 2022 and select:
     - .NET Framework 4.7.2 Targeting Pack
     - .NET Framework 4.8 SDK
     - .NET Framework 4.8 Targeting Pack
+    - .NET 3.1 Runtime (MahApps.Metro)
     - NuGet package manager
     - MSBuild