Search for config loader assembly in bin subfolder. Fixes rollbar#636

northwoodspd · Feb 8, 2023 · d8efcce · d8efcce
1 parent e9c26fe
commit d8efcce
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/Rollbar/Common/RuntimeEnvironmentUtility.cs b/Rollbar/Common/RuntimeEnvironmentUtility.cs
@@ -32,6 +32,11 @@ public static string GetSdkRuntimeLocationPath()
 
             if (path != null)
             {
+                if (Directory.Exists(Path.Combine(path, "bin")))
+                {
+                    return Path.Combine(path, "bin");
+                }
+
                 return path;
             }
 #endif

diff --git a/UnitTest.Rollbar/Common/RuntimeEnvironmentUtilityFixture.cs b/UnitTest.Rollbar/Common/RuntimeEnvironmentUtilityFixture.cs
@@ -5,6 +5,7 @@
     using Microsoft.VisualStudio.TestTools.UnitTesting;
     using System;
     using System.Diagnostics;
+    using System.IO;
     using System.Linq;
     using System.Text;
     using System.Threading;
@@ -40,5 +41,26 @@ public void TestGetSdkRuntimeLocationPath()
             Assert.IsFalse(string.IsNullOrWhiteSpace(path));
         }
 
+        [TestMethod]
+        public void TestGetSdkRuntimeLocationPathWithBinSubfolder()
+        {
+            var expectedPath = Path.Combine(AppContext.BaseDirectory, "bin");
+            try
+            {
+                Directory.CreateDirectory(expectedPath);
+
+                var path = RuntimeEnvironmentUtility.GetSdkRuntimeLocationPath();
+                Assert.IsNotNull(path);
+                Assert.IsFalse(string.IsNullOrWhiteSpace(path));
+                Assert.IsTrue(path.EndsWith("bin"));
+            }
+            finally
+            {
+                if (Directory.Exists(expectedPath))
+                {
+                    Directory.Delete(expectedPath);
+                }
+            }
+        }
     }
 }