From 65f412ec9f09831bf1aa2e69c77cd22875dcfc08 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Fri, 31 May 2024 15:37:03 +0000 Subject: [PATCH] fix: Fix myLoadAllTypes impl * Fix lowercase typo in hardcoded assemblies (case matters now that we run on Linux) * Fix resolution to full path (previous impl used deprecated functions, and incorrectly appended relative paths) --- .../DataStreamCore/DynamicLoading/PrimitiveManager.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/DataStreamSuite/DataStreamCore/DynamicLoading/PrimitiveManager.cs b/src/DataStreamSuite/DataStreamCore/DynamicLoading/PrimitiveManager.cs index 0209fdd2b..7ffefa52a 100644 --- a/src/DataStreamSuite/DataStreamCore/DynamicLoading/PrimitiveManager.cs +++ b/src/DataStreamSuite/DataStreamCore/DynamicLoading/PrimitiveManager.cs @@ -22,16 +22,14 @@ namespace BCG { AppDomain currentDomain = AppDomain.CurrentDomain; currentDomain.AssemblyResolve += new ResolveEventHandler(myAssemblyResolver); loadAssembly(this.GetType().Assembly.FullName); - var assemblies = new string[] { "datastream.dll", "sharedstreams.dll" }; + var assemblies = new string[] { "DataStream.dll", "SharedStreams.dll" }; var config_assemblies = Configuration.get().Assemblies; bts.Log.Gen.info($"PrimitiveManager.myLoadAllTypes config_assemblies: {config_assemblies}"); foreach (string assemblyName in assemblies/*config_assemblies*/) { bts.Log.Gen.info($"PrimitiveManager.myLoadAllTypes assemblyName: {assemblyName}"); string resolvedAssemblyPath = assemblyName; if (!System.IO.Path.IsPathRooted(assemblyName)) { - string appPath = Path.GetDirectoryName( - Assembly.GetAssembly(typeof(PrimitiveManager)).CodeBase.Substring("file:///".Length)); - resolvedAssemblyPath = System.IO.Path.GetFullPath(System.IO.Path.Combine(appPath, assemblyName)); + resolvedAssemblyPath = Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, assemblyName)); } loadAssembly(resolvedAssemblyPath); }