From cae3d9ad8c1cc42026531ecaa8656ea265cba2f4 Mon Sep 17 00:00:00 2001 From: zznty <94796179+zznty@users.noreply.github.com> Date: Mon, 13 Jan 2025 01:47:52 +0700 Subject: [PATCH] net 9 --- Directory.Build.props | 2 +- Torch.API/Torch.API.csproj | 12 +- Torch.API/packages.lock.json | 125 ++--- Torch.Server.Tests/Torch.Server.Tests.csproj | 6 +- Torch.Server.Tests/packages.lock.json | 432 +++++++++--------- Torch.Server/Properties/launchSettings.json | 9 +- Torch.Server/Torch.Server.csproj | 16 +- Torch.Server/packages.lock.json | 364 +++++++-------- Torch.Tests/Torch.Tests.csproj | 6 +- Torch.Tests/packages.lock.json | 260 +++++------ Torch.sln | 34 +- .../PatchManager/MSIL/MsilInstruction.cs | 8 +- Torch/Patches/ScriptCompilerPatch.cs | 32 +- Torch/Plugins/AssemblyRewriter.cs | 64 ++- Torch/Torch.csproj | 8 +- Torch/packages.lock.json | 196 ++++---- global.json | 2 +- 17 files changed, 772 insertions(+), 804 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 27bf1cc..afd8165 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,6 +1,6 @@  - net8.0-windows + net9.0-windows win-x64 true true diff --git a/Torch.API/Torch.API.csproj b/Torch.API/Torch.API.csproj index a35db6d..ba84bc8 100644 --- a/Torch.API/Torch.API.csproj +++ b/Torch.API/Torch.API.csproj @@ -12,12 +12,12 @@ - - - - - - + + + + + + runtime diff --git a/Torch.API/packages.lock.json b/Torch.API/packages.lock.json index ab90ed4..f4cc3d2 100644 --- a/Torch.API/packages.lock.json +++ b/Torch.API/packages.lock.json @@ -1,62 +1,62 @@ { "version": 1, "dependencies": { - "net8.0-windows7.0": { + "net9.0-windows7.0": { "JetBrains.Annotations": { "type": "Direct", - "requested": "[2024.2.0, )", - "resolved": "2024.2.0", - "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw==" + "requested": "[2024.3.0, )", + "resolved": "2024.3.0", + "contentHash": "ox5pkeLQXjvJdyAB4b2sBYAlqZGLh3PjSnP1bQNVx72ONuTJ9+34/+Rq91Fc0dG29XG9RgZur9+NcP4riihTug==" }, "Microsoft.Extensions.Configuration.Binder": { "type": "Direct", - "requested": "[8.0.2, )", - "resolved": "8.0.2", - "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "RiScL99DcyngY9zJA2ROrri7Br8tn5N4hP4YNvGdTN/bvg1A3dwvDOxHnNZ3Im7x2SJ5i4LkX1uPiR/MfSFBLQ==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0" } }, "NLog": { "type": "Direct", - "requested": "[5.3.3, )", - "resolved": "5.3.3", - "contentHash": "cy0+hlrUbYu+6mgUsILqCcqlJ2Csqyt2lm8y9T9kE8nhgwl8SvR+LM21QX4nmzFCPiowbrTFYxNF8+gWpy7/HQ==" + "requested": "[5.3.4, )", + "resolved": "5.3.4", + "contentHash": "gLy7+O1hEYJXIlcTr1/VWjGXrZTQFZzYNO18IWasD64pNwz0BreV+nHLxWKXWZzERRzoKnsk2XYtwLkTVk7J1A==" }, "NuGet.Commands": { "type": "Direct", - "requested": "[6.11.0, )", - "resolved": "6.11.0", - "contentHash": "8GjJQZVbNJuttVynsRWsgqhTZiBbjxRr2PgZ3E7zPxDBmKUazkQ1s/FqScm83w8Xq5OdEtegkU0dZhibfRkKeg==", + "requested": "[6.12.1, )", + "resolved": "6.12.1", + "contentHash": "wP1gRYoW+yeY0mmPRBGhI7DFZ8JoGKzWfbiSsceHzVTp00WfnqiEAqSQtB6QJkc5jukoajtP3U1+lx0mErfFsA==", "dependencies": { "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", "Microsoft.Extensions.FileSystemGlobbing": "6.0.0", - "NuGet.Credentials": "6.11.0", - "NuGet.ProjectModel": "6.11.0" + "NuGet.Credentials": "6.12.1", + "NuGet.ProjectModel": "6.12.1" } }, "NuGet.DependencyResolver.Core": { "type": "Direct", - "requested": "[6.11.0, )", - "resolved": "6.11.0", - "contentHash": "SoiPKPooA+IF+iCsX1ykwi3M0e+yBL34QnwIP3ujhQEn1dhlP/N1XsYAnKkJPxV15EZCahuuS4HtnBsZx+CHKA==", + "requested": "[6.12.1, )", + "resolved": "6.12.1", + "contentHash": "Nn4+pXW1qxGcq0OEQBJBh/FjKvWhzD49+kRzuOC9SkRZOrHsTaA12EsQ1mEE4rMUfqviaosmPEtvodJ4eKCmIw==", "dependencies": { - "NuGet.Configuration": "6.11.0", - "NuGet.LibraryModel": "6.11.0", - "NuGet.Protocol": "6.11.0" + "NuGet.Configuration": "6.12.1", + "NuGet.LibraryModel": "6.12.1", + "NuGet.Protocol": "6.12.1" } }, "SemanticVersioning": { "type": "Direct", - "requested": "[2.0.2, )", - "resolved": "2.0.2", - "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA==" + "requested": "[3.0.0, )", + "resolved": "3.0.0", + "contentHash": "RR+8GbPQ/gjDqov/1QN1OPoUlbUruNwcL3WjWCeLw+MY7+od/ENhnkYxCfAC6rQLIu3QifaJt3kPYyP3RumqMQ==" }, "SpaceEngineersDedicated.ReferenceAssemblies": { "type": "Direct", "requested": "[1.*, )", - "resolved": "1.205.23", - "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==", + "resolved": "1.205.26", + "contentHash": "kQSFCLgi0nFUhLvXlp9D2w4cTnXtEIctWtNlK+Vw4FAofws60rwR6Kil9YBNlaDyoo19dcyNt3bs4G9VculcIA==", "dependencies": { "SharpDX": "4.2.0-keen-cringe", "protobuf-net": "1.0.0" @@ -78,10 +78,10 @@ }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", + "resolved": "9.0.0", + "contentHash": "lqvd7W3FGKUO1+ZoUEMaZ5XDJeWvjpy2/M/ptCGz3tXLD4HWVaSzjufsAsjemasBEg+2SxXVtYVvGt5r2nKDlg==", "dependencies": { - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.FileProviders.Abstractions": { @@ -99,8 +99,8 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" + "resolved": "9.0.0", + "contentHash": "N3qEBzmLMYiASUlKxxFIISP4AiwuPTHF5uCh+2CWSwwzAJiIYx0kBJsS30cp1nvhSySFAVi30jecD307jV+8Kg==" }, "Newtonsoft.Json": { "type": "Transitive", @@ -109,74 +109,75 @@ }, "NuGet.Common": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "T3bCiKUSx8wdYpcqr6Dbx93zAqFp689ee/oa1tH22XI/xl7EUzQ7No/WlE1FUqvEX1+Mqar3wRNAn2O/yxo94g==", + "resolved": "6.12.1", + "contentHash": "nk8nTdhQl4x2VaAQUvefI7DDYAuBDlE+OZZRffm50Qx5dUAEq8wkc5JIqrN2lTEohObHPI/SXyG2UFdMQkrdyg==", "dependencies": { - "NuGet.Frameworks": "6.11.0" + "NuGet.Frameworks": "6.12.1" } }, "NuGet.Configuration": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "73QprQqmumFrv3Ooi4YWpRYeBj8jZy9gNdOaOCp4pPInpt41SJJAz/aP4je+StwIJvi5HsgPPecLKekDIQEwKg==", + "resolved": "6.12.1", + "contentHash": "IRwlY1379ZgJ0oEJvjD+lDuOhJ5S1fsU5n/bEC5/i0+N9bo2WIMDAdaQ/qIdyK/gMJ/YWS+++GSX6rN7luqEvg==", "dependencies": { - "NuGet.Common": "6.11.0", + "NuGet.Common": "6.12.1", "System.Security.Cryptography.ProtectedData": "4.4.0" } }, "NuGet.Credentials": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "TeMvEyoqkIxDnYJjPCpD48vV5XoDATmyX2kGYYB2MIzWBT24ZjWauTda72hYBzg0OLLiuafxfnNJKGG6IHHzOQ==", + "resolved": "6.12.1", + "contentHash": "VdqUIupqm16kiedkv/iyBX5yaVwCI9piV7IvHf0FLgFciCnx22jI8luHXTqeJgWsHOLJl+nTjeV3RY/AcccK7Q==", "dependencies": { - "NuGet.Protocol": "6.11.0" + "NuGet.Protocol": "6.12.1" } }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "Ew/mrfmLF5phsprysHbph2+tdZ10HMHAURavsr/Kx1WhybDG4vmGuoNLbbZMZOqnPRdpyCTc42OKWLoedxpYtA==" + "resolved": "6.12.1", + "contentHash": "kPaRD5RJC0ByUg+yGX6bDz5XHMI7OYmQwP8kbtef+vZ+csj/VDb5Bwas4ChxwhoAbI8lEvwP5/3aViQPpgNBow==" }, "NuGet.LibraryModel": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "KUV2eeMICMb24OPcICn/wgncNzt6+W+lmFVO5eorTdo1qV4WXxYGyG1NTPiCY+Nrv5H/Ilnv9UaUM2ozqSmnjw==", + "resolved": "6.12.1", + "contentHash": "IqX7Ze7qSbhx22lsdnMbLJpcqrmwGyQbyNk9JSsZ/u5p6PIaZyeWsvHHy+oXU8fuRmmKfHBnZEsceaCAw6Xy5A==", "dependencies": { - "NuGet.Common": "6.11.0", - "NuGet.Versioning": "6.11.0" + "NuGet.Common": "6.12.1", + "NuGet.Versioning": "6.12.1" } }, "NuGet.Packaging": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "VmUv2LedVuPY1tfNybORO2I9IuqOzeV7I5JBD+PwNvJq2bAqovi4FCw2cYI0g+kjOJXBN2lAJfrfnqtUOlVJdQ==", + "resolved": "6.12.1", + "contentHash": "6s5NO3VNX6fIx6GwuWZtIsal9W1xkelYd3Vg2KUAg1zGqnKC3wB5IZlombvVGVGcwyl/A+iDvpUwSvgeDoB3wA==", "dependencies": { "Newtonsoft.Json": "13.0.3", - "NuGet.Configuration": "6.11.0", - "NuGet.Versioning": "6.11.0", + "NuGet.Configuration": "6.12.1", + "NuGet.Versioning": "6.12.1", + "System.Formats.Asn1": "8.0.1", "System.Security.Cryptography.Pkcs": "6.0.4" } }, "NuGet.ProjectModel": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "g0KtmDH6fas97WsN73yV2h1F5JT9o6+Y0wlPK+ij9YLKaAXaF6+1HkSaQMMJ+xh9/jCJG9G6nau6InOlb1g48g==", + "resolved": "6.12.1", + "contentHash": "nzpVqooG0qumADw5t8YMg9e+ezVqUhhoGvoihVmu5O9gJDqzkRYswQzyIVsE24dirBQabW0X0Sv53f6ZLJCv+g==", "dependencies": { - "NuGet.DependencyResolver.Core": "6.11.0" + "NuGet.DependencyResolver.Core": "6.12.1" } }, "NuGet.Protocol": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "p5B8oNLLnGhUfMbcS16aRiegj11pD6k+LELyRBqvNFR/pE3yR1XT+g1XS33ME9wvoU+xbCGnl4Grztt1jHPinw==", + "resolved": "6.12.1", + "contentHash": "VBN7OtG/Y9Rnj1WT3G8X88ZHu5Pq+yzca5Z6OI/FWXcENVAQkUl0ml6Cv8ghOqYyiuvnObGDV9oWLD/bIuVtDw==", "dependencies": { - "NuGet.Packaging": "6.11.0" + "NuGet.Packaging": "6.12.1" } }, "NuGet.Versioning": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "v/GGlIj2dd7svplFmASWEueu62veKW0MrMtBaZ7QG8aJTSGv2yE+pgUGhXRcQ4nxNOEq/wLBrz1vkth/1SND7A==" + "resolved": "6.12.1", + "contentHash": "fJ6rFYANDnohFsdpaY79FvrJxI6murmoOxXz6nZlf819F48+IBKMnAIg3oIBRtZq5y498ObMtKnro5IitvizUg==" }, "protobuf-net": { "type": "Transitive", @@ -190,8 +191,8 @@ }, "System.Formats.Asn1": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T6fD00dQ3NTbPDy31m4eQUwKW84s03z0N2C8HpOklyeaDgaJPa/TexP4/SkORMSOwc7WhKifnA6Ya33AkzmafA==" + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==" }, "System.Security.Cryptography.Pkcs": { "type": "Transitive", @@ -207,7 +208,7 @@ "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog==" } }, - "net8.0-windows7.0/win-x64": { + "net9.0-windows7.0/win-x64": { "System.Security.Cryptography.Pkcs": { "type": "Transitive", "resolved": "6.0.4", diff --git a/Torch.Server.Tests/Torch.Server.Tests.csproj b/Torch.Server.Tests/Torch.Server.Tests.csproj index 234dda8..edb4c54 100644 --- a/Torch.Server.Tests/Torch.Server.Tests.csproj +++ b/Torch.Server.Tests/Torch.Server.Tests.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/Torch.Server.Tests/packages.lock.json b/Torch.Server.Tests/packages.lock.json index 5836dbe..67a7096 100644 --- a/Torch.Server.Tests/packages.lock.json +++ b/Torch.Server.Tests/packages.lock.json @@ -1,32 +1,32 @@ { "version": 1, "dependencies": { - "net8.0-windows7.0": { + "net9.0-windows7.0": { "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.11.0, )", - "resolved": "17.11.0", - "contentHash": "fH7P0LihMXgnlNLtrXGetHd30aQcD+YrSbWXbCPBnrypdRApPgNqd/TgncTlSVY1bbLYdnvpBgts2dcnK37GzA==", + "requested": "[17.12.0, )", + "resolved": "17.12.0", + "contentHash": "kt/PKBZ91rFCWxVIJZSgVLk+YR+4KxTuHf799ho8WNiK5ZQpJNAEZCAWX86vcKrs+DiYjiibpYKdGZP6+/N17w==", "dependencies": { - "Microsoft.CodeCoverage": "17.11.0", - "Microsoft.TestPlatform.TestHost": "17.11.0" + "Microsoft.CodeCoverage": "17.12.0", + "Microsoft.TestPlatform.TestHost": "17.12.0" } }, "NLog": { "type": "Direct", - "requested": "[5.3.3, )", - "resolved": "5.3.3", - "contentHash": "cy0+hlrUbYu+6mgUsILqCcqlJ2Csqyt2lm8y9T9kE8nhgwl8SvR+LM21QX4nmzFCPiowbrTFYxNF8+gWpy7/HQ==" + "requested": "[5.3.4, )", + "resolved": "5.3.4", + "contentHash": "gLy7+O1hEYJXIlcTr1/VWjGXrZTQFZzYNO18IWasD64pNwz0BreV+nHLxWKXWZzERRzoKnsk2XYtwLkTVk7J1A==" }, "xunit": { "type": "Direct", - "requested": "[2.9.0, )", - "resolved": "2.9.0", - "contentHash": "PtU3rZ0ThdmdJqTbK7GkgFf6iBaCR6Q0uvJHznID+XEYk2v6O/b7sRxqnbi3B2gRDXxjTqMkVNayzwsqsFUxRw==", + "requested": "[2.9.3, )", + "resolved": "2.9.3", + "contentHash": "TlXQBinK35LpOPKHAqbLY4xlEen9TBafjs0V5KnA4wZsoQLQJiirCR4CbIXvOH8NzkW4YeJKP5P/Bnrodm0h9Q==", "dependencies": { - "xunit.analyzers": "1.15.0", - "xunit.assert": "2.9.0", - "xunit.core": "[2.9.0]" + "xunit.analyzers": "1.18.0", + "xunit.assert": "2.9.3", + "xunit.core": "[2.9.3]" } }, "AutoCompleteTextBox": { @@ -58,16 +58,16 @@ }, "JetBrains.Annotations": { "type": "Transitive", - "resolved": "2024.2.0", - "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw==" + "resolved": "2024.3.0", + "contentHash": "ox5pkeLQXjvJdyAB4b2sBYAlqZGLh3PjSnP1bQNVx72ONuTJ9+34/+Rq91Fc0dG29XG9RgZur9+NcP4riihTug==" }, "Lib.Harmony.Thin": { "type": "Transitive", - "resolved": "2.3.3-torch", - "contentHash": "djQtMUpURRgP+Ytf1EgQwu4XnJL3J3bz5kyTVcRDNb632N62/A4CbduG96CUsKhL944yGNAJnLX3zfWldPYOTw==", + "resolved": "2.3.4-torch", + "contentHash": "UnLUnLLiXfHZdKa1zhi6w8cl8tJTrpVixLtvjFEVtlDA6Rkf06OcZ2gSidcbcgKjTcR+fk5Qsdos3mU5oohzfg==", "dependencies": { - "MonoMod.Core": "1.1.0", - "System.Text.Json": "8.0.1" + "MonoMod.Core": "1.2.2", + "System.Text.Json": "9.0.0" } }, "MahApps.Metro": { @@ -94,8 +94,8 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==" + "resolved": "9.0.0", + "contentHash": "owmu2Cr3IQ8yQiBleBHlGk8dSQ12oaF2e7TpzwJKEl4m84kkZJjEY1n33L67Y3zM5jPOjmmbdHjbfiL0RqcMRQ==" }, "Microsoft.CodeAnalysis.Analyzers": { "type": "Transitive", @@ -104,8 +104,8 @@ }, "Microsoft.CodeAnalysis.Common": { "type": "Transitive", - "resolved": "4.11.0", - "contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==", + "resolved": "4.12.0", + "contentHash": "c1kNYihL2gdcuU1dqm8R8YeA4YkB43TpU3pa2r66Uooh6AAhRtENzj9A4Kj0a+H8JDDyuTjNZql9XlVUzV+UjA==", "dependencies": { "Microsoft.CodeAnalysis.Analyzers": "3.3.4", "System.Collections.Immutable": "8.0.0", @@ -114,19 +114,19 @@ }, "Microsoft.CodeAnalysis.CSharp": { "type": "Transitive", - "resolved": "4.11.0", - "contentHash": "6XYi2EusI8JT4y2l/F3VVVS+ISoIX9nqHsZRaG6W5aFeJ5BEuBosHfT/ABb73FN0RZ1Z3cj2j7cL28SToJPXOw==", + "resolved": "4.12.0", + "contentHash": "30vVQ1MizeC22iEdEvI2w0eTIYG43/L20yBzuQH01xKzJgHAoWehzI2F8u07o4mXh4DGMOjQF7aEm0zzvsG3Mg==", "dependencies": { "Microsoft.CodeAnalysis.Analyzers": "3.3.4", - "Microsoft.CodeAnalysis.Common": "[4.11.0]", + "Microsoft.CodeAnalysis.Common": "[4.12.0]", "System.Collections.Immutable": "8.0.0", "System.Reflection.Metadata": "8.0.0" } }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.11.0", - "contentHash": "QKcOSuw7MZG4XiQ+pCj+Ib6amOwoRDEO7e3DbxqXeOPXSnfyGXYoZQI8I140s1mKQVn1Vh+c5WlKvCvlgMovpg==" + "resolved": "17.12.0", + "contentHash": "4svMznBd5JM21JIG2xZKGNanAHNXplxf/kQDFfLHXQ3OnpJkayRK/TjacFjA+EYmoyuNXHo/sOETEfcYtAzIrA==" }, "Microsoft.Diagnostics.NETCore.Client": { "type": "Transitive", @@ -147,153 +147,153 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==", + "resolved": "9.0.0", + "contentHash": "YIMO9T3JL8MeEXgVozKt2v79hquo/EFtnY0vgxmLnUvk1Rei/halI7kOWZL2RBeV9FMGzgM9LZA8CVaNwFMaNA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", + "resolved": "9.0.0", + "contentHash": "lqvd7W3FGKUO1+ZoUEMaZ5XDJeWvjpy2/M/ptCGz3tXLD4HWVaSzjufsAsjemasBEg+2SxXVtYVvGt5r2nKDlg==", "dependencies": { - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "8.0.2", - "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==", + "resolved": "9.0.0", + "contentHash": "RiScL99DcyngY9zJA2ROrri7Br8tn5N4hP4YNvGdTN/bvg1A3dwvDOxHnNZ3Im7x2SJ5i4LkX1uPiR/MfSFBLQ==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0" } }, "Microsoft.Extensions.Configuration.CommandLine": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "NZuZMz3Q8Z780nKX3ifV1fE7lS+6pynDHK71OfU4OZ1ItgvDOhyOC7E6z+JMZrAj63zRpwbdldYFk499t3+1dQ==", + "resolved": "9.0.0", + "contentHash": "qD+hdkBtR9Ps7AxfhTJCnoVakkadHgHlD1WRN0QHGHod+SDuca1ao1kF4G2rmpAz2AEKrE2N2vE8CCCZ+ILnNw==", "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + "Microsoft.Extensions.Configuration": "9.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0" } }, "Microsoft.Extensions.Configuration.EnvironmentVariables": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "plvZ0ZIpq+97gdPNNvhwvrEZ92kNml9hd1pe3idMA7svR0PztdzVLkoWLcRFgySYXUJc3kSM3Xw3mNFMo/bxRA==", + "resolved": "9.0.0", + "contentHash": "v5R638eNMxksfXb7MFnkPwLPp+Ym4W/SIGNuoe8qFVVyvygQD5DdLusybmYSJEr9zc1UzWzim/ATKeIOVvOFDg==", "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + "Microsoft.Extensions.Configuration": "9.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0" } }, "Microsoft.Extensions.Configuration.FileExtensions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "McP+Lz/EKwvtCv48z0YImw+L1gi1gy5rHhNaNIY2CrjloV+XY8gydT8DjMR6zWeL13AFK+DioVpppwAuO1Gi1w==", + "resolved": "9.0.0", + "contentHash": "4EK93Jcd2lQG4GY6PAw8jGss0ZzFP0vPc1J85mES5fKNuDTqgFXHba9onBw2s18fs3I4vdo2AWyfD1mPAxWSQQ==", "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", - "Microsoft.Extensions.FileProviders.Physical": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Configuration": "9.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0", + "Microsoft.Extensions.FileProviders.Physical": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Configuration.Xml": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "0iRltfE/Xbh6gs9DHiBMShrxhcpJLtF/+2OqW1OpUh1QLQuAvMy4cGElSeJx1/hF6IbsxYhakVgfCNU0Hsmcwg==", + "resolved": "9.0.0", + "contentHash": "emIBXgb6KyFpog3mKXdRq6Wt1JpWLQJi2SoNDI6Q93O1DX9YtsH/Hy03OrryQEEwJrwta6r5iqBP1lY9PMXGUQ==", "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "8.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", - "System.Security.Cryptography.Xml": "8.0.0" + "Microsoft.Extensions.Configuration": "9.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.Configuration.FileExtensions": "9.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0", + "System.Security.Cryptography.Xml": "9.0.0" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==", + "resolved": "9.0.0", + "contentHash": "MCPrg7v3QgNMr0vX4vzRXvkNGgLg8vKWX0nKCWUxu2uPyMsaRgiRc1tHBnbTcfJMhMKj2slE/j2M9oGkd25DNw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + "resolved": "9.0.0", + "contentHash": "+6f2qv2a3dLwd5w6JanPIPs47CxRbnk+ZocMJUhv9NxP88VlOcJYZs9jY+MYSjxvady08bUZn6qgiNh7DadGgg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", + "resolved": "9.0.0", + "contentHash": "uK439QzYR0q2emLVtYzwyK3x+T5bTY4yWsd/k/ZUS9LR6Sflp8MIdhGXW8kQCd86dQD4tLqvcbLkku8qHY263Q==", "dependencies": { - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.FileProviders.Physical": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "UboiXxpPUpwulHvIAVE36Knq0VSHaAmfrFkegLyBZeaADuKezJ/AIXYAW8F5GBlGk/VaibN2k/Zn1ca8YAfVdA==", + "resolved": "9.0.0", + "contentHash": "3+ZUSpOSmie+o8NnLIRqCxSh65XL/ExU7JYnFOg58awDRlY3lVpZ9A369jkoZL1rpsq7LDhEfkn2ghhGaY1y5Q==", "dependencies": { - "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", - "Microsoft.Extensions.FileSystemGlobbing": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.FileSystemGlobbing": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OK+670i7esqlQrPjdIKRbsyMCe9g5kSLpRRQGSr4Q58AOYEe/hCnfLZprh7viNisSUUQZmMrbbuDaIrP+V1ebQ==" + "resolved": "9.0.0", + "contentHash": "jGFKZiXs2HNseK3NK/rfwHNNovER71jSj4BD1a/649ml9+h6oEtYd0GSALZDNW8jZ2Rh+oAeadOa6sagYW1F2A==" }, "Microsoft.Extensions.Logging": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "tvRkov9tAJ3xP51LCv3FJ2zINmv1P8Hi8lhhtcKGqM+ImiTCC84uOPEI4z8Cdq2C3o9e+Aa0Gw0rmrsJD77W+w==", + "resolved": "9.0.0", + "contentHash": "crjWyORoug0kK7RSNJBTeSE6VX8IQgLf3nUpTB9m62bPXp/tzbnOsnbe8TXEG0AASNaKZddnpHKw7fET8E++Pg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0" + "Microsoft.Extensions.DependencyInjection": "9.0.0", + "Microsoft.Extensions.Logging.Abstractions": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0" } }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "resolved": "9.0.0", + "contentHash": "g0UfujELzlLbHoVG8kPKVBaW470Ewi+jnptGS9KUi6jcb+k2StujtK3m26DFSGGwQ/+bVgZfsWqNzlP6YOejvw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0" } }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", + "resolved": "9.0.0", + "contentHash": "y2146b3jrPI3Q0lokKXdKLpmXqakYbDIPDV6r3M8SqvSf45WwOTzkyfDpxnZXJsJQEpAsAqjUq5Pu8RCJMjubg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" + "resolved": "9.0.0", + "contentHash": "N3qEBzmLMYiASUlKxxFIISP4AiwuPTHF5uCh+2CWSwwzAJiIYx0kBJsS30cp1nvhSySFAVi30jecD307jV+8Kg==" }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.11.0", - "contentHash": "PU+CC1yRzbR0IllrtdILaeep7WP5OIrvmWrvCMqG3jB1h4F6Ur7CYHl6ENbDVXPzEvygXh0GWbTyrbjfvgTpAg==", + "resolved": "17.12.0", + "contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==", "dependencies": { "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.11.0", - "contentHash": "KMzJO3dm3+9W8JRQ3IDviu0v7uXP5Lgii6TuxMc5m8ynaqcGnn7Y18cMb5AsP2xp59uUHO474WZrssxBdb8ZxQ==", + "resolved": "17.12.0", + "contentHash": "MiPEJQNyADfwZ4pJNpQex+t9/jOClBGMiCiVVFuELCMSX2nmNfvUor3uFVxNNCg30uxDP8JDYfPnMXQzsfzYyg==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.11.0", + "Microsoft.TestPlatform.ObjectModel": "17.12.0", "Newtonsoft.Json": "13.0.1" } }, @@ -309,36 +309,36 @@ }, "MonoMod.Backports": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "GUAjCrCZEddqHKHFA7Lh61PgTzoKY7gfBShFe0hQe0p8iynHhBK3TWGyRi+QIw/PGfaRPwx6c33CPGFURBVM6g==", + "resolved": "1.1.2", + "contentHash": "baYlNy8n8kmaNhNvqmZ/dIPOeO1r9//dG1i2WbunMWtWZ2EKtIgmXaS+ZzphzTsikkGnoD4Jwr5g0TVdpDjgpw==", "dependencies": { - "MonoMod.ILHelpers": "1.0.1" + "MonoMod.ILHelpers": "1.1.0" } }, "MonoMod.Core": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "Ks8RntZGVcktr2QF/AovTEbuOkrgXz6omjrvT5LRveOIQJuy+IFuEQPBVWu+cSKVIoZD5XkpRFvlVrItgPIrXw==", + "resolved": "1.2.2", + "contentHash": "3R9mQ7TxeQQBFLtGTR2VIDSBGx/I7d8RYpxvW1Mot0/PB6+UOnHr+lkw7dj8cus8YSnLdCFT+CG4JW89daEvjg==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.0", - "MonoMod.ILHelpers": "1.0.1", - "MonoMod.Utils": "25.0.4" + "MonoMod.Backports": "1.1.2", + "MonoMod.ILHelpers": "1.1.0", + "MonoMod.Utils": "25.0.8" } }, "MonoMod.ILHelpers": { "type": "Transitive", - "resolved": "1.0.1", - "contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA==" + "resolved": "1.1.0", + "contentHash": "L2FWjhTrv7tcIxshfZ+M3OcaNr4cNw0IwiVZEgwqRnZ5QAN3+RrNJ8ZwCzwXUWyPDqooJxMcjjg8PsSYUiNBjQ==" }, "MonoMod.Utils": { "type": "Transitive", - "resolved": "25.0.4", - "contentHash": "cB94MaZtFD9u4clYEFTwM4jGXnJnzXsxYF3yBpMZKHhXOas66tMF2frbdYte023i0MH4C5iRJbDjxHmA4x5VgA==", + "resolved": "25.0.8", + "contentHash": "8wfyawgvGqUvfchAj7/gPazAjXO8CWNyXH+C0az+hgJH/80zVL5LxDhQMz0NQTyoCEJWU6gNBGc7CL+G7vCbaQ==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.0", - "MonoMod.ILHelpers": "1.0.1" + "MonoMod.Backports": "1.1.2", + "MonoMod.ILHelpers": "1.1.0" } }, "Newtonsoft.Json": { @@ -348,100 +348,101 @@ }, "NuGet.Commands": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "8GjJQZVbNJuttVynsRWsgqhTZiBbjxRr2PgZ3E7zPxDBmKUazkQ1s/FqScm83w8Xq5OdEtegkU0dZhibfRkKeg==", + "resolved": "6.12.1", + "contentHash": "wP1gRYoW+yeY0mmPRBGhI7DFZ8JoGKzWfbiSsceHzVTp00WfnqiEAqSQtB6QJkc5jukoajtP3U1+lx0mErfFsA==", "dependencies": { "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", "Microsoft.Extensions.FileSystemGlobbing": "6.0.0", - "NuGet.Credentials": "6.11.0", - "NuGet.ProjectModel": "6.11.0" + "NuGet.Credentials": "6.12.1", + "NuGet.ProjectModel": "6.12.1" } }, "NuGet.Common": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "T3bCiKUSx8wdYpcqr6Dbx93zAqFp689ee/oa1tH22XI/xl7EUzQ7No/WlE1FUqvEX1+Mqar3wRNAn2O/yxo94g==", + "resolved": "6.12.1", + "contentHash": "nk8nTdhQl4x2VaAQUvefI7DDYAuBDlE+OZZRffm50Qx5dUAEq8wkc5JIqrN2lTEohObHPI/SXyG2UFdMQkrdyg==", "dependencies": { - "NuGet.Frameworks": "6.11.0" + "NuGet.Frameworks": "6.12.1" } }, "NuGet.Configuration": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "73QprQqmumFrv3Ooi4YWpRYeBj8jZy9gNdOaOCp4pPInpt41SJJAz/aP4je+StwIJvi5HsgPPecLKekDIQEwKg==", + "resolved": "6.12.1", + "contentHash": "IRwlY1379ZgJ0oEJvjD+lDuOhJ5S1fsU5n/bEC5/i0+N9bo2WIMDAdaQ/qIdyK/gMJ/YWS+++GSX6rN7luqEvg==", "dependencies": { - "NuGet.Common": "6.11.0", + "NuGet.Common": "6.12.1", "System.Security.Cryptography.ProtectedData": "4.4.0" } }, "NuGet.Credentials": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "TeMvEyoqkIxDnYJjPCpD48vV5XoDATmyX2kGYYB2MIzWBT24ZjWauTda72hYBzg0OLLiuafxfnNJKGG6IHHzOQ==", + "resolved": "6.12.1", + "contentHash": "VdqUIupqm16kiedkv/iyBX5yaVwCI9piV7IvHf0FLgFciCnx22jI8luHXTqeJgWsHOLJl+nTjeV3RY/AcccK7Q==", "dependencies": { - "NuGet.Protocol": "6.11.0" + "NuGet.Protocol": "6.12.1" } }, "NuGet.DependencyResolver.Core": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "SoiPKPooA+IF+iCsX1ykwi3M0e+yBL34QnwIP3ujhQEn1dhlP/N1XsYAnKkJPxV15EZCahuuS4HtnBsZx+CHKA==", + "resolved": "6.12.1", + "contentHash": "Nn4+pXW1qxGcq0OEQBJBh/FjKvWhzD49+kRzuOC9SkRZOrHsTaA12EsQ1mEE4rMUfqviaosmPEtvodJ4eKCmIw==", "dependencies": { - "NuGet.Configuration": "6.11.0", - "NuGet.LibraryModel": "6.11.0", - "NuGet.Protocol": "6.11.0" + "NuGet.Configuration": "6.12.1", + "NuGet.LibraryModel": "6.12.1", + "NuGet.Protocol": "6.12.1" } }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "Ew/mrfmLF5phsprysHbph2+tdZ10HMHAURavsr/Kx1WhybDG4vmGuoNLbbZMZOqnPRdpyCTc42OKWLoedxpYtA==" + "resolved": "6.12.1", + "contentHash": "kPaRD5RJC0ByUg+yGX6bDz5XHMI7OYmQwP8kbtef+vZ+csj/VDb5Bwas4ChxwhoAbI8lEvwP5/3aViQPpgNBow==" }, "NuGet.LibraryModel": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "KUV2eeMICMb24OPcICn/wgncNzt6+W+lmFVO5eorTdo1qV4WXxYGyG1NTPiCY+Nrv5H/Ilnv9UaUM2ozqSmnjw==", + "resolved": "6.12.1", + "contentHash": "IqX7Ze7qSbhx22lsdnMbLJpcqrmwGyQbyNk9JSsZ/u5p6PIaZyeWsvHHy+oXU8fuRmmKfHBnZEsceaCAw6Xy5A==", "dependencies": { - "NuGet.Common": "6.11.0", - "NuGet.Versioning": "6.11.0" + "NuGet.Common": "6.12.1", + "NuGet.Versioning": "6.12.1" } }, "NuGet.Packaging": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "VmUv2LedVuPY1tfNybORO2I9IuqOzeV7I5JBD+PwNvJq2bAqovi4FCw2cYI0g+kjOJXBN2lAJfrfnqtUOlVJdQ==", + "resolved": "6.12.1", + "contentHash": "6s5NO3VNX6fIx6GwuWZtIsal9W1xkelYd3Vg2KUAg1zGqnKC3wB5IZlombvVGVGcwyl/A+iDvpUwSvgeDoB3wA==", "dependencies": { "Newtonsoft.Json": "13.0.3", - "NuGet.Configuration": "6.11.0", - "NuGet.Versioning": "6.11.0", + "NuGet.Configuration": "6.12.1", + "NuGet.Versioning": "6.12.1", + "System.Formats.Asn1": "8.0.1", "System.Security.Cryptography.Pkcs": "6.0.4" } }, "NuGet.ProjectModel": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "g0KtmDH6fas97WsN73yV2h1F5JT9o6+Y0wlPK+ij9YLKaAXaF6+1HkSaQMMJ+xh9/jCJG9G6nau6InOlb1g48g==", + "resolved": "6.12.1", + "contentHash": "nzpVqooG0qumADw5t8YMg9e+ezVqUhhoGvoihVmu5O9gJDqzkRYswQzyIVsE24dirBQabW0X0Sv53f6ZLJCv+g==", "dependencies": { - "NuGet.DependencyResolver.Core": "6.11.0" + "NuGet.DependencyResolver.Core": "6.12.1" } }, "NuGet.Protocol": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "p5B8oNLLnGhUfMbcS16aRiegj11pD6k+LELyRBqvNFR/pE3yR1XT+g1XS33ME9wvoU+xbCGnl4Grztt1jHPinw==", + "resolved": "6.12.1", + "contentHash": "VBN7OtG/Y9Rnj1WT3G8X88ZHu5Pq+yzca5Z6OI/FWXcENVAQkUl0ml6Cv8ghOqYyiuvnObGDV9oWLD/bIuVtDw==", "dependencies": { - "NuGet.Packaging": "6.11.0" + "NuGet.Packaging": "6.12.1" } }, "NuGet.Versioning": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "v/GGlIj2dd7svplFmASWEueu62veKW0MrMtBaZ7QG8aJTSGv2yE+pgUGhXRcQ4nxNOEq/wLBrz1vkth/1SND7A==" + "resolved": "6.12.1", + "contentHash": "fJ6rFYANDnohFsdpaY79FvrJxI6murmoOxXz6nZlf819F48+IBKMnAIg3oIBRtZq5y498ObMtKnro5IitvizUg==" }, "nulastudio.NetBeauty": { "type": "Transitive", - "resolved": "2.1.4.5", - "contentHash": "hOluHDEPDlS/lmDrRAlv5Xaza+n7kBPOtkuS6nYm0k6npJLi/vlYhZwR/IhpV+lCRTiu4so4D61pSrtHdTiagw==" + "resolved": "2.1.4.6", + "contentHash": "jB9L3V4raas4cIczo3zU+Kb6LwsZ215iVDsxo+jm/QXYQxy+HSizpV3StN3BC35nv3YMaSdthXoxD3aBSPJscw==" }, "protobuf-net": { "type": "Transitive", @@ -450,8 +451,8 @@ }, "SemanticVersioning": { "type": "Transitive", - "resolved": "2.0.2", - "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA==" + "resolved": "3.0.0", + "contentHash": "RR+8GbPQ/gjDqov/1QN1OPoUlbUruNwcL3WjWCeLw+MY7+od/ENhnkYxCfAC6rQLIu3QifaJt3kPYyP3RumqMQ==" }, "SharpDX": { "type": "Transitive", @@ -468,8 +469,8 @@ }, "SpaceEngineersDedicated.ReferenceAssemblies": { "type": "Transitive", - "resolved": "1.205.23", - "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==", + "resolved": "1.205.26", + "contentHash": "kQSFCLgi0nFUhLvXlp9D2w4cTnXtEIctWtNlK+Vw4FAofws60rwR6Kil9YBNlaDyoo19dcyNt3bs4G9VculcIA==", "dependencies": { "SharpDX": "4.2.0-keen-cringe", "protobuf-net": "1.0.0" @@ -477,8 +478,8 @@ }, "System.CodeDom": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "WTlRjL6KWIMr/pAaq3rYqh0TJlzpouaQ/W1eelssHgtlwHAH25jXTkUphTYx9HaIIf7XA6qs/0+YhtLEQRkJ+Q==" + "resolved": "9.0.0", + "contentHash": "oTE5IfuMoET8yaZP/vdvy9xO47guAv/rOhe4DODuFBN3ySprcQOlXqO3j+e/H/YpKKR5sglrxRaZ2HYOhNJrqA==" }, "System.Collections.Immutable": { "type": "Transitive", @@ -492,8 +493,8 @@ }, "System.Formats.Asn1": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AJukBuLoe3QeAF+mfaRKQb2dgyrvt340iMBHYv+VdBzCUM06IxGlvl0o/uPOS7lHnXPN6u8fFRHSHudx5aTi8w==" + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==" }, "System.Linq.Async": { "type": "Transitive", @@ -505,10 +506,10 @@ }, "System.Management": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "jrK22i5LRzxZCfGb+tGmke2VH7oE0DvcDlJ1HAKYU8cPmD8XnpUT0bYn2Gy98GEhGjtfbR/sxKTVb+dE770pfA==", + "resolved": "9.0.0", + "contentHash": "bVh4xAMI5grY5GZoklKcMBLirhC8Lqzp63Ft3zXJacwGAlLyFdF4k0qz4pnKIlO6HyL2Z4zqmHm9UkzEo6FFsA==", "dependencies": { - "System.CodeDom": "8.0.0" + "System.CodeDom": "9.0.0" } }, "System.Reflection.Metadata": { @@ -526,11 +527,8 @@ }, "System.Security.Cryptography.Pkcs": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "ULmp3xoOwNYjOYp4JZ2NK/6NdTgiN1GQXzVVN1njQ7LOZ0d0B9vyMnhyqbIi9Qw4JXj1JgCsitkTShboHRx7Eg==", - "dependencies": { - "System.Formats.Asn1": "8.0.0" - } + "resolved": "9.0.0", + "contentHash": "8tluJF8w9si+2yoHeL8rgVJS6lKvWomTDC8px65Z8MCzzdME5eaPtEQf4OfVGrAxB5fW93ncucy1+221O9EQaw==" }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", @@ -539,24 +537,16 @@ }, "System.Security.Cryptography.Xml": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "HQSFbakswZ1OXFz2Bt3AJlC6ENDqWeVpgqhf213xqQUMDifzydOHIKVb1RV4prayobvR3ETIScMaQdDF2hwGZA==", + "resolved": "9.0.0", + "contentHash": "GQZn5wFd+pyOfwWaCbqxG7trQ5ox01oR8kYgWflgtux4HiUNihGEgG2TktRWyH+9bw7NoEju1D41H/upwQeFQw==", "dependencies": { - "System.Security.Cryptography.Pkcs": "8.0.0" + "System.Security.Cryptography.Pkcs": "9.0.0" } }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" - }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==", - "dependencies": { - "System.Text.Encodings.Web": "8.0.0" - } + "resolved": "9.0.0", + "contentHash": "js7+qAu/9mQvnhA4EfGMZNEzXtJCDxgkgj8ohuxq/Qxv+R56G+ljefhiJHOxTNiw54q8vmABCWUwkMulNdlZ4A==" }, "Torch.SixLabors.ImageSharp": { "type": "Transitive", @@ -574,48 +564,48 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.15.0", - "contentHash": "s+M8K/Rtlgr6CmD7AYQKrNTvT5sh0l0ZKDoZ3Z/ExhlIwfV9mGAMR4f7KqIB7SSK7ZOhqDTgTUMYPmKfmvWUWQ==" + "resolved": "1.18.0", + "contentHash": "OtFMHN8yqIcYP9wcVIgJrq01AfTxijjAqVDy/WeQVSyrDC1RzBWeQPztL49DN2syXRah8TYnfvk035s7L95EZQ==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.9.0", - "contentHash": "Z/1pyia//860wEYTKn6Q5dmgikJdRjgE4t5AoxJkK8oTmidzPLEPG574kmm7LFkMLbH6Frwmgb750kcyR+hwoA==" + "resolved": "2.9.3", + "contentHash": "/Kq28fCE7MjOV42YLVRAJzRF0WmEqsmflm0cfpMjGtzQ2lR5mYVj1/i0Y8uDAOLczkL3/jArrwehfMD0YogMAA==" }, "xunit.core": { "type": "Transitive", - "resolved": "2.9.0", - "contentHash": "uRaop9tZsZMCaUS4AfbSPGYHtvywWnm8XXFNUqII7ShWyDBgdchY6gyDNgO4AK1Lv/1NNW61Zq63CsDV6oH6Jg==", + "resolved": "2.9.3", + "contentHash": "BiAEvqGvyme19wE0wTKdADH+NloYqikiU0mcnmiNyXaF9HyHmE6sr/3DC5vnBkgsWaE6yPyWszKSPSApWdRVeQ==", "dependencies": { - "xunit.extensibility.core": "[2.9.0]", - "xunit.extensibility.execution": "[2.9.0]" + "xunit.extensibility.core": "[2.9.3]", + "xunit.extensibility.execution": "[2.9.3]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.9.0", - "contentHash": "zjDEUSxsr6UNij4gIwCgMqQox+oLDPRZ+mubwWLci+SssPBFQD1xeRR4SvgBuXqbE0QXCJ/STVTp+lxiB5NLVA==", + "resolved": "2.9.3", + "contentHash": "kf3si0YTn2a8J8eZNb+zFpwfoyvIrQ7ivNk5ZYA5yuYk1bEtMe4DxJ2CF/qsRgmEnDr7MnW1mxylBaHTZ4qErA==", "dependencies": { "xunit.abstractions": "2.0.3" } }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.9.0", - "contentHash": "5ZTQZvmPLlBw6QzCOwM0KnMsZw6eGjbmC176QHZlcbQoMhGIeGcYzYwn5w9yXxf+4phtplMuVqTpTbFDQh2bqQ==", + "resolved": "2.9.3", + "contentHash": "yMb6vMESlSrE3Wfj7V6cjQ3S4TXdXpRqYeNEI3zsX31uTsGMJjEw6oD5F5u1cHnMptjhEECnmZSsPxB6ChZHDQ==", "dependencies": { - "xunit.extensibility.core": "[2.9.0]" + "xunit.extensibility.core": "[2.9.3]" } }, "torch": { "type": "Project", "dependencies": { "ControlzEx": "[5.0.2, )", - "Lib.Harmony.Thin": "[2.3.3-torch, )", + "Lib.Harmony.Thin": "[2.3.4-torch, )", "MahApps.Metro": "[2.4.10, )", - "Microsoft.CodeAnalysis.CSharp": "[4.11.0, )", - "Microsoft.CodeAnalysis.Common": "[4.11.0, )", - "NLog": "[5.3.3, )", + "Microsoft.CodeAnalysis.CSharp": "[4.12.0, )", + "Microsoft.CodeAnalysis.Common": "[4.12.0, )", + "NLog": "[5.3.4, )", "System.ComponentModel.Annotations": "[5.0.0, )", "Torch.API": "[1.0.0, )", "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )" @@ -624,12 +614,12 @@ "torch.api": { "type": "Project", "dependencies": { - "JetBrains.Annotations": "[2024.2.0, )", - "Microsoft.Extensions.Configuration.Binder": "[8.0.2, )", - "NLog": "[5.3.3, )", - "NuGet.Commands": "[6.11.0, )", - "NuGet.DependencyResolver.Core": "[6.11.0, )", - "SemanticVersioning": "[2.0.2, )", + "JetBrains.Annotations": "[2024.3.0, )", + "Microsoft.Extensions.Configuration.Binder": "[9.0.0, )", + "NLog": "[5.3.4, )", + "NuGet.Commands": "[6.12.1, )", + "NuGet.DependencyResolver.Core": "[6.12.1, )", + "SemanticVersioning": "[3.0.0, )", "SpaceEngineersDedicated.ReferenceAssemblies": "[1.*, )", "System.Linq.Async": "[6.0.1, )" } @@ -642,57 +632,49 @@ "ControlzEx": "[5.0.2, )", "MahApps.Metro": "[2.4.10, )", "MdXaml": "[1.27.0, )", - "Microsoft.Bcl.AsyncInterfaces": "[8.0.0, )", + "Microsoft.Bcl.AsyncInterfaces": "[9.0.0, )", "Microsoft.Diagnostics.Runtime": "[3.1.512801, )", - "Microsoft.Extensions.Configuration.CommandLine": "[8.0.0, )", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "[8.0.0, )", - "Microsoft.Extensions.Configuration.Xml": "[8.0.0, )", - "Microsoft.Extensions.Logging": "[8.0.0, )", - "NLog": "[5.3.3, )", + "Microsoft.Extensions.Configuration.CommandLine": "[9.0.0, )", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "[9.0.0, )", + "Microsoft.Extensions.Configuration.Xml": "[9.0.0, )", + "Microsoft.Extensions.Logging": "[9.0.0, )", + "NLog": "[5.3.4, )", "System.ComponentModel.Annotations": "[5.0.0, )", - "System.Management": "[8.0.0, )", + "System.Management": "[9.0.0, )", "Torch": "[1.0.0, )", "Torch.API": "[1.0.0, )", - "nulastudio.NetBeauty": "[2.1.4.5, )" + "nulastudio.NetBeauty": "[2.1.4.6, )" } }, "torch.tests": { "type": "Project", "dependencies": { - "Microsoft.NET.Test.Sdk": "[17.11.0, )", - "NLog": "[5.3.3, )", + "Microsoft.NET.Test.Sdk": "[17.12.0, )", + "NLog": "[5.3.4, )", "Torch": "[1.0.0, )", "Torch.API": "[1.0.0, )", - "xunit": "[2.9.0, )" + "xunit": "[2.9.3, )" } } }, - "net8.0-windows7.0/win-x64": { + "net9.0-windows7.0/win-x64": { "System.Management": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "jrK22i5LRzxZCfGb+tGmke2VH7oE0DvcDlJ1HAKYU8cPmD8XnpUT0bYn2Gy98GEhGjtfbR/sxKTVb+dE770pfA==", + "resolved": "9.0.0", + "contentHash": "bVh4xAMI5grY5GZoklKcMBLirhC8Lqzp63Ft3zXJacwGAlLyFdF4k0qz4pnKIlO6HyL2Z4zqmHm9UkzEo6FFsA==", "dependencies": { - "System.CodeDom": "8.0.0" + "System.CodeDom": "9.0.0" } }, "System.Security.Cryptography.Pkcs": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "ULmp3xoOwNYjOYp4JZ2NK/6NdTgiN1GQXzVVN1njQ7LOZ0d0B9vyMnhyqbIi9Qw4JXj1JgCsitkTShboHRx7Eg==", - "dependencies": { - "System.Formats.Asn1": "8.0.0" - } + "resolved": "9.0.0", + "contentHash": "8tluJF8w9si+2yoHeL8rgVJS6lKvWomTDC8px65Z8MCzzdME5eaPtEQf4OfVGrAxB5fW93ncucy1+221O9EQaw==" }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", "resolved": "4.4.0", "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog==" - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" } } } diff --git a/Torch.Server/Properties/launchSettings.json b/Torch.Server/Properties/launchSettings.json index 34fdeba..3a29e2c 100644 --- a/Torch.Server/Properties/launchSettings.json +++ b/Torch.Server/Properties/launchSettings.json @@ -1,11 +1,12 @@ { - "$schema": "https://json.schemastore.org/launchsettings.json", "profiles": { "Torch.Server": { "commandName": "Project", "commandLineArgs": "--noupdate true --gamepath \"C:\\Program Files (x86)\\Steam\\steamapps\\common\\SpaceEngineersDedicatedServer\"", "use64Bit": true, - "hotReloadEnabled": false + "hotReloadEnabled": false, + "nativeDebugging": true } - } -} + }, + "$schema": "https://json.schemastore.org/launchsettings.json" +} \ No newline at end of file diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj index 2b97a24..f01a6fe 100644 --- a/Torch.Server/Torch.Server.csproj +++ b/Torch.Server/Torch.Server.csproj @@ -31,21 +31,21 @@ - + - - - - - + + + + + all compile - - + + diff --git a/Torch.Server/packages.lock.json b/Torch.Server/packages.lock.json index 89a3d7c..86f6858 100644 --- a/Torch.Server/packages.lock.json +++ b/Torch.Server/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net8.0-windows7.0": { + "net9.0-windows7.0": { "AutoCompleteTextBox": { "type": "Direct", "requested": "[1.7.2, )", @@ -48,9 +48,9 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==" + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "owmu2Cr3IQ8yQiBleBHlGk8dSQ12oaF2e7TpzwJKEl4m84kkZJjEY1n33L67Y3zM5jPOjmmbdHjbfiL0RqcMRQ==" }, "Microsoft.Diagnostics.Runtime": { "type": "Direct", @@ -63,59 +63,59 @@ }, "Microsoft.Extensions.Configuration.CommandLine": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "NZuZMz3Q8Z780nKX3ifV1fE7lS+6pynDHK71OfU4OZ1ItgvDOhyOC7E6z+JMZrAj63zRpwbdldYFk499t3+1dQ==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "qD+hdkBtR9Ps7AxfhTJCnoVakkadHgHlD1WRN0QHGHod+SDuca1ao1kF4G2rmpAz2AEKrE2N2vE8CCCZ+ILnNw==", "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + "Microsoft.Extensions.Configuration": "9.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0" } }, "Microsoft.Extensions.Configuration.EnvironmentVariables": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "plvZ0ZIpq+97gdPNNvhwvrEZ92kNml9hd1pe3idMA7svR0PztdzVLkoWLcRFgySYXUJc3kSM3Xw3mNFMo/bxRA==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "v5R638eNMxksfXb7MFnkPwLPp+Ym4W/SIGNuoe8qFVVyvygQD5DdLusybmYSJEr9zc1UzWzim/ATKeIOVvOFDg==", "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + "Microsoft.Extensions.Configuration": "9.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0" } }, "Microsoft.Extensions.Configuration.Xml": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "0iRltfE/Xbh6gs9DHiBMShrxhcpJLtF/+2OqW1OpUh1QLQuAvMy4cGElSeJx1/hF6IbsxYhakVgfCNU0Hsmcwg==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "emIBXgb6KyFpog3mKXdRq6Wt1JpWLQJi2SoNDI6Q93O1DX9YtsH/Hy03OrryQEEwJrwta6r5iqBP1lY9PMXGUQ==", "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Configuration.FileExtensions": "8.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", - "System.Security.Cryptography.Xml": "8.0.0" + "Microsoft.Extensions.Configuration": "9.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.Configuration.FileExtensions": "9.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0", + "System.Security.Cryptography.Xml": "9.0.0" } }, "Microsoft.Extensions.Logging": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "tvRkov9tAJ3xP51LCv3FJ2zINmv1P8Hi8lhhtcKGqM+ImiTCC84uOPEI4z8Cdq2C3o9e+Aa0Gw0rmrsJD77W+w==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "crjWyORoug0kK7RSNJBTeSE6VX8IQgLf3nUpTB9m62bPXp/tzbnOsnbe8TXEG0AASNaKZddnpHKw7fET8E++Pg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection": "8.0.0", - "Microsoft.Extensions.Logging.Abstractions": "8.0.0", - "Microsoft.Extensions.Options": "8.0.0" + "Microsoft.Extensions.DependencyInjection": "9.0.0", + "Microsoft.Extensions.Logging.Abstractions": "9.0.0", + "Microsoft.Extensions.Options": "9.0.0" } }, "NLog": { "type": "Direct", - "requested": "[5.3.3, )", - "resolved": "5.3.3", - "contentHash": "cy0+hlrUbYu+6mgUsILqCcqlJ2Csqyt2lm8y9T9kE8nhgwl8SvR+LM21QX4nmzFCPiowbrTFYxNF8+gWpy7/HQ==" + "requested": "[5.3.4, )", + "resolved": "5.3.4", + "contentHash": "gLy7+O1hEYJXIlcTr1/VWjGXrZTQFZzYNO18IWasD64pNwz0BreV+nHLxWKXWZzERRzoKnsk2XYtwLkTVk7J1A==" }, "nulastudio.NetBeauty": { "type": "Direct", - "requested": "[2.1.4.5, )", - "resolved": "2.1.4.5", - "contentHash": "hOluHDEPDlS/lmDrRAlv5Xaza+n7kBPOtkuS6nYm0k6npJLi/vlYhZwR/IhpV+lCRTiu4so4D61pSrtHdTiagw==" + "requested": "[2.1.4.6, )", + "resolved": "2.1.4.6", + "contentHash": "jB9L3V4raas4cIczo3zU+Kb6LwsZ215iVDsxo+jm/QXYQxy+HSizpV3StN3BC35nv3YMaSdthXoxD3aBSPJscw==" }, "PropertyChanged.Fody": { "type": "Direct", @@ -140,11 +140,11 @@ }, "System.Management": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "jrK22i5LRzxZCfGb+tGmke2VH7oE0DvcDlJ1HAKYU8cPmD8XnpUT0bYn2Gy98GEhGjtfbR/sxKTVb+dE770pfA==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "bVh4xAMI5grY5GZoklKcMBLirhC8Lqzp63Ft3zXJacwGAlLyFdF4k0qz4pnKIlO6HyL2Z4zqmHm9UkzEo6FFsA==", "dependencies": { - "System.CodeDom": "8.0.0" + "System.CodeDom": "9.0.0" } }, "AvalonEdit": { @@ -159,16 +159,16 @@ }, "JetBrains.Annotations": { "type": "Transitive", - "resolved": "2024.2.0", - "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw==" + "resolved": "2024.3.0", + "contentHash": "ox5pkeLQXjvJdyAB4b2sBYAlqZGLh3PjSnP1bQNVx72ONuTJ9+34/+Rq91Fc0dG29XG9RgZur9+NcP4riihTug==" }, "Lib.Harmony.Thin": { "type": "Transitive", - "resolved": "2.3.3-torch", - "contentHash": "djQtMUpURRgP+Ytf1EgQwu4XnJL3J3bz5kyTVcRDNb632N62/A4CbduG96CUsKhL944yGNAJnLX3zfWldPYOTw==", + "resolved": "2.3.4-torch", + "contentHash": "UnLUnLLiXfHZdKa1zhi6w8cl8tJTrpVixLtvjFEVtlDA6Rkf06OcZ2gSidcbcgKjTcR+fk5Qsdos3mU5oohzfg==", "dependencies": { - "MonoMod.Core": "1.1.0", - "System.Text.Json": "8.0.1" + "MonoMod.Core": "1.2.2", + "System.Text.Json": "9.0.0" } }, "MdXaml.Plugins": { @@ -183,8 +183,8 @@ }, "Microsoft.CodeAnalysis.Common": { "type": "Transitive", - "resolved": "4.11.0", - "contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==", + "resolved": "4.12.0", + "contentHash": "c1kNYihL2gdcuU1dqm8R8YeA4YkB43TpU3pa2r66Uooh6AAhRtENzj9A4Kj0a+H8JDDyuTjNZql9XlVUzV+UjA==", "dependencies": { "Microsoft.CodeAnalysis.Analyzers": "3.3.4", "System.Collections.Immutable": "8.0.0", @@ -193,11 +193,11 @@ }, "Microsoft.CodeAnalysis.CSharp": { "type": "Transitive", - "resolved": "4.11.0", - "contentHash": "6XYi2EusI8JT4y2l/F3VVVS+ISoIX9nqHsZRaG6W5aFeJ5BEuBosHfT/ABb73FN0RZ1Z3cj2j7cL28SToJPXOw==", + "resolved": "4.12.0", + "contentHash": "30vVQ1MizeC22iEdEvI2w0eTIYG43/L20yBzuQH01xKzJgHAoWehzI2F8u07o4mXh4DGMOjQF7aEm0zzvsG3Mg==", "dependencies": { "Microsoft.CodeAnalysis.Analyzers": "3.3.4", - "Microsoft.CodeAnalysis.Common": "[4.11.0]", + "Microsoft.CodeAnalysis.Common": "[4.12.0]", "System.Collections.Immutable": "8.0.0", "System.Reflection.Metadata": "8.0.0" } @@ -213,98 +213,98 @@ }, "Microsoft.Extensions.Configuration": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==", + "resolved": "9.0.0", + "contentHash": "YIMO9T3JL8MeEXgVozKt2v79hquo/EFtnY0vgxmLnUvk1Rei/halI7kOWZL2RBeV9FMGzgM9LZA8CVaNwFMaNA==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", + "resolved": "9.0.0", + "contentHash": "lqvd7W3FGKUO1+ZoUEMaZ5XDJeWvjpy2/M/ptCGz3tXLD4HWVaSzjufsAsjemasBEg+2SxXVtYVvGt5r2nKDlg==", "dependencies": { - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "8.0.2", - "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==", + "resolved": "9.0.0", + "contentHash": "RiScL99DcyngY9zJA2ROrri7Br8tn5N4hP4YNvGdTN/bvg1A3dwvDOxHnNZ3Im7x2SJ5i4LkX1uPiR/MfSFBLQ==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0" } }, "Microsoft.Extensions.Configuration.FileExtensions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "McP+Lz/EKwvtCv48z0YImw+L1gi1gy5rHhNaNIY2CrjloV+XY8gydT8DjMR6zWeL13AFK+DioVpppwAuO1Gi1w==", + "resolved": "9.0.0", + "contentHash": "4EK93Jcd2lQG4GY6PAw8jGss0ZzFP0vPc1J85mES5fKNuDTqgFXHba9onBw2s18fs3I4vdo2AWyfD1mPAxWSQQ==", "dependencies": { - "Microsoft.Extensions.Configuration": "8.0.0", - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", - "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", - "Microsoft.Extensions.FileProviders.Physical": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Configuration": "9.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0", + "Microsoft.Extensions.FileProviders.Physical": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.DependencyInjection": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "V8S3bsm50ig6JSyrbcJJ8bW2b9QLGouz+G1miK3UTaOWmMtFwNNNzUf4AleyDWUmTrWMLNnFSLEQtxmxgNQnNQ==", + "resolved": "9.0.0", + "contentHash": "MCPrg7v3QgNMr0vX4vzRXvkNGgLg8vKWX0nKCWUxu2uPyMsaRgiRc1tHBnbTcfJMhMKj2slE/j2M9oGkd25DNw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0" } }, "Microsoft.Extensions.DependencyInjection.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "cjWrLkJXK0rs4zofsK4bSdg+jhDLTaxrkXu4gS6Y7MAlCvRyNNgwY/lJi5RDlQOnSZweHqoyvgvbdvQsRIW+hg==" + "resolved": "9.0.0", + "contentHash": "+6f2qv2a3dLwd5w6JanPIPs47CxRbnk+ZocMJUhv9NxP88VlOcJYZs9jY+MYSjxvady08bUZn6qgiNh7DadGgg==" }, "Microsoft.Extensions.FileProviders.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", + "resolved": "9.0.0", + "contentHash": "uK439QzYR0q2emLVtYzwyK3x+T5bTY4yWsd/k/ZUS9LR6Sflp8MIdhGXW8kQCd86dQD4tLqvcbLkku8qHY263Q==", "dependencies": { - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.FileProviders.Physical": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "UboiXxpPUpwulHvIAVE36Knq0VSHaAmfrFkegLyBZeaADuKezJ/AIXYAW8F5GBlGk/VaibN2k/Zn1ca8YAfVdA==", + "resolved": "9.0.0", + "contentHash": "3+ZUSpOSmie+o8NnLIRqCxSh65XL/ExU7JYnFOg58awDRlY3lVpZ9A369jkoZL1rpsq7LDhEfkn2ghhGaY1y5Q==", "dependencies": { - "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", - "Microsoft.Extensions.FileSystemGlobbing": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.FileProviders.Abstractions": "9.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.FileSystemGlobbing": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "OK+670i7esqlQrPjdIKRbsyMCe9g5kSLpRRQGSr4Q58AOYEe/hCnfLZprh7viNisSUUQZmMrbbuDaIrP+V1ebQ==" + "resolved": "9.0.0", + "contentHash": "jGFKZiXs2HNseK3NK/rfwHNNovER71jSj4BD1a/649ml9+h6oEtYd0GSALZDNW8jZ2Rh+oAeadOa6sagYW1F2A==" }, "Microsoft.Extensions.Logging.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "arDBqTgFCyS0EvRV7O3MZturChstm50OJ0y9bDJvAcmEPJm0FFpFyjU/JLYyStNGGey081DvnQYlncNX5SJJGA==", + "resolved": "9.0.0", + "contentHash": "g0UfujELzlLbHoVG8kPKVBaW470Ewi+jnptGS9KUi6jcb+k2StujtK3m26DFSGGwQ/+bVgZfsWqNzlP6YOejvw==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0" } }, "Microsoft.Extensions.Options": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "JOVOfqpnqlVLUzINQ2fox8evY2SKLYJ3BV8QDe/Jyp21u1T7r45x/R/5QdteURMR5r01GxeJSBBUOCOyaNXA3g==", + "resolved": "9.0.0", + "contentHash": "y2146b3jrPI3Q0lokKXdKLpmXqakYbDIPDV6r3M8SqvSf45WwOTzkyfDpxnZXJsJQEpAsAqjUq5Pu8RCJMjubg==", "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0", + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" + "resolved": "9.0.0", + "contentHash": "N3qEBzmLMYiASUlKxxFIISP4AiwuPTHF5uCh+2CWSwwzAJiIYx0kBJsS30cp1nvhSySFAVi30jecD307jV+8Kg==" }, "Microsoft.Xaml.Behaviors.Wpf": { "type": "Transitive", @@ -318,36 +318,36 @@ }, "MonoMod.Backports": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "GUAjCrCZEddqHKHFA7Lh61PgTzoKY7gfBShFe0hQe0p8iynHhBK3TWGyRi+QIw/PGfaRPwx6c33CPGFURBVM6g==", + "resolved": "1.1.2", + "contentHash": "baYlNy8n8kmaNhNvqmZ/dIPOeO1r9//dG1i2WbunMWtWZ2EKtIgmXaS+ZzphzTsikkGnoD4Jwr5g0TVdpDjgpw==", "dependencies": { - "MonoMod.ILHelpers": "1.0.1" + "MonoMod.ILHelpers": "1.1.0" } }, "MonoMod.Core": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "Ks8RntZGVcktr2QF/AovTEbuOkrgXz6omjrvT5LRveOIQJuy+IFuEQPBVWu+cSKVIoZD5XkpRFvlVrItgPIrXw==", + "resolved": "1.2.2", + "contentHash": "3R9mQ7TxeQQBFLtGTR2VIDSBGx/I7d8RYpxvW1Mot0/PB6+UOnHr+lkw7dj8cus8YSnLdCFT+CG4JW89daEvjg==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.0", - "MonoMod.ILHelpers": "1.0.1", - "MonoMod.Utils": "25.0.4" + "MonoMod.Backports": "1.1.2", + "MonoMod.ILHelpers": "1.1.0", + "MonoMod.Utils": "25.0.8" } }, "MonoMod.ILHelpers": { "type": "Transitive", - "resolved": "1.0.1", - "contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA==" + "resolved": "1.1.0", + "contentHash": "L2FWjhTrv7tcIxshfZ+M3OcaNr4cNw0IwiVZEgwqRnZ5QAN3+RrNJ8ZwCzwXUWyPDqooJxMcjjg8PsSYUiNBjQ==" }, "MonoMod.Utils": { "type": "Transitive", - "resolved": "25.0.4", - "contentHash": "cB94MaZtFD9u4clYEFTwM4jGXnJnzXsxYF3yBpMZKHhXOas66tMF2frbdYte023i0MH4C5iRJbDjxHmA4x5VgA==", + "resolved": "25.0.8", + "contentHash": "8wfyawgvGqUvfchAj7/gPazAjXO8CWNyXH+C0az+hgJH/80zVL5LxDhQMz0NQTyoCEJWU6gNBGc7CL+G7vCbaQ==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.0", - "MonoMod.ILHelpers": "1.0.1" + "MonoMod.Backports": "1.1.2", + "MonoMod.ILHelpers": "1.1.0" } }, "Newtonsoft.Json": { @@ -357,95 +357,96 @@ }, "NuGet.Commands": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "8GjJQZVbNJuttVynsRWsgqhTZiBbjxRr2PgZ3E7zPxDBmKUazkQ1s/FqScm83w8Xq5OdEtegkU0dZhibfRkKeg==", + "resolved": "6.12.1", + "contentHash": "wP1gRYoW+yeY0mmPRBGhI7DFZ8JoGKzWfbiSsceHzVTp00WfnqiEAqSQtB6QJkc5jukoajtP3U1+lx0mErfFsA==", "dependencies": { "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", "Microsoft.Extensions.FileSystemGlobbing": "6.0.0", - "NuGet.Credentials": "6.11.0", - "NuGet.ProjectModel": "6.11.0" + "NuGet.Credentials": "6.12.1", + "NuGet.ProjectModel": "6.12.1" } }, "NuGet.Common": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "T3bCiKUSx8wdYpcqr6Dbx93zAqFp689ee/oa1tH22XI/xl7EUzQ7No/WlE1FUqvEX1+Mqar3wRNAn2O/yxo94g==", + "resolved": "6.12.1", + "contentHash": "nk8nTdhQl4x2VaAQUvefI7DDYAuBDlE+OZZRffm50Qx5dUAEq8wkc5JIqrN2lTEohObHPI/SXyG2UFdMQkrdyg==", "dependencies": { - "NuGet.Frameworks": "6.11.0" + "NuGet.Frameworks": "6.12.1" } }, "NuGet.Configuration": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "73QprQqmumFrv3Ooi4YWpRYeBj8jZy9gNdOaOCp4pPInpt41SJJAz/aP4je+StwIJvi5HsgPPecLKekDIQEwKg==", + "resolved": "6.12.1", + "contentHash": "IRwlY1379ZgJ0oEJvjD+lDuOhJ5S1fsU5n/bEC5/i0+N9bo2WIMDAdaQ/qIdyK/gMJ/YWS+++GSX6rN7luqEvg==", "dependencies": { - "NuGet.Common": "6.11.0", + "NuGet.Common": "6.12.1", "System.Security.Cryptography.ProtectedData": "4.4.0" } }, "NuGet.Credentials": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "TeMvEyoqkIxDnYJjPCpD48vV5XoDATmyX2kGYYB2MIzWBT24ZjWauTda72hYBzg0OLLiuafxfnNJKGG6IHHzOQ==", + "resolved": "6.12.1", + "contentHash": "VdqUIupqm16kiedkv/iyBX5yaVwCI9piV7IvHf0FLgFciCnx22jI8luHXTqeJgWsHOLJl+nTjeV3RY/AcccK7Q==", "dependencies": { - "NuGet.Protocol": "6.11.0" + "NuGet.Protocol": "6.12.1" } }, "NuGet.DependencyResolver.Core": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "SoiPKPooA+IF+iCsX1ykwi3M0e+yBL34QnwIP3ujhQEn1dhlP/N1XsYAnKkJPxV15EZCahuuS4HtnBsZx+CHKA==", + "resolved": "6.12.1", + "contentHash": "Nn4+pXW1qxGcq0OEQBJBh/FjKvWhzD49+kRzuOC9SkRZOrHsTaA12EsQ1mEE4rMUfqviaosmPEtvodJ4eKCmIw==", "dependencies": { - "NuGet.Configuration": "6.11.0", - "NuGet.LibraryModel": "6.11.0", - "NuGet.Protocol": "6.11.0" + "NuGet.Configuration": "6.12.1", + "NuGet.LibraryModel": "6.12.1", + "NuGet.Protocol": "6.12.1" } }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "Ew/mrfmLF5phsprysHbph2+tdZ10HMHAURavsr/Kx1WhybDG4vmGuoNLbbZMZOqnPRdpyCTc42OKWLoedxpYtA==" + "resolved": "6.12.1", + "contentHash": "kPaRD5RJC0ByUg+yGX6bDz5XHMI7OYmQwP8kbtef+vZ+csj/VDb5Bwas4ChxwhoAbI8lEvwP5/3aViQPpgNBow==" }, "NuGet.LibraryModel": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "KUV2eeMICMb24OPcICn/wgncNzt6+W+lmFVO5eorTdo1qV4WXxYGyG1NTPiCY+Nrv5H/Ilnv9UaUM2ozqSmnjw==", + "resolved": "6.12.1", + "contentHash": "IqX7Ze7qSbhx22lsdnMbLJpcqrmwGyQbyNk9JSsZ/u5p6PIaZyeWsvHHy+oXU8fuRmmKfHBnZEsceaCAw6Xy5A==", "dependencies": { - "NuGet.Common": "6.11.0", - "NuGet.Versioning": "6.11.0" + "NuGet.Common": "6.12.1", + "NuGet.Versioning": "6.12.1" } }, "NuGet.Packaging": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "VmUv2LedVuPY1tfNybORO2I9IuqOzeV7I5JBD+PwNvJq2bAqovi4FCw2cYI0g+kjOJXBN2lAJfrfnqtUOlVJdQ==", + "resolved": "6.12.1", + "contentHash": "6s5NO3VNX6fIx6GwuWZtIsal9W1xkelYd3Vg2KUAg1zGqnKC3wB5IZlombvVGVGcwyl/A+iDvpUwSvgeDoB3wA==", "dependencies": { "Newtonsoft.Json": "13.0.3", - "NuGet.Configuration": "6.11.0", - "NuGet.Versioning": "6.11.0", + "NuGet.Configuration": "6.12.1", + "NuGet.Versioning": "6.12.1", + "System.Formats.Asn1": "8.0.1", "System.Security.Cryptography.Pkcs": "6.0.4" } }, "NuGet.ProjectModel": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "g0KtmDH6fas97WsN73yV2h1F5JT9o6+Y0wlPK+ij9YLKaAXaF6+1HkSaQMMJ+xh9/jCJG9G6nau6InOlb1g48g==", + "resolved": "6.12.1", + "contentHash": "nzpVqooG0qumADw5t8YMg9e+ezVqUhhoGvoihVmu5O9gJDqzkRYswQzyIVsE24dirBQabW0X0Sv53f6ZLJCv+g==", "dependencies": { - "NuGet.DependencyResolver.Core": "6.11.0" + "NuGet.DependencyResolver.Core": "6.12.1" } }, "NuGet.Protocol": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "p5B8oNLLnGhUfMbcS16aRiegj11pD6k+LELyRBqvNFR/pE3yR1XT+g1XS33ME9wvoU+xbCGnl4Grztt1jHPinw==", + "resolved": "6.12.1", + "contentHash": "VBN7OtG/Y9Rnj1WT3G8X88ZHu5Pq+yzca5Z6OI/FWXcENVAQkUl0ml6Cv8ghOqYyiuvnObGDV9oWLD/bIuVtDw==", "dependencies": { - "NuGet.Packaging": "6.11.0" + "NuGet.Packaging": "6.12.1" } }, "NuGet.Versioning": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "v/GGlIj2dd7svplFmASWEueu62veKW0MrMtBaZ7QG8aJTSGv2yE+pgUGhXRcQ4nxNOEq/wLBrz1vkth/1SND7A==" + "resolved": "6.12.1", + "contentHash": "fJ6rFYANDnohFsdpaY79FvrJxI6murmoOxXz6nZlf819F48+IBKMnAIg3oIBRtZq5y498ObMtKnro5IitvizUg==" }, "protobuf-net": { "type": "Transitive", @@ -454,8 +455,8 @@ }, "SemanticVersioning": { "type": "Transitive", - "resolved": "2.0.2", - "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA==" + "resolved": "3.0.0", + "contentHash": "RR+8GbPQ/gjDqov/1QN1OPoUlbUruNwcL3WjWCeLw+MY7+od/ENhnkYxCfAC6rQLIu3QifaJt3kPYyP3RumqMQ==" }, "SharpDX": { "type": "Transitive", @@ -472,8 +473,8 @@ }, "SpaceEngineersDedicated.ReferenceAssemblies": { "type": "Transitive", - "resolved": "1.205.23", - "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==", + "resolved": "1.205.26", + "contentHash": "kQSFCLgi0nFUhLvXlp9D2w4cTnXtEIctWtNlK+Vw4FAofws60rwR6Kil9YBNlaDyoo19dcyNt3bs4G9VculcIA==", "dependencies": { "SharpDX": "4.2.0-keen-cringe", "protobuf-net": "1.0.0" @@ -481,8 +482,8 @@ }, "System.CodeDom": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "WTlRjL6KWIMr/pAaq3rYqh0TJlzpouaQ/W1eelssHgtlwHAH25jXTkUphTYx9HaIIf7XA6qs/0+YhtLEQRkJ+Q==" + "resolved": "9.0.0", + "contentHash": "oTE5IfuMoET8yaZP/vdvy9xO47guAv/rOhe4DODuFBN3ySprcQOlXqO3j+e/H/YpKKR5sglrxRaZ2HYOhNJrqA==" }, "System.Collections.Immutable": { "type": "Transitive", @@ -491,8 +492,8 @@ }, "System.Formats.Asn1": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "AJukBuLoe3QeAF+mfaRKQb2dgyrvt340iMBHYv+VdBzCUM06IxGlvl0o/uPOS7lHnXPN6u8fFRHSHudx5aTi8w==" + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==" }, "System.Linq.Async": { "type": "Transitive", @@ -517,11 +518,8 @@ }, "System.Security.Cryptography.Pkcs": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "ULmp3xoOwNYjOYp4JZ2NK/6NdTgiN1GQXzVVN1njQ7LOZ0d0B9vyMnhyqbIi9Qw4JXj1JgCsitkTShboHRx7Eg==", - "dependencies": { - "System.Formats.Asn1": "8.0.0" - } + "resolved": "9.0.0", + "contentHash": "8tluJF8w9si+2yoHeL8rgVJS6lKvWomTDC8px65Z8MCzzdME5eaPtEQf4OfVGrAxB5fW93ncucy1+221O9EQaw==" }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", @@ -530,24 +528,16 @@ }, "System.Security.Cryptography.Xml": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "HQSFbakswZ1OXFz2Bt3AJlC6ENDqWeVpgqhf213xqQUMDifzydOHIKVb1RV4prayobvR3ETIScMaQdDF2hwGZA==", + "resolved": "9.0.0", + "contentHash": "GQZn5wFd+pyOfwWaCbqxG7trQ5ox01oR8kYgWflgtux4HiUNihGEgG2TktRWyH+9bw7NoEju1D41H/upwQeFQw==", "dependencies": { - "System.Security.Cryptography.Pkcs": "8.0.0" + "System.Security.Cryptography.Pkcs": "9.0.0" } }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" - }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==", - "dependencies": { - "System.Text.Encodings.Web": "8.0.0" - } + "resolved": "9.0.0", + "contentHash": "js7+qAu/9mQvnhA4EfGMZNEzXtJCDxgkgj8ohuxq/Qxv+R56G+ljefhiJHOxTNiw54q8vmABCWUwkMulNdlZ4A==" }, "Torch.SixLabors.ImageSharp": { "type": "Transitive", @@ -562,11 +552,11 @@ "type": "Project", "dependencies": { "ControlzEx": "[5.0.2, )", - "Lib.Harmony.Thin": "[2.3.3-torch, )", + "Lib.Harmony.Thin": "[2.3.4-torch, )", "MahApps.Metro": "[2.4.10, )", - "Microsoft.CodeAnalysis.CSharp": "[4.11.0, )", - "Microsoft.CodeAnalysis.Common": "[4.11.0, )", - "NLog": "[5.3.3, )", + "Microsoft.CodeAnalysis.CSharp": "[4.12.0, )", + "Microsoft.CodeAnalysis.Common": "[4.12.0, )", + "NLog": "[5.3.4, )", "System.ComponentModel.Annotations": "[5.0.0, )", "Torch.API": "[1.0.0, )", "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )" @@ -575,18 +565,18 @@ "torch.api": { "type": "Project", "dependencies": { - "JetBrains.Annotations": "[2024.2.0, )", - "Microsoft.Extensions.Configuration.Binder": "[8.0.2, )", - "NLog": "[5.3.3, )", - "NuGet.Commands": "[6.11.0, )", - "NuGet.DependencyResolver.Core": "[6.11.0, )", - "SemanticVersioning": "[2.0.2, )", + "JetBrains.Annotations": "[2024.3.0, )", + "Microsoft.Extensions.Configuration.Binder": "[9.0.0, )", + "NLog": "[5.3.4, )", + "NuGet.Commands": "[6.12.1, )", + "NuGet.DependencyResolver.Core": "[6.12.1, )", + "SemanticVersioning": "[3.0.0, )", "SpaceEngineersDedicated.ReferenceAssemblies": "[1.*, )", "System.Linq.Async": "[6.0.1, )" } } }, - "net8.0-windows7.0/win-x64": { + "net9.0-windows7.0/win-x64": { "Steamworks.NET": { "type": "Direct", "requested": "[20.2.0, )", @@ -595,30 +585,22 @@ }, "System.Management": { "type": "Direct", - "requested": "[8.0.0, )", - "resolved": "8.0.0", - "contentHash": "jrK22i5LRzxZCfGb+tGmke2VH7oE0DvcDlJ1HAKYU8cPmD8XnpUT0bYn2Gy98GEhGjtfbR/sxKTVb+dE770pfA==", + "requested": "[9.0.0, )", + "resolved": "9.0.0", + "contentHash": "bVh4xAMI5grY5GZoklKcMBLirhC8Lqzp63Ft3zXJacwGAlLyFdF4k0qz4pnKIlO6HyL2Z4zqmHm9UkzEo6FFsA==", "dependencies": { - "System.CodeDom": "8.0.0" + "System.CodeDom": "9.0.0" } }, "System.Security.Cryptography.Pkcs": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "ULmp3xoOwNYjOYp4JZ2NK/6NdTgiN1GQXzVVN1njQ7LOZ0d0B9vyMnhyqbIi9Qw4JXj1JgCsitkTShboHRx7Eg==", - "dependencies": { - "System.Formats.Asn1": "8.0.0" - } + "resolved": "9.0.0", + "contentHash": "8tluJF8w9si+2yoHeL8rgVJS6lKvWomTDC8px65Z8MCzzdME5eaPtEQf4OfVGrAxB5fW93ncucy1+221O9EQaw==" }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", "resolved": "4.4.0", "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog==" - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" } } } diff --git a/Torch.Tests/Torch.Tests.csproj b/Torch.Tests/Torch.Tests.csproj index a7c97bb..7a17ed8 100644 --- a/Torch.Tests/Torch.Tests.csproj +++ b/Torch.Tests/Torch.Tests.csproj @@ -13,9 +13,9 @@ - - - + + + diff --git a/Torch.Tests/packages.lock.json b/Torch.Tests/packages.lock.json index 6125631..381ab6d 100644 --- a/Torch.Tests/packages.lock.json +++ b/Torch.Tests/packages.lock.json @@ -1,32 +1,32 @@ { "version": 1, "dependencies": { - "net8.0-windows7.0": { + "net9.0-windows7.0": { "Microsoft.NET.Test.Sdk": { "type": "Direct", - "requested": "[17.11.0, )", - "resolved": "17.11.0", - "contentHash": "fH7P0LihMXgnlNLtrXGetHd30aQcD+YrSbWXbCPBnrypdRApPgNqd/TgncTlSVY1bbLYdnvpBgts2dcnK37GzA==", + "requested": "[17.12.0, )", + "resolved": "17.12.0", + "contentHash": "kt/PKBZ91rFCWxVIJZSgVLk+YR+4KxTuHf799ho8WNiK5ZQpJNAEZCAWX86vcKrs+DiYjiibpYKdGZP6+/N17w==", "dependencies": { - "Microsoft.CodeCoverage": "17.11.0", - "Microsoft.TestPlatform.TestHost": "17.11.0" + "Microsoft.CodeCoverage": "17.12.0", + "Microsoft.TestPlatform.TestHost": "17.12.0" } }, "NLog": { "type": "Direct", - "requested": "[5.3.3, )", - "resolved": "5.3.3", - "contentHash": "cy0+hlrUbYu+6mgUsILqCcqlJ2Csqyt2lm8y9T9kE8nhgwl8SvR+LM21QX4nmzFCPiowbrTFYxNF8+gWpy7/HQ==" + "requested": "[5.3.4, )", + "resolved": "5.3.4", + "contentHash": "gLy7+O1hEYJXIlcTr1/VWjGXrZTQFZzYNO18IWasD64pNwz0BreV+nHLxWKXWZzERRzoKnsk2XYtwLkTVk7J1A==" }, "xunit": { "type": "Direct", - "requested": "[2.9.0, )", - "resolved": "2.9.0", - "contentHash": "PtU3rZ0ThdmdJqTbK7GkgFf6iBaCR6Q0uvJHznID+XEYk2v6O/b7sRxqnbi3B2gRDXxjTqMkVNayzwsqsFUxRw==", + "requested": "[2.9.3, )", + "resolved": "2.9.3", + "contentHash": "TlXQBinK35LpOPKHAqbLY4xlEen9TBafjs0V5KnA4wZsoQLQJiirCR4CbIXvOH8NzkW4YeJKP5P/Bnrodm0h9Q==", "dependencies": { - "xunit.analyzers": "1.15.0", - "xunit.assert": "2.9.0", - "xunit.core": "[2.9.0]" + "xunit.analyzers": "1.18.0", + "xunit.assert": "2.9.3", + "xunit.core": "[2.9.3]" } }, "ControlzEx": { @@ -40,16 +40,16 @@ }, "JetBrains.Annotations": { "type": "Transitive", - "resolved": "2024.2.0", - "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw==" + "resolved": "2024.3.0", + "contentHash": "ox5pkeLQXjvJdyAB4b2sBYAlqZGLh3PjSnP1bQNVx72ONuTJ9+34/+Rq91Fc0dG29XG9RgZur9+NcP4riihTug==" }, "Lib.Harmony.Thin": { "type": "Transitive", - "resolved": "2.3.3-torch", - "contentHash": "djQtMUpURRgP+Ytf1EgQwu4XnJL3J3bz5kyTVcRDNb632N62/A4CbduG96CUsKhL944yGNAJnLX3zfWldPYOTw==", + "resolved": "2.3.4-torch", + "contentHash": "UnLUnLLiXfHZdKa1zhi6w8cl8tJTrpVixLtvjFEVtlDA6Rkf06OcZ2gSidcbcgKjTcR+fk5Qsdos3mU5oohzfg==", "dependencies": { - "MonoMod.Core": "1.1.0", - "System.Text.Json": "8.0.1" + "MonoMod.Core": "1.2.2", + "System.Text.Json": "9.0.0" } }, "MahApps.Metro": { @@ -72,8 +72,8 @@ }, "Microsoft.CodeAnalysis.Common": { "type": "Transitive", - "resolved": "4.11.0", - "contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==", + "resolved": "4.12.0", + "contentHash": "c1kNYihL2gdcuU1dqm8R8YeA4YkB43TpU3pa2r66Uooh6AAhRtENzj9A4Kj0a+H8JDDyuTjNZql9XlVUzV+UjA==", "dependencies": { "Microsoft.CodeAnalysis.Analyzers": "3.3.4", "System.Collections.Immutable": "8.0.0", @@ -82,34 +82,34 @@ }, "Microsoft.CodeAnalysis.CSharp": { "type": "Transitive", - "resolved": "4.11.0", - "contentHash": "6XYi2EusI8JT4y2l/F3VVVS+ISoIX9nqHsZRaG6W5aFeJ5BEuBosHfT/ABb73FN0RZ1Z3cj2j7cL28SToJPXOw==", + "resolved": "4.12.0", + "contentHash": "30vVQ1MizeC22iEdEvI2w0eTIYG43/L20yBzuQH01xKzJgHAoWehzI2F8u07o4mXh4DGMOjQF7aEm0zzvsG3Mg==", "dependencies": { "Microsoft.CodeAnalysis.Analyzers": "3.3.4", - "Microsoft.CodeAnalysis.Common": "[4.11.0]", + "Microsoft.CodeAnalysis.Common": "[4.12.0]", "System.Collections.Immutable": "8.0.0", "System.Reflection.Metadata": "8.0.0" } }, "Microsoft.CodeCoverage": { "type": "Transitive", - "resolved": "17.11.0", - "contentHash": "QKcOSuw7MZG4XiQ+pCj+Ib6amOwoRDEO7e3DbxqXeOPXSnfyGXYoZQI8I140s1mKQVn1Vh+c5WlKvCvlgMovpg==" + "resolved": "17.12.0", + "contentHash": "4svMznBd5JM21JIG2xZKGNanAHNXplxf/kQDFfLHXQ3OnpJkayRK/TjacFjA+EYmoyuNXHo/sOETEfcYtAzIrA==" }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", + "resolved": "9.0.0", + "contentHash": "lqvd7W3FGKUO1+ZoUEMaZ5XDJeWvjpy2/M/ptCGz3tXLD4HWVaSzjufsAsjemasBEg+2SxXVtYVvGt5r2nKDlg==", "dependencies": { - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "8.0.2", - "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==", + "resolved": "9.0.0", + "contentHash": "RiScL99DcyngY9zJA2ROrri7Br8tn5N4hP4YNvGdTN/bvg1A3dwvDOxHnNZ3Im7x2SJ5i4LkX1uPiR/MfSFBLQ==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0" } }, "Microsoft.Extensions.FileProviders.Abstractions": { @@ -127,23 +127,23 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" + "resolved": "9.0.0", + "contentHash": "N3qEBzmLMYiASUlKxxFIISP4AiwuPTHF5uCh+2CWSwwzAJiIYx0kBJsS30cp1nvhSySFAVi30jecD307jV+8Kg==" }, "Microsoft.TestPlatform.ObjectModel": { "type": "Transitive", - "resolved": "17.11.0", - "contentHash": "PU+CC1yRzbR0IllrtdILaeep7WP5OIrvmWrvCMqG3jB1h4F6Ur7CYHl6ENbDVXPzEvygXh0GWbTyrbjfvgTpAg==", + "resolved": "17.12.0", + "contentHash": "TDqkTKLfQuAaPcEb3pDDWnh7b3SyZF+/W9OZvWFp6eJCIiiYFdSB6taE2I6tWrFw5ywhzOb6sreoGJTI6m3rSQ==", "dependencies": { "System.Reflection.Metadata": "1.6.0" } }, "Microsoft.TestPlatform.TestHost": { "type": "Transitive", - "resolved": "17.11.0", - "contentHash": "KMzJO3dm3+9W8JRQ3IDviu0v7uXP5Lgii6TuxMc5m8ynaqcGnn7Y18cMb5AsP2xp59uUHO474WZrssxBdb8ZxQ==", + "resolved": "17.12.0", + "contentHash": "MiPEJQNyADfwZ4pJNpQex+t9/jOClBGMiCiVVFuELCMSX2nmNfvUor3uFVxNNCg30uxDP8JDYfPnMXQzsfzYyg==", "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "17.11.0", + "Microsoft.TestPlatform.ObjectModel": "17.12.0", "Newtonsoft.Json": "13.0.1" } }, @@ -159,36 +159,36 @@ }, "MonoMod.Backports": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "GUAjCrCZEddqHKHFA7Lh61PgTzoKY7gfBShFe0hQe0p8iynHhBK3TWGyRi+QIw/PGfaRPwx6c33CPGFURBVM6g==", + "resolved": "1.1.2", + "contentHash": "baYlNy8n8kmaNhNvqmZ/dIPOeO1r9//dG1i2WbunMWtWZ2EKtIgmXaS+ZzphzTsikkGnoD4Jwr5g0TVdpDjgpw==", "dependencies": { - "MonoMod.ILHelpers": "1.0.1" + "MonoMod.ILHelpers": "1.1.0" } }, "MonoMod.Core": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "Ks8RntZGVcktr2QF/AovTEbuOkrgXz6omjrvT5LRveOIQJuy+IFuEQPBVWu+cSKVIoZD5XkpRFvlVrItgPIrXw==", + "resolved": "1.2.2", + "contentHash": "3R9mQ7TxeQQBFLtGTR2VIDSBGx/I7d8RYpxvW1Mot0/PB6+UOnHr+lkw7dj8cus8YSnLdCFT+CG4JW89daEvjg==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.0", - "MonoMod.ILHelpers": "1.0.1", - "MonoMod.Utils": "25.0.4" + "MonoMod.Backports": "1.1.2", + "MonoMod.ILHelpers": "1.1.0", + "MonoMod.Utils": "25.0.8" } }, "MonoMod.ILHelpers": { "type": "Transitive", - "resolved": "1.0.1", - "contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA==" + "resolved": "1.1.0", + "contentHash": "L2FWjhTrv7tcIxshfZ+M3OcaNr4cNw0IwiVZEgwqRnZ5QAN3+RrNJ8ZwCzwXUWyPDqooJxMcjjg8PsSYUiNBjQ==" }, "MonoMod.Utils": { "type": "Transitive", - "resolved": "25.0.4", - "contentHash": "cB94MaZtFD9u4clYEFTwM4jGXnJnzXsxYF3yBpMZKHhXOas66tMF2frbdYte023i0MH4C5iRJbDjxHmA4x5VgA==", + "resolved": "25.0.8", + "contentHash": "8wfyawgvGqUvfchAj7/gPazAjXO8CWNyXH+C0az+hgJH/80zVL5LxDhQMz0NQTyoCEJWU6gNBGc7CL+G7vCbaQ==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.0", - "MonoMod.ILHelpers": "1.0.1" + "MonoMod.Backports": "1.1.2", + "MonoMod.ILHelpers": "1.1.0" } }, "Newtonsoft.Json": { @@ -198,95 +198,96 @@ }, "NuGet.Commands": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "8GjJQZVbNJuttVynsRWsgqhTZiBbjxRr2PgZ3E7zPxDBmKUazkQ1s/FqScm83w8Xq5OdEtegkU0dZhibfRkKeg==", + "resolved": "6.12.1", + "contentHash": "wP1gRYoW+yeY0mmPRBGhI7DFZ8JoGKzWfbiSsceHzVTp00WfnqiEAqSQtB6QJkc5jukoajtP3U1+lx0mErfFsA==", "dependencies": { "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", "Microsoft.Extensions.FileSystemGlobbing": "6.0.0", - "NuGet.Credentials": "6.11.0", - "NuGet.ProjectModel": "6.11.0" + "NuGet.Credentials": "6.12.1", + "NuGet.ProjectModel": "6.12.1" } }, "NuGet.Common": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "T3bCiKUSx8wdYpcqr6Dbx93zAqFp689ee/oa1tH22XI/xl7EUzQ7No/WlE1FUqvEX1+Mqar3wRNAn2O/yxo94g==", + "resolved": "6.12.1", + "contentHash": "nk8nTdhQl4x2VaAQUvefI7DDYAuBDlE+OZZRffm50Qx5dUAEq8wkc5JIqrN2lTEohObHPI/SXyG2UFdMQkrdyg==", "dependencies": { - "NuGet.Frameworks": "6.11.0" + "NuGet.Frameworks": "6.12.1" } }, "NuGet.Configuration": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "73QprQqmumFrv3Ooi4YWpRYeBj8jZy9gNdOaOCp4pPInpt41SJJAz/aP4je+StwIJvi5HsgPPecLKekDIQEwKg==", + "resolved": "6.12.1", + "contentHash": "IRwlY1379ZgJ0oEJvjD+lDuOhJ5S1fsU5n/bEC5/i0+N9bo2WIMDAdaQ/qIdyK/gMJ/YWS+++GSX6rN7luqEvg==", "dependencies": { - "NuGet.Common": "6.11.0", + "NuGet.Common": "6.12.1", "System.Security.Cryptography.ProtectedData": "4.4.0" } }, "NuGet.Credentials": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "TeMvEyoqkIxDnYJjPCpD48vV5XoDATmyX2kGYYB2MIzWBT24ZjWauTda72hYBzg0OLLiuafxfnNJKGG6IHHzOQ==", + "resolved": "6.12.1", + "contentHash": "VdqUIupqm16kiedkv/iyBX5yaVwCI9piV7IvHf0FLgFciCnx22jI8luHXTqeJgWsHOLJl+nTjeV3RY/AcccK7Q==", "dependencies": { - "NuGet.Protocol": "6.11.0" + "NuGet.Protocol": "6.12.1" } }, "NuGet.DependencyResolver.Core": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "SoiPKPooA+IF+iCsX1ykwi3M0e+yBL34QnwIP3ujhQEn1dhlP/N1XsYAnKkJPxV15EZCahuuS4HtnBsZx+CHKA==", + "resolved": "6.12.1", + "contentHash": "Nn4+pXW1qxGcq0OEQBJBh/FjKvWhzD49+kRzuOC9SkRZOrHsTaA12EsQ1mEE4rMUfqviaosmPEtvodJ4eKCmIw==", "dependencies": { - "NuGet.Configuration": "6.11.0", - "NuGet.LibraryModel": "6.11.0", - "NuGet.Protocol": "6.11.0" + "NuGet.Configuration": "6.12.1", + "NuGet.LibraryModel": "6.12.1", + "NuGet.Protocol": "6.12.1" } }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "Ew/mrfmLF5phsprysHbph2+tdZ10HMHAURavsr/Kx1WhybDG4vmGuoNLbbZMZOqnPRdpyCTc42OKWLoedxpYtA==" + "resolved": "6.12.1", + "contentHash": "kPaRD5RJC0ByUg+yGX6bDz5XHMI7OYmQwP8kbtef+vZ+csj/VDb5Bwas4ChxwhoAbI8lEvwP5/3aViQPpgNBow==" }, "NuGet.LibraryModel": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "KUV2eeMICMb24OPcICn/wgncNzt6+W+lmFVO5eorTdo1qV4WXxYGyG1NTPiCY+Nrv5H/Ilnv9UaUM2ozqSmnjw==", + "resolved": "6.12.1", + "contentHash": "IqX7Ze7qSbhx22lsdnMbLJpcqrmwGyQbyNk9JSsZ/u5p6PIaZyeWsvHHy+oXU8fuRmmKfHBnZEsceaCAw6Xy5A==", "dependencies": { - "NuGet.Common": "6.11.0", - "NuGet.Versioning": "6.11.0" + "NuGet.Common": "6.12.1", + "NuGet.Versioning": "6.12.1" } }, "NuGet.Packaging": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "VmUv2LedVuPY1tfNybORO2I9IuqOzeV7I5JBD+PwNvJq2bAqovi4FCw2cYI0g+kjOJXBN2lAJfrfnqtUOlVJdQ==", + "resolved": "6.12.1", + "contentHash": "6s5NO3VNX6fIx6GwuWZtIsal9W1xkelYd3Vg2KUAg1zGqnKC3wB5IZlombvVGVGcwyl/A+iDvpUwSvgeDoB3wA==", "dependencies": { "Newtonsoft.Json": "13.0.3", - "NuGet.Configuration": "6.11.0", - "NuGet.Versioning": "6.11.0", + "NuGet.Configuration": "6.12.1", + "NuGet.Versioning": "6.12.1", + "System.Formats.Asn1": "8.0.1", "System.Security.Cryptography.Pkcs": "6.0.4" } }, "NuGet.ProjectModel": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "g0KtmDH6fas97WsN73yV2h1F5JT9o6+Y0wlPK+ij9YLKaAXaF6+1HkSaQMMJ+xh9/jCJG9G6nau6InOlb1g48g==", + "resolved": "6.12.1", + "contentHash": "nzpVqooG0qumADw5t8YMg9e+ezVqUhhoGvoihVmu5O9gJDqzkRYswQzyIVsE24dirBQabW0X0Sv53f6ZLJCv+g==", "dependencies": { - "NuGet.DependencyResolver.Core": "6.11.0" + "NuGet.DependencyResolver.Core": "6.12.1" } }, "NuGet.Protocol": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "p5B8oNLLnGhUfMbcS16aRiegj11pD6k+LELyRBqvNFR/pE3yR1XT+g1XS33ME9wvoU+xbCGnl4Grztt1jHPinw==", + "resolved": "6.12.1", + "contentHash": "VBN7OtG/Y9Rnj1WT3G8X88ZHu5Pq+yzca5Z6OI/FWXcENVAQkUl0ml6Cv8ghOqYyiuvnObGDV9oWLD/bIuVtDw==", "dependencies": { - "NuGet.Packaging": "6.11.0" + "NuGet.Packaging": "6.12.1" } }, "NuGet.Versioning": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "v/GGlIj2dd7svplFmASWEueu62veKW0MrMtBaZ7QG8aJTSGv2yE+pgUGhXRcQ4nxNOEq/wLBrz1vkth/1SND7A==" + "resolved": "6.12.1", + "contentHash": "fJ6rFYANDnohFsdpaY79FvrJxI6murmoOxXz6nZlf819F48+IBKMnAIg3oIBRtZq5y498ObMtKnro5IitvizUg==" }, "protobuf-net": { "type": "Transitive", @@ -295,8 +296,8 @@ }, "SemanticVersioning": { "type": "Transitive", - "resolved": "2.0.2", - "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA==" + "resolved": "3.0.0", + "contentHash": "RR+8GbPQ/gjDqov/1QN1OPoUlbUruNwcL3WjWCeLw+MY7+od/ENhnkYxCfAC6rQLIu3QifaJt3kPYyP3RumqMQ==" }, "SharpDX": { "type": "Transitive", @@ -313,8 +314,8 @@ }, "SpaceEngineersDedicated.ReferenceAssemblies": { "type": "Transitive", - "resolved": "1.205.23", - "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==", + "resolved": "1.205.26", + "contentHash": "kQSFCLgi0nFUhLvXlp9D2w4cTnXtEIctWtNlK+Vw4FAofws60rwR6Kil9YBNlaDyoo19dcyNt3bs4G9VculcIA==", "dependencies": { "SharpDX": "4.2.0-keen-cringe", "protobuf-net": "1.0.0" @@ -332,8 +333,8 @@ }, "System.Formats.Asn1": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T6fD00dQ3NTbPDy31m4eQUwKW84s03z0N2C8HpOklyeaDgaJPa/TexP4/SkORMSOwc7WhKifnA6Ya33AkzmafA==" + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==" }, "System.Linq.Async": { "type": "Transitive", @@ -369,18 +370,10 @@ "resolved": "4.4.0", "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog==" }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" - }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==", - "dependencies": { - "System.Text.Encodings.Web": "8.0.0" - } + "resolved": "9.0.0", + "contentHash": "js7+qAu/9mQvnhA4EfGMZNEzXtJCDxgkgj8ohuxq/Qxv+R56G+ljefhiJHOxTNiw54q8vmABCWUwkMulNdlZ4A==" }, "Torch.SixLabors.ImageSharp": { "type": "Transitive", @@ -398,48 +391,48 @@ }, "xunit.analyzers": { "type": "Transitive", - "resolved": "1.15.0", - "contentHash": "s+M8K/Rtlgr6CmD7AYQKrNTvT5sh0l0ZKDoZ3Z/ExhlIwfV9mGAMR4f7KqIB7SSK7ZOhqDTgTUMYPmKfmvWUWQ==" + "resolved": "1.18.0", + "contentHash": "OtFMHN8yqIcYP9wcVIgJrq01AfTxijjAqVDy/WeQVSyrDC1RzBWeQPztL49DN2syXRah8TYnfvk035s7L95EZQ==" }, "xunit.assert": { "type": "Transitive", - "resolved": "2.9.0", - "contentHash": "Z/1pyia//860wEYTKn6Q5dmgikJdRjgE4t5AoxJkK8oTmidzPLEPG574kmm7LFkMLbH6Frwmgb750kcyR+hwoA==" + "resolved": "2.9.3", + "contentHash": "/Kq28fCE7MjOV42YLVRAJzRF0WmEqsmflm0cfpMjGtzQ2lR5mYVj1/i0Y8uDAOLczkL3/jArrwehfMD0YogMAA==" }, "xunit.core": { "type": "Transitive", - "resolved": "2.9.0", - "contentHash": "uRaop9tZsZMCaUS4AfbSPGYHtvywWnm8XXFNUqII7ShWyDBgdchY6gyDNgO4AK1Lv/1NNW61Zq63CsDV6oH6Jg==", + "resolved": "2.9.3", + "contentHash": "BiAEvqGvyme19wE0wTKdADH+NloYqikiU0mcnmiNyXaF9HyHmE6sr/3DC5vnBkgsWaE6yPyWszKSPSApWdRVeQ==", "dependencies": { - "xunit.extensibility.core": "[2.9.0]", - "xunit.extensibility.execution": "[2.9.0]" + "xunit.extensibility.core": "[2.9.3]", + "xunit.extensibility.execution": "[2.9.3]" } }, "xunit.extensibility.core": { "type": "Transitive", - "resolved": "2.9.0", - "contentHash": "zjDEUSxsr6UNij4gIwCgMqQox+oLDPRZ+mubwWLci+SssPBFQD1xeRR4SvgBuXqbE0QXCJ/STVTp+lxiB5NLVA==", + "resolved": "2.9.3", + "contentHash": "kf3si0YTn2a8J8eZNb+zFpwfoyvIrQ7ivNk5ZYA5yuYk1bEtMe4DxJ2CF/qsRgmEnDr7MnW1mxylBaHTZ4qErA==", "dependencies": { "xunit.abstractions": "2.0.3" } }, "xunit.extensibility.execution": { "type": "Transitive", - "resolved": "2.9.0", - "contentHash": "5ZTQZvmPLlBw6QzCOwM0KnMsZw6eGjbmC176QHZlcbQoMhGIeGcYzYwn5w9yXxf+4phtplMuVqTpTbFDQh2bqQ==", + "resolved": "2.9.3", + "contentHash": "yMb6vMESlSrE3Wfj7V6cjQ3S4TXdXpRqYeNEI3zsX31uTsGMJjEw6oD5F5u1cHnMptjhEECnmZSsPxB6ChZHDQ==", "dependencies": { - "xunit.extensibility.core": "[2.9.0]" + "xunit.extensibility.core": "[2.9.3]" } }, "torch": { "type": "Project", "dependencies": { "ControlzEx": "[5.0.2, )", - "Lib.Harmony.Thin": "[2.3.3-torch, )", + "Lib.Harmony.Thin": "[2.3.4-torch, )", "MahApps.Metro": "[2.4.10, )", - "Microsoft.CodeAnalysis.CSharp": "[4.11.0, )", - "Microsoft.CodeAnalysis.Common": "[4.11.0, )", - "NLog": "[5.3.3, )", + "Microsoft.CodeAnalysis.CSharp": "[4.12.0, )", + "Microsoft.CodeAnalysis.Common": "[4.12.0, )", + "NLog": "[5.3.4, )", "System.ComponentModel.Annotations": "[5.0.0, )", "Torch.API": "[1.0.0, )", "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )" @@ -448,18 +441,18 @@ "torch.api": { "type": "Project", "dependencies": { - "JetBrains.Annotations": "[2024.2.0, )", - "Microsoft.Extensions.Configuration.Binder": "[8.0.2, )", - "NLog": "[5.3.3, )", - "NuGet.Commands": "[6.11.0, )", - "NuGet.DependencyResolver.Core": "[6.11.0, )", - "SemanticVersioning": "[2.0.2, )", + "JetBrains.Annotations": "[2024.3.0, )", + "Microsoft.Extensions.Configuration.Binder": "[9.0.0, )", + "NLog": "[5.3.4, )", + "NuGet.Commands": "[6.12.1, )", + "NuGet.DependencyResolver.Core": "[6.12.1, )", + "SemanticVersioning": "[3.0.0, )", "SpaceEngineersDedicated.ReferenceAssemblies": "[1.*, )", "System.Linq.Async": "[6.0.1, )" } } }, - "net8.0-windows7.0/win-x64": { + "net9.0-windows7.0/win-x64": { "System.Security.Cryptography.Pkcs": { "type": "Transitive", "resolved": "6.0.4", @@ -472,11 +465,6 @@ "type": "Transitive", "resolved": "4.4.0", "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog==" - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" } } } diff --git a/Torch.sln b/Torch.sln index f6150e1..ab1007e 100644 --- a/Torch.sln +++ b/Torch.sln @@ -1,22 +1,22 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.14 +# Visual Studio Version 17 +VisualStudioVersion = 17.10.34916.146 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Torch", "Torch\Torch.csproj", "{7E01635C-3B67-472E-BCD6-C5539564F214}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Torch", "Torch\Torch.csproj", "{7E01635C-3B67-472E-BCD6-C5539564F214}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Torch.API", "Torch.API\Torch.API.csproj", "{FBA5D932-6254-4A1E-BAF4-E229FA94E3C2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Torch.API", "Torch.API\Torch.API.csproj", "{FBA5D932-6254-4A1E-BAF4-E229FA94E3C2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Torch.Server", "Torch.Server\Torch.Server.csproj", "{CA50886B-7B22-4CD8-93A0-C06F38D4F77D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Torch.Server", "Torch.Server\Torch.Server.csproj", "{CA50886B-7B22-4CD8-93A0-C06F38D4F77D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7AD02A71-1D4C-48F9-A8C1-789A5512424F}" ProjectSection(SolutionItems) = preProject NLog.config = NLog.config EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Torch.Tests", "Torch.Tests\Torch.Tests.csproj", "{C3C8B671-6AD1-44AA-A8DA-E0C0DC0FEDF5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Torch.Tests", "Torch.Tests\Torch.Tests.csproj", "{C3C8B671-6AD1-44AA-A8DA-E0C0DC0FEDF5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Torch.Server.Tests", "Torch.Server.Tests\Torch.Server.Tests.csproj", "{9EFD1D91-2FA2-47ED-B537-D8BC3B0E543E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Torch.Server.Tests", "Torch.Server.Tests\Torch.Server.Tests.csproj", "{9EFD1D91-2FA2-47ED-B537-D8BC3B0E543E}" EndProject Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Torch.Mod", "Torch.Mod\Torch.Mod.shproj", "{3CE4D2E9-B461-4F19-8233-F87E0DFDDD74}" EndProject @@ -26,31 +26,27 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CI/CD workflows", "CI/CD wo EndProjectSection EndProject Global - GlobalSection(SharedMSBuildProjectFiles) = preSolution - Torch.Mod\Torch.Mod.projitems*{3ce4d2e9-b461-4f19-8233-f87e0dfddd74}*SharedItemsImports = 13 - Torch.Mod\Torch.Mod.projitems*{7e01635c-3b67-472e-bcd6-c5539564f214}*SharedItemsImports = 4 - EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7E01635C-3B67-472E-BCD6-C5539564F214}.Release|Any CPU.ActiveCfg = Release|Any CPU {7E01635C-3B67-472E-BCD6-C5539564F214}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7E01635C-3B67-472E-BCD6-C5539564F214}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7E01635C-3B67-472E-BCD6-C5539564F214}.Release|Any CPU.ActiveCfg = Release|Any CPU {7E01635C-3B67-472E-BCD6-C5539564F214}.Release|Any CPU.Build.0 = Release|Any CPU - {FBA5D932-6254-4A1E-BAF4-E229FA94E3C2}.Release|Any CPU.ActiveCfg = Release|Any CPU {FBA5D932-6254-4A1E-BAF4-E229FA94E3C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FBA5D932-6254-4A1E-BAF4-E229FA94E3C2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FBA5D932-6254-4A1E-BAF4-E229FA94E3C2}.Release|Any CPU.ActiveCfg = Release|Any CPU {FBA5D932-6254-4A1E-BAF4-E229FA94E3C2}.Release|Any CPU.Build.0 = Release|Any CPU - {CA50886B-7B22-4CD8-93A0-C06F38D4F77D}.Release|Any CPU.ActiveCfg = Release|Any CPU {CA50886B-7B22-4CD8-93A0-C06F38D4F77D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CA50886B-7B22-4CD8-93A0-C06F38D4F77D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CA50886B-7B22-4CD8-93A0-C06F38D4F77D}.Release|Any CPU.ActiveCfg = Release|Any CPU {CA50886B-7B22-4CD8-93A0-C06F38D4F77D}.Release|Any CPU.Build.0 = Release|Any CPU - {9EFD1D91-2FA2-47ED-B537-D8BC3B0E543E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9EFD1D91-2FA2-47ED-B537-D8BC3B0E543E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C3C8B671-6AD1-44AA-A8DA-E0C0DC0FEDF5}.Release|Any CPU.ActiveCfg = Release|Any CPU {C3C8B671-6AD1-44AA-A8DA-E0C0DC0FEDF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C3C8B671-6AD1-44AA-A8DA-E0C0DC0FEDF5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9EFD1D91-2FA2-47ED-B537-D8BC3B0E543E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9EFD1D91-2FA2-47ED-B537-D8BC3B0E543E}.Release|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -61,6 +57,10 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {BB51D91F-958D-4B63-A897-3C40642ACD3E} EndGlobalSection + GlobalSection(SharedMSBuildProjectFiles) = preSolution + Torch.Mod\Torch.Mod.projitems*{3ce4d2e9-b461-4f19-8233-f87e0dfddd74}*SharedItemsImports = 13 + Torch.Mod\Torch.Mod.projitems*{7e01635c-3b67-472e-bcd6-c5539564f214}*SharedItemsImports = 5 + EndGlobalSection GlobalSection(Performance) = preSolution HasPerformanceSessions = true EndGlobalSection diff --git a/Torch/Managers/PatchManager/MSIL/MsilInstruction.cs b/Torch/Managers/PatchManager/MSIL/MsilInstruction.cs index fce1a1a..4ce9f29 100644 --- a/Torch/Managers/PatchManager/MSIL/MsilInstruction.cs +++ b/Torch/Managers/PatchManager/MSIL/MsilInstruction.cs @@ -300,19 +300,13 @@ namespace Torch.Managers.PatchManager.MSIL return sb.ToString(); } - -#pragma warning disable 649 - [ReflectedMethod(Name = "StackChange")] - private static Func _stackChange; -#pragma warning restore 649 - /// /// Estimates the stack delta for this instruction. /// /// Stack delta public int StackChange() { - int num = _stackChange.Invoke(OpCode); + int num = OpCode.EvaluationStackDelta; if ((OpCode == OpCodes.Call || OpCode == OpCodes.Callvirt || OpCode == OpCodes.Newobj) && Operand is MsilOperandInline inline) { diff --git a/Torch/Patches/ScriptCompilerPatch.cs b/Torch/Patches/ScriptCompilerPatch.cs index de5975f..9a2643d 100644 --- a/Torch/Patches/ScriptCompilerPatch.cs +++ b/Torch/Patches/ScriptCompilerPatch.cs @@ -10,6 +10,7 @@ using System.Reflection; using System.Reflection.Emit; using System.Text.RegularExpressions; using System.Threading; +using HarmonyLib; using Microsoft.CodeAnalysis; using Torch.Managers.PatchManager; using Torch.Managers.PatchManager.MSIL; @@ -31,15 +32,23 @@ namespace Torch.Patches [ReflectedMethodInfo(null, "AllowMembers", TypeName = "VRage.Scripting.MyScriptWhitelist+MyWhitelistBatch, VRage.Scripting")] private static MethodInfo _allowMembersMethod; + [ReflectedMethodInfo(null, "ResolveTypeSymbol", TypeName = "VRage.Scripting.MyScriptWhitelist+Batch, VRage.Scripting")] + private static MethodInfo _resolveTypeSymbolMethod; + public static void Patch(PatchContext context) { - context.GetPattern(typeof(MyScriptWhitelist).GetConstructor(new[] {typeof(MyScriptCompiler)})) + context.GetPattern(typeof(MyScriptWhitelist).GetConstructor([typeof(MyScriptCompiler)])) .AddPrefix(nameof(WhitelistCtorPrefix)); context.GetPattern(Info.OfMethod("VRage.Scripting", "VRage.Scripting.MyVRageScriptingInternal", "Initialize")) .AddPrefix(nameof(InitializePrefix)); context.GetPattern(_allowMembersMethod).AddPrefix(nameof(AllowMembersPrefix)); - context.GetPattern(_register1Method).AddTranspiler(nameof(RegisterTranspiler)); - context.GetPattern(_register2Method).AddTranspiler(nameof(RegisterTranspiler)); + + var harmony = new Harmony(nameof(ScriptCompilerPatch)); + + harmony.Patch(_allowMembersMethod, finalizer: new(typeof(ScriptCompilerPatch), nameof(RegisterFinalizer))); + harmony.Patch(_register1Method, finalizer: new(typeof(ScriptCompilerPatch), nameof(RegisterFinalizer))); + harmony.Patch(_register2Method, finalizer: new(typeof(ScriptCompilerPatch), nameof(RegisterFinalizer))); + harmony.Patch(_resolveTypeSymbolMethod, finalizer: new(typeof(ScriptCompilerPatch), nameof(RegisterFinalizer))); } private static void WhitelistCtorPrefix(MyScriptCompiler scriptCompiler) @@ -101,22 +110,9 @@ namespace Torch.Patches members = members.Where(b => b is { }).ToArray(); } - private static IEnumerable RegisterTranspiler(IEnumerable instructions) + private static Exception RegisterFinalizer(Exception __exception) { - var ins = instructions.ToList(); - var throwIns = ins.FindAll(b => b.OpCode == OpCodes.Throw).Select(b => ins.IndexOf(b)); - foreach (var index in throwIns) - { - var i = index; - do - { - ins[i] = new(OpCodes.Nop); - } while (ins[--i].OpCode.FlowControl != FlowControl.Cond_Branch); - - ins[index] = new(OpCodes.Ret); - } - - return ins; + return __exception is MyWhitelistException ? null : __exception; } } } \ No newline at end of file diff --git a/Torch/Plugins/AssemblyRewriter.cs b/Torch/Plugins/AssemblyRewriter.cs index b0352c4..cf4c96d 100644 --- a/Torch/Plugins/AssemblyRewriter.cs +++ b/Torch/Plugins/AssemblyRewriter.cs @@ -5,6 +5,8 @@ using System.IO.Compression; using System.Linq; using System.Reflection; using Mono.Cecil; +using Mono.Cecil.Cil; +using Mono.Cecil.Pdb; using NLog; namespace Torch.Plugins; @@ -14,13 +16,17 @@ internal static class AssemblyRewriter private static readonly ILogger Log = LogManager.GetCurrentClassLogger(); private static readonly ZipResolver _zipResolver; private static readonly DefaultAssemblyResolver _defaultResolver; + private static readonly DefaultSymbolReaderProvider _defaultSymbolReader; + private static readonly ZipSymbolReader _zipSymbolReader; static AssemblyRewriter() { _defaultResolver = new(); _zipResolver = new(_defaultResolver); + _defaultSymbolReader = new(); + _zipSymbolReader = new(_defaultSymbolReader); _defaultResolver.AddSearchDirectory(AppContext.BaseDirectory); - _defaultResolver.AddSearchDirectory(Path.Combine(Directory.GetCurrentDirectory(), "DedicatedServer64")); + _defaultResolver.AddSearchDirectory(ApplicationContext.Current.GameBinariesDirectory.FullName); #if !DEBUG _defaultResolver.AddSearchDirectory(Path.Join(AppContext.BaseDirectory, "torch64")); #endif @@ -29,6 +35,7 @@ internal static class AssemblyRewriter public static Assembly ProcessWeavers(this Stream stream, ZipArchive archive) { _zipResolver.Archive = archive; + _zipSymbolReader.Archive = archive; using var assStream = new MemoryStream(); stream.CopyTo(assStream); @@ -36,7 +43,7 @@ internal static class AssemblyRewriter try { - var ass = ProcessInternal(assStream, _zipResolver); + var ass = ProcessInternal(assStream, _zipResolver, _zipSymbolReader); return ass; } catch (Exception e) @@ -47,6 +54,7 @@ internal static class AssemblyRewriter finally { _zipResolver.Archive = null; + _zipSymbolReader.Archive = null; } } @@ -56,17 +64,19 @@ internal static class AssemblyRewriter using var assStream = new MemoryStream(); stream.CopyTo(assStream); assStream.Position = 0; - var ass = ProcessInternal(assStream, _defaultResolver); + var ass = ProcessInternal(assStream, _defaultResolver, _defaultSymbolReader); _defaultResolver.RemoveSearchDirectory(path); return ass; } - private static Assembly ProcessInternal(Stream inputStream, IAssemblyResolver resolver) + private static Assembly ProcessInternal(Stream inputStream, IAssemblyResolver resolver, ISymbolReaderProvider symbolReaderProvider = null) { using var assembly = AssemblyDefinition.ReadAssembly(inputStream, new() { AssemblyResolver = resolver, - ReadSymbols = true + SymbolReaderProvider = symbolReaderProvider, + ThrowIfSymbolsAreNotMatching = false, + ReadSymbols = symbolReaderProvider is not null }); foreach (var fieldDefinition in FindAllToRewrite(assembly.MainModule)) { @@ -86,19 +96,13 @@ internal static class AssemblyRewriter private static bool HasValidAttributes(FieldDefinition definition) => definition.CustomAttributes.Any(b => b.AttributeType.Name.Contains("Reflected") || b.AttributeType.Name == "DependencyAttribute"); - private class ZipResolver : IAssemblyResolver + private class ZipResolver(IAssemblyResolver fallbackResolver) : IAssemblyResolver { - private readonly IAssemblyResolver _fallbackResolver; public ZipArchive Archive { get; set; } - - public ZipResolver(IAssemblyResolver fallbackResolver) - { - _fallbackResolver = fallbackResolver; - } public void Dispose() { - _fallbackResolver.Dispose(); + fallbackResolver.Dispose(); } public AssemblyDefinition Resolve(AssemblyNameReference name) @@ -111,7 +115,7 @@ internal static class AssemblyRewriter var fileName = $"{name.Name}.dll"; if (Archive.Entries.FirstOrDefault(entry => entry.Name == fileName) is not { } archiveEntry) - return _fallbackResolver.Resolve(name, parameters); + return fallbackResolver.Resolve(name, parameters); using var stream = archiveEntry.Open(); using var memStream = new MemoryStream(); @@ -121,4 +125,36 @@ internal static class AssemblyRewriter return AssemblyDefinition.ReadAssembly(memStream, parameters); } } + + private class ZipSymbolReader(ISymbolReaderProvider fallbackProvider) : ISymbolReaderProvider + { + private readonly PdbReaderProvider _pdbReaderProvider = new(); + public ZipArchive Archive { get; set; } + + public ISymbolReader GetSymbolReader(ModuleDefinition module, string fileName) + { + fileName = Path.GetFileNameWithoutExtension(string.IsNullOrEmpty(fileName) ? module.Name : fileName); + if (Archive.Entries.FirstOrDefault(entry => entry.Name == $"{fileName}.pdb") is not { } archiveEntry) + try + { + return fallbackProvider.GetSymbolReader(module, fileName + ".dll"); + } + catch (SymbolsNotFoundException) + { + return null; + } + + using var stream = archiveEntry.Open(); + var memStream = new MemoryStream(); + stream.CopyTo(memStream); + memStream.Position = 0; + + return _pdbReaderProvider.GetSymbolReader(module, memStream); + } + + public ISymbolReader GetSymbolReader(ModuleDefinition module, Stream symbolStream) + { + return fallbackProvider.GetSymbolReader(module, symbolStream); + } + } } \ No newline at end of file diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj index bb63da1..c848787 100644 --- a/Torch/Torch.csproj +++ b/Torch/Torch.csproj @@ -14,14 +14,14 @@ - + - - - + + + diff --git a/Torch/packages.lock.json b/Torch/packages.lock.json index e3ce0bd..8ff0446 100644 --- a/Torch/packages.lock.json +++ b/Torch/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - "net8.0-windows7.0": { + "net9.0-windows7.0": { "ControlzEx": { "type": "Direct", "requested": "[5.0.2, )", @@ -23,12 +23,12 @@ }, "Lib.Harmony.Thin": { "type": "Direct", - "requested": "[2.3.3-torch, )", - "resolved": "2.3.3-torch", - "contentHash": "djQtMUpURRgP+Ytf1EgQwu4XnJL3J3bz5kyTVcRDNb632N62/A4CbduG96CUsKhL944yGNAJnLX3zfWldPYOTw==", + "requested": "[2.3.4-torch, )", + "resolved": "2.3.4-torch", + "contentHash": "UnLUnLLiXfHZdKa1zhi6w8cl8tJTrpVixLtvjFEVtlDA6Rkf06OcZ2gSidcbcgKjTcR+fk5Qsdos3mU5oohzfg==", "dependencies": { - "MonoMod.Core": "1.1.0", - "System.Text.Json": "8.0.1" + "MonoMod.Core": "1.2.2", + "System.Text.Json": "9.0.0" } }, "MahApps.Metro": { @@ -42,9 +42,9 @@ }, "Microsoft.CodeAnalysis.Common": { "type": "Direct", - "requested": "[4.11.0, )", - "resolved": "4.11.0", - "contentHash": "djf8ujmqYImFgB04UGtcsEhHrzVqzHowS+EEl/Yunc5LdrYrZhGBWUTXoCF0NzYXJxtfuD+UVQarWpvrNc94Qg==", + "requested": "[4.12.0, )", + "resolved": "4.12.0", + "contentHash": "c1kNYihL2gdcuU1dqm8R8YeA4YkB43TpU3pa2r66Uooh6AAhRtENzj9A4Kj0a+H8JDDyuTjNZql9XlVUzV+UjA==", "dependencies": { "Microsoft.CodeAnalysis.Analyzers": "3.3.4", "System.Collections.Immutable": "8.0.0", @@ -53,21 +53,21 @@ }, "Microsoft.CodeAnalysis.CSharp": { "type": "Direct", - "requested": "[4.11.0, )", - "resolved": "4.11.0", - "contentHash": "6XYi2EusI8JT4y2l/F3VVVS+ISoIX9nqHsZRaG6W5aFeJ5BEuBosHfT/ABb73FN0RZ1Z3cj2j7cL28SToJPXOw==", + "requested": "[4.12.0, )", + "resolved": "4.12.0", + "contentHash": "30vVQ1MizeC22iEdEvI2w0eTIYG43/L20yBzuQH01xKzJgHAoWehzI2F8u07o4mXh4DGMOjQF7aEm0zzvsG3Mg==", "dependencies": { "Microsoft.CodeAnalysis.Analyzers": "3.3.4", - "Microsoft.CodeAnalysis.Common": "[4.11.0]", + "Microsoft.CodeAnalysis.Common": "[4.12.0]", "System.Collections.Immutable": "8.0.0", "System.Reflection.Metadata": "8.0.0" } }, "NLog": { "type": "Direct", - "requested": "[5.3.3, )", - "resolved": "5.3.3", - "contentHash": "cy0+hlrUbYu+6mgUsILqCcqlJ2Csqyt2lm8y9T9kE8nhgwl8SvR+LM21QX4nmzFCPiowbrTFYxNF8+gWpy7/HQ==" + "requested": "[5.3.4, )", + "resolved": "5.3.4", + "contentHash": "gLy7+O1hEYJXIlcTr1/VWjGXrZTQFZzYNO18IWasD64pNwz0BreV+nHLxWKXWZzERRzoKnsk2XYtwLkTVk7J1A==" }, "PropertyChanged.Fody": { "type": "Direct", @@ -101,8 +101,8 @@ }, "JetBrains.Annotations": { "type": "Transitive", - "resolved": "2024.2.0", - "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw==" + "resolved": "2024.3.0", + "contentHash": "ox5pkeLQXjvJdyAB4b2sBYAlqZGLh3PjSnP1bQNVx72ONuTJ9+34/+Rq91Fc0dG29XG9RgZur9+NcP4riihTug==" }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", @@ -116,18 +116,18 @@ }, "Microsoft.Extensions.Configuration.Abstractions": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", + "resolved": "9.0.0", + "contentHash": "lqvd7W3FGKUO1+ZoUEMaZ5XDJeWvjpy2/M/ptCGz3tXLD4HWVaSzjufsAsjemasBEg+2SxXVtYVvGt5r2nKDlg==", "dependencies": { - "Microsoft.Extensions.Primitives": "8.0.0" + "Microsoft.Extensions.Primitives": "9.0.0" } }, "Microsoft.Extensions.Configuration.Binder": { "type": "Transitive", - "resolved": "8.0.2", - "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==", + "resolved": "9.0.0", + "contentHash": "RiScL99DcyngY9zJA2ROrri7Br8tn5N4hP4YNvGdTN/bvg1A3dwvDOxHnNZ3Im7x2SJ5i4LkX1uPiR/MfSFBLQ==", "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + "Microsoft.Extensions.Configuration.Abstractions": "9.0.0" } }, "Microsoft.Extensions.FileProviders.Abstractions": { @@ -145,8 +145,8 @@ }, "Microsoft.Extensions.Primitives": { "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" + "resolved": "9.0.0", + "contentHash": "N3qEBzmLMYiASUlKxxFIISP4AiwuPTHF5uCh+2CWSwwzAJiIYx0kBJsS30cp1nvhSySFAVi30jecD307jV+8Kg==" }, "Microsoft.Xaml.Behaviors.Wpf": { "type": "Transitive", @@ -160,36 +160,36 @@ }, "MonoMod.Backports": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "GUAjCrCZEddqHKHFA7Lh61PgTzoKY7gfBShFe0hQe0p8iynHhBK3TWGyRi+QIw/PGfaRPwx6c33CPGFURBVM6g==", + "resolved": "1.1.2", + "contentHash": "baYlNy8n8kmaNhNvqmZ/dIPOeO1r9//dG1i2WbunMWtWZ2EKtIgmXaS+ZzphzTsikkGnoD4Jwr5g0TVdpDjgpw==", "dependencies": { - "MonoMod.ILHelpers": "1.0.1" + "MonoMod.ILHelpers": "1.1.0" } }, "MonoMod.Core": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "Ks8RntZGVcktr2QF/AovTEbuOkrgXz6omjrvT5LRveOIQJuy+IFuEQPBVWu+cSKVIoZD5XkpRFvlVrItgPIrXw==", + "resolved": "1.2.2", + "contentHash": "3R9mQ7TxeQQBFLtGTR2VIDSBGx/I7d8RYpxvW1Mot0/PB6+UOnHr+lkw7dj8cus8YSnLdCFT+CG4JW89daEvjg==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.0", - "MonoMod.ILHelpers": "1.0.1", - "MonoMod.Utils": "25.0.4" + "MonoMod.Backports": "1.1.2", + "MonoMod.ILHelpers": "1.1.0", + "MonoMod.Utils": "25.0.8" } }, "MonoMod.ILHelpers": { "type": "Transitive", - "resolved": "1.0.1", - "contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA==" + "resolved": "1.1.0", + "contentHash": "L2FWjhTrv7tcIxshfZ+M3OcaNr4cNw0IwiVZEgwqRnZ5QAN3+RrNJ8ZwCzwXUWyPDqooJxMcjjg8PsSYUiNBjQ==" }, "MonoMod.Utils": { "type": "Transitive", - "resolved": "25.0.4", - "contentHash": "cB94MaZtFD9u4clYEFTwM4jGXnJnzXsxYF3yBpMZKHhXOas66tMF2frbdYte023i0MH4C5iRJbDjxHmA4x5VgA==", + "resolved": "25.0.8", + "contentHash": "8wfyawgvGqUvfchAj7/gPazAjXO8CWNyXH+C0az+hgJH/80zVL5LxDhQMz0NQTyoCEJWU6gNBGc7CL+G7vCbaQ==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.0", - "MonoMod.ILHelpers": "1.0.1" + "MonoMod.Backports": "1.1.2", + "MonoMod.ILHelpers": "1.1.0" } }, "Newtonsoft.Json": { @@ -199,95 +199,96 @@ }, "NuGet.Commands": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "8GjJQZVbNJuttVynsRWsgqhTZiBbjxRr2PgZ3E7zPxDBmKUazkQ1s/FqScm83w8Xq5OdEtegkU0dZhibfRkKeg==", + "resolved": "6.12.1", + "contentHash": "wP1gRYoW+yeY0mmPRBGhI7DFZ8JoGKzWfbiSsceHzVTp00WfnqiEAqSQtB6QJkc5jukoajtP3U1+lx0mErfFsA==", "dependencies": { "Microsoft.Extensions.FileProviders.Abstractions": "6.0.0", "Microsoft.Extensions.FileSystemGlobbing": "6.0.0", - "NuGet.Credentials": "6.11.0", - "NuGet.ProjectModel": "6.11.0" + "NuGet.Credentials": "6.12.1", + "NuGet.ProjectModel": "6.12.1" } }, "NuGet.Common": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "T3bCiKUSx8wdYpcqr6Dbx93zAqFp689ee/oa1tH22XI/xl7EUzQ7No/WlE1FUqvEX1+Mqar3wRNAn2O/yxo94g==", + "resolved": "6.12.1", + "contentHash": "nk8nTdhQl4x2VaAQUvefI7DDYAuBDlE+OZZRffm50Qx5dUAEq8wkc5JIqrN2lTEohObHPI/SXyG2UFdMQkrdyg==", "dependencies": { - "NuGet.Frameworks": "6.11.0" + "NuGet.Frameworks": "6.12.1" } }, "NuGet.Configuration": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "73QprQqmumFrv3Ooi4YWpRYeBj8jZy9gNdOaOCp4pPInpt41SJJAz/aP4je+StwIJvi5HsgPPecLKekDIQEwKg==", + "resolved": "6.12.1", + "contentHash": "IRwlY1379ZgJ0oEJvjD+lDuOhJ5S1fsU5n/bEC5/i0+N9bo2WIMDAdaQ/qIdyK/gMJ/YWS+++GSX6rN7luqEvg==", "dependencies": { - "NuGet.Common": "6.11.0", + "NuGet.Common": "6.12.1", "System.Security.Cryptography.ProtectedData": "4.4.0" } }, "NuGet.Credentials": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "TeMvEyoqkIxDnYJjPCpD48vV5XoDATmyX2kGYYB2MIzWBT24ZjWauTda72hYBzg0OLLiuafxfnNJKGG6IHHzOQ==", + "resolved": "6.12.1", + "contentHash": "VdqUIupqm16kiedkv/iyBX5yaVwCI9piV7IvHf0FLgFciCnx22jI8luHXTqeJgWsHOLJl+nTjeV3RY/AcccK7Q==", "dependencies": { - "NuGet.Protocol": "6.11.0" + "NuGet.Protocol": "6.12.1" } }, "NuGet.DependencyResolver.Core": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "SoiPKPooA+IF+iCsX1ykwi3M0e+yBL34QnwIP3ujhQEn1dhlP/N1XsYAnKkJPxV15EZCahuuS4HtnBsZx+CHKA==", + "resolved": "6.12.1", + "contentHash": "Nn4+pXW1qxGcq0OEQBJBh/FjKvWhzD49+kRzuOC9SkRZOrHsTaA12EsQ1mEE4rMUfqviaosmPEtvodJ4eKCmIw==", "dependencies": { - "NuGet.Configuration": "6.11.0", - "NuGet.LibraryModel": "6.11.0", - "NuGet.Protocol": "6.11.0" + "NuGet.Configuration": "6.12.1", + "NuGet.LibraryModel": "6.12.1", + "NuGet.Protocol": "6.12.1" } }, "NuGet.Frameworks": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "Ew/mrfmLF5phsprysHbph2+tdZ10HMHAURavsr/Kx1WhybDG4vmGuoNLbbZMZOqnPRdpyCTc42OKWLoedxpYtA==" + "resolved": "6.12.1", + "contentHash": "kPaRD5RJC0ByUg+yGX6bDz5XHMI7OYmQwP8kbtef+vZ+csj/VDb5Bwas4ChxwhoAbI8lEvwP5/3aViQPpgNBow==" }, "NuGet.LibraryModel": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "KUV2eeMICMb24OPcICn/wgncNzt6+W+lmFVO5eorTdo1qV4WXxYGyG1NTPiCY+Nrv5H/Ilnv9UaUM2ozqSmnjw==", + "resolved": "6.12.1", + "contentHash": "IqX7Ze7qSbhx22lsdnMbLJpcqrmwGyQbyNk9JSsZ/u5p6PIaZyeWsvHHy+oXU8fuRmmKfHBnZEsceaCAw6Xy5A==", "dependencies": { - "NuGet.Common": "6.11.0", - "NuGet.Versioning": "6.11.0" + "NuGet.Common": "6.12.1", + "NuGet.Versioning": "6.12.1" } }, "NuGet.Packaging": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "VmUv2LedVuPY1tfNybORO2I9IuqOzeV7I5JBD+PwNvJq2bAqovi4FCw2cYI0g+kjOJXBN2lAJfrfnqtUOlVJdQ==", + "resolved": "6.12.1", + "contentHash": "6s5NO3VNX6fIx6GwuWZtIsal9W1xkelYd3Vg2KUAg1zGqnKC3wB5IZlombvVGVGcwyl/A+iDvpUwSvgeDoB3wA==", "dependencies": { "Newtonsoft.Json": "13.0.3", - "NuGet.Configuration": "6.11.0", - "NuGet.Versioning": "6.11.0", + "NuGet.Configuration": "6.12.1", + "NuGet.Versioning": "6.12.1", + "System.Formats.Asn1": "8.0.1", "System.Security.Cryptography.Pkcs": "6.0.4" } }, "NuGet.ProjectModel": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "g0KtmDH6fas97WsN73yV2h1F5JT9o6+Y0wlPK+ij9YLKaAXaF6+1HkSaQMMJ+xh9/jCJG9G6nau6InOlb1g48g==", + "resolved": "6.12.1", + "contentHash": "nzpVqooG0qumADw5t8YMg9e+ezVqUhhoGvoihVmu5O9gJDqzkRYswQzyIVsE24dirBQabW0X0Sv53f6ZLJCv+g==", "dependencies": { - "NuGet.DependencyResolver.Core": "6.11.0" + "NuGet.DependencyResolver.Core": "6.12.1" } }, "NuGet.Protocol": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "p5B8oNLLnGhUfMbcS16aRiegj11pD6k+LELyRBqvNFR/pE3yR1XT+g1XS33ME9wvoU+xbCGnl4Grztt1jHPinw==", + "resolved": "6.12.1", + "contentHash": "VBN7OtG/Y9Rnj1WT3G8X88ZHu5Pq+yzca5Z6OI/FWXcENVAQkUl0ml6Cv8ghOqYyiuvnObGDV9oWLD/bIuVtDw==", "dependencies": { - "NuGet.Packaging": "6.11.0" + "NuGet.Packaging": "6.12.1" } }, "NuGet.Versioning": { "type": "Transitive", - "resolved": "6.11.0", - "contentHash": "v/GGlIj2dd7svplFmASWEueu62veKW0MrMtBaZ7QG8aJTSGv2yE+pgUGhXRcQ4nxNOEq/wLBrz1vkth/1SND7A==" + "resolved": "6.12.1", + "contentHash": "fJ6rFYANDnohFsdpaY79FvrJxI6murmoOxXz6nZlf819F48+IBKMnAIg3oIBRtZq5y498ObMtKnro5IitvizUg==" }, "protobuf-net": { "type": "Transitive", @@ -296,8 +297,8 @@ }, "SemanticVersioning": { "type": "Transitive", - "resolved": "2.0.2", - "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA==" + "resolved": "3.0.0", + "contentHash": "RR+8GbPQ/gjDqov/1QN1OPoUlbUruNwcL3WjWCeLw+MY7+od/ENhnkYxCfAC6rQLIu3QifaJt3kPYyP3RumqMQ==" }, "SharpDX": { "type": "Transitive", @@ -314,8 +315,8 @@ }, "SpaceEngineersDedicated.ReferenceAssemblies": { "type": "Transitive", - "resolved": "1.205.23", - "contentHash": "J7mF5hY39PzzCZps6vhIRzKiq8vD6Af9TgumTJR068vjEi+BzyeEFhqX+cl2Dd1ngOmsBtGWc5m+vxgTfs5YuA==", + "resolved": "1.205.26", + "contentHash": "kQSFCLgi0nFUhLvXlp9D2w4cTnXtEIctWtNlK+Vw4FAofws60rwR6Kil9YBNlaDyoo19dcyNt3bs4G9VculcIA==", "dependencies": { "SharpDX": "4.2.0-keen-cringe", "protobuf-net": "1.0.0" @@ -328,8 +329,8 @@ }, "System.Formats.Asn1": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "T6fD00dQ3NTbPDy31m4eQUwKW84s03z0N2C8HpOklyeaDgaJPa/TexP4/SkORMSOwc7WhKifnA6Ya33AkzmafA==" + "resolved": "8.0.1", + "contentHash": "XqKba7Mm/koKSjKMfW82olQdmfbI5yqeoLV/tidRp7fbh5rmHAQ5raDI/7SU0swTzv+jgqtUGkzmFxuUg0it1A==" }, "System.Linq.Async": { "type": "Transitive", @@ -365,34 +366,26 @@ "resolved": "4.4.0", "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog==" }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" - }, "System.Text.Json": { "type": "Transitive", - "resolved": "8.0.1", - "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==", - "dependencies": { - "System.Text.Encodings.Web": "8.0.0" - } + "resolved": "9.0.0", + "contentHash": "js7+qAu/9mQvnhA4EfGMZNEzXtJCDxgkgj8ohuxq/Qxv+R56G+ljefhiJHOxTNiw54q8vmABCWUwkMulNdlZ4A==" }, "torch.api": { "type": "Project", "dependencies": { - "JetBrains.Annotations": "[2024.2.0, )", - "Microsoft.Extensions.Configuration.Binder": "[8.0.2, )", - "NLog": "[5.3.3, )", - "NuGet.Commands": "[6.11.0, )", - "NuGet.DependencyResolver.Core": "[6.11.0, )", - "SemanticVersioning": "[2.0.2, )", + "JetBrains.Annotations": "[2024.3.0, )", + "Microsoft.Extensions.Configuration.Binder": "[9.0.0, )", + "NLog": "[5.3.4, )", + "NuGet.Commands": "[6.12.1, )", + "NuGet.DependencyResolver.Core": "[6.12.1, )", + "SemanticVersioning": "[3.0.0, )", "SpaceEngineersDedicated.ReferenceAssemblies": "[1.*, )", "System.Linq.Async": "[6.0.1, )" } } }, - "net8.0-windows7.0/win-x64": { + "net9.0-windows7.0/win-x64": { "System.Security.Cryptography.Pkcs": { "type": "Transitive", "resolved": "6.0.4", @@ -405,11 +398,6 @@ "type": "Transitive", "resolved": "4.4.0", "contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog==" - }, - "System.Text.Encodings.Web": { - "type": "Transitive", - "resolved": "8.0.0", - "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" } } } diff --git a/global.json b/global.json index 1df2109..93398a3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.0", + "version": "9.0.0", "rollForward": "latestFeature", "allowPrerelease": false }