From 8e959a3423c3b2af5e9f92445ef6f05145b97228 Mon Sep 17 00:00:00 2001 From: zznty <94796179+zznty@users.noreply.github.com> Date: Fri, 1 Nov 2024 23:05:10 +0700 Subject: [PATCH] add harmony to built-in packages --- CringeBootstrap/packages.lock.json | 21 ++++-- CringeLauncher/CringeLauncher.csproj | 1 - CringeLauncher/packages.lock.json | 35 +++++---- CringePlugins/CringePlugins.csproj | 1 + CringePlugins/Resolver/BuiltInPackages.cs | 5 +- CringePlugins/packages.lock.json | 87 ++++++++++++++++++++++- NuGet/NuGet.csproj | 1 + NuGet/packages.lock.json | 14 ++++ 8 files changed, 141 insertions(+), 24 deletions(-) diff --git a/CringeBootstrap/packages.lock.json b/CringeBootstrap/packages.lock.json index 1ef9944..b234780 100644 --- a/CringeBootstrap/packages.lock.json +++ b/CringeBootstrap/packages.lock.json @@ -71,8 +71,8 @@ }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, "Microsoft.CodeAnalysis.Analyzers": { "type": "Transitive", @@ -375,8 +375,8 @@ }, "SpaceEngineersDedicated.ReferenceAssemblies": { "type": "Transitive", - "resolved": "1.205.25", - "contentHash": "+70s6nJnBxEFYZY1qwKfM7FgYBYY6YDSPvbltEXrn7CVAeiWIxbtdcUZ4nDBGVTYqUWEI/r3zbLP1zlcNE27Dg==", + "resolved": "1.205.26", + "contentHash": "kQSFCLgi0nFUhLvXlp9D2w4cTnXtEIctWtNlK+Vw4FAofws60rwR6Kil9YBNlaDyoo19dcyNt3bs4G9VculcIA==", "dependencies": { "SharpDX": "4.2.0-keen-cringe", "protobuf-net": "1.0.0" @@ -704,6 +704,14 @@ "System.Runtime.Extensions": "4.3.0" } }, + "System.Linq.Async": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "0YhHcaroWpQ9UCot3Pizah7ryAzQhNvobLMSxeDIGmnXfkQn8u5owvpOH0K6EVB+z9L7u6Cc4W17Br/+jyttEQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "6.0.0" + } + }, "System.Linq.Expressions": { "type": "Transitive", "resolved": "4.3.0", @@ -1310,7 +1318,6 @@ "dependencies": { "CringeBootstrap.Abstractions": "[1.0.0, )", "CringePlugins": "[1.0.0, )", - "Lib.Harmony.Thin": "[2.3.3, )", "Microsoft.CodeAnalysis.CSharp": "[4.11.0, )", "NLog": "[5.3.4, )", "SpaceEngineersDedicated.ReferenceAssemblies": "[1.*, )", @@ -1329,6 +1336,7 @@ "Basic.Reference.Assemblies.Net80": "[1.7.9, )", "Basic.Reference.Assemblies.Net80Windows": "[1.7.9, )", "ImGui.NET.DirectX": "[1.91.0.1, )", + "Lib.Harmony.Thin": "[2.3.3, )", "NLog": "[5.3.4, )", "NuGet": "[1.0.0, )", "SharedCringe": "[1.0.0, )", @@ -1340,7 +1348,8 @@ "type": "Project", "dependencies": { "NuGet.Frameworks": "[6.11.1, )", - "NuGet.Versioning": "[6.11.1, )" + "NuGet.Versioning": "[6.11.1, )", + "System.Linq.Async": "[6.0.1, )" } }, "sharedcringe": { diff --git a/CringeLauncher/CringeLauncher.csproj b/CringeLauncher/CringeLauncher.csproj index 2d0da19..9c2ccb7 100644 --- a/CringeLauncher/CringeLauncher.csproj +++ b/CringeLauncher/CringeLauncher.csproj @@ -37,7 +37,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - diff --git a/CringeLauncher/packages.lock.json b/CringeLauncher/packages.lock.json index 08582bd..8fc922f 100644 --- a/CringeLauncher/packages.lock.json +++ b/CringeLauncher/packages.lock.json @@ -14,16 +14,6 @@ "resolved": "2.2.1", "contentHash": "QGI4nMGQbKsuFUUboixVHu4mv3lHB5RejIa7toIlzTmwLkuCYYEpUBJjmy3OpXYyj5dVSZAXVbr4oeMSloE67Q==" }, - "Lib.Harmony.Thin": { - "type": "Direct", - "requested": "[2.3.3, )", - "resolved": "2.3.3", - "contentHash": "jsaFv7XnWJnyfyvFbkgIkZtV6tWMteNUcDK3idq+3LwPqpTFNxsOv2eKmj4qqP8QR8UynG1Y9AUaC/+dVruMHg==", - "dependencies": { - "MonoMod.Core": "1.1.0", - "System.Text.Json": "8.0.1" - } - }, "Microsoft.CodeAnalysis.CSharp": { "type": "Direct", "requested": "[4.11.0, )", @@ -147,10 +137,19 @@ "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, + "Lib.Harmony.Thin": { + "type": "Transitive", + "resolved": "2.3.3", + "contentHash": "jsaFv7XnWJnyfyvFbkgIkZtV6tWMteNUcDK3idq+3LwPqpTFNxsOv2eKmj4qqP8QR8UynG1Y9AUaC/+dVruMHg==", + "dependencies": { + "MonoMod.Core": "1.1.0", + "System.Text.Json": "8.0.1" + } + }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", - "resolved": "5.0.0", - "contentHash": "W8DPQjkMScOMTtJbPwmPyj9c3zYSFGawDW3jwlBOOsnY+EzZFLgNQ/UMkK35JmkNOVPdCyPr2Tw7Vv9N+KA3ZQ==" + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" }, "Microsoft.CodeAnalysis.Analyzers": { "type": "Transitive", @@ -304,6 +303,14 @@ "resolved": "6.0.0", "contentHash": "T6fD00dQ3NTbPDy31m4eQUwKW84s03z0N2C8HpOklyeaDgaJPa/TexP4/SkORMSOwc7WhKifnA6Ya33AkzmafA==" }, + "System.Linq.Async": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "0YhHcaroWpQ9UCot3Pizah7ryAzQhNvobLMSxeDIGmnXfkQn8u5owvpOH0K6EVB+z9L7u6Cc4W17Br/+jyttEQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "6.0.0" + } + }, "System.Numerics.Vectors": { "type": "Transitive", "resolved": "4.5.0", @@ -381,6 +388,7 @@ "Basic.Reference.Assemblies.Net80": "[1.7.9, )", "Basic.Reference.Assemblies.Net80Windows": "[1.7.9, )", "ImGui.NET.DirectX": "[1.91.0.1, )", + "Lib.Harmony.Thin": "[2.3.3, )", "NLog": "[5.3.4, )", "NuGet": "[1.0.0, )", "SharedCringe": "[1.0.0, )", @@ -392,7 +400,8 @@ "type": "Project", "dependencies": { "NuGet.Frameworks": "[6.11.1, )", - "NuGet.Versioning": "[6.11.1, )" + "NuGet.Versioning": "[6.11.1, )", + "System.Linq.Async": "[6.0.1, )" } }, "sharedcringe": { diff --git a/CringePlugins/CringePlugins.csproj b/CringePlugins/CringePlugins.csproj index 39fbba1..2f3caf9 100644 --- a/CringePlugins/CringePlugins.csproj +++ b/CringePlugins/CringePlugins.csproj @@ -24,6 +24,7 @@ + diff --git a/CringePlugins/Resolver/BuiltInPackages.cs b/CringePlugins/Resolver/BuiltInPackages.cs index fb6dd3e..577a670 100644 --- a/CringePlugins/Resolver/BuiltInPackages.cs +++ b/CringePlugins/Resolver/BuiltInPackages.cs @@ -20,6 +20,7 @@ public static class BuiltInPackages { private const string SeReferenceAssemblies = "SpaceEngineersDedicated.ReferenceAssemblies"; private const string ImGui = "ImGui.NET.DirectX"; + private const string Harmony = "Lib.Harmony.Thin"; public static ImmutableArray GetPackages(NuGetFramework runtimeFramework) { @@ -30,6 +31,7 @@ public static class BuiltInPackages nlog.AsDependency() ], SeReferenceAssemblies, new(seVersion)); var imGui = FromAssembly(runtimeFramework, id: ImGui); + var harmony = FromAssembly(runtimeFramework, id: Harmony); BuiltInSdkPackage MapSdkPackage( (string FileName, byte[] ImageBytes, PortableExecutableReference Reference, Guid Mvid) r) @@ -50,7 +52,8 @@ public static class BuiltInPackages nlog, se, imGui, - FromAssembly(runtimeFramework, [se.AsDependency(), imGui.AsDependency()]), + harmony, + FromAssembly(runtimeFramework, [se.AsDependency(), imGui.AsDependency(), harmony.AsDependency()]), ]; } diff --git a/CringePlugins/packages.lock.json b/CringePlugins/packages.lock.json index 0b38dbb..e265fbc 100644 --- a/CringePlugins/packages.lock.json +++ b/CringePlugins/packages.lock.json @@ -43,6 +43,16 @@ "resolved": "2.2.1", "contentHash": "QGI4nMGQbKsuFUUboixVHu4mv3lHB5RejIa7toIlzTmwLkuCYYEpUBJjmy3OpXYyj5dVSZAXVbr4oeMSloE67Q==" }, + "Lib.Harmony.Thin": { + "type": "Direct", + "requested": "[2.3.3, )", + "resolved": "2.3.3", + "contentHash": "jsaFv7XnWJnyfyvFbkgIkZtV6tWMteNUcDK3idq+3LwPqpTFNxsOv2eKmj4qqP8QR8UynG1Y9AUaC/+dVruMHg==", + "dependencies": { + "MonoMod.Core": "1.1.0", + "System.Text.Json": "8.0.1" + } + }, "NLog": { "type": "Direct", "requested": "[5.3.4, )", @@ -52,13 +62,18 @@ "SpaceEngineersDedicated.ReferenceAssemblies": { "type": "Direct", "requested": "[1.*, )", - "resolved": "1.205.25", - "contentHash": "+70s6nJnBxEFYZY1qwKfM7FgYBYY6YDSPvbltEXrn7CVAeiWIxbtdcUZ4nDBGVTYqUWEI/r3zbLP1zlcNE27Dg==", + "resolved": "1.205.26", + "contentHash": "kQSFCLgi0nFUhLvXlp9D2w4cTnXtEIctWtNlK+Vw4FAofws60rwR6Kil9YBNlaDyoo19dcyNt3bs4G9VculcIA==", "dependencies": { "SharpDX": "4.2.0-keen-cringe", "protobuf-net": "1.0.0" } }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" + }, "Microsoft.CodeAnalysis.Analyzers": { "type": "Transitive", "resolved": "3.3.4", @@ -74,6 +89,45 @@ "System.Reflection.Metadata": "8.0.0" } }, + "Mono.Cecil": { + "type": "Transitive", + "resolved": "0.11.5", + "contentHash": "fxfX+0JGTZ8YQeu1MYjbBiK2CYTSzDyEeIixt+yqKKTn7FW8rv7JMY70qevup4ZJfD7Kk/VG/jDzQQTpfch87g==" + }, + "MonoMod.Backports": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "GUAjCrCZEddqHKHFA7Lh61PgTzoKY7gfBShFe0hQe0p8iynHhBK3TWGyRi+QIw/PGfaRPwx6c33CPGFURBVM6g==", + "dependencies": { + "MonoMod.ILHelpers": "1.0.1" + } + }, + "MonoMod.Core": { + "type": "Transitive", + "resolved": "1.1.0", + "contentHash": "Ks8RntZGVcktr2QF/AovTEbuOkrgXz6omjrvT5LRveOIQJuy+IFuEQPBVWu+cSKVIoZD5XkpRFvlVrItgPIrXw==", + "dependencies": { + "Mono.Cecil": "0.11.5", + "MonoMod.Backports": "1.1.0", + "MonoMod.ILHelpers": "1.0.1", + "MonoMod.Utils": "25.0.4" + } + }, + "MonoMod.ILHelpers": { + "type": "Transitive", + "resolved": "1.0.1", + "contentHash": "6djj/Hz+/eTomo1H/sJEJNxBz2ZdhXjvH0MOmyU2xRtbjaIfBQuyVV0zNUbJhMY/8qoWrz7WXfskfFhdaY0afA==" + }, + "MonoMod.Utils": { + "type": "Transitive", + "resolved": "25.0.4", + "contentHash": "cB94MaZtFD9u4clYEFTwM4jGXnJnzXsxYF3yBpMZKHhXOas66tMF2frbdYte023i0MH4C5iRJbDjxHmA4x5VgA==", + "dependencies": { + "Mono.Cecil": "0.11.5", + "MonoMod.Backports": "1.1.0", + "MonoMod.ILHelpers": "1.0.1" + } + }, "NuGet.Frameworks": { "type": "Transitive", "resolved": "6.11.1", @@ -104,6 +158,14 @@ "resolved": "8.0.0", "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" }, + "System.Linq.Async": { + "type": "Transitive", + "resolved": "6.0.1", + "contentHash": "0YhHcaroWpQ9UCot3Pizah7ryAzQhNvobLMSxeDIGmnXfkQn8u5owvpOH0K6EVB+z9L7u6Cc4W17Br/+jyttEQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "6.0.0" + } + }, "System.Numerics.Vectors": { "type": "Transitive", "resolved": "4.5.0", @@ -122,6 +184,19 @@ "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" + } + }, "cringebootstrap.abstractions": { "type": "Project" }, @@ -129,7 +204,8 @@ "type": "Project", "dependencies": { "NuGet.Frameworks": "[6.11.1, )", - "NuGet.Versioning": "[6.11.1, )" + "NuGet.Versioning": "[6.11.1, )", + "System.Linq.Async": "[6.0.1, )" } }, "sharedcringe": { @@ -152,6 +228,11 @@ "System.Numerics.Vectors": "4.5.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0" } + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "yev/k9GHAEGx2Rg3/tU6MQh4HGBXJs70y7j1LaM1i/ER9po+6nnQ6RRqTJn1E7Xu0fbIFK80Nh5EoODxrbxwBQ==" } } } diff --git a/NuGet/NuGet.csproj b/NuGet/NuGet.csproj index 9dbc45a..d0726bb 100644 --- a/NuGet/NuGet.csproj +++ b/NuGet/NuGet.csproj @@ -11,6 +11,7 @@ + diff --git a/NuGet/packages.lock.json b/NuGet/packages.lock.json index 0df2633..403ba19 100644 --- a/NuGet/packages.lock.json +++ b/NuGet/packages.lock.json @@ -13,6 +13,20 @@ "requested": "[6.11.1, )", "resolved": "6.11.1", "contentHash": "YNn3BB71F+guJW42TbAhGcMh3gpyqFMZcPVD9pm5vcvGivTALtRely/VCPWQQ6JQ5PfwIrjPaJMO7VnqyeK3rg==" + }, + "System.Linq.Async": { + "type": "Direct", + "requested": "[6.0.1, )", + "resolved": "6.0.1", + "contentHash": "0YhHcaroWpQ9UCot3Pizah7ryAzQhNvobLMSxeDIGmnXfkQn8u5owvpOH0K6EVB+z9L7u6Cc4W17Br/+jyttEQ==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "6.0.0" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "UcSjPsst+DfAdJGVDsu346FX0ci0ah+lw3WRtn18NUwEqRt70HaOQ7lI72vy3+1LxtqI3T5GWwV39rQSrCzAeg==" } }, "net8.0/win-x64": {}