From 3acab6cafaed090d6a30b3c93452cf0cee7697ef Mon Sep 17 00:00:00 2001 From: zznty <94796179+zznty@users.noreply.github.com> Date: Mon, 22 Jan 2024 23:27:47 +0700 Subject: [PATCH] bring back original harmony --- CringeLauncher/packages.lock.json | 29 ++++++++++++++++++++++++----- PluginLoader/PluginLoader.csproj | 2 +- PluginLoader/packages.lock.json | 24 +++++++++++++++++++----- 3 files changed, 44 insertions(+), 11 deletions(-) diff --git a/CringeLauncher/packages.lock.json b/CringeLauncher/packages.lock.json index 6e0cd17..3271170 100644 --- a/CringeLauncher/packages.lock.json +++ b/CringeLauncher/packages.lock.json @@ -68,12 +68,13 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.1" } }, - "HarmonyX": { + "Lib.Harmony": { "type": "Transitive", - "resolved": "2.10.2-prerelease.6", - "contentHash": "CPCUR/t5AQ5DDs40bTJ5OwUVTCoZONaJGbWKKjAOwg7c7Ct4KEbfybH6T+KvRGVjf5eN1oyGY5BN7EfWxUh9Xg==", + "resolved": "2.3.0-prerelease.5", + "contentHash": "y2FQX0Fl6MFrHHpwmJlK8M3nT5lxIPUqPPUGvkWJ1DAy3MSnu9dlGvKn2sIDIXrqrO14KfRsRKga8E7rjbxV4A==", "dependencies": { - "MonoMod.RuntimeDetour": "25.0.0" + "MonoMod.Core": "1.1.0-prerelease.2", + "System.Text.Json": "8.0.1" } }, "Microsoft.Bcl.AsyncInterfaces": { @@ -255,10 +256,23 @@ "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==", + "dependencies": { + "System.Text.Encodings.Web": "8.0.0" + } + }, "pluginloader": { "type": "Project", "dependencies": { - "HarmonyX": "[2.10.2-prerelease.6, )", + "Lib.Harmony": "[2.3.0-prerelease.5, )", "MonoMod.RuntimeDetour": "[25.1.0-prerelease.2, )", "Steamworks.NET": "[20.1.0, )" } @@ -310,6 +324,11 @@ "type": "Transitive", "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" } } } diff --git a/PluginLoader/PluginLoader.csproj b/PluginLoader/PluginLoader.csproj index cb29928..af95090 100644 --- a/PluginLoader/PluginLoader.csproj +++ b/PluginLoader/PluginLoader.csproj @@ -9,8 +9,8 @@ + - diff --git a/PluginLoader/packages.lock.json b/PluginLoader/packages.lock.json index ba1880c..73b0b08 100644 --- a/PluginLoader/packages.lock.json +++ b/PluginLoader/packages.lock.json @@ -2,13 +2,14 @@ "version": 1, "dependencies": { "net8.0-windows10.0.19041": { - "HarmonyX": { + "Lib.Harmony": { "type": "Direct", - "requested": "[2.10.2-prerelease.6, )", - "resolved": "2.10.2-prerelease.6", - "contentHash": "CPCUR/t5AQ5DDs40bTJ5OwUVTCoZONaJGbWKKjAOwg7c7Ct4KEbfybH6T+KvRGVjf5eN1oyGY5BN7EfWxUh9Xg==", + "requested": "[2.3.0-prerelease.5, )", + "resolved": "2.3.0-prerelease.5", + "contentHash": "y2FQX0Fl6MFrHHpwmJlK8M3nT5lxIPUqPPUGvkWJ1DAy3MSnu9dlGvKn2sIDIXrqrO14KfRsRKga8E7rjbxV4A==", "dependencies": { - "MonoMod.RuntimeDetour": "25.0.0" + "MonoMod.Core": "1.1.0-prerelease.2", + "System.Text.Json": "8.0.1" } }, "Microsoft.CodeAnalysis.CSharp": { @@ -125,6 +126,19 @@ "type": "Transitive", "resolved": "6.0.0", "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "7AWk2za1hSEJBppe/Lg+uDcam2TrDqwIKa9XcPssSwyjC2xa39EKEGul3CO5RWNF+hMuZG4zlBDrvhBdDTg4lg==", + "dependencies": { + "System.Text.Encodings.Web": "8.0.0" + } } } }