Mirrors/ArchiSteamFarm
2
0
Fork 0
mirror of https://github.com/JustArchiNET/ArchiSteamFarm synced 2024-11-10 07:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for OS-specific builds not being able to restart after update

Browse source
This commit is contained in:
Archi 2021-11-22 22:36:38 +01:00
parent d3737f0705
commit 958c6bb704
No known key found for this signature in database
GPG key ID: 6B138B4C64555AEA
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
ArchiSteamFarm/Core/ASF.cs
View file

@ -77,6 +77,7 @@ public static class ASF {
internal static ICrossProcessSemaphore? RateLimitingSemaphore { get; private set; }
internal static ImmutableDictionary<Uri, (ICrossProcessSemaphore RateLimitingSemaphore, SemaphoreSlim OpenConnectionsSemaphore)>? WebLimitingSemaphores { get; private set; }
private static readonly ImmutableHashSet<string> AssembliesNeededBeforeUpdate = ImmutableHashSet.Create("System.IO.Pipes");
private static readonly SemaphoreSlim UpdateSemaphore = new(1, 1);
private static Timer? AutoUpdatesTimer;
@ -419,17 +420,31 @@ public static class ASF {
}.ToImmutableDictionary();
}
private static void LoadAssembliesNeededBeforeUpdate() {
HashSet<string> loadedAssembliesNames = new();
foreach (Assembly assembly in AssembliesNeededBeforeUpdate.Select(Assembly.Load)) {
LoadAssembliesRecursively(assembly, loadedAssembliesNames);
}
}
[UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "We don't care about trimmed assemblies, as we need it to work only with the known (used) ones")]
private static void LoadAssembliesRecursively(Assembly assembly, HashSet<string>? loadedAssembliesNames = null) {
if (assembly == null) {
throw new ArgumentNullException(nameof(assembly));
}
if (loadedAssembliesNames == null) {
if ((loadedAssembliesNames == null) || (loadedAssembliesNames.Count == 0)) {
Assembly[] loadedAssemblies = AppDomain.CurrentDomain.GetAssemblies();
// ReSharper disable once RedundantSuppressNullableWarningExpression - required for .NET Framework
loadedAssembliesNames = loadedAssemblies.Select(static loadedAssembly => loadedAssembly.FullName).Where(static name => !string.IsNullOrEmpty(name)).ToHashSet()!;
IEnumerable<string> loadedAssembliesEnumerable = loadedAssemblies.Select(static loadedAssembly => loadedAssembly.FullName).Where(static name => !string.IsNullOrEmpty(name))!;
if (loadedAssembliesNames == null) {
loadedAssembliesNames = loadedAssembliesEnumerable.ToHashSet();
} else {
loadedAssembliesNames.UnionWith(loadedAssembliesEnumerable);
}
}
foreach (AssemblyName assemblyName in assembly.GetReferencedAssemblies().Where(assemblyName => !loadedAssembliesNames.Contains(assemblyName.FullName))) {
@ -924,6 +939,11 @@ public static class ASF {
LoadAssembliesRecursively(Assembly.GetExecutingAssembly());
}
// This is a tricky one, for some reason we might need to preload some selected assemblies even in OS-specific builds that normally should be self-contained...
// It's as if the executable file was directly mapped to memory and moving it out of the original path caused the whole thing to crash
// TODO: This is a total hack, I wish we could get to the bottom of this hole and find out what is really going on there in regards to the above
LoadAssembliesNeededBeforeUpdate();
// Firstly we'll move all our existing files to a backup directory
string backupDirectory = Path.Combine(targetDirectory, SharedInfo.UpdateDirectory);