diff --git a/Torch.Server.Tests/packages.lock.json b/Torch.Server.Tests/packages.lock.json index bd205cc..748361d 100644 --- a/Torch.Server.Tests/packages.lock.json +++ b/Torch.Server.Tests/packages.lock.json @@ -56,19 +56,20 @@ "System.Text.Json": "5.0.1" } }, - "HarmonyX": { - "type": "Transitive", - "resolved": "2.13.0-torch", - "contentHash": "ehrCDqzHrNNUlNnRgIys2npuQqbGZ378lixy4pg8/2yQMejctX/p448XTnGGfrCTx6DaHfgQv9Da89JALJgeWA==", - "dependencies": { - "MonoMod.RuntimeDetour": "25.1.2" - } - }, "JetBrains.Annotations": { "type": "Transitive", "resolved": "2024.2.0", "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw==" }, + "Lib.Harmony.Thin": { + "type": "Transitive", + "resolved": "2.3.3-torch", + "contentHash": "djQtMUpURRgP+Ytf1EgQwu4XnJL3J3bz5kyTVcRDNb632N62/A4CbduG96CUsKhL944yGNAJnLX3zfWldPYOTw==", + "dependencies": { + "MonoMod.Core": "1.1.0", + "System.Text.Json": "8.0.1" + } + }, "MahApps.Metro": { "type": "Transitive", "resolved": "2.4.10", @@ -308,48 +309,36 @@ }, "MonoMod.Backports": { "type": "Transitive", - "resolved": "1.1.2", - "contentHash": "baYlNy8n8kmaNhNvqmZ/dIPOeO1r9//dG1i2WbunMWtWZ2EKtIgmXaS+ZzphzTsikkGnoD4Jwr5g0TVdpDjgpw==", + "resolved": "1.1.0", + "contentHash": "GUAjCrCZEddqHKHFA7Lh61PgTzoKY7gfBShFe0hQe0p8iynHhBK3TWGyRi+QIw/PGfaRPwx6c33CPGFURBVM6g==", "dependencies": { - "MonoMod.ILHelpers": "1.1.0" + "MonoMod.ILHelpers": "1.0.1" } }, "MonoMod.Core": { "type": "Transitive", - "resolved": "1.1.2", - "contentHash": "6Yvjx2W0QFnPNyBjCKnrhYimskBE2MUKEMJz0t+2fJO67Jt4Lmams6BdZPTVudQykmEWTh5c2fwEfAMxKQtC4Q==", + "resolved": "1.1.0", + "contentHash": "Ks8RntZGVcktr2QF/AovTEbuOkrgXz6omjrvT5LRveOIQJuy+IFuEQPBVWu+cSKVIoZD5XkpRFvlVrItgPIrXw==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2", - "MonoMod.ILHelpers": "1.1.0", - "MonoMod.Utils": "25.0.6" + "MonoMod.Backports": "1.1.0", + "MonoMod.ILHelpers": "1.0.1", + "MonoMod.Utils": "25.0.4" } }, "MonoMod.ILHelpers": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "L2FWjhTrv7tcIxshfZ+M3OcaNr4cNw0IwiVZEgwqRnZ5QAN3+RrNJ8ZwCzwXUWyPDqooJxMcjjg8PsSYUiNBjQ==" - }, - "MonoMod.RuntimeDetour": { - "type": "Transitive", - "resolved": "25.1.2", - "contentHash": "eNf/V6FqS5ErkvdA+vyVM5d7SFeKCkltn5XhT2GrjJ2xec6BG3E7lk/52qVIqDSsMrU+M6dTM8W+fl4IxKQWHw==", - "dependencies": { - "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2", - "MonoMod.Core": "1.1.2", - "MonoMod.ILHelpers": "1.1.0", - "MonoMod.Utils": "25.0.6" - } + "resolved": "1.0.1", + "contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA==" }, "MonoMod.Utils": { "type": "Transitive", - "resolved": "25.0.6", - "contentHash": "FAGqXHT4ENtg3UTA5PKBgLYcRP8w+u4zMUN2M73yfb0aYLIpCTVOcTfO1iTM2Jse0ukBxjd+ovO5KnCYt+Z0ag==", + "resolved": "25.0.4", + "contentHash": "cB94MaZtFD9u4clYEFTwM4jGXnJnzXsxYF3yBpMZKHhXOas66tMF2frbdYte023i0MH4C5iRJbDjxHmA4x5VgA==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2", - "MonoMod.ILHelpers": "1.1.0" + "MonoMod.Backports": "1.1.0", + "MonoMod.ILHelpers": "1.0.1" } }, "Newtonsoft.Json": { @@ -456,19 +445,8 @@ }, "protobuf-net": { "type": "Transitive", - "resolved": "3.2.30", - "contentHash": "C/UTlmxEJHAHpqm8xQK1UyJKaIynVCSNG4mVrbLgnZ7ccH28nN49O8iMJvKEodTgVbnimvy+3mIiAdW6mATwnw==", - "dependencies": { - "protobuf-net.Core": "3.2.30" - } - }, - "protobuf-net.Core": { - "type": "Transitive", - "resolved": "3.2.30", - "contentHash": "v2ZxxYrz+X212ukSx+uqkLuPu414bvmSAnTyf+PBUKR9ENJxO4P/csorA/27456MCp1JNoMssDj/f91RDiwBfQ==", - "dependencies": { - "System.Collections.Immutable": "7.0.0" - } + "resolved": "1.0.0", + "contentHash": "kTGOK0E87473sOImOjgZOnz3kTC2aMLffoRWQLYNuBLJnwNNmjanF9IkevZ9Q7yYLeABQfcF3BpeepuMntMVNw==" }, "SemanticVersioning": { "type": "Transitive", @@ -567,10 +545,18 @@ "System.Security.Cryptography.Pkcs": "8.0.0" } }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" + }, "System.Text.Json": { "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "/UM3UK1dXKl8Ybysg/21gM4S8DJgkR+yLU8JwqCVbuNqQNImelntgYFAN5QxR8sJJ1kMx//hOUdf0lltosi8cQ==" + "resolved": "8.0.1", + "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==", + "dependencies": { + "System.Text.Encodings.Web": "8.0.0" + } }, "Torch.SixLabors.ImageSharp": { "type": "Transitive", @@ -625,15 +611,14 @@ "type": "Project", "dependencies": { "ControlzEx": "[5.0.2, )", - "HarmonyX": "[2.13.0-torch, )", + "Lib.Harmony.Thin": "[2.3.3-torch, )", "MahApps.Metro": "[2.4.10, )", "Microsoft.CodeAnalysis.CSharp": "[4.11.0, )", "Microsoft.CodeAnalysis.Common": "[4.11.0, )", "NLog": "[5.3.3, )", "System.ComponentModel.Annotations": "[5.0.0, )", "Torch.API": "[1.0.0, )", - "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )", - "protobuf-net": "[3.2.30, )" + "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )" } }, "torch.api": { @@ -703,6 +688,11 @@ "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/packages.lock.json b/Torch.Server/packages.lock.json index 2f37c57..e202cf6 100644 --- a/Torch.Server/packages.lock.json +++ b/Torch.Server/packages.lock.json @@ -157,19 +157,20 @@ "resolved": "6.6.4", "contentHash": "vLZS+oa+ndUHYPlx/8n9bBTT3dHkCF0riml4paKq4D663+cZd47x1uagQo32D/gKFZ/sfmV1oqKaLmH0elxq4A==" }, - "HarmonyX": { - "type": "Transitive", - "resolved": "2.13.0-torch", - "contentHash": "ehrCDqzHrNNUlNnRgIys2npuQqbGZ378lixy4pg8/2yQMejctX/p448XTnGGfrCTx6DaHfgQv9Da89JALJgeWA==", - "dependencies": { - "MonoMod.RuntimeDetour": "25.1.2" - } - }, "JetBrains.Annotations": { "type": "Transitive", "resolved": "2024.2.0", "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw==" }, + "Lib.Harmony.Thin": { + "type": "Transitive", + "resolved": "2.3.3-torch", + "contentHash": "djQtMUpURRgP+Ytf1EgQwu4XnJL3J3bz5kyTVcRDNb632N62/A4CbduG96CUsKhL944yGNAJnLX3zfWldPYOTw==", + "dependencies": { + "MonoMod.Core": "1.1.0", + "System.Text.Json": "8.0.1" + } + }, "MdXaml.Plugins": { "type": "Transitive", "resolved": "1.27.0", @@ -317,48 +318,36 @@ }, "MonoMod.Backports": { "type": "Transitive", - "resolved": "1.1.2", - "contentHash": "baYlNy8n8kmaNhNvqmZ/dIPOeO1r9//dG1i2WbunMWtWZ2EKtIgmXaS+ZzphzTsikkGnoD4Jwr5g0TVdpDjgpw==", + "resolved": "1.1.0", + "contentHash": "GUAjCrCZEddqHKHFA7Lh61PgTzoKY7gfBShFe0hQe0p8iynHhBK3TWGyRi+QIw/PGfaRPwx6c33CPGFURBVM6g==", "dependencies": { - "MonoMod.ILHelpers": "1.1.0" + "MonoMod.ILHelpers": "1.0.1" } }, "MonoMod.Core": { "type": "Transitive", - "resolved": "1.1.2", - "contentHash": "6Yvjx2W0QFnPNyBjCKnrhYimskBE2MUKEMJz0t+2fJO67Jt4Lmams6BdZPTVudQykmEWTh5c2fwEfAMxKQtC4Q==", + "resolved": "1.1.0", + "contentHash": "Ks8RntZGVcktr2QF/AovTEbuOkrgXz6omjrvT5LRveOIQJuy+IFuEQPBVWu+cSKVIoZD5XkpRFvlVrItgPIrXw==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2", - "MonoMod.ILHelpers": "1.1.0", - "MonoMod.Utils": "25.0.6" + "MonoMod.Backports": "1.1.0", + "MonoMod.ILHelpers": "1.0.1", + "MonoMod.Utils": "25.0.4" } }, "MonoMod.ILHelpers": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "L2FWjhTrv7tcIxshfZ+M3OcaNr4cNw0IwiVZEgwqRnZ5QAN3+RrNJ8ZwCzwXUWyPDqooJxMcjjg8PsSYUiNBjQ==" - }, - "MonoMod.RuntimeDetour": { - "type": "Transitive", - "resolved": "25.1.2", - "contentHash": "eNf/V6FqS5ErkvdA+vyVM5d7SFeKCkltn5XhT2GrjJ2xec6BG3E7lk/52qVIqDSsMrU+M6dTM8W+fl4IxKQWHw==", - "dependencies": { - "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2", - "MonoMod.Core": "1.1.2", - "MonoMod.ILHelpers": "1.1.0", - "MonoMod.Utils": "25.0.6" - } + "resolved": "1.0.1", + "contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA==" }, "MonoMod.Utils": { "type": "Transitive", - "resolved": "25.0.6", - "contentHash": "FAGqXHT4ENtg3UTA5PKBgLYcRP8w+u4zMUN2M73yfb0aYLIpCTVOcTfO1iTM2Jse0ukBxjd+ovO5KnCYt+Z0ag==", + "resolved": "25.0.4", + "contentHash": "cB94MaZtFD9u4clYEFTwM4jGXnJnzXsxYF3yBpMZKHhXOas66tMF2frbdYte023i0MH4C5iRJbDjxHmA4x5VgA==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2", - "MonoMod.ILHelpers": "1.1.0" + "MonoMod.Backports": "1.1.0", + "MonoMod.ILHelpers": "1.0.1" } }, "Newtonsoft.Json": { @@ -547,10 +536,18 @@ "System.Security.Cryptography.Pkcs": "8.0.0" } }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" + }, "System.Text.Json": { "type": "Transitive", - "resolved": "5.0.1", - "contentHash": "/UM3UK1dXKl8Ybysg/21gM4S8DJgkR+yLU8JwqCVbuNqQNImelntgYFAN5QxR8sJJ1kMx//hOUdf0lltosi8cQ==" + "resolved": "8.0.1", + "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==", + "dependencies": { + "System.Text.Encodings.Web": "8.0.0" + } }, "Torch.SixLabors.ImageSharp": { "type": "Transitive", @@ -565,7 +562,7 @@ "type": "Project", "dependencies": { "ControlzEx": "[5.0.2, )", - "HarmonyX": "[2.13.0-torch, )", + "Lib.Harmony.Thin": "[2.3.3-torch, )", "MahApps.Metro": "[2.4.10, )", "Microsoft.CodeAnalysis.CSharp": "[4.11.0, )", "Microsoft.CodeAnalysis.Common": "[4.11.0, )", @@ -617,6 +614,11 @@ "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/packages.lock.json b/Torch.Tests/packages.lock.json index db46feb..9777740 100644 --- a/Torch.Tests/packages.lock.json +++ b/Torch.Tests/packages.lock.json @@ -38,19 +38,20 @@ "System.Text.Json": "5.0.1" } }, - "HarmonyX": { - "type": "Transitive", - "resolved": "2.13.0-torch", - "contentHash": "ehrCDqzHrNNUlNnRgIys2npuQqbGZ378lixy4pg8/2yQMejctX/p448XTnGGfrCTx6DaHfgQv9Da89JALJgeWA==", - "dependencies": { - "MonoMod.RuntimeDetour": "25.1.2" - } - }, "JetBrains.Annotations": { "type": "Transitive", "resolved": "2024.2.0", "contentHash": "GNnqCFW/163p1fOehKx0CnAqjmpPrUSqrgfHM6qca+P+RN39C9rhlfZHQpJhxmQG/dkOYe/b3Z0P8b6Kv5m1qw==" }, + "Lib.Harmony.Thin": { + "type": "Transitive", + "resolved": "2.3.3-torch", + "contentHash": "djQtMUpURRgP+Ytf1EgQwu4XnJL3J3bz5kyTVcRDNb632N62/A4CbduG96CUsKhL944yGNAJnLX3zfWldPYOTw==", + "dependencies": { + "MonoMod.Core": "1.1.0", + "System.Text.Json": "8.0.1" + } + }, "MahApps.Metro": { "type": "Transitive", "resolved": "2.4.10", @@ -158,48 +159,36 @@ }, "MonoMod.Backports": { "type": "Transitive", - "resolved": "1.1.2", - "contentHash": "baYlNy8n8kmaNhNvqmZ/dIPOeO1r9//dG1i2WbunMWtWZ2EKtIgmXaS+ZzphzTsikkGnoD4Jwr5g0TVdpDjgpw==", + "resolved": "1.1.0", + "contentHash": "GUAjCrCZEddqHKHFA7Lh61PgTzoKY7gfBShFe0hQe0p8iynHhBK3TWGyRi+QIw/PGfaRPwx6c33CPGFURBVM6g==", "dependencies": { - "MonoMod.ILHelpers": "1.1.0" + "MonoMod.ILHelpers": "1.0.1" } }, "MonoMod.Core": { "type": "Transitive", - "resolved": "1.1.2", - "contentHash": "6Yvjx2W0QFnPNyBjCKnrhYimskBE2MUKEMJz0t+2fJO67Jt4Lmams6BdZPTVudQykmEWTh5c2fwEfAMxKQtC4Q==", + "resolved": "1.1.0", + "contentHash": "Ks8RntZGVcktr2QF/AovTEbuOkrgXz6omjrvT5LRveOIQJuy+IFuEQPBVWu+cSKVIoZD5XkpRFvlVrItgPIrXw==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2", - "MonoMod.ILHelpers": "1.1.0", - "MonoMod.Utils": "25.0.6" + "MonoMod.Backports": "1.1.0", + "MonoMod.ILHelpers": "1.0.1", + "MonoMod.Utils": "25.0.4" } }, "MonoMod.ILHelpers": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "L2FWjhTrv7tcIxshfZ+M3OcaNr4cNw0IwiVZEgwqRnZ5QAN3+RrNJ8ZwCzwXUWyPDqooJxMcjjg8PsSYUiNBjQ==" - }, - "MonoMod.RuntimeDetour": { - "type": "Transitive", - "resolved": "25.1.2", - "contentHash": "eNf/V6FqS5ErkvdA+vyVM5d7SFeKCkltn5XhT2GrjJ2xec6BG3E7lk/52qVIqDSsMrU+M6dTM8W+fl4IxKQWHw==", - "dependencies": { - "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2", - "MonoMod.Core": "1.1.2", - "MonoMod.ILHelpers": "1.1.0", - "MonoMod.Utils": "25.0.6" - } + "resolved": "1.0.1", + "contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA==" }, "MonoMod.Utils": { "type": "Transitive", - "resolved": "25.0.6", - "contentHash": "FAGqXHT4ENtg3UTA5PKBgLYcRP8w+u4zMUN2M73yfb0aYLIpCTVOcTfO1iTM2Jse0ukBxjd+ovO5KnCYt+Z0ag==", + "resolved": "25.0.4", + "contentHash": "cB94MaZtFD9u4clYEFTwM4jGXnJnzXsxYF3yBpMZKHhXOas66tMF2frbdYte023i0MH4C5iRJbDjxHmA4x5VgA==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2", - "MonoMod.ILHelpers": "1.1.0" + "MonoMod.Backports": "1.1.0", + "MonoMod.ILHelpers": "1.0.1" } }, "Newtonsoft.Json": { @@ -301,19 +290,8 @@ }, "protobuf-net": { "type": "Transitive", - "resolved": "3.2.30", - "contentHash": "C/UTlmxEJHAHpqm8xQK1UyJKaIynVCSNG4mVrbLgnZ7ccH28nN49O8iMJvKEodTgVbnimvy+3mIiAdW6mATwnw==", - "dependencies": { - "protobuf-net.Core": "3.2.30" - } - }, - "protobuf-net.Core": { - "type": "Transitive", - "resolved": "3.2.30", - "contentHash": "v2ZxxYrz+X212ukSx+uqkLuPu414bvmSAnTyf+PBUKR9ENJxO4P/csorA/27456MCp1JNoMssDj/f91RDiwBfQ==", - "dependencies": { - "System.Collections.Immutable": "7.0.0" - } + "resolved": "1.0.0", + "contentHash": "kTGOK0E87473sOImOjgZOnz3kTC2aMLffoRWQLYNuBLJnwNNmjanF9IkevZ9Q7yYLeABQfcF3BpeepuMntMVNw==" }, "SemanticVersioning": { "type": "Transitive", @@ -391,10 +369,18 @@ "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": "5.0.1", - "contentHash": "/UM3UK1dXKl8Ybysg/21gM4S8DJgkR+yLU8JwqCVbuNqQNImelntgYFAN5QxR8sJJ1kMx//hOUdf0lltosi8cQ==" + "resolved": "8.0.1", + "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==", + "dependencies": { + "System.Text.Encodings.Web": "8.0.0" + } }, "Torch.SixLabors.ImageSharp": { "type": "Transitive", @@ -449,15 +435,14 @@ "type": "Project", "dependencies": { "ControlzEx": "[5.0.2, )", - "HarmonyX": "[2.13.0-torch, )", + "Lib.Harmony.Thin": "[2.3.3-torch, )", "MahApps.Metro": "[2.4.10, )", "Microsoft.CodeAnalysis.CSharp": "[4.11.0, )", "Microsoft.CodeAnalysis.Common": "[4.11.0, )", "NLog": "[5.3.3, )", "System.ComponentModel.Annotations": "[5.0.0, )", "Torch.API": "[1.0.0, )", - "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )", - "protobuf-net": "[3.2.30, )" + "Torch.SixLabors.ImageSharp": "[1.0.0-beta6, )" } }, "torch.api": { @@ -487,6 +472,11 @@ "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/Torch.csproj b/Torch/Torch.csproj index 82831bf..bb63da1 100644 --- a/Torch/Torch.csproj +++ b/Torch/Torch.csproj @@ -14,7 +14,7 @@ - + diff --git a/Torch/TorchBase.cs b/Torch/TorchBase.cs index 363677c..c6c3efa 100644 --- a/Torch/TorchBase.cs +++ b/Torch/TorchBase.cs @@ -140,20 +140,6 @@ namespace Torch if (state == TorchGameState.Created) PatchManager.CommitInternal(); }; - - var harmonyLog = LogManager.GetLogger("HarmonyX"); - HarmonyLib.Tools.Logger.ChannelFilter = HarmonyLib.Tools.Logger.LogChannel.Debug; - HarmonyLib.Tools.Logger.MessageReceived += (_, args) => harmonyLog.Log(args.LogChannel switch - { - HarmonyLib.Tools.Logger.LogChannel.None => LogLevel.Off, - HarmonyLib.Tools.Logger.LogChannel.Info => LogLevel.Info, - HarmonyLib.Tools.Logger.LogChannel.IL => LogLevel.Trace, - HarmonyLib.Tools.Logger.LogChannel.Warn => LogLevel.Warn, - HarmonyLib.Tools.Logger.LogChannel.Error => LogLevel.Error, - HarmonyLib.Tools.Logger.LogChannel.Debug => LogLevel.Debug, - HarmonyLib.Tools.Logger.LogChannel.All => LogLevel.Debug, - _ => throw new ArgumentOutOfRangeException() - }, args.Message); } [Obsolete("Prefer using Managers.GetManager for global managers")] diff --git a/Torch/packages.lock.json b/Torch/packages.lock.json index 358058c..384cb14 100644 --- a/Torch/packages.lock.json +++ b/Torch/packages.lock.json @@ -12,15 +12,6 @@ "System.Text.Json": "5.0.1" } }, - "HarmonyX": { - "type": "Direct", - "requested": "[2.13.0-torch, )", - "resolved": "2.13.0-torch", - "contentHash": "ehrCDqzHrNNUlNnRgIys2npuQqbGZ378lixy4pg8/2yQMejctX/p448XTnGGfrCTx6DaHfgQv9Da89JALJgeWA==", - "dependencies": { - "MonoMod.RuntimeDetour": "25.1.2" - } - }, "InfoOf.Fody": { "type": "Direct", "requested": "[2.2.0, )", @@ -30,6 +21,16 @@ "Fody": "6.8.0" } }, + "Lib.Harmony.Thin": { + "type": "Direct", + "requested": "[2.3.3-torch, )", + "resolved": "2.3.3-torch", + "contentHash": "djQtMUpURRgP+Ytf1EgQwu4XnJL3J3bz5kyTVcRDNb632N62/A4CbduG96CUsKhL944yGNAJnLX3zfWldPYOTw==", + "dependencies": { + "MonoMod.Core": "1.1.0", + "System.Text.Json": "8.0.1" + } + }, "MahApps.Metro": { "type": "Direct", "requested": "[2.4.10, )", @@ -159,48 +160,36 @@ }, "MonoMod.Backports": { "type": "Transitive", - "resolved": "1.1.2", - "contentHash": "baYlNy8n8kmaNhNvqmZ/dIPOeO1r9//dG1i2WbunMWtWZ2EKtIgmXaS+ZzphzTsikkGnoD4Jwr5g0TVdpDjgpw==", + "resolved": "1.1.0", + "contentHash": "GUAjCrCZEddqHKHFA7Lh61PgTzoKY7gfBShFe0hQe0p8iynHhBK3TWGyRi+QIw/PGfaRPwx6c33CPGFURBVM6g==", "dependencies": { - "MonoMod.ILHelpers": "1.1.0" + "MonoMod.ILHelpers": "1.0.1" } }, "MonoMod.Core": { "type": "Transitive", - "resolved": "1.1.2", - "contentHash": "6Yvjx2W0QFnPNyBjCKnrhYimskBE2MUKEMJz0t+2fJO67Jt4Lmams6BdZPTVudQykmEWTh5c2fwEfAMxKQtC4Q==", + "resolved": "1.1.0", + "contentHash": "Ks8RntZGVcktr2QF/AovTEbuOkrgXz6omjrvT5LRveOIQJuy+IFuEQPBVWu+cSKVIoZD5XkpRFvlVrItgPIrXw==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2", - "MonoMod.ILHelpers": "1.1.0", - "MonoMod.Utils": "25.0.6" + "MonoMod.Backports": "1.1.0", + "MonoMod.ILHelpers": "1.0.1", + "MonoMod.Utils": "25.0.4" } }, "MonoMod.ILHelpers": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "L2FWjhTrv7tcIxshfZ+M3OcaNr4cNw0IwiVZEgwqRnZ5QAN3+RrNJ8ZwCzwXUWyPDqooJxMcjjg8PsSYUiNBjQ==" - }, - "MonoMod.RuntimeDetour": { - "type": "Transitive", - "resolved": "25.1.2", - "contentHash": "eNf/V6FqS5ErkvdA+vyVM5d7SFeKCkltn5XhT2GrjJ2xec6BG3E7lk/52qVIqDSsMrU+M6dTM8W+fl4IxKQWHw==", - "dependencies": { - "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2", - "MonoMod.Core": "1.1.2", - "MonoMod.ILHelpers": "1.1.0", - "MonoMod.Utils": "25.0.6" - } + "resolved": "1.0.1", + "contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA==" }, "MonoMod.Utils": { "type": "Transitive", - "resolved": "25.0.6", - "contentHash": "FAGqXHT4ENtg3UTA5PKBgLYcRP8w+u4zMUN2M73yfb0aYLIpCTVOcTfO1iTM2Jse0ukBxjd+ovO5KnCYt+Z0ag==", + "resolved": "25.0.4", + "contentHash": "cB94MaZtFD9u4clYEFTwM4jGXnJnzXsxYF3yBpMZKHhXOas66tMF2frbdYte023i0MH4C5iRJbDjxHmA4x5VgA==", "dependencies": { "Mono.Cecil": "0.11.5", - "MonoMod.Backports": "1.1.2", - "MonoMod.ILHelpers": "1.1.0" + "MonoMod.Backports": "1.1.0", + "MonoMod.ILHelpers": "1.0.1" } }, "Newtonsoft.Json": { @@ -376,10 +365,18 @@ "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": "5.0.1", - "contentHash": "/UM3UK1dXKl8Ybysg/21gM4S8DJgkR+yLU8JwqCVbuNqQNImelntgYFAN5QxR8sJJ1kMx//hOUdf0lltosi8cQ==" + "resolved": "8.0.1", + "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==", + "dependencies": { + "System.Text.Encodings.Web": "8.0.0" + } }, "torch.api": { "type": "Project", @@ -408,6 +405,11 @@ "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==" } } }