diff --git a/Client/Scripts/Properties/AssemblyInfo.cs b/Client/Scripts/Properties/AssemblyInfo.cs index a448b7d..16f46f2 100644 --- a/Client/Scripts/Properties/AssemblyInfo.cs +++ b/Client/Scripts/Properties/AssemblyInfo.cs @@ -16,7 +16,7 @@ using System.Resources; // Version information -[assembly: AssemblyVersion("1.6.0.28")] -[assembly: AssemblyFileVersion("1.6.0.28")] +[assembly: AssemblyVersion("1.6.0.55")] +[assembly: AssemblyFileVersion("1.6.0.55")] [assembly: NeutralResourcesLanguageAttribute( "en-US" )] diff --git a/Core/CoreUtils.cs b/Core/CoreUtils.cs index 3adb0de..452f407 100644 --- a/Core/CoreUtils.cs +++ b/Core/CoreUtils.cs @@ -120,8 +120,18 @@ namespace RageCoop.Core public static void LoadAllReferencedAssemblies(this AssemblyName assembly) { - foreach (var child in Assembly.Load(assembly).GetReferencedAssemblies()) - LoadAllReferencedAssemblies(child); + try + { + foreach (var child in Assembly.Load(assembly).GetReferencedAssemblies()) + LoadAllReferencedAssemblies(child); + } + catch (Exception ex) + { + if (!assembly.Name.StartsWith("Microsoft.CodeAnalysis")) + { + System.Console.WriteLine("Error loading dependency: " + ex); + } + } } public static string ToFullPath(this string path) diff --git a/Server/Properties/AssemblyInfo.cs b/Server/Properties/AssemblyInfo.cs index 66fc7df..0d194ff 100644 --- a/Server/Properties/AssemblyInfo.cs +++ b/Server/Properties/AssemblyInfo.cs @@ -15,7 +15,7 @@ using System.Resources; [assembly: AssemblyCulture("")] // Version information -[assembly: AssemblyVersion("1.6.0.55")] -[assembly: AssemblyFileVersion("1.6.0.55")] +[assembly: AssemblyVersion("1.6.0.57")] +[assembly: AssemblyFileVersion("1.6.0.57")] [assembly: NeutralResourcesLanguageAttribute( "en-US" )] diff --git a/libs/ScriptHookVDotNetCore b/libs/ScriptHookVDotNetCore index 1d189d6..7ff6ffd 160000 --- a/libs/ScriptHookVDotNetCore +++ b/libs/ScriptHookVDotNetCore @@ -1 +1 @@ -Subproject commit 1d189d681a096e07eda4e6eba87e4e5f6b23a0e5 +Subproject commit 7ff6ffd004857db036b8f668fd9598f961d2f4c2