Skip to content

Search for config loader assembly in bin subfolder #640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Search for config loader assembly in bin subfolder #640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8efcce
Search for config loader assembly in bin subfolder. Fixes #636
jacob-ewald Feb 8, 2023
c740831
Merge branch 'master' into issue-636
jacob-ewald Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Rollbar/Common/RuntimeEnvironmentUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 22 additions & 0 deletions UnitTest.Rollbar/Common/RuntimeEnvironmentUtilityFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}
}
}
}