Backups/UnityExplorer
1
0
Fork 0
mirror of https://github.com/sinai-dev/UnityExplorer.git synced 2025-06-16 22:27:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix exception when adding certain references in net6

Browse Source
This commit is contained in:
Sinai 2022-04-12 00:26:49 +10:00
parent 6110c59721
commit 409a468b55
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/CSConsole/ScriptEvaluator.cs
View File

@ -11,7 +11,7 @@ namespace UnityExplorer.CSConsole
{ {
public class ScriptEvaluator : Evaluator, IDisposable public class ScriptEvaluator : Evaluator, IDisposable
{ {
private static readonly HashSet<string> StdLib = new HashSet<string>(StringComparer.InvariantCultureIgnoreCase) private static readonly HashSet<string> StdLib = new(StringComparer.InvariantCultureIgnoreCase)
{ {
"mscorlib", "System.Core", "System", "System.Xml" "mscorlib", "System.Core", "System", "System.Xml"
}; };
@ -23,7 +23,7 @@ namespace UnityExplorer.CSConsole
{ {
_textWriter = tw; _textWriter = tw;
ImportAppdomainAssemblies(Reference); ImportAppdomainAssemblies();
AppDomain.CurrentDomain.AssemblyLoad += OnAssemblyLoad; AppDomain.CurrentDomain.AssemblyLoad += OnAssemblyLoad;
} }
@ -68,7 +68,7 @@ namespace UnityExplorer.CSConsole
return new CompilerContext(settings, _reportPrinter); return new CompilerContext(settings, _reportPrinter);
} }
private static void ImportAppdomainAssemblies(Action<Assembly> import) private void ImportAppdomainAssemblies()
{ {
foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies()) foreach (Assembly assembly in AppDomain.CurrentDomain.GetAssemblies())
{ {
@ -76,7 +76,14 @@ namespace UnityExplorer.CSConsole
if (StdLib.Contains(name)) if (StdLib.Contains(name))
continue; continue;
import(assembly); try
{
Reference(assembly);
}
catch // (Exception ex)
{
//ExplorerCore.LogWarning($"Excepting referencing '{name}': {ex.GetType()}.{ex.Message}");
}
} }
} }
} }