Compare commits

..

2 Commits

Author SHA1 Message Date
zznty
8011f9eed7 update harmony 2023-07-09 03:46:23 +07:00
1df791e7a8 Update for latest version, and have script compiler use Release x64 compilation 2023-07-07 22:37:52 -04:00
6 changed files with 13 additions and 10 deletions

View File

@@ -173,7 +173,7 @@ namespace Torch.Server
{ {
var steamCmdProc = new ProcessStartInfo(steamCmdExePath) var steamCmdProc = new ProcessStartInfo(steamCmdExePath)
{ {
Arguments = string.Format(TOOL_ARGS, configuration.GetValue("gamePath", "../"), depotId, "3111493184861426002"), Arguments = string.Format(TOOL_ARGS, configuration.GetValue("gamePath", "../"), depotId, "14195799952783859"),
WorkingDirectory = path, WorkingDirectory = path,
RedirectStandardOutput = true RedirectStandardOutput = true
}; };

View File

@@ -153,8 +153,8 @@
}, },
"HarmonyX": { "HarmonyX": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.10.2-prerelease.5", "resolved": "2.10.2-prerelease.6",
"contentHash": "0ae0orZFSOMusmKRWfjcxeJY1rz04GMlTw4FRusljsT5UVZyToIBVZA1F8NVfD+zxCZZ++iNQth5EN0qsKtnLQ==", "contentHash": "CPCUR/t5AQ5DDs40bTJ5OwUVTCoZONaJGbWKKjAOwg7c7Ct4KEbfybH6T+KvRGVjf5eN1oyGY5BN7EfWxUh9Xg==",
"dependencies": { "dependencies": {
"MonoMod.RuntimeDetour": "25.0.0" "MonoMod.RuntimeDetour": "25.0.0"
} }
@@ -574,7 +574,7 @@
"type": "Project", "type": "Project",
"dependencies": { "dependencies": {
"ControlzEx": "[6.0.0, )", "ControlzEx": "[6.0.0, )",
"HarmonyX": "[2.10.2-prerelease.5, )", "HarmonyX": "[2.10.2-prerelease.6, )",
"MahApps.Metro": "[2.4.9, )", "MahApps.Metro": "[2.4.9, )",
"Microsoft.CodeAnalysis.CSharp": "[4.6.0, )", "Microsoft.CodeAnalysis.CSharp": "[4.6.0, )",
"Microsoft.CodeAnalysis.Common": "[4.6.0, )", "Microsoft.CodeAnalysis.Common": "[4.6.0, )",

View File

@@ -214,7 +214,8 @@ public class ScriptCompilationManager : Manager
return null; return null;
} }
private readonly CSharpCompilationOptions _compilationOptions = new(OutputKind.DynamicallyLinkedLibrary); private readonly CSharpCompilationOptions _compilationOptions = new(OutputKind.DynamicallyLinkedLibrary,
optimizationLevel: OptimizationLevel.Release, platform: Platform.X64);
private readonly CSharpParseOptions _parseOptions = new(LanguageVersion.CSharp11, DocumentationMode.None); private readonly CSharpParseOptions _parseOptions = new(LanguageVersion.CSharp11, DocumentationMode.None);
private CSharpCompilation CreateCompilation(string assemblyFileName, IEnumerable<Script> scripts) private CSharpCompilation CreateCompilation(string assemblyFileName, IEnumerable<Script> scripts)

View File

@@ -24,7 +24,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="ControlzEx" Version="6.0.0" /> <PackageReference Include="ControlzEx" Version="6.0.0" />
<PackageReference Include="HarmonyX" Version="2.10.2-prerelease.5" /> <PackageReference Include="HarmonyX" Version="2.10.2-prerelease.6" />
<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.6.0" /> <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.6.0" />

View File

@@ -124,7 +124,9 @@ namespace Torch
Managers.AddManager(sessionManager); Managers.AddManager(sessionManager);
Managers.AddManager(new PatchManager(this)); Managers.AddManager(new PatchManager(this));
Managers.AddManager(new FilesystemManager(this)); Managers.AddManager(new FilesystemManager(this));
#if !DEBUG
Managers.AddManager(new UpdateManager(this)); Managers.AddManager(new UpdateManager(this));
#endif
Managers.AddManager(new EventManager(this)); Managers.AddManager(new EventManager(this));
#pragma warning disable CS0618 #pragma warning disable CS0618
Managers.AddManager(Plugins); Managers.AddManager(Plugins);

View File

@@ -14,9 +14,9 @@
}, },
"HarmonyX": { "HarmonyX": {
"type": "Direct", "type": "Direct",
"requested": "[2.10.2-prerelease.5, )", "requested": "[2.10.2-prerelease.6, )",
"resolved": "2.10.2-prerelease.5", "resolved": "2.10.2-prerelease.6",
"contentHash": "0ae0orZFSOMusmKRWfjcxeJY1rz04GMlTw4FRusljsT5UVZyToIBVZA1F8NVfD+zxCZZ++iNQth5EN0qsKtnLQ==", "contentHash": "CPCUR/t5AQ5DDs40bTJ5OwUVTCoZONaJGbWKKjAOwg7c7Ct4KEbfybH6T+KvRGVjf5eN1oyGY5BN7EfWxUh9Xg==",
"dependencies": { "dependencies": {
"MonoMod.RuntimeDetour": "25.0.0" "MonoMod.RuntimeDetour": "25.0.0"
} }