Skip to content

Commit 0520764

Browse files
Return assembly for assembly loading
1 parent 36e57e3 commit 0520764

File tree

2 files changed

+21
-20
lines changed

2 files changed

+21
-20
lines changed

api/AltV.Net/Alt.Assembly.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@ public partial class Alt
88
{
99
public static IEnumerable<Assembly> Assemblies => Module.Assemblies;
1010

11-
public static void LoadAssemblyFromName(AssemblyName assemblyName) => Module.LoadAssemblyFromName(assemblyName);
11+
public static Assembly LoadAssemblyFromName(AssemblyName assemblyName) =>
12+
Module.LoadAssemblyFromName(assemblyName);
1213

13-
public static void LoadAssemblyFromStream(Stream stream) => Module.LoadAssemblyFromStream(stream);
14+
public static Assembly LoadAssemblyFromStream(Stream stream) => Module.LoadAssemblyFromStream(stream);
1415

15-
public static void LoadAssemblyFromStream(Stream stream, Stream assemblySymbols) =>
16+
public static Assembly LoadAssemblyFromStream(Stream stream, Stream assemblySymbols) =>
1617
Module.LoadAssemblyFromStream(stream, assemblySymbols);
1718

18-
public static void LoadAssemblyFromPath(string path) => Module.LoadAssemblyFromPath(path);
19+
public static Assembly LoadAssemblyFromPath(string path) => Module.LoadAssemblyFromPath(path);
1920

20-
public static void LoadAssemblyFromNativeImagePath(string nativeImagePath, string assemblyPath) =>
21+
public static Assembly LoadAssemblyFromNativeImagePath(string nativeImagePath, string assemblyPath) =>
2122
Module.LoadAssemblyFromNativeImagePath(nativeImagePath, assemblyPath);
2223
}
2324
}

api/AltV.Net/Module.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -138,34 +138,34 @@ public Module(IServer server, AssemblyLoadContext assemblyLoadContext,
138138
ColShapePool = colShapePool;
139139
}
140140

141-
public void LoadAssemblyFromName(AssemblyName assemblyName)
141+
public Assembly LoadAssemblyFromName(AssemblyName assemblyName)
142142
{
143-
if (!assemblyLoadContext.TryGetTarget(out var target)) return;
144-
target.LoadFromAssemblyName(assemblyName);
143+
if (!assemblyLoadContext.TryGetTarget(out var target)) return null;
144+
return target.LoadFromAssemblyName(assemblyName);
145145
}
146146

147-
public void LoadAssemblyFromStream(Stream stream)
147+
public Assembly LoadAssemblyFromStream(Stream stream)
148148
{
149-
if (!assemblyLoadContext.TryGetTarget(out var target)) return;
150-
target.LoadFromStream(stream);
149+
if (!assemblyLoadContext.TryGetTarget(out var target)) return null;
150+
return target.LoadFromStream(stream);
151151
}
152152

153-
public void LoadAssemblyFromStream(Stream stream, Stream assemblySymbols)
153+
public Assembly LoadAssemblyFromStream(Stream stream, Stream assemblySymbols)
154154
{
155-
if (!assemblyLoadContext.TryGetTarget(out var target)) return;
156-
target.LoadFromStream(stream, assemblySymbols);
155+
if (!assemblyLoadContext.TryGetTarget(out var target)) return null;
156+
return target.LoadFromStream(stream, assemblySymbols);
157157
}
158158

159-
public void LoadAssemblyFromPath(string path)
159+
public Assembly LoadAssemblyFromPath(string path)
160160
{
161-
if (!assemblyLoadContext.TryGetTarget(out var target)) return;
162-
target.LoadFromAssemblyPath(path);
161+
if (!assemblyLoadContext.TryGetTarget(out var target)) return null;
162+
return target.LoadFromAssemblyPath(path);
163163
}
164164

165-
public void LoadAssemblyFromNativeImagePath(string nativeImagePath, string assemblyPath)
165+
public Assembly LoadAssemblyFromNativeImagePath(string nativeImagePath, string assemblyPath)
166166
{
167-
if (!assemblyLoadContext.TryGetTarget(out var target)) return;
168-
target.LoadFromNativeImagePath(nativeImagePath, assemblyPath);
167+
if (!assemblyLoadContext.TryGetTarget(out var target)) return null;
168+
return target.LoadFromNativeImagePath(nativeImagePath, assemblyPath);
169169
}
170170

171171
public void On(string eventName, Function function)

0 commit comments

Comments
 (0)