Compare commits
13 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
615defabb6 | ||
![]() |
0d719ee01f | ||
22c4cfb039 | |||
5f0ffb6f9a | |||
1b2a989441 | |||
![]() |
83dfc7152f | ||
d7e5f53e4f | |||
9b08b39a1f | |||
![]() |
8011f9eed7 | ||
1df791e7a8 | |||
![]() |
bbc2f9046f | ||
117ea7df91 | |||
6ec355f931 |
@@ -18,11 +18,11 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="JorgeSerrano.Json.JsonSnakeCaseNamingPolicy" Version="0.9.0" />
|
<PackageReference Include="JorgeSerrano.Json.JsonSnakeCaseNamingPolicy" Version="0.9.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
|
||||||
<PackageReference Include="NLog" Version="5.2.0" />
|
<PackageReference Include="NLog" Version="5.2.4" />
|
||||||
<PackageReference Include="NuGet.Commands" Version="6.6.1" />
|
<PackageReference Include="NuGet.Commands" Version="6.7.0" />
|
||||||
<PackageReference Include="NuGet.DependencyResolver.Core" Version="6.6.1" />
|
<PackageReference Include="NuGet.DependencyResolver.Core" Version="6.7.0" />
|
||||||
<PackageReference Include="SemanticVersioning" Version="2.0.2" />
|
<PackageReference Include="SemanticVersioning" Version="2.0.2" />
|
||||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.120">
|
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.22.3">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>compile</IncludeAssets>
|
<IncludeAssets>compile</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
@@ -19,31 +19,31 @@
|
|||||||
},
|
},
|
||||||
"NLog": {
|
"NLog": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[5.2.0, )",
|
"requested": "[5.2.4, )",
|
||||||
"resolved": "5.2.0",
|
"resolved": "5.2.4",
|
||||||
"contentHash": "uYBgseY0m/9lQUbZYGsQsTBFOWrfs3iaekzzYMH6vFmpoOAvV8/bp1XxG/suZkwB5h8nAiTJAp7VENWRDKtKPA=="
|
"contentHash": "/qzds1Cp9rQD53La3mlWOmCHsFSbmT9BCb8q6k3eOrbOYDfdf3ZN1hBW7IDImUD6V8BfPfEFBhXGDLOEOQxHgQ=="
|
||||||
},
|
},
|
||||||
"NuGet.Commands": {
|
"NuGet.Commands": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[6.6.1, )",
|
"requested": "[6.7.0, )",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "D1b7gTk1wp7sxscLhS8O/yoErsRVbR4zJvLVD4jo1sgxh42ZOWKpMkhznPUxpvmCxBhw9hAy8/yWrRH91SfdEQ==",
|
"contentHash": "qRqOvLbnUBpyYwRaV2jxckv9LWeQDoNHRQIY1Tii91mNrpnfHwV9AcsBMfzY76NQji6/5oI5Wmp1rAQOSIROMg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
|
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
|
||||||
"Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
|
"Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
|
||||||
"NuGet.Credentials": "6.6.1",
|
"NuGet.Credentials": "6.7.0",
|
||||||
"NuGet.ProjectModel": "6.6.1"
|
"NuGet.ProjectModel": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.DependencyResolver.Core": {
|
"NuGet.DependencyResolver.Core": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[6.6.1, )",
|
"requested": "[6.7.0, )",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "K+EXXLU37PBnwLGx6WnVGxlfWYkdedvUUOeDMERXelNgjg20irtKf3hk+wGB7NmxAdNY9/gGcOgSDOV+M0w3Jg==",
|
"contentHash": "kNLYj3VBxFNe99vV7qk7VdknGsrUSHIByRbwIhjUTBrxoJzikmOXsjdya/PiFwEhPm9R+u89DfnMmqfAbsPcTA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Configuration": "6.6.1",
|
"NuGet.Configuration": "6.7.0",
|
||||||
"NuGet.LibraryModel": "6.6.1",
|
"NuGet.LibraryModel": "6.7.0",
|
||||||
"NuGet.Protocol": "6.6.1"
|
"NuGet.Protocol": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"SemanticVersioning": {
|
"SemanticVersioning": {
|
||||||
@@ -54,9 +54,9 @@
|
|||||||
},
|
},
|
||||||
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[1.202.120, )",
|
"requested": "[1.203.22.3, )",
|
||||||
"resolved": "1.202.120",
|
"resolved": "1.203.22.3",
|
||||||
"contentHash": "HTP48NOSZY3eQPX3GJN+gjxdW83SM7DX6NcKCFqNIIvjz/J+l8uimHAQp9dnLySb0wb1K1Z1xBPIXyxMQRREIw==",
|
"contentHash": "U7awzB6nGNN3tyZpeWQQjF4MHxJ4CDbvXEuJDkddLa2ellh2SYCV4V3UqukMuVzlrUSC71ITFwDVZZ+uYZYVtw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"protobuf-net": "1.0.0"
|
"protobuf-net": "1.0.0"
|
||||||
}
|
}
|
||||||
@@ -108,75 +108,74 @@
|
|||||||
},
|
},
|
||||||
"NuGet.Common": {
|
"NuGet.Common": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "hW5NtShErO3qbdkyv7doCRsFNK9Rlcc7mVjYM+hg1sOAWheTh/oo95DzNbsZthiqyHZfaioopfWtzmoxNw9h4g==",
|
"contentHash": "o3hdvub38qN4UuPWISIvdhM36liEno2o58LRnIrSucZ6+SNv4jc+Cqh/y7BfmQ+UvpqLY19yEc4123rMpp6Edg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Frameworks": "6.6.1"
|
"NuGet.Frameworks": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Configuration": {
|
"NuGet.Configuration": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "9WbK8wgwPfRpSwuG+ZhMshE48qUYvPIw7VNLCncrq/in4vE6SGsuawPSxPJkkLBtcKTGbPMez5JDvUf6vEBgKg==",
|
"contentHash": "M1ttuwgjCNIEcgjFj3Fh/SZ/CaZY11SpxDOEOgPFUxB24K9JMGnB5BGBMOV8joleNcbwzEEY6WCVwHPYg3bb9A==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Common": "6.6.1",
|
"NuGet.Common": "6.7.0",
|
||||||
"System.Security.Cryptography.ProtectedData": "4.4.0"
|
"System.Security.Cryptography.ProtectedData": "4.4.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Credentials": {
|
"NuGet.Credentials": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "TuOlXcE1ajwdtfnQaUjDv2xO2u/WDS56/b5jHfEBZetKfcpT0W3iNOqInVPO0qxRxXK5/HXUKVr2Pya1LsVVnA==",
|
"contentHash": "q4ewbEg/ocZZFY8X56WwV274uRzsE0ibXiLKCsJww5y0CRLPXxsk4GhIgA13N32zm91COjaeyZrDxf62yDTU4w==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Protocol": "6.6.1"
|
"NuGet.Protocol": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Frameworks": {
|
"NuGet.Frameworks": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "iRtDhL0zPqVw037fHEK9bQljTKPuOHhfIkz86/IH2P8eetr910HTTe5G8lJTuzZHh592Ze/sYhh173HIFjPSfg=="
|
"contentHash": "mTKaTSINpCjMHTNdaPMD/0nfHvWGetG67KzWtDJklnAp9nNwqA+t65G0v8XA/Ve35ipmPRdklxFIl3O55iTgnQ=="
|
||||||
},
|
},
|
||||||
"NuGet.LibraryModel": {
|
"NuGet.LibraryModel": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "B0KH19sNNUq56YfEozIsIpk8EOyolG0LRT+hqG1/mhuXlQFiP9BgT6pZgwLQVLUl9YBDx3+KWQQbl6pz8Yh/Sw==",
|
"contentHash": "JSRdDUgnjny9kFaOiU/58b1KMB8hzc/9J+SZsrqtWXCeo+MrMohqUx9yLTjIdPqEyYCmWC7kX4Y9lSXufx0bZQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Common": "6.6.1",
|
"NuGet.Common": "6.7.0",
|
||||||
"NuGet.Versioning": "6.6.1"
|
"NuGet.Versioning": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Packaging": {
|
"NuGet.Packaging": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "GwhFi2Ep4YzAGQFYz1OsMVNfiJ1M46nyCgHQ7xjJSMvxDYFgodR1RqVugWFMbIUUq6I8iYASwp5lpHXvITeuIQ==",
|
"contentHash": "uDhdZXzW8MLXhloPla/7j8jBWduNhDvY5UC1Dg1z8zJEvkGSj+WAcXKvymDf9UpbyiklWmonlb2hkX02ToJ1yQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Newtonsoft.Json": "13.0.1",
|
"Newtonsoft.Json": "13.0.1",
|
||||||
"NuGet.Configuration": "6.6.1",
|
"NuGet.Configuration": "6.7.0",
|
||||||
"NuGet.Versioning": "6.6.1",
|
"NuGet.Versioning": "6.7.0",
|
||||||
"System.Security.Cryptography.Cng": "5.0.0",
|
"System.Security.Cryptography.Pkcs": "6.0.4"
|
||||||
"System.Security.Cryptography.Pkcs": "5.0.0"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.ProjectModel": {
|
"NuGet.ProjectModel": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "CEyRXXvgIoEQBWn3WZupjkIVC6rPcGUAO5p4Gz+fnF8kcefWQOXHfnOE+UKZ0WwAJG5iMWRvXBKAGOuFiFhNpQ==",
|
"contentHash": "SnT/0ni+2GoAVY4VsiRvBYOv5E6FpRqY24vVm38rS5Gfq4iQGjxPl7ZZsXGg5Iy2q3kED20DO+x+/yXCRUqswg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.DependencyResolver.Core": "6.6.1"
|
"NuGet.DependencyResolver.Core": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Protocol": {
|
"NuGet.Protocol": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "HhKLsK6Q0NNp6qb0T26GLR5gCTRZu+gzqDVK4xqXHZmsolaDVIdIYpn44b2etaVYLzNJCvgRkw+I422u2bIvMw==",
|
"contentHash": "CZvnf3n0A1wtGNHAViLtZbtqZ5KXnI/fDe0CE+rphoIYJP91D8ImYQG2eM/Y4aQ1n4pcqebg/XVnSr37qjXoeQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Packaging": "6.6.1"
|
"NuGet.Packaging": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Versioning": {
|
"NuGet.Versioning": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "Wm/AOFICTIrCgbVxv9dNWusraTzcggbo5W4ao7hD8NNVq911an9TGwW+uNuYc8I5PkpTeMuSXneV2u6hbi1P4w=="
|
"contentHash": "3sKMpt6btwpv6TKbbpUisT7a9qZoqoAGvHC0lUiqMl9V1oArqXP0DRhlNq7alFynA1HqKOFeRje5kPYkbqFJ/Q=="
|
||||||
},
|
},
|
||||||
"protobuf-net": {
|
"protobuf-net": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
@@ -185,24 +184,15 @@
|
|||||||
},
|
},
|
||||||
"System.Formats.Asn1": {
|
"System.Formats.Asn1": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "5.0.0",
|
"resolved": "6.0.0",
|
||||||
"contentHash": "MTvUIktmemNB+El0Fgw9egyqT9AYSIk6DTJeoDSpc3GIHxHCMo8COqkWT1mptX5tZ1SlQ6HJZ0OsSvMth1c12w=="
|
"contentHash": "T6fD00dQ3NTbPDy31m4eQUwKW84s03z0N2C8HpOklyeaDgaJPa/TexP4/SkORMSOwc7WhKifnA6Ya33AkzmafA=="
|
||||||
},
|
|
||||||
"System.Security.Cryptography.Cng": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "5.0.0",
|
|
||||||
"contentHash": "jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==",
|
|
||||||
"dependencies": {
|
|
||||||
"System.Formats.Asn1": "5.0.0"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"System.Security.Cryptography.Pkcs": {
|
"System.Security.Cryptography.Pkcs": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "5.0.0",
|
"resolved": "6.0.4",
|
||||||
"contentHash": "9TPLGjBCGKmNvG8pjwPeuYy0SMVmGZRwlTZvyPHDbYv/DRkoeumJdfumaaDNQzVGMEmbWtg07zUpSW9q70IlDQ==",
|
"contentHash": "LGbXi1oUJ9QgCNGXRO9ndzBL/GZgANcsURpMhNR8uO+rca47SZmciS3RSQUvlQRwK3QHZSHNOXzoMUASKA+Anw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"System.Formats.Asn1": "5.0.0",
|
"System.Formats.Asn1": "6.0.0"
|
||||||
"System.Security.Cryptography.Cng": "5.0.0"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"System.Security.Cryptography.ProtectedData": {
|
"System.Security.Cryptography.ProtectedData": {
|
||||||
|
@@ -11,7 +11,7 @@
|
|||||||
<repository type="git" url="https://github.com/PveTeam/Torch" />
|
<repository type="git" url="https://github.com/PveTeam/Torch" />
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<group targetFramework="net7.0-windows7.0">
|
<group targetFramework="net7.0-windows7.0">
|
||||||
<dependency id="SpaceEngineersDedicated.ReferenceAssemblies" version="1.202.120" />
|
<dependency id="SpaceEngineersDedicated.ReferenceAssemblies" version="1.203.22.3" />
|
||||||
<dependency id="Torch.Server" version="torchVersion" />
|
<dependency id="Torch.Server" version="torchVersion" />
|
||||||
</group>
|
</group>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
@@ -17,9 +17,9 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<!-- <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> -->
|
<!-- <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
|
||||||
<PackageReference Include="NLog" Version="5.2.0" />
|
<PackageReference Include="NLog" Version="5.2.4" />
|
||||||
<PackageReference Include="xunit" Version="2.4.2" />
|
<PackageReference Include="xunit" Version="2.5.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="VRage.Game, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
<Reference Include="VRage.Game, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
|
||||||
|
@@ -30,9 +30,8 @@ namespace Torch.Server
|
|||||||
private bool _init;
|
private bool _init;
|
||||||
private const string TOOL_DIR = "tool";
|
private const string TOOL_DIR = "tool";
|
||||||
private const string TOOL_ZIP = "temp.zip";
|
private const string TOOL_ZIP = "temp.zip";
|
||||||
private static readonly string TOOL_EXE = "DepotDownloader.exe";
|
private static readonly string TOOL_EXE = "steamcmd.exe";
|
||||||
private const string TOOL_ARGS = "-app 298740 -depot {1} -dir \"{0}\" -manifest {2}";
|
private const string TOOL_ARGS = "+force_install_dir \"{0}\" +login anonymous +app_update 298740 +quit";
|
||||||
private static readonly int[] Depots = { 298741, 1004 };
|
|
||||||
private TorchServer _server;
|
private TorchServer _server;
|
||||||
|
|
||||||
internal Persistent<TorchConfig> ConfigPersistent { get; }
|
internal Persistent<TorchConfig> ConfigPersistent { get; }
|
||||||
@@ -131,7 +130,7 @@ namespace Torch.Server
|
|||||||
|
|
||||||
public static async Task RunSteamCmdAsync(IConfiguration configuration)
|
public static async Task RunSteamCmdAsync(IConfiguration configuration)
|
||||||
{
|
{
|
||||||
var log = LogManager.GetLogger("SteamTool");
|
var log = LogManager.GetLogger("SteamCMD");
|
||||||
|
|
||||||
var path = configuration.GetValue<string>("steamToolPath") ?? ApplicationContext.Current.TorchDirectory
|
var path = configuration.GetValue<string>("steamToolPath") ?? ApplicationContext.Current.TorchDirectory
|
||||||
.CreateSubdirectory(TOOL_DIR).FullName;
|
.CreateSubdirectory(TOOL_DIR).FullName;
|
||||||
@@ -141,39 +140,32 @@ namespace Torch.Server
|
|||||||
Directory.CreateDirectory(path);
|
Directory.CreateDirectory(path);
|
||||||
}
|
}
|
||||||
|
|
||||||
var steamCmdExePath = Path.Combine(path, TOOL_EXE);
|
var toolExe = Path.Combine(path, TOOL_EXE);
|
||||||
if (!File.Exists(steamCmdExePath))
|
if (!File.Exists(toolExe))
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
log.Info("Downloading Steam Tool.");
|
log.Info("Downloading SteamCMD.");
|
||||||
using (var client = new HttpClient())
|
using (var client = new HttpClient())
|
||||||
await using (var file = File.Create(TOOL_ZIP))
|
await using (var file = File.Create(TOOL_ZIP))
|
||||||
await using (var stream = await client.GetStreamAsync("https://github.com/SteamRE/DepotDownloader/releases/download/DepotDownloader_2.4.7/depotdownloader-2.4.7.zip"))
|
await using (var stream = await client.GetStreamAsync("https://steamcdn-a.akamaihd.net/client/installer/steamcmd.zip"))
|
||||||
await stream.CopyToAsync(file);
|
await stream.CopyToAsync(file);
|
||||||
|
|
||||||
ZipFile.ExtractToDirectory(TOOL_ZIP, path);
|
ZipFile.ExtractToDirectory(TOOL_ZIP, path);
|
||||||
File.Delete(TOOL_ZIP);
|
File.Delete(TOOL_ZIP);
|
||||||
log.Info("Steam Tool downloaded successfully!");
|
log.Info("SteamCMD downloaded successfully!");
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
log.Error(e, "Failed to download Steam Tool, unable to update the DS.");
|
log.Error(e, "Failed to download SteamCMD, unable to update the DS.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
log.Info("Checking for DS updates.");
|
log.Info("Checking for DS updates.");
|
||||||
foreach (var depot in Depots)
|
var steamCmdProc = new ProcessStartInfo(toolExe)
|
||||||
{
|
{
|
||||||
await DownloadDepot(depot);
|
Arguments = string.Format(TOOL_ARGS, configuration.GetValue("gamePath", "../")),
|
||||||
}
|
|
||||||
|
|
||||||
async Task DownloadDepot(int depotId)
|
|
||||||
{
|
|
||||||
var steamCmdProc = new ProcessStartInfo(steamCmdExePath)
|
|
||||||
{
|
|
||||||
Arguments = string.Format(TOOL_ARGS, configuration.GetValue("gamePath", "../"), depotId, "3111493184861426002"),
|
|
||||||
WorkingDirectory = path,
|
WorkingDirectory = path,
|
||||||
RedirectStandardOutput = true
|
RedirectStandardOutput = true
|
||||||
};
|
};
|
||||||
@@ -186,5 +178,4 @@ namespace Torch.Server
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@@ -28,6 +28,7 @@ using VRage.FileSystem;
|
|||||||
using VRage.Game;
|
using VRage.Game;
|
||||||
using VRage.Game.ObjectBuilder;
|
using VRage.Game.ObjectBuilder;
|
||||||
using VRage.ObjectBuilders;
|
using VRage.ObjectBuilders;
|
||||||
|
using VRage.ObjectBuilders.Private;
|
||||||
using VRage.Plugins;
|
using VRage.Plugins;
|
||||||
|
|
||||||
namespace Torch.Server.Managers
|
namespace Torch.Server.Managers
|
||||||
@@ -363,10 +364,10 @@ namespace Torch.Server.Managers
|
|||||||
public void SaveSandbox()
|
public void SaveSandbox()
|
||||||
{
|
{
|
||||||
using (var f = File.Open(_checkpointPath, FileMode.Create))
|
using (var f = File.Open(_checkpointPath, FileMode.Create))
|
||||||
MyObjectBuilderSerializer.SerializeXML(f, Checkpoint);
|
MyObjectBuilderSerializerKeen.SerializeXML(f, Checkpoint);
|
||||||
|
|
||||||
using (var f = File.Open(_worldConfigPath, FileMode.Create))
|
using (var f = File.Open(_worldConfigPath, FileMode.Create))
|
||||||
MyObjectBuilderSerializer.SerializeXML(f, WorldConfiguration);
|
MyObjectBuilderSerializerKeen.SerializeXML(f, WorldConfiguration);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void LoadSandbox()
|
public void LoadSandbox()
|
||||||
|
@@ -35,13 +35,13 @@
|
|||||||
<PackageReference Include="AutoCompleteTextBox" Version="1.6.0" />
|
<PackageReference Include="AutoCompleteTextBox" Version="1.6.0" />
|
||||||
<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
|
<PackageReference Include="Ben.Demystifier" Version="0.4.1" />
|
||||||
<PackageReference Include="ControlzEx" Version="6.0.0" />
|
<PackageReference Include="ControlzEx" Version="6.0.0" />
|
||||||
<PackageReference Include="MahApps.Metro" Version="2.4.9" />
|
<PackageReference Include="MahApps.Metro" Version="2.4.10" />
|
||||||
<PackageReference Include="MdXaml" Version="1.20.1" />
|
<PackageReference Include="MdXaml" Version="1.21.0" />
|
||||||
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="2.4.416101" />
|
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.0.442202" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="7.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="7.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="7.0.0" />
|
||||||
<PackageReference Include="NLog" Version="5.2.0" />
|
<PackageReference Include="NLog" Version="5.2.4" />
|
||||||
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
|
<PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
|
||||||
<PackageReference Include="Steamworks.NET" Version="20.1.0">
|
<PackageReference Include="Steamworks.NET" Version="20.1.0">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
@@ -50,7 +50,7 @@
|
|||||||
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
||||||
<PackageReference Include="System.Management" Version="7.0.2" />
|
<PackageReference Include="System.Management" Version="7.0.2" />
|
||||||
<PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.5" />
|
<PackageReference Include="nulastudio.NetCoreBeauty" Version="1.2.9.5" />
|
||||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.120">
|
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.22.3">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>compile</IncludeAssets>
|
<IncludeAssets>compile</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
@@ -69,6 +69,14 @@ namespace Torch.Server
|
|||||||
|
|
||||||
_simUpdateTimer.Elapsed += SimUpdateElapsed;
|
_simUpdateTimer.Elapsed += SimUpdateElapsed;
|
||||||
_simUpdateTimer.Start();
|
_simUpdateTimer.Start();
|
||||||
|
|
||||||
|
Console.CancelKeyPress += (_, _) =>
|
||||||
|
{
|
||||||
|
if (State == ServerState.Running)
|
||||||
|
Stop();
|
||||||
|
|
||||||
|
Environment.Exit(0);
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SimUpdateElapsed(object sender, System.Timers.ElapsedEventArgs e)
|
private void SimUpdateElapsed(object sender, System.Timers.ElapsedEventArgs e)
|
||||||
@@ -121,7 +129,38 @@ namespace Torch.Server
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public ServerState State { get; private set; }
|
public ServerState State { get; private set; }
|
||||||
|
|
||||||
public event Action<ITorchServer> Initialized;
|
private Action<ITorchServer> _initializedEvent;
|
||||||
|
|
||||||
|
public event Action<ITorchServer> Initialized
|
||||||
|
{
|
||||||
|
add
|
||||||
|
{
|
||||||
|
var action = _initializedEvent;
|
||||||
|
Action<ITorchServer> action2;
|
||||||
|
do
|
||||||
|
{
|
||||||
|
action2 = action;
|
||||||
|
var action3 = (Action<ITorchServer>)Delegate.Combine(action2, value);
|
||||||
|
action = Interlocked.CompareExchange(ref _initializedEvent, action3, action2);
|
||||||
|
}
|
||||||
|
while (action != action2);
|
||||||
|
|
||||||
|
if (GetManager<InstanceManager>().DedicatedConfig != null)
|
||||||
|
value(this); //if already initialized
|
||||||
|
}
|
||||||
|
remove
|
||||||
|
{
|
||||||
|
var action = _initializedEvent;
|
||||||
|
Action<ITorchServer> action2;
|
||||||
|
do
|
||||||
|
{
|
||||||
|
action2 = action;
|
||||||
|
var action3 = (Action<ITorchServer>)Delegate.Remove(action2, value);
|
||||||
|
action = Interlocked.CompareExchange(ref _initializedEvent, action3, action2);
|
||||||
|
}
|
||||||
|
while (action != action2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
public int OnlinePlayers { get; private set; }
|
public int OnlinePlayers { get; private set; }
|
||||||
|
|
||||||
@@ -132,7 +171,7 @@ namespace Torch.Server
|
|||||||
base.Init();
|
base.Init();
|
||||||
GetManager<InstanceManager>().LoadInstance(InstancePath);
|
GetManager<InstanceManager>().LoadInstance(InstancePath);
|
||||||
CanRun = true;
|
CanRun = true;
|
||||||
Initialized?.Invoke(this);
|
_initializedEvent?.Invoke(this);
|
||||||
Log.Info($"Initialized server '{InstanceName}' at '{InstancePath}'");
|
Log.Info($"Initialized server '{InstanceName}' at '{InstancePath}'");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -208,9 +247,14 @@ namespace Torch.Server
|
|||||||
StopInternal();
|
StopInternal();
|
||||||
LogManager.Flush();
|
LogManager.Flush();
|
||||||
|
|
||||||
|
if (
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
Environment.Exit(0);
|
// ReSharper disable once ConditionIsAlwaysTrueOrFalse
|
||||||
|
true ||
|
||||||
#endif
|
#endif
|
||||||
|
ApplicationContext.Current.IsService
|
||||||
|
)
|
||||||
|
Environment.Exit(0);
|
||||||
|
|
||||||
var exe = Path.Combine(AppContext.BaseDirectory, "Torch.Server.exe");
|
var exe = Path.Combine(AppContext.BaseDirectory, "Torch.Server.exe");
|
||||||
|
|
||||||
|
@@ -116,7 +116,7 @@ namespace Torch.Server
|
|||||||
if (_server?.State == ServerState.Running)
|
if (_server?.State == ServerState.Running)
|
||||||
_server.Stop();
|
_server.Stop();
|
||||||
|
|
||||||
Process.GetCurrentProcess().Kill();
|
Environment.Exit(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -29,32 +29,32 @@
|
|||||||
},
|
},
|
||||||
"MahApps.Metro": {
|
"MahApps.Metro": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[2.4.9, )",
|
"requested": "[2.4.10, )",
|
||||||
"resolved": "2.4.9",
|
"resolved": "2.4.10",
|
||||||
"contentHash": "eMTkg6TBnCwHzszw7CP+pxsBeB4ZMsJFiTJJoifUVBysRyEenzzR+TKQJuMvvKK6KzvLxwHmJsFhi9o5p4vxhQ==",
|
"contentHash": "45exHKJCVYaD1/rNr3ekZPECEBM4uHOt6aYp6yNaJbliFMUo+d3z8Gi1xG+qEkbiHKITX+dlz+BW1FOsjAbl/w==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ControlzEx": "[4.4.0, 6.0.0)"
|
"ControlzEx": "[4.4.0, 6.0.0)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"MdXaml": {
|
"MdXaml": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[1.20.1, )",
|
"requested": "[1.21.0, )",
|
||||||
"resolved": "1.20.1",
|
"resolved": "1.21.0",
|
||||||
"contentHash": "fx64BBFK7yO2MHBxMAMV4/b3x24rQ7Gfn64CISaw4dS7Wvr0HGc4vHNyrMY+/CgEpOEATLVgtM1a9liQ+QOesA==",
|
"contentHash": "S1aqVD27rif73/KqG52UGZMUqCcCBvOmno8dgivBQQC8IU9TMRX/fdKdxJvWZqYuDE8QTzdxDy377garPiBs3w==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"AvalonEdit": "6.0.0",
|
"AvalonEdit": "6.0.0",
|
||||||
"MdXaml.Plugins": "1.20.1"
|
"MdXaml.Plugins": "1.21.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Microsoft.Diagnostics.Runtime": {
|
"Microsoft.Diagnostics.Runtime": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[2.4.416101, )",
|
"requested": "[3.0.442202, )",
|
||||||
"resolved": "2.4.416101",
|
"resolved": "3.0.442202",
|
||||||
"contentHash": "BUGBGNmjLWnRJ+Oqj23aDKjulOqDk6q62oQzeg9FghfphhhuTwlNLGHV88vKKldx+NHjWUzF3eUPUFxhROrcyQ==",
|
"contentHash": "lLKVmm5EsxtEYuPivwMNsS+EtNqWPO9kPs99kFGeGN/XH3brzrmyoN5YX8Adwcpzom4OUk5AifKn1K3Eo2EGWQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Diagnostics.NETCore.Client": "0.2.251802",
|
"Microsoft.Diagnostics.NETCore.Client": "0.2.410101",
|
||||||
"System.Collections.Immutable": "5.0.0",
|
"System.Collections.Immutable": "6.0.0",
|
||||||
"System.Runtime.CompilerServices.Unsafe": "5.0.0"
|
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Microsoft.Extensions.Configuration.CommandLine": {
|
"Microsoft.Extensions.Configuration.CommandLine": {
|
||||||
@@ -92,9 +92,9 @@
|
|||||||
},
|
},
|
||||||
"NLog": {
|
"NLog": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[5.2.0, )",
|
"requested": "[5.2.4, )",
|
||||||
"resolved": "5.2.0",
|
"resolved": "5.2.4",
|
||||||
"contentHash": "uYBgseY0m/9lQUbZYGsQsTBFOWrfs3iaekzzYMH6vFmpoOAvV8/bp1XxG/suZkwB5h8nAiTJAp7VENWRDKtKPA=="
|
"contentHash": "/qzds1Cp9rQD53La3mlWOmCHsFSbmT9BCb8q6k3eOrbOYDfdf3ZN1hBW7IDImUD6V8BfPfEFBhXGDLOEOQxHgQ=="
|
||||||
},
|
},
|
||||||
"nulastudio.NetCoreBeauty": {
|
"nulastudio.NetCoreBeauty": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
@@ -113,9 +113,9 @@
|
|||||||
},
|
},
|
||||||
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[1.202.120, )",
|
"requested": "[1.203.22.3, )",
|
||||||
"resolved": "1.202.120",
|
"resolved": "1.203.22.3",
|
||||||
"contentHash": "HTP48NOSZY3eQPX3GJN+gjxdW83SM7DX6NcKCFqNIIvjz/J+l8uimHAQp9dnLySb0wb1K1Z1xBPIXyxMQRREIw==",
|
"contentHash": "U7awzB6nGNN3tyZpeWQQjF4MHxJ4CDbvXEuJDkddLa2ellh2SYCV4V3UqukMuVzlrUSC71ITFwDVZZ+uYZYVtw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"protobuf-net": "1.0.0"
|
"protobuf-net": "1.0.0"
|
||||||
}
|
}
|
||||||
@@ -153,10 +153,10 @@
|
|||||||
},
|
},
|
||||||
"HarmonyX": {
|
"HarmonyX": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "2.10.2-prerelease.4",
|
"resolved": "2.10.2-prerelease.6",
|
||||||
"contentHash": "M/44/DhSu1WR8gL62aLPGKqAJ0rrgkw38nT3DgEvLAvyIoQLJmL2Jsn4/d4CC0eDT1Vv82cB9Mxgg0sFD3/qrQ==",
|
"contentHash": "CPCUR/t5AQ5DDs40bTJ5OwUVTCoZONaJGbWKKjAOwg7c7Ct4KEbfybH6T+KvRGVjf5eN1oyGY5BN7EfWxUh9Xg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"MonoModReorg.RuntimeDetour": "23.3.22.1"
|
"MonoMod.RuntimeDetour": "25.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": {
|
"JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": {
|
||||||
@@ -166,8 +166,8 @@
|
|||||||
},
|
},
|
||||||
"MdXaml.Plugins": {
|
"MdXaml.Plugins": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "1.20.1",
|
"resolved": "1.21.0",
|
||||||
"contentHash": "+pLkHJ8LuTVdZ0FM5c9ftjaebN4L7I4ShhXideTSos8rfULFSzLFuBWZot22A9yljuEpn5FbPw04Jrrs/il9ng=="
|
"contentHash": "jP1NEfsFLZPzjmtSsebeNC2hLo01O4fP5q5c+pqEBMxIxIn1gg6FHj2eL47PqxALKtyTbCiNb+Zm6Ra3Um55hA=="
|
||||||
},
|
},
|
||||||
"Microsoft.Bcl.AsyncInterfaces": {
|
"Microsoft.Bcl.AsyncInterfaces": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
@@ -181,28 +181,27 @@
|
|||||||
},
|
},
|
||||||
"Microsoft.CodeAnalysis.Common": {
|
"Microsoft.CodeAnalysis.Common": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "4.6.0",
|
"resolved": "4.7.0",
|
||||||
"contentHash": "N3uLvekc7DjvE1BX8YW7UH7ldjA4ps/Tun2YmOoSIItJrh1gnQIMKUbK1c3uQUx2NHbLibVZI4o/VB9xb4B7tA==",
|
"contentHash": "pD5S14xMUebSGYe75kt0q/aaS/ftvktSo/pEv7aX7hNPHfdZS+SZeXvkvcffGxWkunYOyRF9m1oN7zzSdYj9dQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.CodeAnalysis.Analyzers": "3.3.4",
|
"Microsoft.CodeAnalysis.Analyzers": "3.3.4",
|
||||||
"System.Collections.Immutable": "7.0.0",
|
"System.Collections.Immutable": "7.0.0",
|
||||||
"System.Reflection.Metadata": "7.0.0",
|
"System.Reflection.Metadata": "7.0.0",
|
||||||
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
|
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
|
||||||
"System.Text.Encoding.CodePages": "7.0.0"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Microsoft.CodeAnalysis.CSharp": {
|
"Microsoft.CodeAnalysis.CSharp": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "4.6.0",
|
"resolved": "4.7.0",
|
||||||
"contentHash": "9pyFZUN2Lyu3C0Xfs49kezfH+CzQHMibGsQeQPu0P+GWyH2XXDwmyZ6jAaKQGNUXOJfC2OK01hWMJTJY315uDQ==",
|
"contentHash": "JHCP2L6lB0oJ3tQoHkC67SFZxW+KbJVOnAo+6L01K5r/NlBlSUhTk5nUAldWhTVwGdzqNeHqGtnEqpsCmGSwQA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.CodeAnalysis.Common": "[4.6.0]"
|
"Microsoft.CodeAnalysis.Common": "[4.7.0]"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Microsoft.Diagnostics.NETCore.Client": {
|
"Microsoft.Diagnostics.NETCore.Client": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "0.2.251802",
|
"resolved": "0.2.410101",
|
||||||
"contentHash": "bqnYl6AdSeboeN4v25hSukK6Odm6/54E3Y2B8rBvgqvAW0mF8fo7XNRVE2DMOG7Rk0fiuA079QIH28+V+W1Zdg==",
|
"contentHash": "I4hMjlbPcM5R+M4ThD2Zt1z58M8uZnWkDbFLXHntOOAajajEucrw4XYNSaoi5rgoqksgxQ3g388Vof4QzUNwdQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Bcl.AsyncInterfaces": "1.1.0",
|
"Microsoft.Bcl.AsyncInterfaces": "1.1.0",
|
||||||
"Microsoft.Extensions.Logging": "2.1.1"
|
"Microsoft.Extensions.Logging": "2.1.1"
|
||||||
@@ -313,50 +312,50 @@
|
|||||||
"resolved": "0.11.4",
|
"resolved": "0.11.4",
|
||||||
"contentHash": "IC1h5g0NeJGHIUgzM1P82ld57knhP0IcQfrYITDPXlNpMYGUrsG5TxuaWTjaeqDNQMBDNZkB8L0rBnwsY6JHuQ=="
|
"contentHash": "IC1h5g0NeJGHIUgzM1P82ld57knhP0IcQfrYITDPXlNpMYGUrsG5TxuaWTjaeqDNQMBDNZkB8L0rBnwsY6JHuQ=="
|
||||||
},
|
},
|
||||||
"MonoModReorg.Backports": {
|
"MonoMod.Backports": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.3.22.1",
|
"resolved": "1.0.1",
|
||||||
"contentHash": "nLx18prtZbS0nVO8YHElP+TUj1kkDswRgQpa9agt3tyNWke9Kqk5lVkGu87Y3cCMhG+m5Ai0ZDH0+V5B6bXF+Q==",
|
"contentHash": "LWIzLvkkmXlucCWL9gg17WBHhmw9hBpMjiFFBfVKJ4Cova6BLoLqjT+yjZM7RW70ezXJ/ry7zsicvvTV67Hxnw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"MonoModReorg.ILHelpers": "23.3.22.1"
|
"MonoMod.ILHelpers": "1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"MonoModReorg.Core": {
|
"MonoMod.Core": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.3.22.1",
|
"resolved": "1.0.1",
|
||||||
"contentHash": "Q3ZOgm6AOTL0icgcHsT/6mV5kYt6meqX3DEN1p/et5PxJsXUhVkiZfAptp8y/i+cO6HNgkcESpXEQ4jUWVwsDA==",
|
"contentHash": "VL7d4L+/JU9LR1eXe+Wo2NquCzPExeMorBe23S/7Rn8cydb4Ex+wMpFhnlUfwT9jbLV/TiNbaVGJtR73fBwVCw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Mono.Cecil": "0.11.4",
|
"Mono.Cecil": "0.11.4",
|
||||||
"MonoModReorg.Backports": "23.3.22.1",
|
"MonoMod.Backports": "1.0.1",
|
||||||
"MonoModReorg.ILHelpers": "23.3.22.1",
|
"MonoMod.ILHelpers": "1.0.0",
|
||||||
"MonoModReorg.Utils": "23.3.22.1"
|
"MonoMod.Utils": "25.0.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"MonoModReorg.ILHelpers": {
|
"MonoMod.ILHelpers": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.3.22.1",
|
"resolved": "1.0.0",
|
||||||
"contentHash": "dHE/3VZtnTUTkQ34j8Gu6CxKes1QDL8tBuF3QElxHHpPl/QabGCK938k47WWRcRBMoP7IAthkn+Bob4H97rBgw=="
|
"contentHash": "dTjGA+dYl7W5yQ0oG/Wr57tsa+ueoFUrwPtz9MZF9iheun4n70u7lge52F8UJi9i0zMHRfS2mAY6+nPuRZHQyQ=="
|
||||||
},
|
},
|
||||||
"MonoModReorg.RuntimeDetour": {
|
"MonoMod.RuntimeDetour": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.3.22.1",
|
"resolved": "25.0.2",
|
||||||
"contentHash": "cUES3Hi7QJtBNe0qwVdjZOCDkZDaCpdqS6Au0RaCyQ1PDIR4av13E9qBNAEYew46sgPe0fOrU334md6DLDGHlQ==",
|
"contentHash": "7HuQGIMMtu9q0PEnJYl7xztT14TmGSP56B4unBYWuZvPgWCZWX9hGOmTm7zDYhwMsjUQcCTl9iiqOlI1+NHVLg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Mono.Cecil": "0.11.4",
|
"Mono.Cecil": "0.11.4",
|
||||||
"MonoModReorg.Backports": "23.3.22.1",
|
"MonoMod.Backports": "1.0.1",
|
||||||
"MonoModReorg.Core": "23.3.22.1",
|
"MonoMod.Core": "1.0.1",
|
||||||
"MonoModReorg.ILHelpers": "23.3.22.1",
|
"MonoMod.ILHelpers": "1.0.0",
|
||||||
"MonoModReorg.Utils": "23.3.22.1"
|
"MonoMod.Utils": "25.0.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"MonoModReorg.Utils": {
|
"MonoMod.Utils": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.3.22.1",
|
"resolved": "25.0.3",
|
||||||
"contentHash": "q1cX0mbYxdw2WcE/qGBB84lVY/ffobEr46VQFuwGcWhtw6f1Ql1k4TZfs8gebpesSxHnca13grLeVHrUSpy1+g==",
|
"contentHash": "+/lFnYwNB728wnqAzkzCny88Ik++dueJiDAE+mRuMQf8NYHvWhNgLyZQ1VTN4x8iTelQGL1SzaY0I2bBPNNAog==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Mono.Cecil": "0.11.4",
|
"Mono.Cecil": "0.11.4",
|
||||||
"MonoModReorg.Backports": "23.3.22.1",
|
"MonoMod.Backports": "1.0.1",
|
||||||
"MonoModReorg.ILHelpers": "23.3.22.1"
|
"MonoMod.ILHelpers": "1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Newtonsoft.Json": {
|
"Newtonsoft.Json": {
|
||||||
@@ -366,96 +365,95 @@
|
|||||||
},
|
},
|
||||||
"NuGet.Commands": {
|
"NuGet.Commands": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "D1b7gTk1wp7sxscLhS8O/yoErsRVbR4zJvLVD4jo1sgxh42ZOWKpMkhznPUxpvmCxBhw9hAy8/yWrRH91SfdEQ==",
|
"contentHash": "qRqOvLbnUBpyYwRaV2jxckv9LWeQDoNHRQIY1Tii91mNrpnfHwV9AcsBMfzY76NQji6/5oI5Wmp1rAQOSIROMg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
|
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
|
||||||
"Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
|
"Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
|
||||||
"NuGet.Credentials": "6.6.1",
|
"NuGet.Credentials": "6.7.0",
|
||||||
"NuGet.ProjectModel": "6.6.1"
|
"NuGet.ProjectModel": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Common": {
|
"NuGet.Common": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "hW5NtShErO3qbdkyv7doCRsFNK9Rlcc7mVjYM+hg1sOAWheTh/oo95DzNbsZthiqyHZfaioopfWtzmoxNw9h4g==",
|
"contentHash": "o3hdvub38qN4UuPWISIvdhM36liEno2o58LRnIrSucZ6+SNv4jc+Cqh/y7BfmQ+UvpqLY19yEc4123rMpp6Edg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Frameworks": "6.6.1"
|
"NuGet.Frameworks": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Configuration": {
|
"NuGet.Configuration": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "9WbK8wgwPfRpSwuG+ZhMshE48qUYvPIw7VNLCncrq/in4vE6SGsuawPSxPJkkLBtcKTGbPMez5JDvUf6vEBgKg==",
|
"contentHash": "M1ttuwgjCNIEcgjFj3Fh/SZ/CaZY11SpxDOEOgPFUxB24K9JMGnB5BGBMOV8joleNcbwzEEY6WCVwHPYg3bb9A==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Common": "6.6.1",
|
"NuGet.Common": "6.7.0",
|
||||||
"System.Security.Cryptography.ProtectedData": "4.4.0"
|
"System.Security.Cryptography.ProtectedData": "4.4.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Credentials": {
|
"NuGet.Credentials": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "TuOlXcE1ajwdtfnQaUjDv2xO2u/WDS56/b5jHfEBZetKfcpT0W3iNOqInVPO0qxRxXK5/HXUKVr2Pya1LsVVnA==",
|
"contentHash": "q4ewbEg/ocZZFY8X56WwV274uRzsE0ibXiLKCsJww5y0CRLPXxsk4GhIgA13N32zm91COjaeyZrDxf62yDTU4w==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Protocol": "6.6.1"
|
"NuGet.Protocol": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.DependencyResolver.Core": {
|
"NuGet.DependencyResolver.Core": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "K+EXXLU37PBnwLGx6WnVGxlfWYkdedvUUOeDMERXelNgjg20irtKf3hk+wGB7NmxAdNY9/gGcOgSDOV+M0w3Jg==",
|
"contentHash": "kNLYj3VBxFNe99vV7qk7VdknGsrUSHIByRbwIhjUTBrxoJzikmOXsjdya/PiFwEhPm9R+u89DfnMmqfAbsPcTA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Configuration": "6.6.1",
|
"NuGet.Configuration": "6.7.0",
|
||||||
"NuGet.LibraryModel": "6.6.1",
|
"NuGet.LibraryModel": "6.7.0",
|
||||||
"NuGet.Protocol": "6.6.1"
|
"NuGet.Protocol": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Frameworks": {
|
"NuGet.Frameworks": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "iRtDhL0zPqVw037fHEK9bQljTKPuOHhfIkz86/IH2P8eetr910HTTe5G8lJTuzZHh592Ze/sYhh173HIFjPSfg=="
|
"contentHash": "mTKaTSINpCjMHTNdaPMD/0nfHvWGetG67KzWtDJklnAp9nNwqA+t65G0v8XA/Ve35ipmPRdklxFIl3O55iTgnQ=="
|
||||||
},
|
},
|
||||||
"NuGet.LibraryModel": {
|
"NuGet.LibraryModel": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "B0KH19sNNUq56YfEozIsIpk8EOyolG0LRT+hqG1/mhuXlQFiP9BgT6pZgwLQVLUl9YBDx3+KWQQbl6pz8Yh/Sw==",
|
"contentHash": "JSRdDUgnjny9kFaOiU/58b1KMB8hzc/9J+SZsrqtWXCeo+MrMohqUx9yLTjIdPqEyYCmWC7kX4Y9lSXufx0bZQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Common": "6.6.1",
|
"NuGet.Common": "6.7.0",
|
||||||
"NuGet.Versioning": "6.6.1"
|
"NuGet.Versioning": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Packaging": {
|
"NuGet.Packaging": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "GwhFi2Ep4YzAGQFYz1OsMVNfiJ1M46nyCgHQ7xjJSMvxDYFgodR1RqVugWFMbIUUq6I8iYASwp5lpHXvITeuIQ==",
|
"contentHash": "uDhdZXzW8MLXhloPla/7j8jBWduNhDvY5UC1Dg1z8zJEvkGSj+WAcXKvymDf9UpbyiklWmonlb2hkX02ToJ1yQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Newtonsoft.Json": "13.0.1",
|
"Newtonsoft.Json": "13.0.1",
|
||||||
"NuGet.Configuration": "6.6.1",
|
"NuGet.Configuration": "6.7.0",
|
||||||
"NuGet.Versioning": "6.6.1",
|
"NuGet.Versioning": "6.7.0",
|
||||||
"System.Security.Cryptography.Cng": "5.0.0",
|
"System.Security.Cryptography.Pkcs": "6.0.4"
|
||||||
"System.Security.Cryptography.Pkcs": "5.0.0"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.ProjectModel": {
|
"NuGet.ProjectModel": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "CEyRXXvgIoEQBWn3WZupjkIVC6rPcGUAO5p4Gz+fnF8kcefWQOXHfnOE+UKZ0WwAJG5iMWRvXBKAGOuFiFhNpQ==",
|
"contentHash": "SnT/0ni+2GoAVY4VsiRvBYOv5E6FpRqY24vVm38rS5Gfq4iQGjxPl7ZZsXGg5Iy2q3kED20DO+x+/yXCRUqswg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.DependencyResolver.Core": "6.6.1"
|
"NuGet.DependencyResolver.Core": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Protocol": {
|
"NuGet.Protocol": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "HhKLsK6Q0NNp6qb0T26GLR5gCTRZu+gzqDVK4xqXHZmsolaDVIdIYpn44b2etaVYLzNJCvgRkw+I422u2bIvMw==",
|
"contentHash": "CZvnf3n0A1wtGNHAViLtZbtqZ5KXnI/fDe0CE+rphoIYJP91D8ImYQG2eM/Y4aQ1n4pcqebg/XVnSr37qjXoeQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Packaging": "6.6.1"
|
"NuGet.Packaging": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Versioning": {
|
"NuGet.Versioning": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "Wm/AOFICTIrCgbVxv9dNWusraTzcggbo5W4ao7hD8NNVq911an9TGwW+uNuYc8I5PkpTeMuSXneV2u6hbi1P4w=="
|
"contentHash": "3sKMpt6btwpv6TKbbpUisT7a9qZoqoAGvHC0lUiqMl9V1oArqXP0DRhlNq7alFynA1HqKOFeRje5kPYkbqFJ/Q=="
|
||||||
},
|
},
|
||||||
"protobuf-net": {
|
"protobuf-net": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
@@ -522,14 +520,6 @@
|
|||||||
"resolved": "6.0.0",
|
"resolved": "6.0.0",
|
||||||
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
|
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
|
||||||
},
|
},
|
||||||
"System.Security.Cryptography.Cng": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "5.0.0",
|
|
||||||
"contentHash": "jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==",
|
|
||||||
"dependencies": {
|
|
||||||
"System.Formats.Asn1": "5.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Security.Cryptography.Pkcs": {
|
"System.Security.Cryptography.Pkcs": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "7.0.0",
|
"resolved": "7.0.0",
|
||||||
@@ -551,11 +541,6 @@
|
|||||||
"System.Security.Cryptography.Pkcs": "7.0.0"
|
"System.Security.Cryptography.Pkcs": "7.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"System.Text.Encoding.CodePages": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "7.0.0",
|
|
||||||
"contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ=="
|
|
||||||
},
|
|
||||||
"System.Text.Json": {
|
"System.Text.Json": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "5.0.2",
|
"resolved": "5.0.2",
|
||||||
@@ -574,12 +559,12 @@
|
|||||||
"type": "Project",
|
"type": "Project",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ControlzEx": "[6.0.0, )",
|
"ControlzEx": "[6.0.0, )",
|
||||||
"HarmonyX": "[2.10.2-prerelease.4, )",
|
"HarmonyX": "[2.10.2-prerelease.6, )",
|
||||||
"MahApps.Metro": "[2.4.9, )",
|
"MahApps.Metro": "[2.4.10, )",
|
||||||
"Microsoft.CodeAnalysis.CSharp": "[4.6.0, )",
|
"Microsoft.CodeAnalysis.CSharp": "[4.7.0, )",
|
||||||
"Microsoft.CodeAnalysis.Common": "[4.6.0, )",
|
"Microsoft.CodeAnalysis.Common": "[4.7.0, )",
|
||||||
"MonoModReorg.RuntimeDetour": "[23.3.22.1, )",
|
"MonoMod.RuntimeDetour": "[25.0.2, )",
|
||||||
"NLog": "[5.2.0, )",
|
"NLog": "[5.2.4, )",
|
||||||
"System.ComponentModel.Annotations": "[5.0.0, )",
|
"System.ComponentModel.Annotations": "[5.0.0, )",
|
||||||
"Torch.API": "[1.0.0, )",
|
"Torch.API": "[1.0.0, )",
|
||||||
"Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )",
|
"Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )",
|
||||||
@@ -591,9 +576,9 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": "[0.9.0, )",
|
"JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": "[0.9.0, )",
|
||||||
"Microsoft.Extensions.Configuration.Binder": "[7.0.4, )",
|
"Microsoft.Extensions.Configuration.Binder": "[7.0.4, )",
|
||||||
"NLog": "[5.2.0, )",
|
"NLog": "[5.2.4, )",
|
||||||
"NuGet.Commands": "[6.6.1, )",
|
"NuGet.Commands": "[6.7.0, )",
|
||||||
"NuGet.DependencyResolver.Core": "[6.6.1, )",
|
"NuGet.DependencyResolver.Core": "[6.7.0, )",
|
||||||
"SemanticVersioning": "[2.0.2, )",
|
"SemanticVersioning": "[2.0.2, )",
|
||||||
"System.Linq.Async": "[6.0.1, )"
|
"System.Linq.Async": "[6.0.1, )"
|
||||||
}
|
}
|
||||||
@@ -615,14 +600,6 @@
|
|||||||
"System.CodeDom": "7.0.0"
|
"System.CodeDom": "7.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"System.Security.Cryptography.Cng": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "5.0.0",
|
|
||||||
"contentHash": "jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==",
|
|
||||||
"dependencies": {
|
|
||||||
"System.Formats.Asn1": "5.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Security.Cryptography.Pkcs": {
|
"System.Security.Cryptography.Pkcs": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "7.0.0",
|
"resolved": "7.0.0",
|
||||||
@@ -635,11 +612,6 @@
|
|||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "4.4.0",
|
"resolved": "4.4.0",
|
||||||
"contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
|
"contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
|
||||||
},
|
|
||||||
"System.Text.Encoding.CodePages": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "7.0.0",
|
|
||||||
"contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ=="
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -17,9 +17,9 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<!-- <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> -->
|
<!-- <Import Project="$(SolutionDir)\TransformOnBuild.targets" /> -->
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
|
||||||
<PackageReference Include="NLog" Version="5.2.0" />
|
<PackageReference Include="NLog" Version="5.2.4" />
|
||||||
<PackageReference Include="xunit" Version="2.4.2" />
|
<PackageReference Include="xunit" Version="2.5.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="System.Data.DataSetExtensions" />
|
<Reference Include="System.Data.DataSetExtensions" />
|
||||||
|
@@ -27,6 +27,7 @@ using VRage.Game.ModAPI;
|
|||||||
using VRage.Groups;
|
using VRage.Groups;
|
||||||
using VRage.ModAPI;
|
using VRage.ModAPI;
|
||||||
using VRage.ObjectBuilders;
|
using VRage.ObjectBuilders;
|
||||||
|
using VRage.ObjectBuilders.Private;
|
||||||
using VRage.Sync;
|
using VRage.Sync;
|
||||||
using VRageMath;
|
using VRageMath;
|
||||||
|
|
||||||
@@ -45,14 +46,14 @@ namespace Torch.Managers
|
|||||||
{
|
{
|
||||||
var ob = grid.GetObjectBuilder(true);
|
var ob = grid.GetObjectBuilder(true);
|
||||||
using (var f = File.Open(path, FileMode.CreateNew))
|
using (var f = File.Open(path, FileMode.CreateNew))
|
||||||
MyObjectBuilderSerializer.SerializeXML(f, ob);
|
MyObjectBuilderSerializerKeen.SerializeXML(f, ob);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ImportGrid(string path, Vector3D position)
|
public void ImportGrid(string path, Vector3D position)
|
||||||
{
|
{
|
||||||
MyObjectBuilder_EntityBase gridOb;
|
MyObjectBuilder_EntityBase gridOb;
|
||||||
using (var f = File.OpenRead(path))
|
using (var f = File.OpenRead(path))
|
||||||
MyObjectBuilderSerializer.DeserializeXML(f, out gridOb);
|
MyObjectBuilderSerializerKeen.DeserializeXML(f, out gridOb);
|
||||||
|
|
||||||
var grid = MyEntities.CreateFromObjectBuilderParallel(gridOb);
|
var grid = MyEntities.CreateFromObjectBuilderParallel(gridOb);
|
||||||
grid.PositionComp.SetPosition(position);
|
grid.PositionComp.SetPosition(position);
|
||||||
|
@@ -82,7 +82,7 @@ public class ScriptCompilationManager : Manager
|
|||||||
TerminationReasonSetter(block, MyProgrammableBlock.ScriptTerminationReason.None);
|
TerminationReasonSetter(block, MyProgrammableBlock.ScriptTerminationReason.None);
|
||||||
|
|
||||||
var component = ScriptComponentGetter(block);
|
var component = ScriptComponentGetter(block);
|
||||||
component.NextUpdate = UpdateType.None;
|
component.UpdateFrequency = UpdateFrequency.None;
|
||||||
component.NeedsUpdate = MyEntityUpdateEnum.NONE;
|
component.NeedsUpdate = MyEntityUpdateEnum.NONE;
|
||||||
|
|
||||||
try
|
try
|
||||||
@@ -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)
|
||||||
|
@@ -44,7 +44,7 @@ namespace Torch.Patches
|
|||||||
[ReflectedMethodInfo(typeof(MyLog), nameof(MyLog.WriteLineAndConsole), Parameters = new[] { typeof(string) })]
|
[ReflectedMethodInfo(typeof(MyLog), nameof(MyLog.WriteLineAndConsole), Parameters = new[] { typeof(string) })]
|
||||||
private static MethodInfo _logWriteLineAndConsole;
|
private static MethodInfo _logWriteLineAndConsole;
|
||||||
|
|
||||||
[ReflectedMethodInfo(typeof(MyLog), nameof(MyLog.Init))]
|
[ReflectedMethodInfo(typeof(MyLog), nameof(MyLog.Init), Parameters = new[] { typeof(string), typeof(StringBuilder), typeof(bool) })]
|
||||||
private static MethodInfo _logInit;
|
private static MethodInfo _logInit;
|
||||||
|
|
||||||
[ReflectedMethodInfo(typeof(MyLog), nameof(MyLog.Close))]
|
[ReflectedMethodInfo(typeof(MyLog), nameof(MyLog.Close))]
|
||||||
@@ -79,6 +79,9 @@ namespace Torch.Patches
|
|||||||
[ReflectedSetter(Name = "m_enabled")]
|
[ReflectedSetter(Name = "m_enabled")]
|
||||||
private static Action<MyLog, bool> _enabledSetter = null!;
|
private static Action<MyLog, bool> _enabledSetter = null!;
|
||||||
|
|
||||||
|
[ReflectedMethod(Type = typeof(MyLog), Name = "LogFlag")]
|
||||||
|
private static Func<MyLog, LoggingOptions, bool> _logFlag = null!;
|
||||||
|
|
||||||
private static int GetIndentByCurrentThread()
|
private static int GetIndentByCurrentThread()
|
||||||
{
|
{
|
||||||
using var l = _lockGetter(MyLog.Default).AcquireExclusiveUsing();
|
using var l = _lockGetter(MyLog.Default).AcquireExclusiveUsing();
|
||||||
@@ -122,7 +125,7 @@ namespace Torch.Patches
|
|||||||
}
|
}
|
||||||
private static bool PrefixWriteLineOptions(MyLog __instance, string message, LoggingOptions option)
|
private static bool PrefixWriteLineOptions(MyLog __instance, string message, LoggingOptions option)
|
||||||
{
|
{
|
||||||
if (__instance.LogEnabled && __instance.LogFlag(option) && _log.IsDebugEnabled)
|
if (__instance.LogEnabled && _logFlag(__instance, option) && _log.IsDebugEnabled)
|
||||||
_log.Info($"{string.Empty.PadRight(3 * GetIndentByCurrentThread(), ' ')}{message}");
|
_log.Info($"{string.Empty.PadRight(3 * GetIndentByCurrentThread(), ' ')}{message}");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@@ -72,7 +72,9 @@ namespace Torch.Session
|
|||||||
{
|
{
|
||||||
if (_overrideMods.ContainsKey(modId))
|
if (_overrideMods.ContainsKey(modId))
|
||||||
return false;
|
return false;
|
||||||
var item = ModItemUtils.Create(modId);
|
#pragma warning disable CS0618
|
||||||
|
var item = ModItemUtils.Create(modId, TorchBase.Instance.Config.UgcServiceType.ToString());
|
||||||
|
#pragma warning restore CS0618
|
||||||
_overrideMods.Add(modId, item);
|
_overrideMods.Add(modId, item);
|
||||||
|
|
||||||
OverrideModsChanged?.Invoke(new CollectionChangeEventArgs(CollectionChangeAction.Add, item));
|
OverrideModsChanged?.Invoke(new CollectionChangeEventArgs(CollectionChangeAction.Add, item));
|
||||||
|
@@ -24,18 +24,18 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="ControlzEx" Version="6.0.0" />
|
<PackageReference Include="ControlzEx" Version="6.0.0" />
|
||||||
<PackageReference Include="HarmonyX" Version="2.10.2-prerelease.4" />
|
<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.10" />
|
||||||
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.6.0" />
|
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.7.0" />
|
||||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.6.0" />
|
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" />
|
||||||
<PackageReference Include="MonoModReorg.RuntimeDetour" Version="23.3.22.1" />
|
<PackageReference Include="MonoMod.RuntimeDetour" Version="25.0.2" />
|
||||||
<PackageReference Include="NLog" Version="5.2.0" />
|
<PackageReference Include="NLog" Version="5.2.4" />
|
||||||
<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.2.26" />
|
<PackageReference Include="protobuf-net" Version="3.2.26" />
|
||||||
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
||||||
<PackageReference Include="Torch.SixLabors.ImageSharp" Version="1.0.0-beta6" />
|
<PackageReference Include="Torch.SixLabors.ImageSharp" Version="1.0.0-beta6" />
|
||||||
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.120">
|
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.22.3">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>compile</IncludeAssets>
|
<IncludeAssets>compile</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
@@ -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);
|
||||||
@@ -370,10 +372,10 @@ namespace Torch
|
|||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public virtual void Stop()
|
public virtual void Stop()
|
||||||
{
|
{
|
||||||
LogManager.Flush();
|
|
||||||
Game.SignalStop();
|
Game.SignalStop();
|
||||||
if (!Game.WaitFor(VRageGame.GameState.Stopped))
|
if (!Game.WaitFor(VRageGame.GameState.Stopped, TimeSpan.FromSeconds(Config.TickTimeout)))
|
||||||
Log.Warn("Failed to wait for the game to be stopped");
|
Log.Warn("Failed to wait for the game to be stopped");
|
||||||
|
LogManager.Flush();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
|
@@ -14,11 +14,11 @@
|
|||||||
},
|
},
|
||||||
"HarmonyX": {
|
"HarmonyX": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[2.10.2-prerelease.4, )",
|
"requested": "[2.10.2-prerelease.6, )",
|
||||||
"resolved": "2.10.2-prerelease.4",
|
"resolved": "2.10.2-prerelease.6",
|
||||||
"contentHash": "M/44/DhSu1WR8gL62aLPGKqAJ0rrgkw38nT3DgEvLAvyIoQLJmL2Jsn4/d4CC0eDT1Vv82cB9Mxgg0sFD3/qrQ==",
|
"contentHash": "CPCUR/t5AQ5DDs40bTJ5OwUVTCoZONaJGbWKKjAOwg7c7Ct4KEbfybH6T+KvRGVjf5eN1oyGY5BN7EfWxUh9Xg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"MonoModReorg.RuntimeDetour": "23.3.22.1"
|
"MonoMod.RuntimeDetour": "25.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"InfoOf.Fody": {
|
"InfoOf.Fody": {
|
||||||
@@ -32,53 +32,52 @@
|
|||||||
},
|
},
|
||||||
"MahApps.Metro": {
|
"MahApps.Metro": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[2.4.9, )",
|
"requested": "[2.4.10, )",
|
||||||
"resolved": "2.4.9",
|
"resolved": "2.4.10",
|
||||||
"contentHash": "eMTkg6TBnCwHzszw7CP+pxsBeB4ZMsJFiTJJoifUVBysRyEenzzR+TKQJuMvvKK6KzvLxwHmJsFhi9o5p4vxhQ==",
|
"contentHash": "45exHKJCVYaD1/rNr3ekZPECEBM4uHOt6aYp6yNaJbliFMUo+d3z8Gi1xG+qEkbiHKITX+dlz+BW1FOsjAbl/w==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ControlzEx": "[4.4.0, 6.0.0)"
|
"ControlzEx": "[4.4.0, 6.0.0)"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Microsoft.CodeAnalysis.Common": {
|
"Microsoft.CodeAnalysis.Common": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[4.6.0, )",
|
"requested": "[4.7.0, )",
|
||||||
"resolved": "4.6.0",
|
"resolved": "4.7.0",
|
||||||
"contentHash": "N3uLvekc7DjvE1BX8YW7UH7ldjA4ps/Tun2YmOoSIItJrh1gnQIMKUbK1c3uQUx2NHbLibVZI4o/VB9xb4B7tA==",
|
"contentHash": "pD5S14xMUebSGYe75kt0q/aaS/ftvktSo/pEv7aX7hNPHfdZS+SZeXvkvcffGxWkunYOyRF9m1oN7zzSdYj9dQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.CodeAnalysis.Analyzers": "3.3.4",
|
"Microsoft.CodeAnalysis.Analyzers": "3.3.4",
|
||||||
"System.Collections.Immutable": "7.0.0",
|
"System.Collections.Immutable": "7.0.0",
|
||||||
"System.Reflection.Metadata": "7.0.0",
|
"System.Reflection.Metadata": "7.0.0",
|
||||||
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
|
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
|
||||||
"System.Text.Encoding.CodePages": "7.0.0"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Microsoft.CodeAnalysis.CSharp": {
|
"Microsoft.CodeAnalysis.CSharp": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[4.6.0, )",
|
"requested": "[4.7.0, )",
|
||||||
"resolved": "4.6.0",
|
"resolved": "4.7.0",
|
||||||
"contentHash": "9pyFZUN2Lyu3C0Xfs49kezfH+CzQHMibGsQeQPu0P+GWyH2XXDwmyZ6jAaKQGNUXOJfC2OK01hWMJTJY315uDQ==",
|
"contentHash": "JHCP2L6lB0oJ3tQoHkC67SFZxW+KbJVOnAo+6L01K5r/NlBlSUhTk5nUAldWhTVwGdzqNeHqGtnEqpsCmGSwQA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.CodeAnalysis.Common": "[4.6.0]"
|
"Microsoft.CodeAnalysis.Common": "[4.7.0]"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"MonoModReorg.RuntimeDetour": {
|
"MonoMod.RuntimeDetour": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[23.3.22.1, )",
|
"requested": "[25.0.2, )",
|
||||||
"resolved": "23.3.22.1",
|
"resolved": "25.0.2",
|
||||||
"contentHash": "cUES3Hi7QJtBNe0qwVdjZOCDkZDaCpdqS6Au0RaCyQ1PDIR4av13E9qBNAEYew46sgPe0fOrU334md6DLDGHlQ==",
|
"contentHash": "7HuQGIMMtu9q0PEnJYl7xztT14TmGSP56B4unBYWuZvPgWCZWX9hGOmTm7zDYhwMsjUQcCTl9iiqOlI1+NHVLg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Mono.Cecil": "0.11.4",
|
"Mono.Cecil": "0.11.4",
|
||||||
"MonoModReorg.Backports": "23.3.22.1",
|
"MonoMod.Backports": "1.0.1",
|
||||||
"MonoModReorg.Core": "23.3.22.1",
|
"MonoMod.Core": "1.0.1",
|
||||||
"MonoModReorg.ILHelpers": "23.3.22.1",
|
"MonoMod.ILHelpers": "1.0.0",
|
||||||
"MonoModReorg.Utils": "23.3.22.1"
|
"MonoMod.Utils": "25.0.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NLog": {
|
"NLog": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[5.2.0, )",
|
"requested": "[5.2.4, )",
|
||||||
"resolved": "5.2.0",
|
"resolved": "5.2.4",
|
||||||
"contentHash": "uYBgseY0m/9lQUbZYGsQsTBFOWrfs3iaekzzYMH6vFmpoOAvV8/bp1XxG/suZkwB5h8nAiTJAp7VENWRDKtKPA=="
|
"contentHash": "/qzds1Cp9rQD53La3mlWOmCHsFSbmT9BCb8q6k3eOrbOYDfdf3ZN1hBW7IDImUD6V8BfPfEFBhXGDLOEOQxHgQ=="
|
||||||
},
|
},
|
||||||
"PropertyChanged.Fody": {
|
"PropertyChanged.Fody": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
@@ -100,9 +99,9 @@
|
|||||||
},
|
},
|
||||||
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
"SpaceEngineersDedicated.ReferenceAssemblies": {
|
||||||
"type": "Direct",
|
"type": "Direct",
|
||||||
"requested": "[1.202.120, )",
|
"requested": "[1.203.22.3, )",
|
||||||
"resolved": "1.202.120",
|
"resolved": "1.203.22.3",
|
||||||
"contentHash": "HTP48NOSZY3eQPX3GJN+gjxdW83SM7DX6NcKCFqNIIvjz/J+l8uimHAQp9dnLySb0wb1K1Z1xBPIXyxMQRREIw==",
|
"contentHash": "U7awzB6nGNN3tyZpeWQQjF4MHxJ4CDbvXEuJDkddLa2ellh2SYCV4V3UqukMuVzlrUSC71ITFwDVZZ+uYZYVtw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"protobuf-net": "1.0.0"
|
"protobuf-net": "1.0.0"
|
||||||
}
|
}
|
||||||
@@ -187,38 +186,38 @@
|
|||||||
"resolved": "0.11.4",
|
"resolved": "0.11.4",
|
||||||
"contentHash": "IC1h5g0NeJGHIUgzM1P82ld57knhP0IcQfrYITDPXlNpMYGUrsG5TxuaWTjaeqDNQMBDNZkB8L0rBnwsY6JHuQ=="
|
"contentHash": "IC1h5g0NeJGHIUgzM1P82ld57knhP0IcQfrYITDPXlNpMYGUrsG5TxuaWTjaeqDNQMBDNZkB8L0rBnwsY6JHuQ=="
|
||||||
},
|
},
|
||||||
"MonoModReorg.Backports": {
|
"MonoMod.Backports": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.3.22.1",
|
"resolved": "1.0.1",
|
||||||
"contentHash": "nLx18prtZbS0nVO8YHElP+TUj1kkDswRgQpa9agt3tyNWke9Kqk5lVkGu87Y3cCMhG+m5Ai0ZDH0+V5B6bXF+Q==",
|
"contentHash": "LWIzLvkkmXlucCWL9gg17WBHhmw9hBpMjiFFBfVKJ4Cova6BLoLqjT+yjZM7RW70ezXJ/ry7zsicvvTV67Hxnw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"MonoModReorg.ILHelpers": "23.3.22.1"
|
"MonoMod.ILHelpers": "1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"MonoModReorg.Core": {
|
"MonoMod.Core": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.3.22.1",
|
"resolved": "1.0.1",
|
||||||
"contentHash": "Q3ZOgm6AOTL0icgcHsT/6mV5kYt6meqX3DEN1p/et5PxJsXUhVkiZfAptp8y/i+cO6HNgkcESpXEQ4jUWVwsDA==",
|
"contentHash": "VL7d4L+/JU9LR1eXe+Wo2NquCzPExeMorBe23S/7Rn8cydb4Ex+wMpFhnlUfwT9jbLV/TiNbaVGJtR73fBwVCw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Mono.Cecil": "0.11.4",
|
"Mono.Cecil": "0.11.4",
|
||||||
"MonoModReorg.Backports": "23.3.22.1",
|
"MonoMod.Backports": "1.0.1",
|
||||||
"MonoModReorg.ILHelpers": "23.3.22.1",
|
"MonoMod.ILHelpers": "1.0.0",
|
||||||
"MonoModReorg.Utils": "23.3.22.1"
|
"MonoMod.Utils": "25.0.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"MonoModReorg.ILHelpers": {
|
"MonoMod.ILHelpers": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.3.22.1",
|
"resolved": "1.0.0",
|
||||||
"contentHash": "dHE/3VZtnTUTkQ34j8Gu6CxKes1QDL8tBuF3QElxHHpPl/QabGCK938k47WWRcRBMoP7IAthkn+Bob4H97rBgw=="
|
"contentHash": "dTjGA+dYl7W5yQ0oG/Wr57tsa+ueoFUrwPtz9MZF9iheun4n70u7lge52F8UJi9i0zMHRfS2mAY6+nPuRZHQyQ=="
|
||||||
},
|
},
|
||||||
"MonoModReorg.Utils": {
|
"MonoMod.Utils": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "23.3.22.1",
|
"resolved": "25.0.3",
|
||||||
"contentHash": "q1cX0mbYxdw2WcE/qGBB84lVY/ffobEr46VQFuwGcWhtw6f1Ql1k4TZfs8gebpesSxHnca13grLeVHrUSpy1+g==",
|
"contentHash": "+/lFnYwNB728wnqAzkzCny88Ik++dueJiDAE+mRuMQf8NYHvWhNgLyZQ1VTN4x8iTelQGL1SzaY0I2bBPNNAog==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Mono.Cecil": "0.11.4",
|
"Mono.Cecil": "0.11.4",
|
||||||
"MonoModReorg.Backports": "23.3.22.1",
|
"MonoMod.Backports": "1.0.1",
|
||||||
"MonoModReorg.ILHelpers": "23.3.22.1"
|
"MonoMod.ILHelpers": "1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"Newtonsoft.Json": {
|
"Newtonsoft.Json": {
|
||||||
@@ -228,96 +227,95 @@
|
|||||||
},
|
},
|
||||||
"NuGet.Commands": {
|
"NuGet.Commands": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "D1b7gTk1wp7sxscLhS8O/yoErsRVbR4zJvLVD4jo1sgxh42ZOWKpMkhznPUxpvmCxBhw9hAy8/yWrRH91SfdEQ==",
|
"contentHash": "qRqOvLbnUBpyYwRaV2jxckv9LWeQDoNHRQIY1Tii91mNrpnfHwV9AcsBMfzY76NQji6/5oI5Wmp1rAQOSIROMg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
|
"Microsoft.Extensions.FileProviders.Abstractions": "6.0.0",
|
||||||
"Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
|
"Microsoft.Extensions.FileSystemGlobbing": "6.0.0",
|
||||||
"NuGet.Credentials": "6.6.1",
|
"NuGet.Credentials": "6.7.0",
|
||||||
"NuGet.ProjectModel": "6.6.1"
|
"NuGet.ProjectModel": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Common": {
|
"NuGet.Common": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "hW5NtShErO3qbdkyv7doCRsFNK9Rlcc7mVjYM+hg1sOAWheTh/oo95DzNbsZthiqyHZfaioopfWtzmoxNw9h4g==",
|
"contentHash": "o3hdvub38qN4UuPWISIvdhM36liEno2o58LRnIrSucZ6+SNv4jc+Cqh/y7BfmQ+UvpqLY19yEc4123rMpp6Edg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Frameworks": "6.6.1"
|
"NuGet.Frameworks": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Configuration": {
|
"NuGet.Configuration": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "9WbK8wgwPfRpSwuG+ZhMshE48qUYvPIw7VNLCncrq/in4vE6SGsuawPSxPJkkLBtcKTGbPMez5JDvUf6vEBgKg==",
|
"contentHash": "M1ttuwgjCNIEcgjFj3Fh/SZ/CaZY11SpxDOEOgPFUxB24K9JMGnB5BGBMOV8joleNcbwzEEY6WCVwHPYg3bb9A==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Common": "6.6.1",
|
"NuGet.Common": "6.7.0",
|
||||||
"System.Security.Cryptography.ProtectedData": "4.4.0"
|
"System.Security.Cryptography.ProtectedData": "4.4.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Credentials": {
|
"NuGet.Credentials": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "TuOlXcE1ajwdtfnQaUjDv2xO2u/WDS56/b5jHfEBZetKfcpT0W3iNOqInVPO0qxRxXK5/HXUKVr2Pya1LsVVnA==",
|
"contentHash": "q4ewbEg/ocZZFY8X56WwV274uRzsE0ibXiLKCsJww5y0CRLPXxsk4GhIgA13N32zm91COjaeyZrDxf62yDTU4w==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Protocol": "6.6.1"
|
"NuGet.Protocol": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.DependencyResolver.Core": {
|
"NuGet.DependencyResolver.Core": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "K+EXXLU37PBnwLGx6WnVGxlfWYkdedvUUOeDMERXelNgjg20irtKf3hk+wGB7NmxAdNY9/gGcOgSDOV+M0w3Jg==",
|
"contentHash": "kNLYj3VBxFNe99vV7qk7VdknGsrUSHIByRbwIhjUTBrxoJzikmOXsjdya/PiFwEhPm9R+u89DfnMmqfAbsPcTA==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Configuration": "6.6.1",
|
"NuGet.Configuration": "6.7.0",
|
||||||
"NuGet.LibraryModel": "6.6.1",
|
"NuGet.LibraryModel": "6.7.0",
|
||||||
"NuGet.Protocol": "6.6.1"
|
"NuGet.Protocol": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Frameworks": {
|
"NuGet.Frameworks": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "iRtDhL0zPqVw037fHEK9bQljTKPuOHhfIkz86/IH2P8eetr910HTTe5G8lJTuzZHh592Ze/sYhh173HIFjPSfg=="
|
"contentHash": "mTKaTSINpCjMHTNdaPMD/0nfHvWGetG67KzWtDJklnAp9nNwqA+t65G0v8XA/Ve35ipmPRdklxFIl3O55iTgnQ=="
|
||||||
},
|
},
|
||||||
"NuGet.LibraryModel": {
|
"NuGet.LibraryModel": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "B0KH19sNNUq56YfEozIsIpk8EOyolG0LRT+hqG1/mhuXlQFiP9BgT6pZgwLQVLUl9YBDx3+KWQQbl6pz8Yh/Sw==",
|
"contentHash": "JSRdDUgnjny9kFaOiU/58b1KMB8hzc/9J+SZsrqtWXCeo+MrMohqUx9yLTjIdPqEyYCmWC7kX4Y9lSXufx0bZQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Common": "6.6.1",
|
"NuGet.Common": "6.7.0",
|
||||||
"NuGet.Versioning": "6.6.1"
|
"NuGet.Versioning": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Packaging": {
|
"NuGet.Packaging": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "GwhFi2Ep4YzAGQFYz1OsMVNfiJ1M46nyCgHQ7xjJSMvxDYFgodR1RqVugWFMbIUUq6I8iYASwp5lpHXvITeuIQ==",
|
"contentHash": "uDhdZXzW8MLXhloPla/7j8jBWduNhDvY5UC1Dg1z8zJEvkGSj+WAcXKvymDf9UpbyiklWmonlb2hkX02ToJ1yQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Newtonsoft.Json": "13.0.1",
|
"Newtonsoft.Json": "13.0.1",
|
||||||
"NuGet.Configuration": "6.6.1",
|
"NuGet.Configuration": "6.7.0",
|
||||||
"NuGet.Versioning": "6.6.1",
|
"NuGet.Versioning": "6.7.0",
|
||||||
"System.Security.Cryptography.Cng": "5.0.0",
|
"System.Security.Cryptography.Pkcs": "6.0.4"
|
||||||
"System.Security.Cryptography.Pkcs": "5.0.0"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.ProjectModel": {
|
"NuGet.ProjectModel": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "CEyRXXvgIoEQBWn3WZupjkIVC6rPcGUAO5p4Gz+fnF8kcefWQOXHfnOE+UKZ0WwAJG5iMWRvXBKAGOuFiFhNpQ==",
|
"contentHash": "SnT/0ni+2GoAVY4VsiRvBYOv5E6FpRqY24vVm38rS5Gfq4iQGjxPl7ZZsXGg5Iy2q3kED20DO+x+/yXCRUqswg==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.DependencyResolver.Core": "6.6.1"
|
"NuGet.DependencyResolver.Core": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Protocol": {
|
"NuGet.Protocol": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "HhKLsK6Q0NNp6qb0T26GLR5gCTRZu+gzqDVK4xqXHZmsolaDVIdIYpn44b2etaVYLzNJCvgRkw+I422u2bIvMw==",
|
"contentHash": "CZvnf3n0A1wtGNHAViLtZbtqZ5KXnI/fDe0CE+rphoIYJP91D8ImYQG2eM/Y4aQ1n4pcqebg/XVnSr37qjXoeQ==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"NuGet.Packaging": "6.6.1"
|
"NuGet.Packaging": "6.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"NuGet.Versioning": {
|
"NuGet.Versioning": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "6.6.1",
|
"resolved": "6.7.0",
|
||||||
"contentHash": "Wm/AOFICTIrCgbVxv9dNWusraTzcggbo5W4ao7hD8NNVq911an9TGwW+uNuYc8I5PkpTeMuSXneV2u6hbi1P4w=="
|
"contentHash": "3sKMpt6btwpv6TKbbpUisT7a9qZoqoAGvHC0lUiqMl9V1oArqXP0DRhlNq7alFynA1HqKOFeRje5kPYkbqFJ/Q=="
|
||||||
},
|
},
|
||||||
"protobuf-net.Core": {
|
"protobuf-net.Core": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
@@ -347,8 +345,8 @@
|
|||||||
},
|
},
|
||||||
"System.Formats.Asn1": {
|
"System.Formats.Asn1": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "5.0.0",
|
"resolved": "6.0.0",
|
||||||
"contentHash": "MTvUIktmemNB+El0Fgw9egyqT9AYSIk6DTJeoDSpc3GIHxHCMo8COqkWT1mptX5tZ1SlQ6HJZ0OsSvMth1c12w=="
|
"contentHash": "T6fD00dQ3NTbPDy31m4eQUwKW84s03z0N2C8HpOklyeaDgaJPa/TexP4/SkORMSOwc7WhKifnA6Ya33AkzmafA=="
|
||||||
},
|
},
|
||||||
"System.Linq.Async": {
|
"System.Linq.Async": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
@@ -371,21 +369,12 @@
|
|||||||
"resolved": "6.0.0",
|
"resolved": "6.0.0",
|
||||||
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
|
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
|
||||||
},
|
},
|
||||||
"System.Security.Cryptography.Cng": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "5.0.0",
|
|
||||||
"contentHash": "jIMXsKn94T9JY7PvPq/tMfqa6GAaHpElRDpmG+SuL+D3+sTw2M8VhnibKnN8Tq+4JqbPJ/f+BwtLeDMEnzAvRg==",
|
|
||||||
"dependencies": {
|
|
||||||
"System.Formats.Asn1": "5.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"System.Security.Cryptography.Pkcs": {
|
"System.Security.Cryptography.Pkcs": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "5.0.0",
|
"resolved": "6.0.4",
|
||||||
"contentHash": "9TPLGjBCGKmNvG8pjwPeuYy0SMVmGZRwlTZvyPHDbYv/DRkoeumJdfumaaDNQzVGMEmbWtg07zUpSW9q70IlDQ==",
|
"contentHash": "LGbXi1oUJ9QgCNGXRO9ndzBL/GZgANcsURpMhNR8uO+rca47SZmciS3RSQUvlQRwK3QHZSHNOXzoMUASKA+Anw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"System.Formats.Asn1": "5.0.0",
|
"System.Formats.Asn1": "6.0.0"
|
||||||
"System.Security.Cryptography.Cng": "5.0.0"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"System.Security.Cryptography.ProtectedData": {
|
"System.Security.Cryptography.ProtectedData": {
|
||||||
@@ -393,11 +382,6 @@
|
|||||||
"resolved": "4.4.0",
|
"resolved": "4.4.0",
|
||||||
"contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
|
"contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
|
||||||
},
|
},
|
||||||
"System.Text.Encoding.CodePages": {
|
|
||||||
"type": "Transitive",
|
|
||||||
"resolved": "7.0.0",
|
|
||||||
"contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ=="
|
|
||||||
},
|
|
||||||
"System.Text.Json": {
|
"System.Text.Json": {
|
||||||
"type": "Transitive",
|
"type": "Transitive",
|
||||||
"resolved": "5.0.2",
|
"resolved": "5.0.2",
|
||||||
@@ -408,9 +392,9 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": "[0.9.0, )",
|
"JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": "[0.9.0, )",
|
||||||
"Microsoft.Extensions.Configuration.Binder": "[7.0.4, )",
|
"Microsoft.Extensions.Configuration.Binder": "[7.0.4, )",
|
||||||
"NLog": "[5.2.0, )",
|
"NLog": "[5.2.4, )",
|
||||||
"NuGet.Commands": "[6.6.1, )",
|
"NuGet.Commands": "[6.7.0, )",
|
||||||
"NuGet.DependencyResolver.Core": "[6.6.1, )",
|
"NuGet.DependencyResolver.Core": "[6.7.0, )",
|
||||||
"SemanticVersioning": "[2.0.2, )",
|
"SemanticVersioning": "[2.0.2, )",
|
||||||
"System.Linq.Async": "[6.0.1, )"
|
"System.Linq.Async": "[6.0.1, )"
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user