diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4cda5c5..7f5ecfe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: submodules: true @@ -21,7 +21,7 @@ jobs: ${{ runner.os }}-nuget- - name: Setup .NET - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v2 with: dotnet-version: 6.x @@ -30,23 +30,23 @@ jobs: with: verbosity: Diagnostic - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: Reactor.dll - path: Reactor/bin/Release/netstandard2.1/Reactor.dll + path: Reactor/bin/Release/net6.0/Reactor.dll - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: Reactor.nupkg path: Reactor/bin/Release/Reactor.*.nupkg - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: Reactor.Debugger.dll - path: Reactor.Debugger/bin/Release/netstandard2.1/Reactor.Debugger.dll + path: Reactor.Debugger/bin/Release/net6.0/Reactor.Debugger.dll - uses: softprops/action-gh-release@v1 if: startsWith(github.ref, 'refs/tags/') with: draft: true - files: Reactor/bin/Release/netstandard2.1/Reactor.dll + files: Reactor/bin/Release/net6.0/Reactor.dll diff --git a/AmongUs.props b/AmongUs.props index a52ff3e..7504ba7 100644 --- a/AmongUs.props +++ b/AmongUs.props @@ -6,11 +6,11 @@ - + - + diff --git a/Reactor.Debugger/DebuggerPlugin.cs b/Reactor.Debugger/DebuggerPlugin.cs index 61d42b5..16ac8cf 100644 --- a/Reactor.Debugger/DebuggerPlugin.cs +++ b/Reactor.Debugger/DebuggerPlugin.cs @@ -1,12 +1,12 @@ using System; using System.Linq; using BepInEx; -using BepInEx.IL2CPP; +using BepInEx.Unity.IL2CPP; using HarmonyLib; +using Il2CppInterop.Runtime.Attributes; +using Il2CppInterop.Runtime.InteropTypes.Arrays; using InnerNet; using Reactor.Extensions; -using UnhollowerBaseLib; -using UnhollowerBaseLib.Attributes; using UnityEngine; namespace Reactor.Debugger; diff --git a/Reactor.Debugger/Patches.cs b/Reactor.Debugger/Patches.cs index 210f622..d8388a8 100644 --- a/Reactor.Debugger/Patches.cs +++ b/Reactor.Debugger/Patches.cs @@ -1,6 +1,6 @@ using System.Linq; using HarmonyLib; -using UnhollowerBaseLib; +using Il2CppInterop.Runtime.InteropTypes.Arrays; using UnityEngine; namespace Reactor.Debugger; diff --git a/Reactor.Debugger/Reactor.Debugger.csproj b/Reactor.Debugger/Reactor.Debugger.csproj index 6d8ccc8..0e3ea4c 100644 --- a/Reactor.Debugger/Reactor.Debugger.csproj +++ b/Reactor.Debugger/Reactor.Debugger.csproj @@ -1,6 +1,6 @@ - netstandard2.1 + net6.0 latest 0.1.0 diff --git a/Reactor.Debugger/packages.lock.json b/Reactor.Debugger/packages.lock.json index deda5ca..c921a13 100644 --- a/Reactor.Debugger/packages.lock.json +++ b/Reactor.Debugger/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - ".NETStandard,Version=v2.1": { + "net6.0": { "AmongUs.GameLibs.Steam": { "type": "Direct", "requested": "[2022.8.23, )", @@ -14,46 +14,51 @@ "resolved": "1.0.1", "contentHash": "G4YpTHG9rtkDJof+ld7Er4E+sCOlgsjG4bJ1itx1ub7dgff6qqHLy9ksX1ehgO0AdBOPVyVl/GKJg9o7iNl8HA==" }, - "BepInEx.IL2CPP": { + "BepInEx.IL2CPP.MSBuild": { "type": "Direct", - "requested": "[6.0.0-be.570, )", - "resolved": "6.0.0-be.570", - "contentHash": "JGkWFFGZTWQ+YlFQ17izlwfGNUyo/zfFGNYPX6XAeTkfM5RwXiPYNMNO6eWoxbKwaYlAylQq2YCRkkCnAr9nwQ==", + "requested": "[2.0.0, )", + "resolved": "2.0.0", + "contentHash": "Xy0XehKQK1cHZwyXBldQrVJv4e3snNOlzGjmQ6I1oovPusZNkjDX1eYriWT05CwKln3BaLA/mNcZ0QzkMLi7lw==" + }, + "BepInEx.Unity.IL2CPP": { + "type": "Direct", + "requested": "[6.0.0-be.649, )", + "resolved": "6.0.0-be.649", + "contentHash": "d/mYFhxUiPlDaWU0ZPMrJWlxVuxNMXpDfn9ow7Du+ELzFqbbdW/dqEkdpj4vL6iiDLycp+WSDjp9b8x16DOT5g==", "dependencies": { - "BepInEx.Core": "6.0.0-be.570", - "BepInEx.Il2Cpp.TlsAdapter": "1.0.1", + "BepInEx.Core": "6.0.0-be.649", + "BepInEx.Unity.Common": "6.0.0-be.649", "HarmonyX": "2.10.0", "Iced": "1.17.0", - "Il2CppAssemblyUnhollower.BaseLib": "0.4.33.3", - "Il2CppAssemblyUnhollower.BaseLib.Legacy": "0.4.33.3", - "Il2CppAssemblyUnhollower.Lib": "0.4.33.3", - "Il2CppDumper": "6.6.4", + "Il2CppInterop.Generator": "1.1.0", + "Il2CppInterop.HarmonySupport": "1.1.0", + "Il2CppInterop.Runtime": "1.1.0", "MonoMod.RuntimeDetour": "22.5.1.1", "Samboy063.Cpp2IL.Core": "2022.0.5" } }, - "BepInEx.IL2CPP.MSBuild": { - "type": "Direct", - "requested": "[1.1.1, )", - "resolved": "1.1.1", - "contentHash": "uUSo4TuamyEIVg+ICNeJMSSW/arKWHGpfBFINc4fdF5kppfHFrsDURKzNPmDvxivtLsiuGthck9J/5uPXgIcTg==" + "AssetRipper.VersionUtilities": { + "type": "Transitive", + "resolved": "1.2.1", + "contentHash": "knQ/W1YwTZS2AbdaZh+nhyyBEZQPQDcahhSOnh88i+cdg4/FEoFJiCwaavgFvCMNuUeHTbcZc4qttF8WQ8xLIA==" }, "BepInEx.Core": { "type": "Transitive", - "resolved": "6.0.0-be.570", - "contentHash": "kygIunLrK1HMGcRo2E/7e4ZEAA0xewuB/j5mPoMi7Xk58GUi43XnclBJHif9x05a55s0kFkfKOrpwIRmjd0cDw==", + "resolved": "6.0.0-be.649", + "contentHash": "fbCDRZ5wqJCorydypIhvKQVR+y7ZRSWlcgan7MK6ObzC6ltHXV3P2im8iZbr2MVXqfwNdkZAIFolfFjrw7AePA==", "dependencies": { "HarmonyX": "2.10.0", - "MonoMod.Utils": "22.3.23.4", + "MonoMod.Utils": "22.5.1.1", "SemanticVersioning": "2.0.2" } }, - "BepInEx.Il2Cpp.TlsAdapter": { + "BepInEx.Unity.Common": { "type": "Transitive", - "resolved": "1.0.1", - "contentHash": "kTfX6312X0Fvwks+t7Ul3YO2jMSbqNS2Jx/85Cgl6lbAjEJnKzsmx7Krmd66dbnx0eY/QMjaV2r6LyWmQARtdA==", + "resolved": "6.0.0-be.649", + "contentHash": "nuZX9E7Ma6MQkTZ07BpLySo4BCMjVU/m8VXLKpj2SAje7OKiLDp69i3EcEAaIRBCRznxnGevQY6+6gteW7veFA==", "dependencies": { - "HarmonyX": "2.3.1" + "AssetRipper.VersionUtilities": "1.2.1", + "MonoMod.Utils": "22.5.1.1" } }, "HarmonyX": { @@ -70,38 +75,41 @@ "resolved": "1.17.0", "contentHash": "8x+HCVTl/HHTGpscH3vMBhV8sknN/muZFw9s3TsI8SA6+c43cOTCi2+jE4KsU8pNLbJ++iF2ZFcpcXHXtDglnw==" }, - "Il2CppAssemblyUnhollower.BaseLib": { + "Il2CppInterop.Common": { "type": "Transitive", - "resolved": "0.4.33.3", - "contentHash": "CH91M6Asz4iwennTa8cLg5wqROJY1JvnsfRetyOvs0cy8o/YAikvm8uuNgZv6UiTO/qoyy/QrBE1qSZDvs8bLw==", + "resolved": "1.1.0", + "contentHash": "wExfEtiVhgTll9Ize6Hxx03lTYsl/nr8+d7VBrqNv+bbNaJ8A67X63TI7+ghsk1OL57DIZb3Txp0WMmNc7vuew==", "dependencies": { - "Iced": "1.15.0" + "Iced": "1.17.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "System.Net.Http": "4.3.4" } }, - "Il2CppAssemblyUnhollower.BaseLib.Legacy": { + "Il2CppInterop.Generator": { "type": "Transitive", - "resolved": "0.4.33.3", - "contentHash": "6yIJg8lkayBDevPwcdcV3LWTdHt8VAZVY0wQwuXH4POOo0Kzc6Cshy9kLCxH3AC6EQg0G/v+Albs6RZgwszXMQ==", + "resolved": "1.1.0", + "contentHash": "YjZUI/GQ78kN2YYpQzNDeo1kUdvxHoXFkrYzTg0IGxDDQTK+AglFQ8au9iMyP5KUgWtfU44FGbnodMVI2yr8Kg==", "dependencies": { - "Il2CppAssemblyUnhollower.BaseLib": "0.4.33.3" - } - }, - "Il2CppAssemblyUnhollower.Lib": { - "type": "Transitive", - "resolved": "0.4.33.3", - "contentHash": "tdu4OnMxodkWwoImNDaycaLY1L3qJOazb5UaLAt1ncRpWyu6xvKuKe5NM6OcBXONpkYsJQeQZjD6syeFl5MCQA==", - "dependencies": { - "Il2CppAssemblyUnhollower.BaseLib": "0.4.33.3", - "Il2CppAssemblyUnhollower.BaseLib.Legacy": "0.4.33.3", + "Il2CppInterop.Common": "1.1.0", "Mono.Cecil": "0.11.3" } }, - "Il2CppDumper": { + "Il2CppInterop.HarmonySupport": { "type": "Transitive", - "resolved": "6.6.4", - "contentHash": "aqjmlyigdZ5FS9ElMNlaCExlgSmAiho4BeIcVwkmzHGnomBzopjOCxqIX9vc/575TQ87TKoaGW2KP+3b5xI15A==", + "resolved": "1.1.0", + "contentHash": "ksBVbpf8J6VYwD9w70n/4QsqqI0BsFu/oAZUuJO3nGCoGqSoKY42fZLZ1YgJFpsMqMo9Lc9Er9QxbrfE8IYxpQ==", "dependencies": { - "Mono.Cecil": "0.11.3" + "HarmonyX": "2.10.0", + "Il2CppInterop.Runtime": "1.1.0" + } + }, + "Il2CppInterop.Runtime": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "CAh73XWvFu9584ELoCAmi2Njs+qKyENJih+TEoz2EN5g8lRF9p7NKche5XLIN8OeQo7+CNKKz9/uf5j8k2q2gA==", + "dependencies": { + "Iced": "1.17.0", + "Il2CppInterop.Common": "1.1.0" } }, "IndexRange": { @@ -114,10 +122,15 @@ "resolved": "2.1.0", "contentHash": "YYpq7NM50bSSVUDjXyV/eiITk6syXqItPjKBOb3jEWS6RFsk0DNhpWMPW6b3hKDmArARuWDU6S2pVu1IeVrvIA==" }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + "resolved": "1.1.1", + "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -158,6 +171,104 @@ "System.Reflection.TypeExtensions": "4.7.0" } }, + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "7VSGO0URRKoMEAq0Sc9cRz8mb6zbyx/BZDEWhgPdzzpmFhkam3fJ1DAGWFXBI4nGlma+uPKpfuMQP5LXRnOH5g==" + }, + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "0oAaTAm6e2oVH+/Zttt0cuhGaePQYKII1dY8iaqP7CvOpVKgLybKRFvQjXR2LtxXOXTVPNv14j0ot8uV+HrUmw==" + }, + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "G24ibsCNi5Kbz0oXWynBoRgtGvsw5ZSVEWjv13/KiCAM8C6wz9zzcCniMeQFIkJ2tasjo2kXlvlBZhplL51kGg==" + }, + "runtime.native.System": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", + "dependencies": { + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" + } + }, + "runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "QR1OwtwehHxSeQvZKXe+iSd+d3XZNkEcuWMFYa2i0aG1l+lR739HPicKMlTbJst3spmeekDVBUS7SeS26s4U/g==", + "dependencies": { + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" + } + }, + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "I+GNKGg2xCHueRd1m9PzeEW7WLbNNLznmTuEi8/vZX71HudUbx1UTwlGkiwMri7JLl8hGaIAWnA/GONhu+LOyQ==" + }, + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "1Z3TAq1ytS1IBRtPXJvEUZdVsfWfeNEhBkbiOCGEl9wwAfsjP2lz3ZFDx5tq8p60/EqbS0HItG5piHuB71RjoA==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "6mU/cVmmHtQiDXhnzUImxIcDL48GbTk+TsptXyJA+MIOG9LRjPoAQC/qBFB7X+UNyK86bmvGwC8t+M66wsYC8w==" + }, + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "vjwG0GGcTW/PPg6KVud8F9GLWYuAV1rrw1BKAqY0oh4jcUqg15oYF1+qkGR2x2ZHM4DQnWKQ7cJgYbfncz/lYg==" + }, + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "7KMFpTkHC/zoExs+PwP8jDCWcrK9H6L7soowT80CUx3e+nxP/AFnq0AQAW5W76z2WYbLAYCRyPfwYFG6zkvQRw==" + }, + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "xrlmRCnKZJLHxyyLIqkZjNXqgxnKdZxfItrPkjI+6pkRo5lHX8YvSZlWrSI5AVwLMi4HbNWP7064hcAWeZKp5w==" + }, + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg==" + }, "Samboy063.Cpp2IL.Core": { "type": "Transitive", "resolved": "2022.0.5", @@ -202,6 +313,23 @@ "System.Runtime": "4.3.0" } }, + "System.Collections.Concurrent": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, "System.Collections.NonGeneric": { "type": "Transitive", "resolved": "4.3.0", @@ -279,6 +407,28 @@ "System.Runtime": "4.3.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "tD6kosZnTAGdrEa0tZSuFyunMbt/5KYDnHdndJYGqZoNy00XVXyACd5d6KnE1YgYv3ne2CjtAfNXo/fwEhnKUA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Diagnostics.Tracing": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, "System.Globalization": { "type": "Transitive", "resolved": "4.3.0", @@ -289,6 +439,17 @@ "System.Runtime": "4.3.0" } }, + "System.Globalization.Calendars": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Runtime": "4.3.0" + } + }, "System.Globalization.Extensions": { "type": "Transitive", "resolved": "4.3.0", @@ -314,6 +475,21 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.IO.FileSystem": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, "System.IO.FileSystem.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -334,6 +510,50 @@ "System.Runtime.Extensions": "4.3.0" } }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.DiagnosticSource": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Extensions": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.Net.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" + } + }, + "System.Net.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "qOu+hDwFwoZPbzPvwut2qATe3ygjeQBDQj91xlsaqGFQUI5i4ZnZb8yyQuLGpDGivEPIt8EJkd1BVzVoP31FXA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", @@ -441,6 +661,161 @@ "System.Runtime.Handles": "4.3.0" } }, + "System.Runtime.Numerics": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", + "dependencies": { + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.Apple": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Cng": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "03idZOqFlsKRL4W+LuCpJ6dBYDUWReug6lZjBa3uJWnk5sPCUXckocevTaUA8iT/MFSrY/2HXkOt753xQ/cf8g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0" + } + }, + "System.Security.Cryptography.Csp": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Linq": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", + "dependencies": { + "System.Collections": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Calendars": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Cng": "4.3.0", + "System.Security.Cryptography.Csp": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, "System.Text.Encoding": { "type": "Transitive", "resolved": "4.3.0", @@ -478,7 +853,7 @@ "reactor": { "type": "Project", "dependencies": { - "BepInEx.IL2CPP": "6.0.0-be.570" + "BepInEx.Unity.IL2CPP": "6.0.0-be.649" } } } diff --git a/Reactor.Example/ExamplePlugin.cs b/Reactor.Example/ExamplePlugin.cs index 34d7a1a..c3f1e4c 100644 --- a/Reactor.Example/ExamplePlugin.cs +++ b/Reactor.Example/ExamplePlugin.cs @@ -1,10 +1,8 @@ using System; using BepInEx; -using BepInEx.IL2CPP; -using Reactor.Extensions; +using BepInEx.Unity.IL2CPP; using Reactor.Networking; using Reactor.Networking.MethodRpc; -using UnhollowerBaseLib.Attributes; using UnityEngine; using Random = UnityEngine.Random; diff --git a/Reactor.Example/Reactor.Example.csproj b/Reactor.Example/Reactor.Example.csproj index ad82b9c..3dfa164 100644 --- a/Reactor.Example/Reactor.Example.csproj +++ b/Reactor.Example/Reactor.Example.csproj @@ -1,6 +1,6 @@ - netstandard2.1 + net6.0 latest embedded diff --git a/Reactor.Example/packages.lock.json b/Reactor.Example/packages.lock.json index deda5ca..c921a13 100644 --- a/Reactor.Example/packages.lock.json +++ b/Reactor.Example/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - ".NETStandard,Version=v2.1": { + "net6.0": { "AmongUs.GameLibs.Steam": { "type": "Direct", "requested": "[2022.8.23, )", @@ -14,46 +14,51 @@ "resolved": "1.0.1", "contentHash": "G4YpTHG9rtkDJof+ld7Er4E+sCOlgsjG4bJ1itx1ub7dgff6qqHLy9ksX1ehgO0AdBOPVyVl/GKJg9o7iNl8HA==" }, - "BepInEx.IL2CPP": { + "BepInEx.IL2CPP.MSBuild": { "type": "Direct", - "requested": "[6.0.0-be.570, )", - "resolved": "6.0.0-be.570", - "contentHash": "JGkWFFGZTWQ+YlFQ17izlwfGNUyo/zfFGNYPX6XAeTkfM5RwXiPYNMNO6eWoxbKwaYlAylQq2YCRkkCnAr9nwQ==", + "requested": "[2.0.0, )", + "resolved": "2.0.0", + "contentHash": "Xy0XehKQK1cHZwyXBldQrVJv4e3snNOlzGjmQ6I1oovPusZNkjDX1eYriWT05CwKln3BaLA/mNcZ0QzkMLi7lw==" + }, + "BepInEx.Unity.IL2CPP": { + "type": "Direct", + "requested": "[6.0.0-be.649, )", + "resolved": "6.0.0-be.649", + "contentHash": "d/mYFhxUiPlDaWU0ZPMrJWlxVuxNMXpDfn9ow7Du+ELzFqbbdW/dqEkdpj4vL6iiDLycp+WSDjp9b8x16DOT5g==", "dependencies": { - "BepInEx.Core": "6.0.0-be.570", - "BepInEx.Il2Cpp.TlsAdapter": "1.0.1", + "BepInEx.Core": "6.0.0-be.649", + "BepInEx.Unity.Common": "6.0.0-be.649", "HarmonyX": "2.10.0", "Iced": "1.17.0", - "Il2CppAssemblyUnhollower.BaseLib": "0.4.33.3", - "Il2CppAssemblyUnhollower.BaseLib.Legacy": "0.4.33.3", - "Il2CppAssemblyUnhollower.Lib": "0.4.33.3", - "Il2CppDumper": "6.6.4", + "Il2CppInterop.Generator": "1.1.0", + "Il2CppInterop.HarmonySupport": "1.1.0", + "Il2CppInterop.Runtime": "1.1.0", "MonoMod.RuntimeDetour": "22.5.1.1", "Samboy063.Cpp2IL.Core": "2022.0.5" } }, - "BepInEx.IL2CPP.MSBuild": { - "type": "Direct", - "requested": "[1.1.1, )", - "resolved": "1.1.1", - "contentHash": "uUSo4TuamyEIVg+ICNeJMSSW/arKWHGpfBFINc4fdF5kppfHFrsDURKzNPmDvxivtLsiuGthck9J/5uPXgIcTg==" + "AssetRipper.VersionUtilities": { + "type": "Transitive", + "resolved": "1.2.1", + "contentHash": "knQ/W1YwTZS2AbdaZh+nhyyBEZQPQDcahhSOnh88i+cdg4/FEoFJiCwaavgFvCMNuUeHTbcZc4qttF8WQ8xLIA==" }, "BepInEx.Core": { "type": "Transitive", - "resolved": "6.0.0-be.570", - "contentHash": "kygIunLrK1HMGcRo2E/7e4ZEAA0xewuB/j5mPoMi7Xk58GUi43XnclBJHif9x05a55s0kFkfKOrpwIRmjd0cDw==", + "resolved": "6.0.0-be.649", + "contentHash": "fbCDRZ5wqJCorydypIhvKQVR+y7ZRSWlcgan7MK6ObzC6ltHXV3P2im8iZbr2MVXqfwNdkZAIFolfFjrw7AePA==", "dependencies": { "HarmonyX": "2.10.0", - "MonoMod.Utils": "22.3.23.4", + "MonoMod.Utils": "22.5.1.1", "SemanticVersioning": "2.0.2" } }, - "BepInEx.Il2Cpp.TlsAdapter": { + "BepInEx.Unity.Common": { "type": "Transitive", - "resolved": "1.0.1", - "contentHash": "kTfX6312X0Fvwks+t7Ul3YO2jMSbqNS2Jx/85Cgl6lbAjEJnKzsmx7Krmd66dbnx0eY/QMjaV2r6LyWmQARtdA==", + "resolved": "6.0.0-be.649", + "contentHash": "nuZX9E7Ma6MQkTZ07BpLySo4BCMjVU/m8VXLKpj2SAje7OKiLDp69i3EcEAaIRBCRznxnGevQY6+6gteW7veFA==", "dependencies": { - "HarmonyX": "2.3.1" + "AssetRipper.VersionUtilities": "1.2.1", + "MonoMod.Utils": "22.5.1.1" } }, "HarmonyX": { @@ -70,38 +75,41 @@ "resolved": "1.17.0", "contentHash": "8x+HCVTl/HHTGpscH3vMBhV8sknN/muZFw9s3TsI8SA6+c43cOTCi2+jE4KsU8pNLbJ++iF2ZFcpcXHXtDglnw==" }, - "Il2CppAssemblyUnhollower.BaseLib": { + "Il2CppInterop.Common": { "type": "Transitive", - "resolved": "0.4.33.3", - "contentHash": "CH91M6Asz4iwennTa8cLg5wqROJY1JvnsfRetyOvs0cy8o/YAikvm8uuNgZv6UiTO/qoyy/QrBE1qSZDvs8bLw==", + "resolved": "1.1.0", + "contentHash": "wExfEtiVhgTll9Ize6Hxx03lTYsl/nr8+d7VBrqNv+bbNaJ8A67X63TI7+ghsk1OL57DIZb3Txp0WMmNc7vuew==", "dependencies": { - "Iced": "1.15.0" + "Iced": "1.17.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "System.Net.Http": "4.3.4" } }, - "Il2CppAssemblyUnhollower.BaseLib.Legacy": { + "Il2CppInterop.Generator": { "type": "Transitive", - "resolved": "0.4.33.3", - "contentHash": "6yIJg8lkayBDevPwcdcV3LWTdHt8VAZVY0wQwuXH4POOo0Kzc6Cshy9kLCxH3AC6EQg0G/v+Albs6RZgwszXMQ==", + "resolved": "1.1.0", + "contentHash": "YjZUI/GQ78kN2YYpQzNDeo1kUdvxHoXFkrYzTg0IGxDDQTK+AglFQ8au9iMyP5KUgWtfU44FGbnodMVI2yr8Kg==", "dependencies": { - "Il2CppAssemblyUnhollower.BaseLib": "0.4.33.3" - } - }, - "Il2CppAssemblyUnhollower.Lib": { - "type": "Transitive", - "resolved": "0.4.33.3", - "contentHash": "tdu4OnMxodkWwoImNDaycaLY1L3qJOazb5UaLAt1ncRpWyu6xvKuKe5NM6OcBXONpkYsJQeQZjD6syeFl5MCQA==", - "dependencies": { - "Il2CppAssemblyUnhollower.BaseLib": "0.4.33.3", - "Il2CppAssemblyUnhollower.BaseLib.Legacy": "0.4.33.3", + "Il2CppInterop.Common": "1.1.0", "Mono.Cecil": "0.11.3" } }, - "Il2CppDumper": { + "Il2CppInterop.HarmonySupport": { "type": "Transitive", - "resolved": "6.6.4", - "contentHash": "aqjmlyigdZ5FS9ElMNlaCExlgSmAiho4BeIcVwkmzHGnomBzopjOCxqIX9vc/575TQ87TKoaGW2KP+3b5xI15A==", + "resolved": "1.1.0", + "contentHash": "ksBVbpf8J6VYwD9w70n/4QsqqI0BsFu/oAZUuJO3nGCoGqSoKY42fZLZ1YgJFpsMqMo9Lc9Er9QxbrfE8IYxpQ==", "dependencies": { - "Mono.Cecil": "0.11.3" + "HarmonyX": "2.10.0", + "Il2CppInterop.Runtime": "1.1.0" + } + }, + "Il2CppInterop.Runtime": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "CAh73XWvFu9584ELoCAmi2Njs+qKyENJih+TEoz2EN5g8lRF9p7NKche5XLIN8OeQo7+CNKKz9/uf5j8k2q2gA==", + "dependencies": { + "Iced": "1.17.0", + "Il2CppInterop.Common": "1.1.0" } }, "IndexRange": { @@ -114,10 +122,15 @@ "resolved": "2.1.0", "contentHash": "YYpq7NM50bSSVUDjXyV/eiITk6syXqItPjKBOb3jEWS6RFsk0DNhpWMPW6b3hKDmArARuWDU6S2pVu1IeVrvIA==" }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + "resolved": "1.1.1", + "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -158,6 +171,104 @@ "System.Reflection.TypeExtensions": "4.7.0" } }, + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "7VSGO0URRKoMEAq0Sc9cRz8mb6zbyx/BZDEWhgPdzzpmFhkam3fJ1DAGWFXBI4nGlma+uPKpfuMQP5LXRnOH5g==" + }, + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "0oAaTAm6e2oVH+/Zttt0cuhGaePQYKII1dY8iaqP7CvOpVKgLybKRFvQjXR2LtxXOXTVPNv14j0ot8uV+HrUmw==" + }, + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "G24ibsCNi5Kbz0oXWynBoRgtGvsw5ZSVEWjv13/KiCAM8C6wz9zzcCniMeQFIkJ2tasjo2kXlvlBZhplL51kGg==" + }, + "runtime.native.System": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", + "dependencies": { + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" + } + }, + "runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "QR1OwtwehHxSeQvZKXe+iSd+d3XZNkEcuWMFYa2i0aG1l+lR739HPicKMlTbJst3spmeekDVBUS7SeS26s4U/g==", + "dependencies": { + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" + } + }, + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "I+GNKGg2xCHueRd1m9PzeEW7WLbNNLznmTuEi8/vZX71HudUbx1UTwlGkiwMri7JLl8hGaIAWnA/GONhu+LOyQ==" + }, + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "1Z3TAq1ytS1IBRtPXJvEUZdVsfWfeNEhBkbiOCGEl9wwAfsjP2lz3ZFDx5tq8p60/EqbS0HItG5piHuB71RjoA==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "6mU/cVmmHtQiDXhnzUImxIcDL48GbTk+TsptXyJA+MIOG9LRjPoAQC/qBFB7X+UNyK86bmvGwC8t+M66wsYC8w==" + }, + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "vjwG0GGcTW/PPg6KVud8F9GLWYuAV1rrw1BKAqY0oh4jcUqg15oYF1+qkGR2x2ZHM4DQnWKQ7cJgYbfncz/lYg==" + }, + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "7KMFpTkHC/zoExs+PwP8jDCWcrK9H6L7soowT80CUx3e+nxP/AFnq0AQAW5W76z2WYbLAYCRyPfwYFG6zkvQRw==" + }, + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "xrlmRCnKZJLHxyyLIqkZjNXqgxnKdZxfItrPkjI+6pkRo5lHX8YvSZlWrSI5AVwLMi4HbNWP7064hcAWeZKp5w==" + }, + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg==" + }, "Samboy063.Cpp2IL.Core": { "type": "Transitive", "resolved": "2022.0.5", @@ -202,6 +313,23 @@ "System.Runtime": "4.3.0" } }, + "System.Collections.Concurrent": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, "System.Collections.NonGeneric": { "type": "Transitive", "resolved": "4.3.0", @@ -279,6 +407,28 @@ "System.Runtime": "4.3.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "tD6kosZnTAGdrEa0tZSuFyunMbt/5KYDnHdndJYGqZoNy00XVXyACd5d6KnE1YgYv3ne2CjtAfNXo/fwEhnKUA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Diagnostics.Tracing": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, "System.Globalization": { "type": "Transitive", "resolved": "4.3.0", @@ -289,6 +439,17 @@ "System.Runtime": "4.3.0" } }, + "System.Globalization.Calendars": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Runtime": "4.3.0" + } + }, "System.Globalization.Extensions": { "type": "Transitive", "resolved": "4.3.0", @@ -314,6 +475,21 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.IO.FileSystem": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, "System.IO.FileSystem.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -334,6 +510,50 @@ "System.Runtime.Extensions": "4.3.0" } }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.DiagnosticSource": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Extensions": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.Net.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" + } + }, + "System.Net.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "qOu+hDwFwoZPbzPvwut2qATe3ygjeQBDQj91xlsaqGFQUI5i4ZnZb8yyQuLGpDGivEPIt8EJkd1BVzVoP31FXA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", @@ -441,6 +661,161 @@ "System.Runtime.Handles": "4.3.0" } }, + "System.Runtime.Numerics": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", + "dependencies": { + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.Apple": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Cng": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "03idZOqFlsKRL4W+LuCpJ6dBYDUWReug6lZjBa3uJWnk5sPCUXckocevTaUA8iT/MFSrY/2HXkOt753xQ/cf8g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0" + } + }, + "System.Security.Cryptography.Csp": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Linq": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", + "dependencies": { + "System.Collections": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Calendars": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Cng": "4.3.0", + "System.Security.Cryptography.Csp": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, "System.Text.Encoding": { "type": "Transitive", "resolved": "4.3.0", @@ -478,7 +853,7 @@ "reactor": { "type": "Project", "dependencies": { - "BepInEx.IL2CPP": "6.0.0-be.570" + "BepInEx.Unity.IL2CPP": "6.0.0-be.649" } } } diff --git a/Reactor/ChainloaderHooks.cs b/Reactor/ChainloaderHooks.cs index 2f99ec2..3a184e3 100644 --- a/Reactor/ChainloaderHooks.cs +++ b/Reactor/ChainloaderHooks.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Reflection.Emit; -using BepInEx.IL2CPP; +using BepInEx.Unity.IL2CPP; using HarmonyLib; namespace Reactor; diff --git a/Reactor/Coroutines.cs b/Reactor/Coroutines.cs index 366ea52..5b1f7f4 100644 --- a/Reactor/Coroutines.cs +++ b/Reactor/Coroutines.cs @@ -2,7 +2,7 @@ using System; using System.Collections; using System.Diagnostics.CodeAnalysis; using System.Runtime.CompilerServices; -using BepInEx.IL2CPP.Utils; +using BepInEx.Unity.IL2CPP.Utils; using UnityEngine; namespace Reactor; diff --git a/Reactor/CustomStringName.cs b/Reactor/CustomStringName.cs index 15fbd9d..c424d48 100644 --- a/Reactor/CustomStringName.cs +++ b/Reactor/CustomStringName.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.Linq; using HarmonyLib; -using UnhollowerBaseLib; +using Il2CppInterop.Runtime.InteropTypes.Arrays; namespace Reactor; diff --git a/Reactor/Extensions/Dispatcher.cs b/Reactor/Extensions/Dispatcher.cs index c36134e..acbfda7 100644 --- a/Reactor/Extensions/Dispatcher.cs +++ b/Reactor/Extensions/Dispatcher.cs @@ -1,6 +1,6 @@ using System; using System.Collections.Generic; -using UnhollowerBaseLib.Attributes; +using Il2CppInterop.Runtime.Attributes; using UnityEngine; namespace Reactor.Extensions; diff --git a/Reactor/Extensions/Extensions.cs b/Reactor/Extensions/Extensions.cs index 6f55f7a..9f936e5 100644 --- a/Reactor/Extensions/Extensions.cs +++ b/Reactor/Extensions/Extensions.cs @@ -9,7 +9,7 @@ using UnityEngine; using UnityEngine.Events; using UnityEngine.Networking; using UnityEngine.SceneManagement; -using Il2CppType = UnhollowerRuntimeLib.Il2CppType; +using Il2CppType = Il2CppInterop.Runtime.Il2CppType; namespace Reactor.Extensions; diff --git a/Reactor/Extensions/GUIExtensions.cs b/Reactor/Extensions/GUIExtensions.cs index c6658eb..69b0c07 100644 --- a/Reactor/Extensions/GUIExtensions.cs +++ b/Reactor/Extensions/GUIExtensions.cs @@ -1,5 +1,4 @@ using System; -using UnhollowerBaseLib; using UnityEngine; using UnityEngine.EventSystems; using UnityEngine.UI; diff --git a/Reactor/Extensions/ReflectionExtensions.cs b/Reactor/Extensions/ReflectionExtensions.cs new file mode 100644 index 0000000..1f2eb91 --- /dev/null +++ b/Reactor/Extensions/ReflectionExtensions.cs @@ -0,0 +1,56 @@ +using System; +using System.Reflection; +using HarmonyLib; +using Il2CppInterop.Common; +using Il2CppInterop.Common.Attributes; +using Il2CppInterop.Runtime; +using Il2CppSystem.Runtime.CompilerServices; +using Il2CppCustomAttributeExtensions = Il2CppSystem.Reflection.CustomAttributeExtensions; +using MethodInfo = System.Reflection.MethodInfo; +using Il2CppMethodInfo = Il2CppSystem.Reflection.MethodInfo; +using Il2CppSystemType = Il2CppSystem.Type; + +namespace Reactor.Extensions; + +public static class ReflectionExtensions +{ + public static Il2CppMethodInfo ToIl2CppMethodInfo(this MethodInfo methodInfo) + { + var il2CppMethodField = Il2CppInteropUtils.GetIl2CppMethodInfoPointerFieldForGeneratedMethod(methodInfo); + if (il2CppMethodField == null) throw new ArgumentException($"'{methodInfo.Name}' is not an il2cpp method", nameof(methodInfo)); + var il2CppMethod = (IntPtr) il2CppMethodField.GetValue(null)!; + + return new Il2CppSystem.Reflection.MethodInfo(IL2CPP.il2cpp_method_get_object(il2CppMethod, IntPtr.Zero)); + } + + public static Il2CppSystemType GetEnumeratorMoveNextType(this Il2CppMethodInfo methodInfo) + { + var customAttribute = Il2CppCustomAttributeExtensions.GetCustomAttribute(methodInfo, Il2CppType.Of()).TryCast(); + if (customAttribute == null) throw new ArgumentException($"'{methodInfo.Name}' is not an enumerator method", nameof(methodInfo)); + + return customAttribute._StateMachineType_k__BackingField; + } + + public static Type ToSystemType(this Il2CppSystemType type) + { + var result = Type.GetType(type.AssemblyQualifiedName); + if (result != null) return result; + + foreach (var t in AccessTools.GetTypesFromAssembly(Assembly.Load(type.Assembly.FullName))) + { + if (t.Namespace != type.Namespace) continue; + + var name = t.GetCustomAttribute()?.ObfuscatedName?.Replace('/', '+') ?? t.FullName; + if (name != type.FullName) continue; + + return t; + } + + throw new Exception("Failed to find a system type for " + type.AssemblyQualifiedName); + } + + public static MethodInfo EnumeratorMoveNext(Type type, string methodName) + { + return AccessTools.Method(AccessTools.Method(type, methodName).ToIl2CppMethodInfo().GetEnumeratorMoveNextType().ToSystemType(), "MoveNext"); + } +} diff --git a/Reactor/Extensions/StreamExtensions.cs b/Reactor/Extensions/StreamExtensions.cs index 67396a6..46e270d 100644 --- a/Reactor/Extensions/StreamExtensions.cs +++ b/Reactor/Extensions/StreamExtensions.cs @@ -1,9 +1,9 @@ using System; using System.IO; using System.Runtime.CompilerServices; -using UnhollowerBaseLib; -using UnhollowerBaseLib.Attributes; -using UnhollowerRuntimeLib; +using Il2CppInterop.Runtime.Attributes; +using Il2CppInterop.Runtime.Injection; +using Il2CppInterop.Runtime.InteropTypes.Arrays; namespace Reactor.Extensions; diff --git a/Reactor/Logger.cs b/Reactor/Logger.cs index 2c6fc7b..c88464e 100644 --- a/Reactor/Logger.cs +++ b/Reactor/Logger.cs @@ -1,4 +1,4 @@ -using BepInEx.IL2CPP; +using BepInEx.Unity.IL2CPP; using BepInEx.Logging; namespace Reactor; diff --git a/Reactor/Networking/CustomRpc.cs b/Reactor/Networking/CustomRpc.cs index db8194d..bdebf50 100644 --- a/Reactor/Networking/CustomRpc.cs +++ b/Reactor/Networking/CustomRpc.cs @@ -1,5 +1,5 @@ using System; -using BepInEx.IL2CPP; +using BepInEx.Unity.IL2CPP; using Hazel; using InnerNet; diff --git a/Reactor/Networking/CustomRpcManager.cs b/Reactor/Networking/CustomRpcManager.cs index a912604..20aca5a 100644 --- a/Reactor/Networking/CustomRpcManager.cs +++ b/Reactor/Networking/CustomRpcManager.cs @@ -62,7 +62,7 @@ public class CustomRpcManager public static IEnumerable TargetMethods() { - return InnerNetObjectTypes.Select(x => x.GetMethod(nameof(InnerNetObject.HandleRpc), AccessTools.all)); + return InnerNetObjectTypes.Select(x => x.GetMethod(nameof(InnerNetObject.HandleRpc), AccessTools.all)!); } public static bool Prefix(InnerNetObject __instance, [HarmonyArgument(0)] byte callId, [HarmonyArgument(1)] MessageReader reader) diff --git a/Reactor/Networking/MethodRpc/MethodRpc.cs b/Reactor/Networking/MethodRpc/MethodRpc.cs index 7846c06..9e99717 100644 --- a/Reactor/Networking/MethodRpc/MethodRpc.cs +++ b/Reactor/Networking/MethodRpc/MethodRpc.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Reflection; using System.Reflection.Emit; using System.Runtime.InteropServices; -using BepInEx.IL2CPP; +using BepInEx.Unity.IL2CPP; using HarmonyLib; using Hazel; using InnerNet; diff --git a/Reactor/Networking/MethodRpc/MethodRpcAttribute.cs b/Reactor/Networking/MethodRpc/MethodRpcAttribute.cs index da6e51b..86465ff 100644 --- a/Reactor/Networking/MethodRpc/MethodRpcAttribute.cs +++ b/Reactor/Networking/MethodRpc/MethodRpcAttribute.cs @@ -1,7 +1,7 @@ using System; using System.Linq; using System.Reflection; -using BepInEx.IL2CPP; +using BepInEx.Unity.IL2CPP; using HarmonyLib; using Hazel; diff --git a/Reactor/Networking/ModList.cs b/Reactor/Networking/ModList.cs index dc48222..41cdcd4 100644 --- a/Reactor/Networking/ModList.cs +++ b/Reactor/Networking/ModList.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.Linq; -using BepInEx.IL2CPP; +using BepInEx.Unity.IL2CPP; namespace Reactor.Networking; diff --git a/Reactor/Networking/Patches/ClientPatches.cs b/Reactor/Networking/Patches/ClientPatches.cs index 17a9358..d333de3 100644 --- a/Reactor/Networking/Patches/ClientPatches.cs +++ b/Reactor/Networking/Patches/ClientPatches.cs @@ -4,9 +4,9 @@ using System.Linq; using HarmonyLib; using Hazel; using Hazel.Udp; +using Il2CppInterop.Runtime.InteropTypes.Arrays; using InnerNet; using Reactor.Extensions; -using UnhollowerBaseLib; using UnityEngine; namespace Reactor.Networking.Patches; diff --git a/Reactor/Networking/Patches/HttpPatches.cs b/Reactor/Networking/Patches/HttpPatches.cs index d7e7ec4..2615d2b 100644 --- a/Reactor/Networking/Patches/HttpPatches.cs +++ b/Reactor/Networking/Patches/HttpPatches.cs @@ -2,7 +2,7 @@ using System; using System.Linq; using System.Text; using HarmonyLib; -using UnhollowerBaseLib; +using Il2CppInterop.Runtime.InteropTypes.Arrays; using UnityEngine.Networking; namespace Reactor.Networking.Patches; diff --git a/Reactor/Networking/PlayerCustomRpc.cs b/Reactor/Networking/PlayerCustomRpc.cs index c692be1..24aca17 100644 --- a/Reactor/Networking/PlayerCustomRpc.cs +++ b/Reactor/Networking/PlayerCustomRpc.cs @@ -1,4 +1,4 @@ -using BepInEx.IL2CPP; +using BepInEx.Unity.IL2CPP; namespace Reactor.Networking; diff --git a/Reactor/Networking/Serialization/MessageConverterAttribute.cs b/Reactor/Networking/Serialization/MessageConverterAttribute.cs index d6bb4db..065731c 100644 --- a/Reactor/Networking/Serialization/MessageConverterAttribute.cs +++ b/Reactor/Networking/Serialization/MessageConverterAttribute.cs @@ -22,7 +22,7 @@ public class MessageConverterAttribute : Attribute try { - var messageConverter = (UnsafeMessageConverter) Activator.CreateInstance(type); + var messageConverter = (UnsafeMessageConverter) Activator.CreateInstance(type)!; MessageSerializer.Register(messageConverter); } catch (Exception e) diff --git a/Reactor/Networking/Serialization/MessageSerializer.cs b/Reactor/Networking/Serialization/MessageSerializer.cs index e01cb08..960d6ad 100644 --- a/Reactor/Networking/Serialization/MessageSerializer.cs +++ b/Reactor/Networking/Serialization/MessageSerializer.cs @@ -11,7 +11,7 @@ public static class MessageSerializer { private static List MessageConverters { get; } = new(); - private static Dictionary MessageConverterMap { get; } = new(); + private static Dictionary MessageConverterMap { get; } = new(); public static void Register(UnsafeMessageConverter messageConverter) { diff --git a/Reactor/Networking/UnsafeCustomRpc.cs b/Reactor/Networking/UnsafeCustomRpc.cs index 97e843e..4769950 100644 --- a/Reactor/Networking/UnsafeCustomRpc.cs +++ b/Reactor/Networking/UnsafeCustomRpc.cs @@ -1,6 +1,6 @@ using System; using BepInEx; -using BepInEx.IL2CPP; +using BepInEx.Unity.IL2CPP; using Hazel; using InnerNet; diff --git a/Reactor/Patches/ReactorVersionShower.cs b/Reactor/Patches/ReactorVersionShower.cs index 957a69e..81b2f6f 100644 --- a/Reactor/Patches/ReactorVersionShower.cs +++ b/Reactor/Patches/ReactorVersionShower.cs @@ -1,11 +1,12 @@ using System; using BepInEx; -using BepInEx.IL2CPP; +using BepInEx.Unity.IL2CPP; using HarmonyLib; using Reactor.Extensions; using TMPro; using UnityEngine; using UnityEngine.SceneManagement; +using Version = SemanticVersioning.Version; namespace Reactor.Patches; @@ -53,10 +54,16 @@ public static class ReactorVersionShower })); } + private static string ToStringWithoutBuild(Version version) + { + return $"{version.Major}.{version.Minor}.{version.Patch}{(version.PreRelease == null ? "" : $"-{version.PreRelease}")}"; + } + public static void UpdateText() { - Text!.text = "Reactor " + typeof(ReactorPlugin).Assembly.GetCustomAttribute().InformationalVersion; - Text.text += "\nBepInEx " + Paths.BepInExVersion; + if (Text == null) return; + Text.text = "Reactor " + ReactorPlugin.Version; + Text.text += "\nBepInEx " + ToStringWithoutBuild(Paths.BepInExVersion); Text.text += "\nMods: " + IL2CPPChainloader.Instance.Plugins.Count; TextUpdated?.Invoke(Text); } diff --git a/Reactor/Patches/RegionInfoWatcher.cs b/Reactor/Patches/RegionInfoWatcher.cs index e9a02ee..4eaec81 100644 --- a/Reactor/Patches/RegionInfoWatcher.cs +++ b/Reactor/Patches/RegionInfoWatcher.cs @@ -21,9 +21,10 @@ internal class RegionInfoWatcher : IDisposable "regionInfo.json" ); - Watcher.Changed += (s, e) => + Watcher.Changed += (_, e) => { - if (new FileInfo(e.Name).Length > 0) + var fileInfo = new FileInfo(e.FullPath); + if (fileInfo.Exists && fileInfo.Length > 0) { if (IgnoreNext) { diff --git a/Reactor/PluginSingleton.cs b/Reactor/PluginSingleton.cs index aa08c90..20215cf 100644 --- a/Reactor/PluginSingleton.cs +++ b/Reactor/PluginSingleton.cs @@ -1,6 +1,6 @@ using System.Linq; using System.Reflection; -using BepInEx.IL2CPP; +using BepInEx.Unity.IL2CPP; namespace Reactor; diff --git a/Reactor/Reactor.csproj b/Reactor/Reactor.csproj index 5d834b4..91f4143 100644 --- a/Reactor/Reactor.csproj +++ b/Reactor/Reactor.csproj @@ -1,12 +1,12 @@ - netstandard2.1 + net6.0 latest embedded enable true - 1.2.8 + 2.0.0 dev Core mod and API for Among Us NuclearPowered diff --git a/Reactor/ReactorPlugin.cs b/Reactor/ReactorPlugin.cs index 2d6b5a3..bcd5c93 100644 --- a/Reactor/ReactorPlugin.cs +++ b/Reactor/ReactorPlugin.cs @@ -2,7 +2,7 @@ using System.Linq; using BepInEx; using BepInEx.Configuration; -using BepInEx.IL2CPP; +using BepInEx.Unity.IL2CPP; using HarmonyLib; using Reactor.Extensions; using Reactor.Networking; @@ -10,7 +10,7 @@ using Reactor.Networking.MethodRpc; using Reactor.Networking.Serialization; using Reactor.Patches; using Reactor.Unstrip; -using UnhollowerBaseLib.Attributes; +using Il2CppInterop.Runtime.Attributes; using UnityEngine; using UnityEngine.SceneManagement; diff --git a/Reactor/RegisterCustomRpcAttribute.cs b/Reactor/RegisterCustomRpcAttribute.cs index e722e27..de88023 100644 --- a/Reactor/RegisterCustomRpcAttribute.cs +++ b/Reactor/RegisterCustomRpcAttribute.cs @@ -1,6 +1,6 @@ using System; using System.Reflection; -using BepInEx.IL2CPP; +using BepInEx.Unity.IL2CPP; using HarmonyLib; using Reactor.Networking; @@ -37,7 +37,7 @@ public class RegisterCustomRpcAttribute : Attribute throw new InvalidOperationException($"Type {type.FullDescription()} has {nameof(RegisterCustomRpcAttribute)} but doesn't extend {nameof(UnsafeCustomRpc)}."); } - var customRpc = (UnsafeCustomRpc) Activator.CreateInstance(type, plugin, attribute.Id); + var customRpc = (UnsafeCustomRpc) Activator.CreateInstance(type, plugin, attribute.Id)!; PluginSingleton.Instance.CustomRpcManager.Register(customRpc); } } diff --git a/Reactor/RegisterInIl2CppAttribute.cs b/Reactor/RegisterInIl2CppAttribute.cs index 5530fc5..7a5ab2f 100644 --- a/Reactor/RegisterInIl2CppAttribute.cs +++ b/Reactor/RegisterInIl2CppAttribute.cs @@ -1,7 +1,7 @@ using System; using System.Reflection; using HarmonyLib; -using UnhollowerRuntimeLib; +using Il2CppInterop.Runtime.Injection; namespace Reactor; diff --git a/Reactor/packages.lock.json b/Reactor/packages.lock.json index ce15a6d..790746b 100644 --- a/Reactor/packages.lock.json +++ b/Reactor/packages.lock.json @@ -1,7 +1,7 @@ { "version": 1, "dependencies": { - ".NETStandard,Version=v2.1": { + "net6.0": { "AmongUs.GameLibs.Steam": { "type": "Direct", "requested": "[2022.8.23, )", @@ -14,30 +14,29 @@ "resolved": "1.0.1", "contentHash": "G4YpTHG9rtkDJof+ld7Er4E+sCOlgsjG4bJ1itx1ub7dgff6qqHLy9ksX1ehgO0AdBOPVyVl/GKJg9o7iNl8HA==" }, - "BepInEx.IL2CPP": { + "BepInEx.IL2CPP.MSBuild": { "type": "Direct", - "requested": "[6.0.0-be.570, )", - "resolved": "6.0.0-be.570", - "contentHash": "JGkWFFGZTWQ+YlFQ17izlwfGNUyo/zfFGNYPX6XAeTkfM5RwXiPYNMNO6eWoxbKwaYlAylQq2YCRkkCnAr9nwQ==", + "requested": "[2.0.0, )", + "resolved": "2.0.0", + "contentHash": "Xy0XehKQK1cHZwyXBldQrVJv4e3snNOlzGjmQ6I1oovPusZNkjDX1eYriWT05CwKln3BaLA/mNcZ0QzkMLi7lw==" + }, + "BepInEx.Unity.IL2CPP": { + "type": "Direct", + "requested": "[6.0.0-be.649, )", + "resolved": "6.0.0-be.649", + "contentHash": "d/mYFhxUiPlDaWU0ZPMrJWlxVuxNMXpDfn9ow7Du+ELzFqbbdW/dqEkdpj4vL6iiDLycp+WSDjp9b8x16DOT5g==", "dependencies": { - "BepInEx.Core": "6.0.0-be.570", - "BepInEx.Il2Cpp.TlsAdapter": "1.0.1", + "BepInEx.Core": "6.0.0-be.649", + "BepInEx.Unity.Common": "6.0.0-be.649", "HarmonyX": "2.10.0", "Iced": "1.17.0", - "Il2CppAssemblyUnhollower.BaseLib": "0.4.33.3", - "Il2CppAssemblyUnhollower.BaseLib.Legacy": "0.4.33.3", - "Il2CppAssemblyUnhollower.Lib": "0.4.33.3", - "Il2CppDumper": "6.6.4", + "Il2CppInterop.Generator": "1.1.0", + "Il2CppInterop.HarmonySupport": "1.1.0", + "Il2CppInterop.Runtime": "1.1.0", "MonoMod.RuntimeDetour": "22.5.1.1", "Samboy063.Cpp2IL.Core": "2022.0.5" } }, - "BepInEx.IL2CPP.MSBuild": { - "type": "Direct", - "requested": "[1.1.1, )", - "resolved": "1.1.1", - "contentHash": "uUSo4TuamyEIVg+ICNeJMSSW/arKWHGpfBFINc4fdF5kppfHFrsDURKzNPmDvxivtLsiuGthck9J/5uPXgIcTg==" - }, "Microsoft.SourceLink.GitHub": { "type": "Direct", "requested": "[1.1.1, )", @@ -48,22 +47,28 @@ "Microsoft.SourceLink.Common": "1.1.1" } }, + "AssetRipper.VersionUtilities": { + "type": "Transitive", + "resolved": "1.2.1", + "contentHash": "knQ/W1YwTZS2AbdaZh+nhyyBEZQPQDcahhSOnh88i+cdg4/FEoFJiCwaavgFvCMNuUeHTbcZc4qttF8WQ8xLIA==" + }, "BepInEx.Core": { "type": "Transitive", - "resolved": "6.0.0-be.570", - "contentHash": "kygIunLrK1HMGcRo2E/7e4ZEAA0xewuB/j5mPoMi7Xk58GUi43XnclBJHif9x05a55s0kFkfKOrpwIRmjd0cDw==", + "resolved": "6.0.0-be.649", + "contentHash": "fbCDRZ5wqJCorydypIhvKQVR+y7ZRSWlcgan7MK6ObzC6ltHXV3P2im8iZbr2MVXqfwNdkZAIFolfFjrw7AePA==", "dependencies": { "HarmonyX": "2.10.0", - "MonoMod.Utils": "22.3.23.4", + "MonoMod.Utils": "22.5.1.1", "SemanticVersioning": "2.0.2" } }, - "BepInEx.Il2Cpp.TlsAdapter": { + "BepInEx.Unity.Common": { "type": "Transitive", - "resolved": "1.0.1", - "contentHash": "kTfX6312X0Fvwks+t7Ul3YO2jMSbqNS2Jx/85Cgl6lbAjEJnKzsmx7Krmd66dbnx0eY/QMjaV2r6LyWmQARtdA==", + "resolved": "6.0.0-be.649", + "contentHash": "nuZX9E7Ma6MQkTZ07BpLySo4BCMjVU/m8VXLKpj2SAje7OKiLDp69i3EcEAaIRBCRznxnGevQY6+6gteW7veFA==", "dependencies": { - "HarmonyX": "2.3.1" + "AssetRipper.VersionUtilities": "1.2.1", + "MonoMod.Utils": "22.5.1.1" } }, "HarmonyX": { @@ -80,38 +85,41 @@ "resolved": "1.17.0", "contentHash": "8x+HCVTl/HHTGpscH3vMBhV8sknN/muZFw9s3TsI8SA6+c43cOTCi2+jE4KsU8pNLbJ++iF2ZFcpcXHXtDglnw==" }, - "Il2CppAssemblyUnhollower.BaseLib": { + "Il2CppInterop.Common": { "type": "Transitive", - "resolved": "0.4.33.3", - "contentHash": "CH91M6Asz4iwennTa8cLg5wqROJY1JvnsfRetyOvs0cy8o/YAikvm8uuNgZv6UiTO/qoyy/QrBE1qSZDvs8bLw==", + "resolved": "1.1.0", + "contentHash": "wExfEtiVhgTll9Ize6Hxx03lTYsl/nr8+d7VBrqNv+bbNaJ8A67X63TI7+ghsk1OL57DIZb3Txp0WMmNc7vuew==", "dependencies": { - "Iced": "1.15.0" + "Iced": "1.17.0", + "Microsoft.Extensions.Logging.Abstractions": "6.0.1", + "System.Net.Http": "4.3.4" } }, - "Il2CppAssemblyUnhollower.BaseLib.Legacy": { + "Il2CppInterop.Generator": { "type": "Transitive", - "resolved": "0.4.33.3", - "contentHash": "6yIJg8lkayBDevPwcdcV3LWTdHt8VAZVY0wQwuXH4POOo0Kzc6Cshy9kLCxH3AC6EQg0G/v+Albs6RZgwszXMQ==", + "resolved": "1.1.0", + "contentHash": "YjZUI/GQ78kN2YYpQzNDeo1kUdvxHoXFkrYzTg0IGxDDQTK+AglFQ8au9iMyP5KUgWtfU44FGbnodMVI2yr8Kg==", "dependencies": { - "Il2CppAssemblyUnhollower.BaseLib": "0.4.33.3" - } - }, - "Il2CppAssemblyUnhollower.Lib": { - "type": "Transitive", - "resolved": "0.4.33.3", - "contentHash": "tdu4OnMxodkWwoImNDaycaLY1L3qJOazb5UaLAt1ncRpWyu6xvKuKe5NM6OcBXONpkYsJQeQZjD6syeFl5MCQA==", - "dependencies": { - "Il2CppAssemblyUnhollower.BaseLib": "0.4.33.3", - "Il2CppAssemblyUnhollower.BaseLib.Legacy": "0.4.33.3", + "Il2CppInterop.Common": "1.1.0", "Mono.Cecil": "0.11.3" } }, - "Il2CppDumper": { + "Il2CppInterop.HarmonySupport": { "type": "Transitive", - "resolved": "6.6.4", - "contentHash": "aqjmlyigdZ5FS9ElMNlaCExlgSmAiho4BeIcVwkmzHGnomBzopjOCxqIX9vc/575TQ87TKoaGW2KP+3b5xI15A==", + "resolved": "1.1.0", + "contentHash": "ksBVbpf8J6VYwD9w70n/4QsqqI0BsFu/oAZUuJO3nGCoGqSoKY42fZLZ1YgJFpsMqMo9Lc9Er9QxbrfE8IYxpQ==", "dependencies": { - "Mono.Cecil": "0.11.3" + "HarmonyX": "2.10.0", + "Il2CppInterop.Runtime": "1.1.0" + } + }, + "Il2CppInterop.Runtime": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "CAh73XWvFu9584ELoCAmi2Njs+qKyENJih+TEoz2EN5g8lRF9p7NKche5XLIN8OeQo7+CNKKz9/uf5j8k2q2gA==", + "dependencies": { + "Iced": "1.17.0", + "Il2CppInterop.Common": "1.1.0" } }, "IndexRange": { @@ -129,10 +137,15 @@ "resolved": "1.1.1", "contentHash": "AT3HlgTjsqHnWpBHSNeR0KxbLZD7bztlZVj7I8vgeYG9SYqbeFGh0TM/KVtC6fg53nrWHl3VfZFvb5BiQFcY6Q==" }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "dzB2Cgg+JmrouhjkcQGzSFjjvpwlq353i8oBQO2GWNjCXSzhbtBRUf28HSauWe7eib3wYOdb3tItdjRwAdwCSg==" + }, "Microsoft.NETCore.Platforms": { "type": "Transitive", - "resolved": "1.1.0", - "contentHash": "kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==" + "resolved": "1.1.1", + "contentHash": "TMBuzAHpTenGbGgk0SMTwyEkyijY/Eae4ZGsFNYJvAr/LDn1ku3Etp3FPxChmDp5HHF3kzJuoaa08N0xjqAJfQ==" }, "Microsoft.NETCore.Targets": { "type": "Transitive", @@ -178,6 +191,104 @@ "System.Reflection.TypeExtensions": "4.7.0" } }, + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "7VSGO0URRKoMEAq0Sc9cRz8mb6zbyx/BZDEWhgPdzzpmFhkam3fJ1DAGWFXBI4nGlma+uPKpfuMQP5LXRnOH5g==" + }, + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "0oAaTAm6e2oVH+/Zttt0cuhGaePQYKII1dY8iaqP7CvOpVKgLybKRFvQjXR2LtxXOXTVPNv14j0ot8uV+HrUmw==" + }, + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "G24ibsCNi5Kbz0oXWynBoRgtGvsw5ZSVEWjv13/KiCAM8C6wz9zzcCniMeQFIkJ2tasjo2kXlvlBZhplL51kGg==" + }, + "runtime.native.System": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "c/qWt2LieNZIj1jGnVNsE2Kl23Ya2aSTBuXMD6V7k9KWr6l16Tqdwq+hJScEpWER9753NWC8h96PaVNY5Ld7Jw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ZVuZJqnnegJhd2k/PtAbbIcZ3aZeITq3sj06oKfMBSfphW3HDmk/t4ObvbOk/JA/swGR0LNqMksAh/f7gpTROg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0" + } + }, + "runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "DloMk88juo0OuOWr56QG7MNchmafTLYWvABy36izkrLI5VledI0rq28KGs1i9wbpeT9NPQrx/wTf8U2vazqQ3Q==", + "dependencies": { + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": "4.3.0" + } + }, + "runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "QR1OwtwehHxSeQvZKXe+iSd+d3XZNkEcuWMFYa2i0aG1l+lR739HPicKMlTbJst3spmeekDVBUS7SeS26s4U/g==", + "dependencies": { + "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2", + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" + } + }, + "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "I+GNKGg2xCHueRd1m9PzeEW7WLbNNLznmTuEi8/vZX71HudUbx1UTwlGkiwMri7JLl8hGaIAWnA/GONhu+LOyQ==" + }, + "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "1Z3TAq1ytS1IBRtPXJvEUZdVsfWfeNEhBkbiOCGEl9wwAfsjP2lz3ZFDx5tq8p60/EqbS0HItG5piHuB71RjoA==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "kVXCuMTrTlxq4XOOMAysuNwsXWpYeboGddNGpIgNSZmv1b6r/s/DPk0fYMB7Q5Qo4bY68o48jt4T4y5BVecbCQ==" + }, + "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "6mU/cVmmHtQiDXhnzUImxIcDL48GbTk+TsptXyJA+MIOG9LRjPoAQC/qBFB7X+UNyK86bmvGwC8t+M66wsYC8w==" + }, + "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "vjwG0GGcTW/PPg6KVud8F9GLWYuAV1rrw1BKAqY0oh4jcUqg15oYF1+qkGR2x2ZHM4DQnWKQ7cJgYbfncz/lYg==" + }, + "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "7KMFpTkHC/zoExs+PwP8jDCWcrK9H6L7soowT80CUx3e+nxP/AFnq0AQAW5W76z2WYbLAYCRyPfwYFG6zkvQRw==" + }, + "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "xrlmRCnKZJLHxyyLIqkZjNXqgxnKdZxfItrPkjI+6pkRo5lHX8YvSZlWrSI5AVwLMi4HbNWP7064hcAWeZKp5w==" + }, + "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.2", + "contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg==" + }, "Samboy063.Cpp2IL.Core": { "type": "Transitive", "resolved": "2022.0.5", @@ -222,6 +333,23 @@ "System.Runtime": "4.3.0" } }, + "System.Collections.Concurrent": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "ztl69Xp0Y/UXCL+3v3tEU+lIy+bvjKNUmopn1wep/a291pVPK7dxBd6T7WnlQqRog+d1a/hSsgRsmFnIBKTPLQ==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, "System.Collections.NonGeneric": { "type": "Transitive", "resolved": "4.3.0", @@ -299,6 +427,28 @@ "System.Runtime": "4.3.0" } }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "tD6kosZnTAGdrEa0tZSuFyunMbt/5KYDnHdndJYGqZoNy00XVXyACd5d6KnE1YgYv3ne2CjtAfNXo/fwEhnKUA==", + "dependencies": { + "System.Collections": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Reflection": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Diagnostics.Tracing": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "rswfv0f/Cqkh78rA5S8eN8Neocz234+emGCtTF3lxPY96F+mmmUen6tbn0glN6PMvlKQb9bPAY5e9u7fgPTkKw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0" + } + }, "System.Globalization": { "type": "Transitive", "resolved": "4.3.0", @@ -309,6 +459,17 @@ "System.Runtime": "4.3.0" } }, + "System.Globalization.Calendars": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "GUlBtdOWT4LTV3I+9/PJW+56AnnChTaOqqTLFtdmype/L500M2LIyXgmtd9X2P2VOkmJd5c67H5SaC2QcL1bFA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Globalization": "4.3.0", + "System.Runtime": "4.3.0" + } + }, "System.Globalization.Extensions": { "type": "Transitive", "resolved": "4.3.0", @@ -334,6 +495,21 @@ "System.Threading.Tasks": "4.3.0" } }, + "System.IO.FileSystem": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "3wEMARTnuio+ulnvi+hkRNROYwa1kylvYahhcLk4HSoVdl+xxTFVeVlYOfLwrDPImGls0mDqbMhrza8qnWPTdA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.IO": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, "System.IO.FileSystem.Primitives": { "type": "Transitive", "resolved": "4.3.0", @@ -354,6 +530,50 @@ "System.Runtime.Extensions": "4.3.0" } }, + "System.Net.Http": { + "type": "Transitive", + "resolved": "4.3.4", + "contentHash": "aOa2d51SEbmM+H+Csw7yJOuNZoHkrP2XnAurye5HWYgGVVU54YZDvsLUYRv6h18X3sPnjNCANmN7ZhIPiqMcjA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.1", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Diagnostics.DiagnosticSource": "4.3.0", + "System.Diagnostics.Tracing": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Extensions": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.Net.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Security.Cryptography.X509Certificates": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.2" + } + }, + "System.Net.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "qOu+hDwFwoZPbzPvwut2qATe3ygjeQBDQj91xlsaqGFQUI5i4ZnZb8yyQuLGpDGivEPIt8EJkd1BVzVoP31FXA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "Microsoft.NETCore.Targets": "1.1.0", + "System.Runtime": "4.3.0", + "System.Runtime.Handles": "4.3.0" + } + }, "System.Reflection": { "type": "Transitive", "resolved": "4.3.0", @@ -461,6 +681,161 @@ "System.Runtime.Handles": "4.3.0" } }, + "System.Runtime.Numerics": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "yMH+MfdzHjy17l2KESnPiF2dwq7T+xLnSJar7slyimAkUh/gTrS9/UQOtv7xarskJ2/XDSNvfLGOBQPjL7PaHQ==", + "dependencies": { + "System.Globalization": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0" + } + }, + "System.Security.Cryptography.Algorithms": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "W1kd2Y8mYSCgc3ULTAZ0hOP2dSdG5YauTb1089T0/kRcN2MpSAW1izOFROrJgxSlMn3ArsgHXagigyi+ibhevg==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.Apple": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Cng": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "03idZOqFlsKRL4W+LuCpJ6dBYDUWReug6lZjBa3uJWnk5sPCUXckocevTaUA8iT/MFSrY/2HXkOt753xQ/cf8g==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0" + } + }, + "System.Security.Cryptography.Csp": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "X4s/FCkEUnRGnwR3aSfVIkldBmtURMhmexALNTwpjklzxWU7yjMk7GHLKOZTNkgnWnE0q7+BCf9N2LVRWxewaA==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.IO": "4.3.0", + "System.Reflection": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0" + } + }, + "System.Security.Cryptography.Encoding": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "1DEWjZZly9ae9C79vFwqaO5kaOlI5q+3/55ohmq/7dpDyDfc8lYe7YVxJUZ5MF/NtbkRjwFRo14yM4OEo9EmDw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Collections.Concurrent": "4.3.0", + "System.Linq": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.OpenSsl": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "h4CEgOgv5PKVF/HwaHzJRiVboL2THYCou97zpmhjghx5frc7fIvlkY1jL+lnIQyChrJDMNEXS6r7byGif8Cy4w==", + "dependencies": { + "System.Collections": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, + "System.Security.Cryptography.Primitives": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "7bDIyVFNL/xKeFHjhobUAQqSpJq9YTOpbEs6mR233Et01STBMXNAc/V+BM6dwYGc95gVh/Zf+iVXWzj3mE8DWg==", + "dependencies": { + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.IO": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Threading": "4.3.0", + "System.Threading.Tasks": "4.3.0" + } + }, + "System.Security.Cryptography.X509Certificates": { + "type": "Transitive", + "resolved": "4.3.0", + "contentHash": "t2Tmu6Y2NtJ2um0RtcuhP7ZdNNxXEgUm2JeoA/0NvlMjAhKCnM1NX07TDl3244mVp3QU6LPEhT3HTtH1uF7IYw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "1.1.0", + "System.Collections": "4.3.0", + "System.Diagnostics.Debug": "4.3.0", + "System.Globalization": "4.3.0", + "System.Globalization.Calendars": "4.3.0", + "System.IO": "4.3.0", + "System.IO.FileSystem": "4.3.0", + "System.IO.FileSystem.Primitives": "4.3.0", + "System.Resources.ResourceManager": "4.3.0", + "System.Runtime": "4.3.0", + "System.Runtime.Extensions": "4.3.0", + "System.Runtime.Handles": "4.3.0", + "System.Runtime.InteropServices": "4.3.0", + "System.Runtime.Numerics": "4.3.0", + "System.Security.Cryptography.Algorithms": "4.3.0", + "System.Security.Cryptography.Cng": "4.3.0", + "System.Security.Cryptography.Csp": "4.3.0", + "System.Security.Cryptography.Encoding": "4.3.0", + "System.Security.Cryptography.OpenSsl": "4.3.0", + "System.Security.Cryptography.Primitives": "4.3.0", + "System.Text.Encoding": "4.3.0", + "System.Threading": "4.3.0", + "runtime.native.System": "4.3.0", + "runtime.native.System.Net.Http": "4.3.0", + "runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0" + } + }, "System.Text.Encoding": { "type": "Transitive", "resolved": "4.3.0",