root/plugin-library
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "8.2版本上传"

Browse Source 
This reverts commit 6a881f2e8a.
This commit is contained in:
张铮
2025-06-18 17:37:53 +08:00
parent 7fe716baab
commit e9af7221de
261 changed files with 1340 additions and 9065 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/01.HybridCLR/Editor/Meta/AssemblyCache.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: fa4650e79a52228488aa85e0690ca52c
guid: c9916e9cd98115a4e813f9d227f4d524
MonoImporter:
externalObjects: {}
serializedVersion: 2

44
Assets/01.HybridCLR/Editor/Meta/AssemblyCacheBase.cs
View File

@@ -1,23 +1,20 @@
using dnlib.DotNet;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace HybridCLR.Editor.Meta
{
public abstract class AssemblyCacheBase
public abstract class AssemblyCacheBase : IDisposable
{
private readonly IAssemblyResolver _assemblyPathResolver;
private readonly ModuleContext _modCtx;
private readonly AssemblyResolver _asmResolver;
private bool disposedValue;
private bool _loadedNetstandard;
public ModuleContext ModCtx => _modCtx;
public Dictionary<string, ModuleDefMD> LoadedModules { get; } = new Dictionary<string, ModuleDefMD>();
private readonly List<ModuleDefMD> _loadedModulesIncludeNetstandard = new List<ModuleDefMD>();
@@ -31,17 +28,6 @@ namespace HybridCLR.Editor.Meta
_asmResolver.UseGAC = false;
}
public ModuleDefMD TryLoadModule(string moduleName, bool loadReferenceAssemblies = true)
{
string dllPath = _assemblyPathResolver.ResolveAssembly(moduleName, false);
if (string.IsNullOrEmpty(dllPath))
{
return null;
}
return LoadModule(moduleName, loadReferenceAssemblies);
}
public ModuleDefMD LoadModule(string moduleName, bool loadReferenceAssemblies = true)
{
// Debug.Log($"load module:{moduleName}");
@@ -89,11 +75,33 @@ namespace HybridCLR.Editor.Meta
private ModuleDefMD DoLoadModule(string dllPath)
{
//Debug.Log($"do load module:{dllPath}");
ModuleDefMD mod = ModuleDefMD.Load(File.ReadAllBytes(dllPath), _modCtx);
mod.EnableTypeDefFindCache = true;
ModuleDefMD mod = ModuleDefMD.Load(dllPath, _modCtx);
_asmResolver.AddToCache(mod);
_loadedModulesIncludeNetstandard.Add(mod);
return mod;
}
protected virtual void Dispose(bool disposing)
{
if (!disposedValue)
{
if (disposing)
{
foreach (var mod in _loadedModulesIncludeNetstandard)
{
mod.Dispose();
}
_loadedModulesIncludeNetstandard.Clear();
LoadedModules.Clear();
}
disposedValue = true;
}
}
public void Dispose()
{
Dispose(disposing: true);
GC.SuppressFinalize(this);
}
}
}

2
Assets/01.HybridCLR/Editor/Meta/AssemblyCacheBase.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 3b01fa99119e72141bfee5628c0ffce1
guid: e640f5657ae667947b7330b660191943
MonoImporter:
externalObjects: {}
serializedVersion: 2

2
Assets/01.HybridCLR/Editor/Meta/AssemblyReferenceDeepCollector.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 0342c7d8575fdea49896260c77285286
guid: 8242ecc75b20deb489e7d9cadbb4d478
MonoImporter:
externalObjects: {}
serializedVersion: 2

2
Assets/01.HybridCLR/Editor/Meta/AssemblyResolverBase.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 5f8d48774b790364cbd36f1f68fd6614
guid: bd22e83fb27da4d49a6a22b4e724b789
MonoImporter:
externalObjects: {}
serializedVersion: 2

105
Assets/01.HybridCLR/Editor/Meta/AssemblySorter.cs
View File

@@ -1,105 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace HybridCLR.Editor.Meta
{
public class AssemblySorter
{
class Node
{
public string Name;
public List<Node> Dependencies = new List<Node>();
public Node(string name)
{
Name = name;
}
}
class TopologicalSorter
{
public static List<Node> Sort(List<Node> nodes)
{
List<Node> sorted = new List<Node>();
HashSet<Node> visited = new HashSet<Node>();
HashSet<Node> tempMarks = new HashSet<Node>();
foreach (var node in nodes)
{
if (!visited.Contains(node))
{
Visit(node, visited, tempMarks, sorted);
}
}
return sorted;
}
private static void Visit(Node node, HashSet<Node> visited, HashSet<Node> tempMarks, List<Node> sorted)
{
if (tempMarks.Contains(node))
{
throw new Exception("Detected cyclic dependency!");
}
if (!visited.Contains(node))
{
tempMarks.Add(node);
foreach (var dependency in node.Dependencies)
{
Visit(dependency, visited, tempMarks, sorted);
}
tempMarks.Remove(node);
visited.Add(node);
sorted.Add(node);
}
}
}
private static List<string> SortAssemblyByReferenceOrder(IEnumerable<string> assemblies, Dictionary<string, HashSet<string>> refs)
{
var nodes = new List<Node>();
var nodeMap = new Dictionary<string, Node>();
foreach (var assembly in assemblies)
{
var node = new Node(assembly);
nodes.Add(node);
nodeMap.Add(assembly, node);
}
foreach (var assembly in assemblies)
{
var node = nodeMap[assembly];
foreach (var refAssembly in refs[assembly])
{
node.Dependencies.Add(nodeMap[refAssembly]);
}
}
var sortedNodes = TopologicalSorter.Sort(nodes);
return sortedNodes.Select(node => node.Name).ToList();
}
public static List<string> SortAssemblyByReferenceOrder(IEnumerable<string> assemblies, IAssemblyResolver assemblyResolver)
{
var assCache = new AssemblyCache(assemblyResolver);
var assRefAssemblies = new Dictionary<string, HashSet<string>>();
foreach (var assName in assemblies)
{
var refAssemblies = new HashSet<string>();
var mod = assCache.LoadModule(assName, false);
foreach (var refAss in mod.GetAssemblyRefs())
{
if (assemblies.Contains(refAss.Name.ToString()))
{
refAssemblies.Add(refAss.Name.ToString());
}
}
assRefAssemblies.Add(assName, refAssemblies);
}
return SortAssemblyByReferenceOrder(assemblies, assRefAssemblies);
}
}
}

11
Assets/01.HybridCLR/Editor/Meta/AssemblySorter.cs.meta
View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: b9b8eb45398fa344daa8c6e9b9fbf291
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/01.HybridCLR/Editor/Meta/CombinedAssemblyResolver.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 89b83906438c52d4b9af4aaef055f177
guid: e5b98951f11c35e44884fea72fb99e56
MonoImporter:
externalObjects: {}
serializedVersion: 2

6
Assets/01.HybridCLR/Editor/Meta/FixedSetAssemblyResolver.cs
View File

@@ -29,12 +29,6 @@ namespace HybridCLR.Editor.Meta
Debug.Log($"[FixedSetAssemblyResolver] resolve:{assemblyName} path:{assemblyPath}");
return true;
}
assemblyPath = $"{_rootDir}/{assemblyName}.dll.bytes";
if (File.Exists(assemblyPath))
{
Debug.Log($"[FixedSetAssemblyResolver] resolve:{assemblyName} path:{assemblyPath}");
return true;
}
}
assemblyPath = null;
return false;

2
Assets/01.HybridCLR/Editor/Meta/FixedSetAssemblyResolver.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f135accd10f42c64b9735c3aa8cb1e77
guid: 5b53789283b21a240a8fa65b68900dfe
MonoImporter:
externalObjects: {}
serializedVersion: 2

60
Assets/01.HybridCLR/Editor/Meta/GenericArgumentContext.cs
View File

@@ -7,11 +7,13 @@ using System.Threading.Tasks;
namespace HybridCLR.Editor.Meta
{
public class GenericArgumentContext
/// <summary>
/// Replaces generic type/method var with its generic argument
/// </summary>
public sealed class GenericArgumentContext
{
private readonly List<TypeSig> typeArgsStack;
private readonly List<TypeSig> methodArgsStack;
List<TypeSig> typeArgsStack = new List<TypeSig>();
List<TypeSig> methodArgsStack = new List<TypeSig>();
public GenericArgumentContext(List<TypeSig> typeArgsStack, List<TypeSig> methodArgsStack)
{
@@ -19,6 +21,16 @@ namespace HybridCLR.Editor.Meta
this.methodArgsStack = methodArgsStack;
}
/// <summary>
/// Replaces a generic type/method var with its generic argument (if any). If
/// <paramref name="typeSig"/> isn't a generic type/method var or if it can't
/// be resolved, it itself is returned. Else the resolved type is returned.
/// </summary>
/// <param name="typeSig">Type signature</param>
/// <returns>New <see cref="TypeSig"/> which is never <c>null</c> unless
/// <paramref name="typeSig"/> is <c>null</c></returns>
public TypeSig Resolve(TypeSig typeSig)
{
if (!typeSig.ContainsGenericParameter)
@@ -29,9 +41,9 @@ namespace HybridCLR.Editor.Meta
switch (typeSig.ElementType)
{
case ElementType.Ptr: return new PtrSig(Resolve(typeSig.Next));
case ElementType.ByRef: return new ByRefSig(Resolve(typeSig.Next));
case ElementType.ByRef: return new PtrSig(Resolve(typeSig.Next));
case ElementType.SZArray: return new SZArraySig(Resolve(typeSig.Next));
case ElementType.SZArray: return new PtrSig(Resolve(typeSig.Next));
case ElementType.Array:
{
var ara = (ArraySig)typeSig;
@@ -41,7 +53,7 @@ namespace HybridCLR.Editor.Meta
case ElementType.Var:
{
GenericVar genericVar = (GenericVar)typeSig;
var newSig = Resolve(typeArgsStack, genericVar.Number);
var newSig = Resolve(typeArgsStack, genericVar.Number, true);
if (newSig == null)
{
throw new Exception();
@@ -52,7 +64,7 @@ namespace HybridCLR.Editor.Meta
case ElementType.MVar:
{
GenericMVar genericVar = (GenericMVar)typeSig;
var newSig = Resolve(methodArgsStack, genericVar.Number);
var newSig = Resolve(methodArgsStack, genericVar.Number, true);
if (newSig == null)
{
throw new Exception();
@@ -67,29 +79,7 @@ namespace HybridCLR.Editor.Meta
case ElementType.FnPtr:
{
var fptr = (FnPtrSig)typeSig;
var cs = fptr.Signature;
CallingConventionSig ccs;
switch (cs)
{
case MethodSig ms:
{
ccs = new MethodSig(ms.GetCallingConvention(), ms.GenParamCount, Resolve(ms.RetType), ms.Params.Select(p => Resolve(p)).ToList());
break;
}
case PropertySig ps:
{
ccs = new PropertySig(ps.HasThis, Resolve(ps.RetType));
break;
}
case GenericInstMethodSig gims:
{
ccs = new GenericInstMethodSig(gims.GenericArguments.Select(ga => Resolve(ga)).ToArray());
break;
}
default: throw new NotSupportedException(cs.ToString());
}
return new FnPtrSig(ccs);
throw new NotSupportedException(typeSig.ToString());
}
case ElementType.ValueArray:
@@ -101,9 +91,13 @@ namespace HybridCLR.Editor.Meta
}
}
private TypeSig Resolve(List<TypeSig> args, uint number)
private TypeSig Resolve(List<TypeSig> args, uint number, bool isTypeVar)
{
return args[(int)number];
var typeSig = args[(int)number];
var gvar = typeSig as GenericSig;
if (gvar is null || gvar.IsTypeVar != isTypeVar)
return typeSig;
return gvar;
}
}

2
Assets/01.HybridCLR/Editor/Meta/GenericArgumentContext.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 07595a9b5b2f54c44a67022ae3e077d4
guid: 8fb1ac43c73a55e4d98e853efca62e46
MonoImporter:
externalObjects: {}
serializedVersion: 2

2
Assets/01.HybridCLR/Editor/Meta/GenericClass.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: c95ff173013909548bd9e2008812f9ff
guid: 72167574ca223e34cb0b704882225877
MonoImporter:
externalObjects: {}
serializedVersion: 2

2
Assets/01.HybridCLR/Editor/Meta/GenericMethod.cs
View File

@@ -94,7 +94,7 @@ namespace HybridCLR.Editor.Meta
methodDef = method.ResolveMethodDef();
if (methodDef == null)
{
//Debug.LogWarning($"method:{method} ResolveMethodDef() == null");
Debug.LogWarning($"method:{method} ResolveMethodDef() == null");
return null;
}
if (method is MethodSpec methodSpec)

2
Assets/01.HybridCLR/Editor/Meta/GenericMethod.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 88ecf3d52ec393b4cac142518944e487
guid: 5110d4398a0b6504c94ed3c37b0da2e9
MonoImporter:
externalObjects: {}
serializedVersion: 2

2
Assets/01.HybridCLR/Editor/Meta/IAssemblyResolver.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f962a018018dbb945a19f82d2e098686
guid: 7cbf06fa49b97cf48a56cb6aeefc7563
MonoImporter:
externalObjects: {}
serializedVersion: 2

26
Assets/01.HybridCLR/Editor/Meta/MetaUtil.cs
View File

@@ -122,7 +122,7 @@ namespace HybridCLR.Editor.Meta
}
return new GenericInstSig(gia.GenericType, gia.GenericArguments.Select(ga => ToShareTypeSig(corTypes, ga)).ToList());
}
case ElementType.FnPtr: return corTypes.UIntPtr;
case ElementType.FnPtr: return corTypes.IntPtr;
case ElementType.ValueArray: return typeSig;
case ElementType.Module: return typeSig;
default:
@@ -189,29 +189,5 @@ namespace HybridCLR.Editor.Meta
}
return methodGenericParams;
}
public static bool IsSupportedPInvokeTypeSig(TypeSig typeSig)
{
typeSig = typeSig.RemovePinnedAndModifiers();
if (typeSig.IsByRef)
{
return true;
}
switch (typeSig.ElementType)
{
case ElementType.SZArray:
case ElementType.Array:
//case ElementType.Class:
case ElementType.String:
//case ElementType.Object:
return false;
default: return true;
}
}
public static bool IsSupportedPInvokeMethodSignature(MethodSig methodSig)
{
return IsSupportedPInvokeTypeSig(methodSig.RetType) && methodSig.Params.All(p => IsSupportedPInvokeTypeSig(p));
}
}
}

2
Assets/01.HybridCLR/Editor/Meta/MetaUtil.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f3dbfe2e8b6a92742b18e287c5d281dd
guid: a2e0aa5795138414ea5139e7691e0185
MonoImporter:
externalObjects: {}
serializedVersion: 2

2
Assets/01.HybridCLR/Editor/Meta/MethodReferenceAnalyzer.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 1c644b0c018fb87498d69c3202439d21
guid: 1c41435d2422e114eac193c405264d1d
MonoImporter:
externalObjects: {}
serializedVersion: 2

13
Assets/01.HybridCLR/Editor/Meta/PathAssemblyResolver.cs
View File

@@ -20,16 +20,11 @@ namespace HybridCLR.Editor.Meta
{
foreach(var path in _searchPaths)
{
assemblyPath = Path.Combine(path, $"{assemblyName}.dll");
if (File.Exists(assemblyPath))
string assPath = Path.Combine(path, assemblyName + ".dll");
if (File.Exists(assPath))
{
Debug.Log($"resolve {assemblyName} at {assemblyPath}");
return true;
}
assemblyPath = Path.Combine(path, $"{assemblyName}.dll.bytes");
if (File.Exists(assemblyPath))
{
Debug.Log($"resolve {assemblyName} at {assemblyPath}");
Debug.Log($"resolve {assemblyName} at {assPath}");
assemblyPath = assPath;
return true;
}
}

2
Assets/01.HybridCLR/Editor/Meta/PathAssemblyResolver.cs.meta
View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 121d574bf01969444aa6619a8f6dbb4c
guid: 94848f63e75d660448de23b230886219
MonoImporter:
externalObjects: {}
serializedVersion: 2