Compare commits
7 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
b24eee3ecf | ||
![]() |
9068558a53 | ||
![]() |
9c22948ce9 | ||
![]() |
2b1a5d4c6e | ||
![]() |
2860dda41b | ||
![]() |
5483728a4e | ||
![]() |
32d318be5e |
@@ -27,10 +27,10 @@ namespace Torch.Server
|
|||||||
|
|
||||||
private static readonly Logger Log = LogManager.GetLogger(nameof(Initializer));
|
private static readonly Logger Log = LogManager.GetLogger(nameof(Initializer));
|
||||||
private bool _init;
|
private bool _init;
|
||||||
private const string STEAMCMD_DIR = "steamcmd";
|
private const string TOOL_DIR = "tool";
|
||||||
private const string STEAMCMD_ZIP = "temp.zip";
|
private const string TOOL_ZIP = "temp.zip";
|
||||||
private static readonly string STEAMCMD_EXE = "steamcmd.exe";
|
private static readonly string TOOL_EXE = "DepotDownloader.exe";
|
||||||
private const string STEAMCMD_ARGS = "+force_install_dir \"{0}\" +login anonymous +app_update 298740 -beta automtatons-beta +quit";
|
private const string TOOL_ARGS = "-app 298740 -depot 298741 -dir \"{0}\"";
|
||||||
private TorchServer _server;
|
private TorchServer _server;
|
||||||
|
|
||||||
internal Persistent<TorchConfig> ConfigPersistent { get; }
|
internal Persistent<TorchConfig> ConfigPersistent { get; }
|
||||||
@@ -57,7 +57,7 @@ namespace Torch.Server
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (configuration.GetValue("getGameUpdates", true) && !configuration.GetValue("noupdate", false))
|
if (configuration.GetValue("getGameUpdates", true) && !configuration.GetValue("noupdate", false))
|
||||||
RunSteamCmd(configuration);
|
RunSteamCmdAsync(configuration).Wait();
|
||||||
|
|
||||||
var processPid = configuration.GetValue<int>("waitForPid");
|
var processPid = configuration.GetValue<int>("waitForPid");
|
||||||
if (processPid != 0)
|
if (processPid != 0)
|
||||||
@@ -124,36 +124,36 @@ namespace Torch.Server
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void RunSteamCmd(IConfiguration configuration)
|
public static async Task RunSteamCmdAsync(IConfiguration configuration)
|
||||||
{
|
{
|
||||||
var log = LogManager.GetLogger("SteamCMD");
|
var log = LogManager.GetLogger("SteamTool");
|
||||||
|
|
||||||
var path = configuration.GetValue<string>("steamCmdPath") ?? ApplicationContext.Current.TorchDirectory
|
var path = configuration.GetValue<string>("steamToolPath") ?? ApplicationContext.Current.TorchDirectory
|
||||||
.CreateSubdirectory(STEAMCMD_DIR).FullName;
|
.CreateSubdirectory(TOOL_DIR).FullName;
|
||||||
|
|
||||||
if (!Directory.Exists(path))
|
if (!Directory.Exists(path))
|
||||||
{
|
{
|
||||||
Directory.CreateDirectory(path);
|
Directory.CreateDirectory(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
var steamCmdExePath = Path.Combine(path, STEAMCMD_EXE);
|
var steamCmdExePath = Path.Combine(path, TOOL_EXE);
|
||||||
if (!File.Exists(steamCmdExePath))
|
if (!File.Exists(steamCmdExePath))
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
log.Info("Downloading SteamCMD.");
|
log.Info("Downloading Steam Tool.");
|
||||||
using (var client = new HttpClient())
|
using (var client = new HttpClient())
|
||||||
using (var file = File.Create(STEAMCMD_ZIP))
|
await using (var file = File.Create(TOOL_ZIP))
|
||||||
using (var stream = client.GetStreamAsync("https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip").Result)
|
await using (var stream = await client.GetStreamAsync("https://github.com/SteamRE/DepotDownloader/releases/download/DepotDownloader_2.4.7/depotdownloader-2.4.7.zip"))
|
||||||
stream.CopyTo(file);
|
await stream.CopyToAsync(file);
|
||||||
|
|
||||||
ZipFile.ExtractToDirectory(STEAMCMD_ZIP, path);
|
ZipFile.ExtractToDirectory(TOOL_ZIP, path);
|
||||||
File.Delete(STEAMCMD_ZIP);
|
File.Delete(TOOL_ZIP);
|
||||||
log.Info("SteamCMD downloaded successfully!");
|
log.Info("Steam Tool downloaded successfully!");
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
log.Error(e, "Failed to download SteamCMD, unable to update the DS.");
|
log.Error(e, "Failed to download Steam Tool, unable to update the DS.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -161,19 +161,16 @@ namespace Torch.Server
|
|||||||
log.Info("Checking for DS updates.");
|
log.Info("Checking for DS updates.");
|
||||||
var steamCmdProc = new ProcessStartInfo(steamCmdExePath)
|
var steamCmdProc = new ProcessStartInfo(steamCmdExePath)
|
||||||
{
|
{
|
||||||
Arguments = string.Format(STEAMCMD_ARGS, configuration.GetValue("gamePath", "../")),
|
Arguments = string.Format(TOOL_ARGS, configuration.GetValue("gamePath", "../")),
|
||||||
WorkingDirectory = path,
|
WorkingDirectory = path,
|
||||||
UseShellExecute = false,
|
RedirectStandardOutput = true
|
||||||
RedirectStandardOutput = true,
|
|
||||||
StandardOutputEncoding = Encoding.ASCII
|
|
||||||
};
|
};
|
||||||
var cmd = Process.Start(steamCmdProc);
|
var cmd = Process.Start(steamCmdProc)!;
|
||||||
|
|
||||||
// ReSharper disable once PossibleNullReferenceException
|
|
||||||
while (!cmd.HasExited)
|
while (!cmd.HasExited)
|
||||||
{
|
{
|
||||||
log.Info(cmd.StandardOutput.ReadLine());
|
if (await cmd.StandardOutput.ReadLineAsync() is { } line)
|
||||||
Thread.Sleep(100);
|
log.Info(line);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -32,9 +32,25 @@ internal class UnhandledExceptionHandler
|
|||||||
{
|
{
|
||||||
Console.WriteLine("Restarting in 5 seconds.");
|
Console.WriteLine("Restarting in 5 seconds.");
|
||||||
Thread.Sleep(5000);
|
Thread.Sleep(5000);
|
||||||
|
|
||||||
var exe = Path.Combine(AppContext.BaseDirectory, "Torch.Server.exe");
|
var exe = Path.Combine(AppContext.BaseDirectory, "Torch.Server.exe");
|
||||||
|
|
||||||
Process.Start(exe, $"-waitForPid {Environment.ProcessId} {_config}");
|
var args = Environment.GetCommandLineArgs();
|
||||||
|
|
||||||
|
for (var i = 0; i < args.Length; i++)
|
||||||
|
{
|
||||||
|
if (args[i].Contains(' '))
|
||||||
|
args[i] = $"\"{args[i]}\"";
|
||||||
|
|
||||||
|
if (!args[i].Contains("--tempAutostart", StringComparison.InvariantCultureIgnoreCase) &&
|
||||||
|
!args[i].Contains("--waitForPid", StringComparison.InvariantCultureIgnoreCase))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
args[i] = string.Empty;
|
||||||
|
args[++i] = string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
Process.Start(exe, $"--waitForPid {Environment.ProcessId} --tempAutostart true {string.Join(" ", args)}");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@@ -162,10 +162,10 @@
|
|||||||
},
|
},
|
||||||
"HarmonyX": {
|
"HarmonyX": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "2.10.2-prerelease.3",
|
"resolved": "2.10.2-prerelease.4",
|
||||||
"contentHash": "XnR2oKlFTCb7F+90OkJR0cqOYOsSPgsQrnX2v9qR0nmM6SPSET/v2SR9vjY/DQhBYUQia16NWv0Mwd8Ml4ZqKA==",
|
"contentHash": "M/44/DhSu1WR8gL62aLPGKqAJ0rrgkw38nT3DgEvLAvyIoQLJmL2Jsn4/d4CC0eDT1Vv82cB9Mxgg0sFD3/qrQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"MonoModReorg.RuntimeDetour": "23.1.2-prerelease.1"
|
"MonoModReorg.RuntimeDetour": "23.3.22.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": {
|
"JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": {
|
||||||
@@ -318,48 +318,48 @@
|
|||||||
},
|
},
|
||||||
"MonoModReorg.Backports": {
|
"MonoModReorg.Backports": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.1.2-prerelease.1",
|
"resolved": "23.3.22.1",
|
||||||
"contentHash": "m1wlCgVjZTFJs3mUxmC1aE/O0RIvsNbSFBI/g93Bqzz1tHa+LhXFyrHzL60PeZMQBIPVy3CeDX4um/UrqLOn/g==",
|
"contentHash": "nLx18prtZbS0nVO8YHElP+TUj1kkDswRgQpa9agt3tyNWke9Kqk5lVkGu87Y3cCMhG+m5Ai0ZDH0+V5B6bXF+Q==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1"
|
"MonoModReorg.ILHelpers": "23.3.22.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"MonoModReorg.Core": {
|
"MonoModReorg.Core": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.1.2-prerelease.1",
|
"resolved": "23.3.22.1",
|
||||||
"contentHash": "t1Y89M0rbwUx2VjDMCJOWgtSdsi1F5KNu0O6JAMOtwo2EWJ0HfYj9nS8UWWPwrgRpsquGjqbmYA8jhb59F2a/A==",
|
"contentHash": "Q3ZOgm6AOTL0icgcHsT/6mV5kYt6meqX3DEN1p/et5PxJsXUhVkiZfAptp8y/i+cO6HNgkcESpXEQ4jUWVwsDA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Mono.Cecil": "0.11.4",
|
"Mono.Cecil": "0.11.4",
|
||||||
"MonoModReorg.Backports": "23.1.2-prerelease.1",
|
"MonoModReorg.Backports": "23.3.22.1",
|
||||||
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1",
|
"MonoModReorg.ILHelpers": "23.3.22.1",
|
||||||
"MonoModReorg.Utils": "23.1.2-prerelease.1"
|
"MonoModReorg.Utils": "23.3.22.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"MonoModReorg.ILHelpers": {
|
"MonoModReorg.ILHelpers": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.1.2-prerelease.1",
|
"resolved": "23.3.22.1",
|
||||||
"contentHash": "GVh1cmrTCAK0zHr3t8aHnKsyKIlDFiDERn++lCZomHcYc8dgcOAhpkZ7KmaKgZCTJuBIrc44RjpKFr/4ScQnGA=="
|
"contentHash": "dHE/3VZtnTUTkQ34j8Gu6CxKes1QDL8tBuF3QElxHHpPl/QabGCK938k47WWRcRBMoP7IAthkn+Bob4H97rBgw=="
|
||||||
},
|
},
|
||||||
"MonoModReorg.RuntimeDetour": {
|
"MonoModReorg.RuntimeDetour": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.1.2-prerelease.1",
|
"resolved": "23.3.22.1",
|
||||||
"contentHash": "UZyJ7OIbLCIBg+dzLejWq2paL1s11koUrq1noSLGCP9uNmFjwDPK+lRmGs0X4qg+Alfq6VsOpI45pGqmaAvP+Q==",
|
"contentHash": "cUES3Hi7QJtBNe0qwVdjZOCDkZDaCpdqS6Au0RaCyQ1PDIR4av13E9qBNAEYew46sgPe0fOrU334md6DLDGHlQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Mono.Cecil": "0.11.4",
|
"Mono.Cecil": "0.11.4",
|
||||||
"MonoModReorg.Backports": "23.1.2-prerelease.1",
|
"MonoModReorg.Backports": "23.3.22.1",
|
||||||
"MonoModReorg.Core": "23.1.2-prerelease.1",
|
"MonoModReorg.Core": "23.3.22.1",
|
||||||
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1",
|
"MonoModReorg.ILHelpers": "23.3.22.1",
|
||||||
"MonoModReorg.Utils": "23.1.2-prerelease.1"
|
"MonoModReorg.Utils": "23.3.22.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"MonoModReorg.Utils": {
|
"MonoModReorg.Utils": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.1.2-prerelease.1",
|
"resolved": "23.3.22.1",
|
||||||
"contentHash": "6N4LNG+x4RVPLOc8QWL7dc5sqWdl0gxR+4ASRd1CvvappsK84ISgD9qgeYHgQQtTgE+h6Cuqr3Om4Ly0roLfoA==",
|
"contentHash": "q1cX0mbYxdw2WcE/qGBB84lVY/ffobEr46VQFuwGcWhtw6f1Ql1k4TZfs8gebpesSxHnca13grLeVHrUSpy1+g==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Mono.Cecil": "0.11.4",
|
"Mono.Cecil": "0.11.4",
|
||||||
"MonoModReorg.Backports": "23.1.2-prerelease.1",
|
"MonoModReorg.Backports": "23.3.22.1",
|
||||||
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1"
|
"MonoModReorg.ILHelpers": "23.3.22.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Newtonsoft.Json": {
|
"Newtonsoft.Json": {
|
||||||
@@ -585,11 +585,11 @@
|
|||||||
"type": "Project",
|
"type": "Project",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ControlzEx": "[5.0.2, )",
|
"ControlzEx": "[5.0.2, )",
|
||||||
"HarmonyX": "[2.10.2-prerelease.3, )",
|
"HarmonyX": "[2.10.2-prerelease.4, )",
|
||||||
"MahApps.Metro": "[2.4.9, )",
|
"MahApps.Metro": "[2.4.9, )",
|
||||||
"Microsoft.CodeAnalysis.CSharp": "[4.4.0, )",
|
"Microsoft.CodeAnalysis.CSharp": "[4.4.0, )",
|
||||||
"Microsoft.CodeAnalysis.Common": "[4.4.0, )",
|
"Microsoft.CodeAnalysis.Common": "[4.4.0, )",
|
||||||
"MonoModReorg.RuntimeDetour": "[23.1.2-prerelease.1, )",
|
"MonoModReorg.RuntimeDetour": "[23.3.22.1, )",
|
||||||
"NLog": "[5.1.0, )",
|
"NLog": "[5.1.0, )",
|
||||||
"System.ComponentModel.Annotations": "[5.0.0, )",
|
"System.ComponentModel.Annotations": "[5.0.0, )",
|
||||||
"Torch.API": "[1.0.0, )",
|
"Torch.API": "[1.0.0, )",
|
||||||
|
@@ -58,21 +58,25 @@ namespace Torch.Managers
|
|||||||
if (!File.Exists(source))
|
if (!File.Exists(source))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
var tempFilePath = Path.Combine(path, file + ".old");
|
try
|
||||||
if (File.Exists(tempFilePath))
|
{
|
||||||
File.Delete(tempFilePath);
|
File.Delete(source);
|
||||||
|
}
|
||||||
|
catch (Exception e) when (e is IOException or UnauthorizedAccessException)
|
||||||
|
{
|
||||||
|
var tempFilePath = Path.Combine(path, file + ".old");
|
||||||
|
if (File.Exists(tempFilePath))
|
||||||
|
File.Delete(tempFilePath);
|
||||||
|
|
||||||
var errorCode = Rename(source, tempFilePath);
|
try
|
||||||
if (Marshal.GetExceptionForHR(errorCode) is { } exception)
|
{
|
||||||
throw exception;
|
File.Move(source, tempFilePath);
|
||||||
|
}
|
||||||
|
catch (UnauthorizedAccessException)
|
||||||
|
{
|
||||||
|
// ignore
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[LibraryImport("msvcrt", SetLastError = true, EntryPoint = "rename")]
|
|
||||||
[UnmanagedCallConv(CallConvs = new[] { typeof(System.Runtime.CompilerServices.CallConvCdecl) })]
|
|
||||||
private static partial int Rename(
|
|
||||||
[MarshalAs(UnmanagedType.LPWStr)]
|
|
||||||
string oldpath,
|
|
||||||
[MarshalAs(UnmanagedType.LPWStr)]
|
|
||||||
string newpath);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -133,6 +133,12 @@ namespace Torch.Managers.PatchManager.MSIL
|
|||||||
case double @double when Operand is MsilOperandInline.MsilOperandDouble operandDouble:
|
case double @double when Operand is MsilOperandInline.MsilOperandDouble operandDouble:
|
||||||
operandDouble.Value = @double;
|
operandDouble.Value = @double;
|
||||||
break;
|
break;
|
||||||
|
case byte @byte when Operand is MsilOperandInline.MsilOperandArgument operandArgument:
|
||||||
|
operandArgument.Value = new(@byte);
|
||||||
|
break;
|
||||||
|
case byte @byte when Operand is MsilOperandInline.MsilOperandLocal operandArgument:
|
||||||
|
operandArgument.Value = new(@byte);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
Labels = instruction.labels.Select(b => new MsilLabel(b)).ToHashSet();
|
Labels = instruction.labels.Select(b => new MsilLabel(b)).ToHashSet();
|
||||||
@@ -153,7 +159,10 @@ namespace Torch.Managers.PatchManager.MSIL
|
|||||||
MsilOperandInline.MsilOperandDouble msilOperandDouble => msilOperandDouble.Value,
|
MsilOperandInline.MsilOperandDouble msilOperandDouble => msilOperandDouble.Value,
|
||||||
MsilOperandInline.MsilOperandInt32 msilOperandInt32 => msilOperandInt32.Value,
|
MsilOperandInline.MsilOperandInt32 msilOperandInt32 => msilOperandInt32.Value,
|
||||||
MsilOperandInline.MsilOperandInt64 msilOperandInt64 => msilOperandInt64.Value,
|
MsilOperandInline.MsilOperandInt64 msilOperandInt64 => msilOperandInt64.Value,
|
||||||
MsilOperandInline.MsilOperandLocal msilOperandLocal => msilOperandLocal.Value.Local,
|
MsilOperandInline.MsilOperandLocal msilOperandLocal when OpCode.OperandType == OperandType.InlineVar => msilOperandLocal.Value.Local,
|
||||||
|
MsilOperandInline.MsilOperandLocal msilOperandLocal when OpCode.OperandType == OperandType.ShortInlineVar => (byte)msilOperandLocal.Value.Index,
|
||||||
|
MsilOperandInline.MsilOperandArgument msilOperandArgument when OpCode.OperandType == OperandType.InlineVar => msilOperandArgument.Value,
|
||||||
|
MsilOperandInline.MsilOperandArgument msilOperandArgument when OpCode.OperandType == OperandType.ShortInlineVar => (byte)msilOperandArgument.Value.Position,
|
||||||
MsilOperandInline.MsilOperandSignature msilOperandSignature => msilOperandSignature.Value,
|
MsilOperandInline.MsilOperandSignature msilOperandSignature => msilOperandSignature.Value,
|
||||||
MsilOperandInline.MsilOperandSingle msilOperandSingle => msilOperandSingle.Value,
|
MsilOperandInline.MsilOperandSingle msilOperandSingle => msilOperandSingle.Value,
|
||||||
MsilOperandInline.MsilOperandString msilOperandString => msilOperandString.Value,
|
MsilOperandInline.MsilOperandString msilOperandString => msilOperandString.Value,
|
||||||
|
@@ -109,7 +109,14 @@ namespace Torch.Managers
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
_fsManager.SoftDelete(extractPath, file.FullName);
|
_fsManager.SoftDelete(extractPath, file.FullName);
|
||||||
file.ExtractToFile(targetFile, true);
|
try
|
||||||
|
{
|
||||||
|
file.ExtractToFile(targetFile, true);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
_log.Warn(e, "unable to extract {0}", targetFile);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -58,10 +58,10 @@ namespace Torch.Patches
|
|||||||
typeof(TypeConverter).Assembly.Location,
|
typeof(TypeConverter).Assembly.Location,
|
||||||
typeof(System.Diagnostics.TraceSource).Assembly.Location,
|
typeof(System.Diagnostics.TraceSource).Assembly.Location,
|
||||||
typeof(System.Security.Policy.Evidence).Assembly.Location,
|
typeof(System.Security.Policy.Evidence).Assembly.Location,
|
||||||
typeof(ProtoBuf.Meta.RuntimeTypeModel).Assembly.Location,
|
Path.Combine(baseDir, "System.Xml.ReaderWriter.dll"),
|
||||||
typeof(ProtoContractAttribute).Assembly.Location,
|
|
||||||
Path.Combine(baseDir, "netstandard.dll"),
|
Path.Combine(baseDir, "netstandard.dll"),
|
||||||
Path.Combine(baseDir, "System.Runtime.dll"),
|
Path.Combine(baseDir, "System.Runtime.dll"),
|
||||||
|
Path.Combine(MyFileSystem.ExePath, "ProtoBuf.Net.Core.dll"),
|
||||||
Path.Combine(MyFileSystem.ExePath, "Sandbox.Game.dll"),
|
Path.Combine(MyFileSystem.ExePath, "Sandbox.Game.dll"),
|
||||||
Path.Combine(MyFileSystem.ExePath, "Sandbox.Common.dll"),
|
Path.Combine(MyFileSystem.ExePath, "Sandbox.Common.dll"),
|
||||||
Path.Combine(MyFileSystem.ExePath, "Sandbox.Graphics.dll"),
|
Path.Combine(MyFileSystem.ExePath, "Sandbox.Graphics.dll"),
|
||||||
@@ -83,14 +83,6 @@ namespace Torch.Patches
|
|||||||
|
|
||||||
using var batch = MyScriptCompiler.Static.Whitelist.OpenBatch();
|
using var batch = MyScriptCompiler.Static.Whitelist.OpenBatch();
|
||||||
batch.AllowTypes(MyWhitelistTarget.ModApi, typeof(ConcurrentQueue<>));
|
batch.AllowTypes(MyWhitelistTarget.ModApi, typeof(ConcurrentQueue<>));
|
||||||
batch.AllowNamespaceOfTypes(MyWhitelistTarget.Both, typeof(ImmutableArray), typeof(ArrayExtensions));
|
|
||||||
batch.AllowTypes(MyWhitelistTarget.ModApi, typeof(ProtoContractAttribute).Assembly.GetExportedTypes()
|
|
||||||
.Where(b => b.Namespace == "ProtoBuf" && b.Name.Contains("Attribute"))
|
|
||||||
.Concat(new[]
|
|
||||||
{
|
|
||||||
typeof(DataFormat), typeof(MemberSerializationOptions), typeof(ImplicitFields)
|
|
||||||
}).ToArray());
|
|
||||||
batch.AllowTypes(MyWhitelistTarget.ModApi, typeof(WorkData));
|
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@@ -24,12 +24,12 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="ControlzEx" Version="5.0.2" />
|
<PackageReference Include="ControlzEx" Version="5.0.2" />
|
||||||
<PackageReference Include="HarmonyX" Version="2.10.2-prerelease.3" />
|
<PackageReference Include="HarmonyX" Version="2.10.2-prerelease.4" />
|
||||||
<PackageReference Include="InfoOf.Fody" Version="2.1.1" PrivateAssets="all" />
|
<PackageReference Include="InfoOf.Fody" Version="2.1.1" PrivateAssets="all" />
|
||||||
<PackageReference Include="MahApps.Metro" Version="2.4.9" />
|
<PackageReference Include="MahApps.Metro" Version="2.4.9" />
|
||||||
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.4.0" />
|
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.4.0" />
|
||||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
|
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
|
||||||
<PackageReference Include="MonoModReorg.RuntimeDetour" Version="23.1.2-prerelease.1" />
|
<PackageReference Include="MonoModReorg.RuntimeDetour" Version="23.3.22.1" />
|
||||||
<PackageReference Include="NLog" Version="5.1.0" />
|
<PackageReference Include="NLog" Version="5.1.0" />
|
||||||
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
|
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
|
||||||
<PackageReference Include="protobuf-net" Version="3.1.26" />
|
<PackageReference Include="protobuf-net" Version="3.1.26" />
|
||||||
|
@@ -14,11 +14,11 @@
|
|||||||
},
|
},
|
||||||
"HarmonyX": {
|
"HarmonyX": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[2.10.2-prerelease.3, )",
|
"requested": "[2.10.2-prerelease.4, )",
|
||||||
"resolved": "2.10.2-prerelease.3",
|
"resolved": "2.10.2-prerelease.4",
|
||||||
"contentHash": "XnR2oKlFTCb7F+90OkJR0cqOYOsSPgsQrnX2v9qR0nmM6SPSET/v2SR9vjY/DQhBYUQia16NWv0Mwd8Ml4ZqKA==",
|
"contentHash": "M/44/DhSu1WR8gL62aLPGKqAJ0rrgkw38nT3DgEvLAvyIoQLJmL2Jsn4/d4CC0eDT1Vv82cB9Mxgg0sFD3/qrQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"MonoModReorg.RuntimeDetour": "23.1.2-prerelease.1"
|
"MonoModReorg.RuntimeDetour": "23.3.22.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"InfoOf.Fody": {
|
"InfoOf.Fody": {
|
||||||
@@ -65,15 +65,15 @@
|
|||||||
},
|
},
|
||||||
"MonoModReorg.RuntimeDetour": {
|
"MonoModReorg.RuntimeDetour": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[23.1.2-prerelease.1, )",
|
"requested": "[23.3.22.1, )",
|
||||||
"resolved": "23.1.2-prerelease.1",
|
"resolved": "23.3.22.1",
|
||||||
"contentHash": "UZyJ7OIbLCIBg+dzLejWq2paL1s11koUrq1noSLGCP9uNmFjwDPK+lRmGs0X4qg+Alfq6VsOpI45pGqmaAvP+Q==",
|
"contentHash": "cUES3Hi7QJtBNe0qwVdjZOCDkZDaCpdqS6Au0RaCyQ1PDIR4av13E9qBNAEYew46sgPe0fOrU334md6DLDGHlQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Mono.Cecil": "0.11.4",
|
"Mono.Cecil": "0.11.4",
|
||||||
"MonoModReorg.Backports": "23.1.2-prerelease.1",
|
"MonoModReorg.Backports": "23.3.22.1",
|
||||||
"MonoModReorg.Core": "23.1.2-prerelease.1",
|
"MonoModReorg.Core": "23.3.22.1",
|
||||||
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1",
|
"MonoModReorg.ILHelpers": "23.3.22.1",
|
||||||
"MonoModReorg.Utils": "23.1.2-prerelease.1"
|
"MonoModReorg.Utils": "23.3.22.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NLog": {
|
"NLog": {
|
||||||
@@ -157,36 +157,36 @@
|
|||||||
},
|
},
|
||||||
"MonoModReorg.Backports": {
|
"MonoModReorg.Backports": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.1.2-prerelease.1",
|
"resolved": "23.3.22.1",
|
||||||
"contentHash": "m1wlCgVjZTFJs3mUxmC1aE/O0RIvsNbSFBI/g93Bqzz1tHa+LhXFyrHzL60PeZMQBIPVy3CeDX4um/UrqLOn/g==",
|
"contentHash": "nLx18prtZbS0nVO8YHElP+TUj1kkDswRgQpa9agt3tyNWke9Kqk5lVkGu87Y3cCMhG+m5Ai0ZDH0+V5B6bXF+Q==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1"
|
"MonoModReorg.ILHelpers": "23.3.22.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"MonoModReorg.Core": {
|
"MonoModReorg.Core": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.1.2-prerelease.1",
|
"resolved": "23.3.22.1",
|
||||||
"contentHash": "t1Y89M0rbwUx2VjDMCJOWgtSdsi1F5KNu0O6JAMOtwo2EWJ0HfYj9nS8UWWPwrgRpsquGjqbmYA8jhb59F2a/A==",
|
"contentHash": "Q3ZOgm6AOTL0icgcHsT/6mV5kYt6meqX3DEN1p/et5PxJsXUhVkiZfAptp8y/i+cO6HNgkcESpXEQ4jUWVwsDA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Mono.Cecil": "0.11.4",
|
"Mono.Cecil": "0.11.4",
|
||||||
"MonoModReorg.Backports": "23.1.2-prerelease.1",
|
"MonoModReorg.Backports": "23.3.22.1",
|
||||||
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1",
|
"MonoModReorg.ILHelpers": "23.3.22.1",
|
||||||
"MonoModReorg.Utils": "23.1.2-prerelease.1"
|
"MonoModReorg.Utils": "23.3.22.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"MonoModReorg.ILHelpers": {
|
"MonoModReorg.ILHelpers": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.1.2-prerelease.1",
|
"resolved": "23.3.22.1",
|
||||||
"contentHash": "GVh1cmrTCAK0zHr3t8aHnKsyKIlDFiDERn++lCZomHcYc8dgcOAhpkZ7KmaKgZCTJuBIrc44RjpKFr/4ScQnGA=="
|
"contentHash": "dHE/3VZtnTUTkQ34j8Gu6CxKes1QDL8tBuF3QElxHHpPl/QabGCK938k47WWRcRBMoP7IAthkn+Bob4H97rBgw=="
|
||||||
},
|
},
|
||||||
"MonoModReorg.Utils": {
|
"MonoModReorg.Utils": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.1.2-prerelease.1",
|
"resolved": "23.3.22.1",
|
||||||
"contentHash": "6N4LNG+x4RVPLOc8QWL7dc5sqWdl0gxR+4ASRd1CvvappsK84ISgD9qgeYHgQQtTgE+h6Cuqr3Om4Ly0roLfoA==",
|
"contentHash": "q1cX0mbYxdw2WcE/qGBB84lVY/ffobEr46VQFuwGcWhtw6f1Ql1k4TZfs8gebpesSxHnca13grLeVHrUSpy1+g==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Mono.Cecil": "0.11.4",
|
"Mono.Cecil": "0.11.4",
|
||||||
"MonoModReorg.Backports": "23.1.2-prerelease.1",
|
"MonoModReorg.Backports": "23.3.22.1",
|
||||||
"MonoModReorg.ILHelpers": "23.1.2-prerelease.1"
|
"MonoModReorg.ILHelpers": "23.3.22.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Newtonsoft.Json": {
|
"Newtonsoft.Json": {
|
||||||
|
Reference in New Issue
Block a user