diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6ddd2a6..a67039f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: - uses: actions/setup-dotnet@v3 with: - dotnet-version: '7.0.x' + dotnet-version: '8.0.x' - run: dotnet nuget add source --username ${{ github.actor }} --password ${{ secrets.GITHUB_TOKEN }} --store-password-in-clear-text --name github https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json name: Add nuget source diff --git a/CringeLauncher/CringeLauncher.csproj b/CringeLauncher/CringeLauncher.csproj index 7d5df29..7f068ea 100644 --- a/CringeLauncher/CringeLauncher.csproj +++ b/CringeLauncher/CringeLauncher.csproj @@ -2,7 +2,7 @@ Exe - net7.0-windows10.0.19041.0 + net8.0-windows10.0.19041.0 enable enable true @@ -14,13 +14,12 @@ - - - + + - - - + + + diff --git a/CringeLauncher/Utils/MethodTools.cs b/CringeLauncher/Utils/MethodTools.cs index 09da280..d2481c9 100644 --- a/CringeLauncher/Utils/MethodTools.cs +++ b/CringeLauncher/Utils/MethodTools.cs @@ -11,10 +11,10 @@ public static class MethodTools var (_, operand) = PatchProcessor.ReadMethodBody(method).First(); if (operand is not LocalVariableInfo localVar) - throw new InvalidOperationException($"Method {method.GetID()} does not contain a valid async state machine"); + throw new InvalidOperationException($"Method {method.FullDescription()} does not contain a valid async state machine"); return AccessTools.Method(localVar.LocalType, "MoveNext") ?? throw new InvalidOperationException( - $"Async State machine of method {method.GetID()} does not contain a valid MoveNext method"); + $"Async State machine of method {method.FullDescription()} does not contain a valid MoveNext method"); } } \ No newline at end of file diff --git a/CringeLauncher/packages.lock.json b/CringeLauncher/packages.lock.json index 9d6aea4..241b166 100644 --- a/CringeLauncher/packages.lock.json +++ b/CringeLauncher/packages.lock.json @@ -1,31 +1,21 @@ { "version": 1, "dependencies": { - "net7.0-windows10.0.19041": { - "Lib.Harmony": { - "type": "Direct", - "requested": "[2.3.0-prerelease.2, )", - "resolved": "2.3.0-prerelease.2", - "contentHash": "96ijLrds6W9otxxKIopzQS68tAm6sFbfWBSxfnxkWb9QmE84NJJH/6mutr8sqQ+Dv5Oqg6fAZBdcM6WfB6khVA==", - "dependencies": { - "MonoMod.Core": "1.0.0-prerelease.2", - "System.Text.Json": "5.0.2" - } - }, + "net8.0-windows10.0.19041": { "Microsoft.CodeAnalysis.CSharp": { "type": "Direct", - "requested": "[4.5.0, )", - "resolved": "4.5.0", - "contentHash": "cM59oMKAOxvdv76bdmaKPy5hfj+oR+zxikWoueEB7CwTko7mt9sVKZI8Qxlov0C/LuKEG+WQwifepqL3vuTiBQ==", + "requested": "[4.8.0, )", + "resolved": "4.8.0", + "contentHash": "+3+qfdb/aaGD8PZRCrsdobbzGs1m9u119SkkJt8e/mk3xLJz/udLtS2T6nY27OTXxBBw10HzAbC8Z9w08VyP/g==", "dependencies": { - "Microsoft.CodeAnalysis.Common": "[4.5.0]" + "Microsoft.CodeAnalysis.Common": "[4.8.0]" } }, "NLog": { "type": "Direct", - "requested": "[5.1.3, )", - "resolved": "5.1.3", - "contentHash": "rB8hwjBf1EZCfG5iPfsv3gPksLoJLr1cOrt7PBbJu6VpJgwYJchDzTUT1dhNDdPv0QakXJQJOhE59ErupcznQQ==" + "requested": "[5.2.7, )", + "resolved": "5.2.7", + "contentHash": "Ww/0b6V1NL8iqpFKtRKVQFFX03LoowNzYeNG6FpVzmhgCfLAkW0h/4lT3+V8mHfyvtHptNoV8Cz0YePLFRUaPA==" }, "SpaceEngineersDedicated.ReferenceAssemblies": { "type": "Direct", @@ -38,27 +28,27 @@ }, "System.Diagnostics.PerformanceCounter": { "type": "Direct", - "requested": "[7.0.0, )", - "resolved": "7.0.0", - "contentHash": "L+zIMEaXp1vA4wZk1KLMpk6tvU0xy94R0IfmhkmTWeC4KwShsmAfbg5I19LgjsCTYp6GVdXZ2aHluVWL0QqBdA==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "lX6DXxtJqVGWw7N/QmVoiCyVQ+Q/Xp+jVXPr3gLK1jJExSn1qmAjJQeb8gnOYeeBTG3E3PmG1nu92eYj/TEjpg==", "dependencies": { - "System.Configuration.ConfigurationManager": "7.0.0" + "System.Configuration.ConfigurationManager": "8.0.0" } }, "System.Management": { "type": "Direct", - "requested": "[7.0.1, )", - "resolved": "7.0.1", - "contentHash": "pHg4hGr/dn5wYdJ+kolMY4gkCIzFDRj/HFqoPq7e5h7OGii6BCBmS2/+ysC2SSoB5WvIDS29DMM5DowxxSY/oA==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "jrK22i5LRzxZCfGb+tGmke2VH7oE0DvcDlJ1HAKYU8cPmD8XnpUT0bYn2Gy98GEhGjtfbR/sxKTVb+dE770pfA==", "dependencies": { - "System.CodeDom": "7.0.0" + "System.CodeDom": "8.0.0" } }, "System.Private.ServiceModel": { "type": "Direct", - "requested": "[4.10.2, )", - "resolved": "4.10.2", - "contentHash": "bi2/w2EDXqxno8zfbt6vHcrpGw0Pav8tEMzmJraHwJvWYJd45wcqr7gNa2IUs91j4z+BNGMooStaWS6pm2Lq0A==", + "requested": "[4.10.3, )", + "resolved": "4.10.3", + "contentHash": "BcUV7OERlLqGxDXZuIyIMMmk1PbqBblLRbAoigmzIUx/M8A+8epvyPyXRpbgoucKH7QmfYdQIev04Phx2Co08A==", "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.Extensions.ObjectPool": "5.0.10", @@ -78,6 +68,14 @@ "System.Runtime.CompilerServices.Unsafe": "4.5.1" } }, + "HarmonyX": { + "type": "Transitive", + "resolved": "2.10.2-prerelease.6", + "contentHash": "CPCUR/t5AQ5DDs40bTJ5OwUVTCoZONaJGbWKKjAOwg7c7Ct4KEbfybH6T+KvRGVjf5eN1oyGY5BN7EfWxUh9Xg==", + "dependencies": { + "MonoMod.RuntimeDetour": "25.0.0" + } + }, "Microsoft.Bcl.AsyncInterfaces": { "type": "Transitive", "resolved": "5.0.0", @@ -85,19 +83,18 @@ }, "Microsoft.CodeAnalysis.Analyzers": { "type": "Transitive", - "resolved": "3.3.3", - "contentHash": "j/rOZtLMVJjrfLRlAMckJLPW/1rze9MT1yfWqSIbUPGRu1m1P0fuo9PmqapwsmePfGB5PJrudQLvmUOAMF0DqQ==" + "resolved": "3.3.4", + "contentHash": "AxkxcPR+rheX0SmvpLVIGLhOUXAKG56a64kV9VQZ4y9gR9ZmPXnqZvHJnmwLSwzrEP6junUF11vuc+aqo5r68g==" }, "Microsoft.CodeAnalysis.Common": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "lwAbIZNdnY0SUNoDmZHkVUwLO8UyNnyyh1t/4XsbFxi4Ounb3xszIYZaWhyj5ZjyfcwqwmtMbE7fUTVCqQEIdQ==", + "resolved": "4.8.0", + "contentHash": "/jR+e/9aT+BApoQJABlVCKnnggGQbvGh7BKq2/wI1LamxC+LbzhcLj4Vj7gXCofl1n4E521YfF9w0WcASGg/KA==", "dependencies": { - "Microsoft.CodeAnalysis.Analyzers": "3.3.3", - "System.Collections.Immutable": "6.0.0", - "System.Reflection.Metadata": "6.0.1", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encoding.CodePages": "6.0.0" + "Microsoft.CodeAnalysis.Analyzers": "3.3.4", + "System.Collections.Immutable": "7.0.0", + "System.Reflection.Metadata": "7.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "Microsoft.Extensions.ObjectPool": { @@ -105,11 +102,6 @@ "resolved": "5.0.10", "contentHash": "pp9tbGqIhdEXL6Q1yJl+zevAJSq4BsxqhS1GXzBvEsEz9DDNu9GLNzgUy2xyFc4YjB4m4Ff2YEWTnvQvVYdkvQ==" }, - "Microsoft.Win32.SystemEvents": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "2nXPrhdAyAzir0gLl8Yy8S5Mnm/uBSQQA7jEsILOS1MTyS7DbmV1NgViMtvV1sfCD1ebITpNwb1NIinKeJgUVQ==" - }, "Mono.Cecil": { "type": "Transitive", "resolved": "0.11.4", @@ -117,36 +109,48 @@ }, "MonoMod.Backports": { "type": "Transitive", - "resolved": "1.0.0-prerelease.2", - "contentHash": "x7ap9fLFhLllTNorvWt8IuVP4NwH3+qfpO/AmoTM/Fcq11DgTyo0up+udsMFdw2nCpxh1//xmVydpac96ulqlg==", + "resolved": "1.0.1-daily.23.11.20.3", + "contentHash": "+NF0Jq7emWRJqCFPyZ17UjH9KXitH0JEwSE6aFbpbuaMJh8KhfzbNteyDbwG3Gc+dyv7IqY887vIGm42k2czJA==", "dependencies": { - "MonoMod.ILHelpers": "1.0.0-prerelease.2" + "MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3" } }, "MonoMod.Core": { "type": "Transitive", - "resolved": "1.0.0-prerelease.2", - "contentHash": "nQYYvooFTMfH7KljHXg1eHCm5CpCmYgJTTdEMVgkhKOdfco/Gw9h/KYC1EXOMNjQdmi/hwcFP5PgF7W6XWVMRg==", + "resolved": "1.0.1-daily.23.11.20.3", + "contentHash": "yoIQLUi2nXV0DnRPUIpeVoBZ+U2uTt6GmEw0P7IdMCp+9wo03R5iW3RHrF9GC6XSixG/A9zMjOxH54NGdMsyqw==", "dependencies": { "Mono.Cecil": "0.11.4", - "MonoMod.Backports": "1.0.0-prerelease.2", - "MonoMod.ILHelpers": "1.0.0-prerelease.2", - "MonoMod.Utils": "25.0.0-prerelease.2" + "MonoMod.Backports": "1.0.1-daily.23.11.20.3", + "MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3", + "MonoMod.Utils": "25.0.3-daily.23.11.20.3" } }, "MonoMod.ILHelpers": { "type": "Transitive", - "resolved": "1.0.0-prerelease.2", - "contentHash": "jB1JpcLGtKsWFIPItn/eQgmKwzPBKoDJnnBRDxWV3Ma4am6wPx8ynXXTwoTZOFi5gfHvkqK0RIu9MwJbwRCmow==" + "resolved": "1.0.0-daily.23.11.20.3", + "contentHash": "sbgc1RwynZBjSP82HrLb9j4Prf8jXh+GKqEIJhzWTMUak+LGPkIHEBSlWWj7M5hUwekCjnheRA4WUhuw+yLGPA==" + }, + "MonoMod.RuntimeDetour": { + "type": "Transitive", + "resolved": "25.0.2-daily.23.11.20.3", + "contentHash": "JU5K+pvq+U03DBTLP2mnSkFxHK0ILdL+X5wvYVIIAg5fFPDZCNoCyBthrRcohGZVBFROmpB/SXgoX+nxn9UOoQ==", + "dependencies": { + "Mono.Cecil": "0.11.4", + "MonoMod.Backports": "1.0.1-daily.23.11.20.3", + "MonoMod.Core": "1.0.1-daily.23.11.20.3", + "MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3", + "MonoMod.Utils": "25.0.3-daily.23.11.20.3" + } }, "MonoMod.Utils": { "type": "Transitive", - "resolved": "25.0.0-prerelease.2", - "contentHash": "8NWKe2Kc/CIt8BpK+DcZnc+23XP5+LG+nuUP8ELQ32qxad1JOBjLMRmCXLfxpk74z37XuBpTJUABa9pwPY2MXg==", + "resolved": "25.0.3-daily.23.11.20.3", + "contentHash": "QCAYLKttu68kfCFmPoeCvmjvgM4nr8Y2m+S6BQzDlw5m4zBHzfVc5nbVwYGJa+d9cATJdX/gLwj/GXWrnX7AMg==", "dependencies": { "Mono.Cecil": "0.11.4", - "MonoMod.Backports": "1.0.0-prerelease.2", - "MonoMod.ILHelpers": "1.0.0-prerelease.2" + "MonoMod.Backports": "1.0.1-daily.23.11.20.3", + "MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3" } }, "protobuf-net": { @@ -169,39 +173,27 @@ }, "System.CodeDom": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "GLltyqEsE5/3IE+zYRP5sNa1l44qKl9v+bfdMcwg+M9qnQf47wK3H0SUR/T+3N4JEQXF3vV4CSuuo0rsg+nq2A==" + "resolved": "8.0.0", + "contentHash": "WTlRjL6KWIMr/pAaq3rYqh0TJlzpouaQ/W1eelssHgtlwHAH25jXTkUphTYx9HaIIf7XA6qs/0+YhtLEQRkJ+Q==" }, "System.Collections.Immutable": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "7.0.0", + "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==" }, "System.Configuration.ConfigurationManager": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "WvRUdlL1lB0dTRZSs5XcQOd5q9MYNk90GkbmRmiCvRHThWiojkpGqWdmEDJdXyHbxG/BhE5hmVbMfRLXW9FJVA==", + "resolved": "8.0.0", + "contentHash": "JlYi9XVvIREURRUlGMr1F6vOFLk7YSY4p1vHo4kX3tQ0AGrjqlRWHDi66ImHhy6qwXBG3BJ6Y1QlYQ+Qz6Xgww==", "dependencies": { - "System.Diagnostics.EventLog": "7.0.0", - "System.Security.Cryptography.ProtectedData": "7.0.0", - "System.Security.Permissions": "7.0.0" + "System.Diagnostics.EventLog": "8.0.0", + "System.Security.Cryptography.ProtectedData": "8.0.0" } }, "System.Diagnostics.EventLog": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "eUDP47obqQm3SFJfP6z+Fx2nJ4KKTQbXB4Q9Uesnzw9SbYdhjyoGXuvDn/gEmFY6N5Z3bFFbpAQGA7m6hrYJCw==" - }, - "System.Drawing.Common": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "KIX+oBU38pxkKPxvLcLfIkOV5Ien8ReN78wro7OF5/erwcmortzeFx+iBswlh2Vz6gVne0khocQudGwaO1Ey6A==", - "dependencies": { - "Microsoft.Win32.SystemEvents": "7.0.0" - } + "resolved": "8.0.0", + "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" }, "System.Formats.Asn1": { "type": "Transitive", @@ -220,10 +212,10 @@ }, "System.Reflection.Metadata": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "III/lNMSn0ZRBuM9m5Cgbiho5j81u0FAEagFX5ta2DKbljZ3T0IpD8j+BIiHQPeKqJppWS9bGEp6JnKnWKze0g==", + "resolved": "7.0.0", + "contentHash": "MclTG61lsD9sYdpNz9xsKBzjsmsfCtcMZYXz/IUr2zlhaTaABonlr1ESeompTgM+Xk+IwtGYU7/voh3YWB/fWw==", "dependencies": { - "System.Collections.Immutable": "6.0.0" + "System.Collections.Immutable": "7.0.0" } }, "System.Runtime.CompilerServices.Unsafe": { @@ -246,8 +238,8 @@ }, "System.Security.Cryptography.ProtectedData": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "xSPiLNlHT6wAHtugASbKAJwV5GVqQK351crnILAucUioFqqieDN79evO1rku1ckt/GfjIn+b17UaSskoY03JuA==" + "resolved": "8.0.0", + "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==" }, "System.Security.Cryptography.Xml": { "type": "Transitive", @@ -258,72 +250,39 @@ "System.Security.Cryptography.Pkcs": "6.0.1" } }, - "System.Security.Permissions": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "Vmp0iRmCEno9BWiskOW5pxJ3d9n+jUqKxvX4GhLwFhnQaySZmBN2FuC0N5gjFHgyFMUjC5sfIJ8KZfoJwkcMmA==", - "dependencies": { - "System.Windows.Extensions": "7.0.0" - } - }, "System.Security.Principal.Windows": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" }, - "System.Text.Encoding.CodePages": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "5.0.2", - "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==" - }, - "System.Windows.Extensions": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "bR4qdCmssMMbo9Fatci49An5B1UaVJZHKNq70PRgzoLYIlitb8Tj7ns/Xt5Pz1CkERiTjcVBDU2y1AVrPBYkaw==", - "dependencies": { - "System.Drawing.Common": "7.0.0" - } - }, "pluginloader": { "type": "Project", "dependencies": { - "Lib.Harmony": "[2.3.0-prerelease.2, )", + "HarmonyX": "[2.10.2-prerelease.6, )", + "MonoMod.RuntimeDetour": "[25.0.2-daily.23.11.20.3, )", "Steamworks.NET": "[20.1.0, )" } } }, - "net7.0-windows10.0.19041/win-x64": { + "net8.0-windows10.0.19041/win-x64": { "System.Diagnostics.PerformanceCounter": { "type": "Direct", - "requested": "[7.0.0, )", - "resolved": "7.0.0", - "contentHash": "L+zIMEaXp1vA4wZk1KLMpk6tvU0xy94R0IfmhkmTWeC4KwShsmAfbg5I19LgjsCTYp6GVdXZ2aHluVWL0QqBdA==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "lX6DXxtJqVGWw7N/QmVoiCyVQ+Q/Xp+jVXPr3gLK1jJExSn1qmAjJQeb8gnOYeeBTG3E3PmG1nu92eYj/TEjpg==", "dependencies": { - "System.Configuration.ConfigurationManager": "7.0.0" + "System.Configuration.ConfigurationManager": "8.0.0" } }, "System.Management": { "type": "Direct", - "requested": "[7.0.1, )", - "resolved": "7.0.1", - "contentHash": "pHg4hGr/dn5wYdJ+kolMY4gkCIzFDRj/HFqoPq7e5h7OGii6BCBmS2/+ysC2SSoB5WvIDS29DMM5DowxxSY/oA==", + "requested": "[8.0.0, )", + "resolved": "8.0.0", + "contentHash": "jrK22i5LRzxZCfGb+tGmke2VH7oE0DvcDlJ1HAKYU8cPmD8XnpUT0bYn2Gy98GEhGjtfbR/sxKTVb+dE770pfA==", "dependencies": { - "System.CodeDom": "7.0.0" + "System.CodeDom": "8.0.0" } }, - "Microsoft.Win32.SystemEvents": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "2nXPrhdAyAzir0gLl8Yy8S5Mnm/uBSQQA7jEsILOS1MTyS7DbmV1NgViMtvV1sfCD1ebITpNwb1NIinKeJgUVQ==" - }, "Steamworks.NET": { "type": "Transitive", "resolved": "20.1.0", @@ -331,16 +290,8 @@ }, "System.Diagnostics.EventLog": { "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "eUDP47obqQm3SFJfP6z+Fx2nJ4KKTQbXB4Q9Uesnzw9SbYdhjyoGXuvDn/gEmFY6N5Z3bFFbpAQGA7m6hrYJCw==" - }, - "System.Drawing.Common": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "KIX+oBU38pxkKPxvLcLfIkOV5Ien8ReN78wro7OF5/erwcmortzeFx+iBswlh2Vz6gVne0khocQudGwaO1Ey6A==", - "dependencies": { - "Microsoft.Win32.SystemEvents": "7.0.0" - } + "resolved": "8.0.0", + "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A==" }, "System.Security.AccessControl": { "type": "Transitive", @@ -355,31 +306,10 @@ "System.Formats.Asn1": "6.0.0" } }, - "System.Security.Cryptography.ProtectedData": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "xSPiLNlHT6wAHtugASbKAJwV5GVqQK351crnILAucUioFqqieDN79evO1rku1ckt/GfjIn+b17UaSskoY03JuA==" - }, "System.Security.Principal.Windows": { "type": "Transitive", "resolved": "5.0.0", "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" - }, - "System.Text.Encoding.CodePages": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Windows.Extensions": { - "type": "Transitive", - "resolved": "7.0.0", - "contentHash": "bR4qdCmssMMbo9Fatci49An5B1UaVJZHKNq70PRgzoLYIlitb8Tj7ns/Xt5Pz1CkERiTjcVBDU2y1AVrPBYkaw==", - "dependencies": { - "System.Drawing.Common": "7.0.0" - } } } } diff --git a/PluginLoader/PluginLoader.csproj b/PluginLoader/PluginLoader.csproj index 391409e..55e1628 100644 --- a/PluginLoader/PluginLoader.csproj +++ b/PluginLoader/PluginLoader.csproj @@ -1,6 +1,6 @@  - net7.0-windows10.0.19041.0 + net8.0-windows10.0.19041.0 enable true true @@ -9,8 +9,9 @@ - - + + + diff --git a/PluginLoader/packages.lock.json b/PluginLoader/packages.lock.json index d53fe15..6cd2037 100644 --- a/PluginLoader/packages.lock.json +++ b/PluginLoader/packages.lock.json @@ -1,24 +1,36 @@ { "version": 1, "dependencies": { - "net7.0-windows10.0.19041": { - "Lib.Harmony": { + "net8.0-windows10.0.19041": { + "HarmonyX": { "type": "Direct", - "requested": "[2.3.0-prerelease.2, )", - "resolved": "2.3.0-prerelease.2", - "contentHash": "96ijLrds6W9otxxKIopzQS68tAm6sFbfWBSxfnxkWb9QmE84NJJH/6mutr8sqQ+Dv5Oqg6fAZBdcM6WfB6khVA==", + "requested": "[2.10.2-prerelease.6, )", + "resolved": "2.10.2-prerelease.6", + "contentHash": "CPCUR/t5AQ5DDs40bTJ5OwUVTCoZONaJGbWKKjAOwg7c7Ct4KEbfybH6T+KvRGVjf5eN1oyGY5BN7EfWxUh9Xg==", "dependencies": { - "MonoMod.Core": "1.0.0-prerelease.2", - "System.Text.Json": "5.0.2" + "MonoMod.RuntimeDetour": "25.0.0" } }, "Microsoft.CodeAnalysis.CSharp": { "type": "Direct", - "requested": "[4.5.0, )", - "resolved": "4.5.0", - "contentHash": "cM59oMKAOxvdv76bdmaKPy5hfj+oR+zxikWoueEB7CwTko7mt9sVKZI8Qxlov0C/LuKEG+WQwifepqL3vuTiBQ==", + "requested": "[4.8.0, )", + "resolved": "4.8.0", + "contentHash": "+3+qfdb/aaGD8PZRCrsdobbzGs1m9u119SkkJt8e/mk3xLJz/udLtS2T6nY27OTXxBBw10HzAbC8Z9w08VyP/g==", "dependencies": { - "Microsoft.CodeAnalysis.Common": "[4.5.0]" + "Microsoft.CodeAnalysis.Common": "[4.8.0]" + } + }, + "MonoMod.RuntimeDetour": { + "type": "Direct", + "requested": "[25.0.2-daily.23.11.20.3, )", + "resolved": "25.0.2-daily.23.11.20.3", + "contentHash": "JU5K+pvq+U03DBTLP2mnSkFxHK0ILdL+X5wvYVIIAg5fFPDZCNoCyBthrRcohGZVBFROmpB/SXgoX+nxn9UOoQ==", + "dependencies": { + "Mono.Cecil": "0.11.4", + "MonoMod.Backports": "1.0.1-daily.23.11.20.3", + "MonoMod.Core": "1.0.1-daily.23.11.20.3", + "MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3", + "MonoMod.Utils": "25.0.3-daily.23.11.20.3" } }, "SpaceEngineersDedicated.ReferenceAssemblies": { @@ -38,19 +50,18 @@ }, "Microsoft.CodeAnalysis.Analyzers": { "type": "Transitive", - "resolved": "3.3.3", - "contentHash": "j/rOZtLMVJjrfLRlAMckJLPW/1rze9MT1yfWqSIbUPGRu1m1P0fuo9PmqapwsmePfGB5PJrudQLvmUOAMF0DqQ==" + "resolved": "3.3.4", + "contentHash": "AxkxcPR+rheX0SmvpLVIGLhOUXAKG56a64kV9VQZ4y9gR9ZmPXnqZvHJnmwLSwzrEP6junUF11vuc+aqo5r68g==" }, "Microsoft.CodeAnalysis.Common": { "type": "Transitive", - "resolved": "4.5.0", - "contentHash": "lwAbIZNdnY0SUNoDmZHkVUwLO8UyNnyyh1t/4XsbFxi4Ounb3xszIYZaWhyj5ZjyfcwqwmtMbE7fUTVCqQEIdQ==", + "resolved": "4.8.0", + "contentHash": "/jR+e/9aT+BApoQJABlVCKnnggGQbvGh7BKq2/wI1LamxC+LbzhcLj4Vj7gXCofl1n4E521YfF9w0WcASGg/KA==", "dependencies": { - "Microsoft.CodeAnalysis.Analyzers": "3.3.3", - "System.Collections.Immutable": "6.0.0", - "System.Reflection.Metadata": "6.0.1", - "System.Runtime.CompilerServices.Unsafe": "6.0.0", - "System.Text.Encoding.CodePages": "6.0.0" + "Microsoft.CodeAnalysis.Analyzers": "3.3.4", + "System.Collections.Immutable": "7.0.0", + "System.Reflection.Metadata": "7.0.0", + "System.Runtime.CompilerServices.Unsafe": "6.0.0" } }, "Mono.Cecil": { @@ -60,36 +71,36 @@ }, "MonoMod.Backports": { "type": "Transitive", - "resolved": "1.0.0-prerelease.2", - "contentHash": "x7ap9fLFhLllTNorvWt8IuVP4NwH3+qfpO/AmoTM/Fcq11DgTyo0up+udsMFdw2nCpxh1//xmVydpac96ulqlg==", + "resolved": "1.0.1-daily.23.11.20.3", + "contentHash": "+NF0Jq7emWRJqCFPyZ17UjH9KXitH0JEwSE6aFbpbuaMJh8KhfzbNteyDbwG3Gc+dyv7IqY887vIGm42k2czJA==", "dependencies": { - "MonoMod.ILHelpers": "1.0.0-prerelease.2" + "MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3" } }, "MonoMod.Core": { "type": "Transitive", - "resolved": "1.0.0-prerelease.2", - "contentHash": "nQYYvooFTMfH7KljHXg1eHCm5CpCmYgJTTdEMVgkhKOdfco/Gw9h/KYC1EXOMNjQdmi/hwcFP5PgF7W6XWVMRg==", + "resolved": "1.0.1-daily.23.11.20.3", + "contentHash": "yoIQLUi2nXV0DnRPUIpeVoBZ+U2uTt6GmEw0P7IdMCp+9wo03R5iW3RHrF9GC6XSixG/A9zMjOxH54NGdMsyqw==", "dependencies": { "Mono.Cecil": "0.11.4", - "MonoMod.Backports": "1.0.0-prerelease.2", - "MonoMod.ILHelpers": "1.0.0-prerelease.2", - "MonoMod.Utils": "25.0.0-prerelease.2" + "MonoMod.Backports": "1.0.1-daily.23.11.20.3", + "MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3", + "MonoMod.Utils": "25.0.3-daily.23.11.20.3" } }, "MonoMod.ILHelpers": { "type": "Transitive", - "resolved": "1.0.0-prerelease.2", - "contentHash": "jB1JpcLGtKsWFIPItn/eQgmKwzPBKoDJnnBRDxWV3Ma4am6wPx8ynXXTwoTZOFi5gfHvkqK0RIu9MwJbwRCmow==" + "resolved": "1.0.0-daily.23.11.20.3", + "contentHash": "sbgc1RwynZBjSP82HrLb9j4Prf8jXh+GKqEIJhzWTMUak+LGPkIHEBSlWWj7M5hUwekCjnheRA4WUhuw+yLGPA==" }, "MonoMod.Utils": { "type": "Transitive", - "resolved": "25.0.0-prerelease.2", - "contentHash": "8NWKe2Kc/CIt8BpK+DcZnc+23XP5+LG+nuUP8ELQ32qxad1JOBjLMRmCXLfxpk74z37XuBpTJUABa9pwPY2MXg==", + "resolved": "25.0.3-daily.23.11.20.3", + "contentHash": "QCAYLKttu68kfCFmPoeCvmjvgM4nr8Y2m+S6BQzDlw5m4zBHzfVc5nbVwYGJa+d9cATJdX/gLwj/GXWrnX7AMg==", "dependencies": { "Mono.Cecil": "0.11.4", - "MonoMod.Backports": "1.0.0-prerelease.2", - "MonoMod.ILHelpers": "1.0.0-prerelease.2" + "MonoMod.Backports": "1.0.1-daily.23.11.20.3", + "MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3" } }, "protobuf-net": { @@ -99,37 +110,21 @@ }, "System.Collections.Immutable": { "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } + "resolved": "7.0.0", + "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ==" }, "System.Reflection.Metadata": { "type": "Transitive", - "resolved": "6.0.1", - "contentHash": "III/lNMSn0ZRBuM9m5Cgbiho5j81u0FAEagFX5ta2DKbljZ3T0IpD8j+BIiHQPeKqJppWS9bGEp6JnKnWKze0g==", + "resolved": "7.0.0", + "contentHash": "MclTG61lsD9sYdpNz9xsKBzjsmsfCtcMZYXz/IUr2zlhaTaABonlr1ESeompTgM+Xk+IwtGYU7/voh3YWB/fWw==", "dependencies": { - "System.Collections.Immutable": "6.0.0" + "System.Collections.Immutable": "7.0.0" } }, "System.Runtime.CompilerServices.Unsafe": { "type": "Transitive", "resolved": "6.0.0", "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" - }, - "System.Text.Encoding.CodePages": { - "type": "Transitive", - "resolved": "6.0.0", - "contentHash": "ZFCILZuOvtKPauZ/j/swhvw68ZRi9ATCfvGbk1QfydmcXBkIWecWKn/250UH7rahZ5OoDBaiAudJtPvLwzw85A==", - "dependencies": { - "System.Runtime.CompilerServices.Unsafe": "6.0.0" - } - }, - "System.Text.Json": { - "type": "Transitive", - "resolved": "5.0.2", - "contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ==" } } } diff --git a/nuget.config b/nuget.config new file mode 100644 index 0000000..5487555 --- /dev/null +++ b/nuget.config @@ -0,0 +1,6 @@ + + + + + +