Load scripts from main assembly only
This commit is contained in:
@ -16,7 +16,7 @@ using System.Resources;
|
|||||||
|
|
||||||
|
|
||||||
// Version informationr(
|
// Version informationr(
|
||||||
[assembly: AssemblyVersion("1.5.3.140")]
|
[assembly: AssemblyVersion("1.5.3.142")]
|
||||||
[assembly: AssemblyFileVersion("1.5.3.140")]
|
[assembly: AssemblyFileVersion("1.5.3.142")]
|
||||||
[assembly: NeutralResourcesLanguageAttribute( "en-US" )]
|
[assembly: NeutralResourcesLanguageAttribute( "en-US" )]
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@ using System.Resources;
|
|||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyCulture("")]
|
||||||
|
|
||||||
// Version information
|
// Version information
|
||||||
[assembly: AssemblyVersion("1.5.3.118")]
|
[assembly: AssemblyVersion("1.5.3.122")]
|
||||||
[assembly: AssemblyFileVersion("1.5.3.118")]
|
[assembly: AssemblyFileVersion("1.5.3.122")]
|
||||||
[assembly: NeutralResourcesLanguageAttribute( "en-US" )]
|
[assembly: NeutralResourcesLanguageAttribute( "en-US" )]
|
||||||
|
|
||||||
|
@ -81,16 +81,20 @@ namespace RageCoop.Server.Scripting
|
|||||||
}
|
}
|
||||||
foreach(var a in assemblies)
|
foreach(var a in assemblies)
|
||||||
{
|
{
|
||||||
try
|
if(a.Key.Name.ToLower() == r.Name.ToLower()+".dll")
|
||||||
{
|
{
|
||||||
r.LoadScriptsFromAssembly(a.Key,a.Value);
|
|
||||||
}
|
try
|
||||||
catch (FileLoadException ex)
|
|
||||||
{
|
|
||||||
if (!ex.Message.EndsWith("Assembly with same name is already loaded"))
|
|
||||||
{
|
{
|
||||||
logger?.Warning("Failed to load assembly: "+a.Key.Name);
|
r.LoadScriptsFromAssembly(a.Key, a.Value);
|
||||||
logger?.Trace(ex.Message);
|
}
|
||||||
|
catch (FileLoadException ex)
|
||||||
|
{
|
||||||
|
if (!ex.Message.EndsWith("Assembly with same name is already loaded"))
|
||||||
|
{
|
||||||
|
logger?.Warning("Failed to load assembly: " + a.Key.Name);
|
||||||
|
logger?.Trace(ex.Message);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user