use original harmony prerelease in oder to fix plugin incompatibilities with X version

This commit is contained in:
zznty
2023-07-04 12:07:34 +07:00
parent 40fa225b1c
commit 412b6d6134
4 changed files with 61 additions and 73 deletions

View File

@@ -14,7 +14,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="HarmonyX" Version="2.10.2-prerelease.4" />
<PackageReference Include="Lib.Harmony" Version="2.3.0-prerelease.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
<PackageReference Include="NLog" Version="5.1.3" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.120" IncludeAssets="compile" PrivateAssets="all" />

View File

@@ -2,13 +2,14 @@
"version": 1,
"dependencies": {
"net7.0-windows10.0.19041": {
"HarmonyX": {
"Lib.Harmony": {
"type": "Direct",
"requested": "[2.10.2-prerelease.4, )",
"resolved": "2.10.2-prerelease.4",
"contentHash": "M/44/DhSu1WR8gL62aLPGKqAJ0rrgkw38nT3DgEvLAvyIoQLJmL2Jsn4/d4CC0eDT1Vv82cB9Mxgg0sFD3/qrQ==",
"requested": "[2.3.0-prerelease.2, )",
"resolved": "2.3.0-prerelease.2",
"contentHash": "96ijLrds6W9otxxKIopzQS68tAm6sFbfWBSxfnxkWb9QmE84NJJH/6mutr8sqQ+Dv5Oqg6fAZBdcM6WfB6khVA==",
"dependencies": {
"MonoModReorg.RuntimeDetour": "23.3.22.1"
"MonoMod.Core": "1.0.0-prerelease.2",
"System.Text.Json": "5.0.2"
}
},
"Microsoft.CodeAnalysis.CSharp": {
@@ -114,50 +115,38 @@
"resolved": "0.11.4",
"contentHash": "IC1h5g0NeJGHIUgzM1P82ld57knhP0IcQfrYITDPXlNpMYGUrsG5TxuaWTjaeqDNQMBDNZkB8L0rBnwsY6JHuQ=="
},
"MonoModReorg.Backports": {
"MonoMod.Backports": {
"type": "Transitive",
"resolved": "23.3.22.1",
"contentHash": "nLx18prtZbS0nVO8YHElP+TUj1kkDswRgQpa9agt3tyNWke9Kqk5lVkGu87Y3cCMhG+m5Ai0ZDH0+V5B6bXF+Q==",
"resolved": "1.0.0-prerelease.2",
"contentHash": "x7ap9fLFhLllTNorvWt8IuVP4NwH3+qfpO/AmoTM/Fcq11DgTyo0up+udsMFdw2nCpxh1//xmVydpac96ulqlg==",
"dependencies": {
"MonoModReorg.ILHelpers": "23.3.22.1"
"MonoMod.ILHelpers": "1.0.0-prerelease.2"
}
},
"MonoModReorg.Core": {
"MonoMod.Core": {
"type": "Transitive",
"resolved": "23.3.22.1",
"contentHash": "Q3ZOgm6AOTL0icgcHsT/6mV5kYt6meqX3DEN1p/et5PxJsXUhVkiZfAptp8y/i+cO6HNgkcESpXEQ4jUWVwsDA==",
"resolved": "1.0.0-prerelease.2",
"contentHash": "nQYYvooFTMfH7KljHXg1eHCm5CpCmYgJTTdEMVgkhKOdfco/Gw9h/KYC1EXOMNjQdmi/hwcFP5PgF7W6XWVMRg==",
"dependencies": {
"Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.3.22.1",
"MonoModReorg.Utils": "23.3.22.1"
"MonoMod.Backports": "1.0.0-prerelease.2",
"MonoMod.ILHelpers": "1.0.0-prerelease.2",
"MonoMod.Utils": "25.0.0-prerelease.2"
}
},
"MonoModReorg.ILHelpers": {
"MonoMod.ILHelpers": {
"type": "Transitive",
"resolved": "23.3.22.1",
"contentHash": "dHE/3VZtnTUTkQ34j8Gu6CxKes1QDL8tBuF3QElxHHpPl/QabGCK938k47WWRcRBMoP7IAthkn+Bob4H97rBgw=="
"resolved": "1.0.0-prerelease.2",
"contentHash": "jB1JpcLGtKsWFIPItn/eQgmKwzPBKoDJnnBRDxWV3Ma4am6wPx8ynXXTwoTZOFi5gfHvkqK0RIu9MwJbwRCmow=="
},
"MonoModReorg.RuntimeDetour": {
"MonoMod.Utils": {
"type": "Transitive",
"resolved": "23.3.22.1",
"contentHash": "cUES3Hi7QJtBNe0qwVdjZOCDkZDaCpdqS6Au0RaCyQ1PDIR4av13E9qBNAEYew46sgPe0fOrU334md6DLDGHlQ==",
"resolved": "25.0.0-prerelease.2",
"contentHash": "8NWKe2Kc/CIt8BpK+DcZnc+23XP5+LG+nuUP8ELQ32qxad1JOBjLMRmCXLfxpk74z37XuBpTJUABa9pwPY2MXg==",
"dependencies": {
"Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.Core": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.3.22.1",
"MonoModReorg.Utils": "23.3.22.1"
}
},
"MonoModReorg.Utils": {
"type": "Transitive",
"resolved": "23.3.22.1",
"contentHash": "q1cX0mbYxdw2WcE/qGBB84lVY/ffobEr46VQFuwGcWhtw6f1Ql1k4TZfs8gebpesSxHnca13grLeVHrUSpy1+g==",
"dependencies": {
"Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.3.22.1"
"MonoMod.Backports": "1.0.0-prerelease.2",
"MonoMod.ILHelpers": "1.0.0-prerelease.2"
}
},
"protobuf-net": {
@@ -290,6 +279,11 @@
"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",
@@ -301,7 +295,7 @@
"pluginloader": {
"type": "Project",
"dependencies": {
"HarmonyX": "[2.10.2-prerelease.4, )",
"Lib.Harmony": "[2.3.0-prerelease.2, )",
"Steamworks.NET": "[20.1.0, )"
}
}

View File

@@ -9,7 +9,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="HarmonyX" Version="2.10.2-prerelease.4" />
<PackageReference Include="Lib.Harmony" Version="2.3.0-prerelease.2" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.202.120" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="Steamworks.NET" Version="20.1.0" />

View File

@@ -2,13 +2,14 @@
"version": 1,
"dependencies": {
"net7.0-windows10.0.19041": {
"HarmonyX": {
"Lib.Harmony": {
"type": "Direct",
"requested": "[2.10.2-prerelease.4, )",
"resolved": "2.10.2-prerelease.4",
"contentHash": "M/44/DhSu1WR8gL62aLPGKqAJ0rrgkw38nT3DgEvLAvyIoQLJmL2Jsn4/d4CC0eDT1Vv82cB9Mxgg0sFD3/qrQ==",
"requested": "[2.3.0-prerelease.2, )",
"resolved": "2.3.0-prerelease.2",
"contentHash": "96ijLrds6W9otxxKIopzQS68tAm6sFbfWBSxfnxkWb9QmE84NJJH/6mutr8sqQ+Dv5Oqg6fAZBdcM6WfB6khVA==",
"dependencies": {
"MonoModReorg.RuntimeDetour": "23.3.22.1"
"MonoMod.Core": "1.0.0-prerelease.2",
"System.Text.Json": "5.0.2"
}
},
"Microsoft.CodeAnalysis.CSharp": {
@@ -57,50 +58,38 @@
"resolved": "0.11.4",
"contentHash": "IC1h5g0NeJGHIUgzM1P82ld57knhP0IcQfrYITDPXlNpMYGUrsG5TxuaWTjaeqDNQMBDNZkB8L0rBnwsY6JHuQ=="
},
"MonoModReorg.Backports": {
"MonoMod.Backports": {
"type": "Transitive",
"resolved": "23.3.22.1",
"contentHash": "nLx18prtZbS0nVO8YHElP+TUj1kkDswRgQpa9agt3tyNWke9Kqk5lVkGu87Y3cCMhG+m5Ai0ZDH0+V5B6bXF+Q==",
"resolved": "1.0.0-prerelease.2",
"contentHash": "x7ap9fLFhLllTNorvWt8IuVP4NwH3+qfpO/AmoTM/Fcq11DgTyo0up+udsMFdw2nCpxh1//xmVydpac96ulqlg==",
"dependencies": {
"MonoModReorg.ILHelpers": "23.3.22.1"
"MonoMod.ILHelpers": "1.0.0-prerelease.2"
}
},
"MonoModReorg.Core": {
"MonoMod.Core": {
"type": "Transitive",
"resolved": "23.3.22.1",
"contentHash": "Q3ZOgm6AOTL0icgcHsT/6mV5kYt6meqX3DEN1p/et5PxJsXUhVkiZfAptp8y/i+cO6HNgkcESpXEQ4jUWVwsDA==",
"resolved": "1.0.0-prerelease.2",
"contentHash": "nQYYvooFTMfH7KljHXg1eHCm5CpCmYgJTTdEMVgkhKOdfco/Gw9h/KYC1EXOMNjQdmi/hwcFP5PgF7W6XWVMRg==",
"dependencies": {
"Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.3.22.1",
"MonoModReorg.Utils": "23.3.22.1"
"MonoMod.Backports": "1.0.0-prerelease.2",
"MonoMod.ILHelpers": "1.0.0-prerelease.2",
"MonoMod.Utils": "25.0.0-prerelease.2"
}
},
"MonoModReorg.ILHelpers": {
"MonoMod.ILHelpers": {
"type": "Transitive",
"resolved": "23.3.22.1",
"contentHash": "dHE/3VZtnTUTkQ34j8Gu6CxKes1QDL8tBuF3QElxHHpPl/QabGCK938k47WWRcRBMoP7IAthkn+Bob4H97rBgw=="
"resolved": "1.0.0-prerelease.2",
"contentHash": "jB1JpcLGtKsWFIPItn/eQgmKwzPBKoDJnnBRDxWV3Ma4am6wPx8ynXXTwoTZOFi5gfHvkqK0RIu9MwJbwRCmow=="
},
"MonoModReorg.RuntimeDetour": {
"MonoMod.Utils": {
"type": "Transitive",
"resolved": "23.3.22.1",
"contentHash": "cUES3Hi7QJtBNe0qwVdjZOCDkZDaCpdqS6Au0RaCyQ1PDIR4av13E9qBNAEYew46sgPe0fOrU334md6DLDGHlQ==",
"resolved": "25.0.0-prerelease.2",
"contentHash": "8NWKe2Kc/CIt8BpK+DcZnc+23XP5+LG+nuUP8ELQ32qxad1JOBjLMRmCXLfxpk74z37XuBpTJUABa9pwPY2MXg==",
"dependencies": {
"Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.Core": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.3.22.1",
"MonoModReorg.Utils": "23.3.22.1"
}
},
"MonoModReorg.Utils": {
"type": "Transitive",
"resolved": "23.3.22.1",
"contentHash": "q1cX0mbYxdw2WcE/qGBB84lVY/ffobEr46VQFuwGcWhtw6f1Ql1k4TZfs8gebpesSxHnca13grLeVHrUSpy1+g==",
"dependencies": {
"Mono.Cecil": "0.11.4",
"MonoModReorg.Backports": "23.3.22.1",
"MonoModReorg.ILHelpers": "23.3.22.1"
"MonoMod.Backports": "1.0.0-prerelease.2",
"MonoMod.ILHelpers": "1.0.0-prerelease.2"
}
},
"protobuf-net": {
@@ -136,6 +125,11 @@
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
},
"System.Text.Json": {
"type": "Transitive",
"resolved": "5.0.2",
"contentHash": "I47dVIGiV6SfAyppphxqupertT/5oZkYLDCX6vC3HpOI4ZLjyoKAreUoem2ie6G0RbRuFrlqz/PcTQjfb2DOfQ=="
}
}
}