PvE/se-launcher
11
0
Fork 0
Code Actions Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
pas2704
2024-01-21 12:43:16 -05:00
parent 5d872cf9a8 51a35a73dc
commit 3f0c9f91dd
7 changed files with 158 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -16,7 +16,7 @@ jobs:
- uses: actions/setup-dotnet@v3 - uses: actions/setup-dotnet@v3
with: 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 - 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 name: Add nuget source

13
CringeLauncher/CringeLauncher.csproj
View File

@@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework> <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
@@ -14,13 +14,12 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Lib.Harmony" Version="2.3.0-prerelease.2" /> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" /> <PackageReference Include="NLog" Version="5.2.7" />
<PackageReference Include="NLog" Version="5.1.3" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.505.1" IncludeAssets="compile" PrivateAssets="all" /> <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.505.1" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="7.0.0" /> <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
<PackageReference Include="System.Management" Version="7.0.1" /> <PackageReference Include="System.Management" Version="8.0.0" />
<PackageReference Include="System.Private.ServiceModel" Version="4.10.2" /> <PackageReference Include="System.Private.ServiceModel" Version="4.10.3" />
<PackageReference Include="Torch.SixLabors.ImageSharp" Version="1.0.0-beta6" /> <PackageReference Include="Torch.SixLabors.ImageSharp" Version="1.0.0-beta6" />
</ItemGroup> </ItemGroup>

4
CringeLauncher/Utils/MethodTools.cs
View File

@@ -11,10 +11,10 @@ public static class MethodTools
var (_, operand) = PatchProcessor.ReadMethodBody(method).First(); var (_, operand) = PatchProcessor.ReadMethodBody(method).First();
if (operand is not LocalVariableInfo localVar) 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") ?? return AccessTools.Method(localVar.LocalType, "MoveNext") ??
throw new InvalidOperationException( 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");
} }
} }

248
CringeLauncher/packages.lock.json
View File

@@ -1,31 +1,21 @@
{ {
"version": 1, "version": 1,
"dependencies": { "dependencies": {
"net7.0-windows10.0.19041": { "net8.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"
}
},
"Microsoft.CodeAnalysis.CSharp": { "Microsoft.CodeAnalysis.CSharp": {
"type": "Direct", "type": "Direct",
"requested": "[4.5.0, )", "requested": "[4.8.0, )",
"resolved": "4.5.0", "resolved": "4.8.0",
"contentHash": "cM59oMKAOxvdv76bdmaKPy5hfj+oR+zxikWoueEB7CwTko7mt9sVKZI8Qxlov0C/LuKEG+WQwifepqL3vuTiBQ==", "contentHash": "+3+qfdb/aaGD8PZRCrsdobbzGs1m9u119SkkJt8e/mk3xLJz/udLtS2T6nY27OTXxBBw10HzAbC8Z9w08VyP/g==",
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Common": "[4.5.0]" "Microsoft.CodeAnalysis.Common": "[4.8.0]"
} }
}, },
"NLog": { "NLog": {
"type": "Direct", "type": "Direct",
"requested": "[5.1.3, )", "requested": "[5.2.7, )",
"resolved": "5.1.3", "resolved": "5.2.7",
"contentHash": "rB8hwjBf1EZCfG5iPfsv3gPksLoJLr1cOrt7PBbJu6VpJgwYJchDzTUT1dhNDdPv0QakXJQJOhE59ErupcznQQ==" "contentHash": "Ww/0b6V1NL8iqpFKtRKVQFFX03LoowNzYeNG6FpVzmhgCfLAkW0h/4lT3+V8mHfyvtHptNoV8Cz0YePLFRUaPA=="
}, },
"SpaceEngineersDedicated.ReferenceAssemblies": { "SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Direct", "type": "Direct",
@@ -38,27 +28,27 @@
}, },
"System.Diagnostics.PerformanceCounter": { "System.Diagnostics.PerformanceCounter": {
"type": "Direct", "type": "Direct",
"requested": "[7.0.0, )", "requested": "[8.0.0, )",
"resolved": "7.0.0", "resolved": "8.0.0",
"contentHash": "L+zIMEaXp1vA4wZk1KLMpk6tvU0xy94R0IfmhkmTWeC4KwShsmAfbg5I19LgjsCTYp6GVdXZ2aHluVWL0QqBdA==", "contentHash": "lX6DXxtJqVGWw7N/QmVoiCyVQ+Q/Xp+jVXPr3gLK1jJExSn1qmAjJQeb8gnOYeeBTG3E3PmG1nu92eYj/TEjpg==",
"dependencies": { "dependencies": {
"System.Configuration.ConfigurationManager": "7.0.0" "System.Configuration.ConfigurationManager": "8.0.0"
} }
}, },
"System.Management": { "System.Management": {
"type": "Direct", "type": "Direct",
"requested": "[7.0.1, )", "requested": "[8.0.0, )",
"resolved": "7.0.1", "resolved": "8.0.0",
"contentHash": "pHg4hGr/dn5wYdJ+kolMY4gkCIzFDRj/HFqoPq7e5h7OGii6BCBmS2/+ysC2SSoB5WvIDS29DMM5DowxxSY/oA==", "contentHash": "jrK22i5LRzxZCfGb+tGmke2VH7oE0DvcDlJ1HAKYU8cPmD8XnpUT0bYn2Gy98GEhGjtfbR/sxKTVb+dE770pfA==",
"dependencies": { "dependencies": {
"System.CodeDom": "7.0.0" "System.CodeDom": "8.0.0"
} }
}, },
"System.Private.ServiceModel": { "System.Private.ServiceModel": {
"type": "Direct", "type": "Direct",
"requested": "[4.10.2, )", "requested": "[4.10.3, )",
"resolved": "4.10.2", "resolved": "4.10.3",
"contentHash": "bi2/w2EDXqxno8zfbt6vHcrpGw0Pav8tEMzmJraHwJvWYJd45wcqr7gNa2IUs91j4z+BNGMooStaWS6pm2Lq0A==", "contentHash": "BcUV7OERlLqGxDXZuIyIMMmk1PbqBblLRbAoigmzIUx/M8A+8epvyPyXRpbgoucKH7QmfYdQIev04Phx2Co08A==",
"dependencies": { "dependencies": {
"Microsoft.Bcl.AsyncInterfaces": "5.0.0", "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
"Microsoft.Extensions.ObjectPool": "5.0.10", "Microsoft.Extensions.ObjectPool": "5.0.10",
@@ -78,6 +68,14 @@
"System.Runtime.CompilerServices.Unsafe": "4.5.1" "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": { "Microsoft.Bcl.AsyncInterfaces": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.0.0", "resolved": "5.0.0",
@@ -85,19 +83,18 @@
}, },
"Microsoft.CodeAnalysis.Analyzers": { "Microsoft.CodeAnalysis.Analyzers": {
"type": "Transitive", "type": "Transitive",
"resolved": "3.3.3", "resolved": "3.3.4",
"contentHash": "j/rOZtLMVJjrfLRlAMckJLPW/1rze9MT1yfWqSIbUPGRu1m1P0fuo9PmqapwsmePfGB5PJrudQLvmUOAMF0DqQ==" "contentHash": "AxkxcPR+rheX0SmvpLVIGLhOUXAKG56a64kV9VQZ4y9gR9ZmPXnqZvHJnmwLSwzrEP6junUF11vuc+aqo5r68g=="
}, },
"Microsoft.CodeAnalysis.Common": { "Microsoft.CodeAnalysis.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "4.5.0", "resolved": "4.8.0",
"contentHash": "lwAbIZNdnY0SUNoDmZHkVUwLO8UyNnyyh1t/4XsbFxi4Ounb3xszIYZaWhyj5ZjyfcwqwmtMbE7fUTVCqQEIdQ==", "contentHash": "/jR+e/9aT+BApoQJABlVCKnnggGQbvGh7BKq2/wI1LamxC+LbzhcLj4Vj7gXCofl1n4E521YfF9w0WcASGg/KA==",
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Analyzers": "3.3.3", "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"System.Collections.Immutable": "6.0.0", "System.Collections.Immutable": "7.0.0",
"System.Reflection.Metadata": "6.0.1", "System.Reflection.Metadata": "7.0.0",
"System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0"
"System.Text.Encoding.CodePages": "6.0.0"
} }
}, },
"Microsoft.Extensions.ObjectPool": { "Microsoft.Extensions.ObjectPool": {
@@ -105,11 +102,6 @@
"resolved": "5.0.10", "resolved": "5.0.10",
"contentHash": "pp9tbGqIhdEXL6Q1yJl+zevAJSq4BsxqhS1GXzBvEsEz9DDNu9GLNzgUy2xyFc4YjB4m4Ff2YEWTnvQvVYdkvQ==" "contentHash": "pp9tbGqIhdEXL6Q1yJl+zevAJSq4BsxqhS1GXzBvEsEz9DDNu9GLNzgUy2xyFc4YjB4m4Ff2YEWTnvQvVYdkvQ=="
}, },
"Microsoft.Win32.SystemEvents": {
"type": "Transitive",
"resolved": "7.0.0",
"contentHash": "2nXPrhdAyAzir0gLl8Yy8S5Mnm/uBSQQA7jEsILOS1MTyS7DbmV1NgViMtvV1sfCD1ebITpNwb1NIinKeJgUVQ=="
},
"Mono.Cecil": { "Mono.Cecil": {
"type": "Transitive", "type": "Transitive",
"resolved": "0.11.4", "resolved": "0.11.4",
@@ -117,36 +109,48 @@
}, },
"MonoMod.Backports": { "MonoMod.Backports": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.0.0-prerelease.2", "resolved": "1.0.1-daily.23.11.20.3",
"contentHash": "x7ap9fLFhLllTNorvWt8IuVP4NwH3+qfpO/AmoTM/Fcq11DgTyo0up+udsMFdw2nCpxh1//xmVydpac96ulqlg==", "contentHash": "+NF0Jq7emWRJqCFPyZ17UjH9KXitH0JEwSE6aFbpbuaMJh8KhfzbNteyDbwG3Gc+dyv7IqY887vIGm42k2czJA==",
"dependencies": { "dependencies": {
"MonoMod.ILHelpers": "1.0.0-prerelease.2" "MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3"
} }
}, },
"MonoMod.Core": { "MonoMod.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.0.0-prerelease.2", "resolved": "1.0.1-daily.23.11.20.3",
"contentHash": "nQYYvooFTMfH7KljHXg1eHCm5CpCmYgJTTdEMVgkhKOdfco/Gw9h/KYC1EXOMNjQdmi/hwcFP5PgF7W6XWVMRg==", "contentHash": "yoIQLUi2nXV0DnRPUIpeVoBZ+U2uTt6GmEw0P7IdMCp+9wo03R5iW3RHrF9GC6XSixG/A9zMjOxH54NGdMsyqw==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.4", "Mono.Cecil": "0.11.4",
"MonoMod.Backports": "1.0.0-prerelease.2", "MonoMod.Backports": "1.0.1-daily.23.11.20.3",
"MonoMod.ILHelpers": "1.0.0-prerelease.2", "MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3",
"MonoMod.Utils": "25.0.0-prerelease.2" "MonoMod.Utils": "25.0.3-daily.23.11.20.3"
} }
}, },
"MonoMod.ILHelpers": { "MonoMod.ILHelpers": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.0.0-prerelease.2", "resolved": "1.0.0-daily.23.11.20.3",
"contentHash": "jB1JpcLGtKsWFIPItn/eQgmKwzPBKoDJnnBRDxWV3Ma4am6wPx8ynXXTwoTZOFi5gfHvkqK0RIu9MwJbwRCmow==" "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": { "MonoMod.Utils": {
"type": "Transitive", "type": "Transitive",
"resolved": "25.0.0-prerelease.2", "resolved": "25.0.3-daily.23.11.20.3",
"contentHash": "8NWKe2Kc/CIt8BpK+DcZnc+23XP5+LG+nuUP8ELQ32qxad1JOBjLMRmCXLfxpk74z37XuBpTJUABa9pwPY2MXg==", "contentHash": "QCAYLKttu68kfCFmPoeCvmjvgM4nr8Y2m+S6BQzDlw5m4zBHzfVc5nbVwYGJa+d9cATJdX/gLwj/GXWrnX7AMg==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.4", "Mono.Cecil": "0.11.4",
"MonoMod.Backports": "1.0.0-prerelease.2", "MonoMod.Backports": "1.0.1-daily.23.11.20.3",
"MonoMod.ILHelpers": "1.0.0-prerelease.2" "MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3"
} }
}, },
"protobuf-net": { "protobuf-net": {
@@ -169,39 +173,27 @@
}, },
"System.CodeDom": { "System.CodeDom": {
"type": "Transitive", "type": "Transitive",
"resolved": "7.0.0", "resolved": "8.0.0",
"contentHash": "GLltyqEsE5/3IE+zYRP5sNa1l44qKl9v+bfdMcwg+M9qnQf47wK3H0SUR/T+3N4JEQXF3vV4CSuuo0rsg+nq2A==" "contentHash": "WTlRjL6KWIMr/pAaq3rYqh0TJlzpouaQ/W1eelssHgtlwHAH25jXTkUphTYx9HaIIf7XA6qs/0+YhtLEQRkJ+Q=="
}, },
"System.Collections.Immutable": { "System.Collections.Immutable": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0", "resolved": "7.0.0",
"contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ=="
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
}, },
"System.Configuration.ConfigurationManager": { "System.Configuration.ConfigurationManager": {
"type": "Transitive", "type": "Transitive",
"resolved": "7.0.0", "resolved": "8.0.0",
"contentHash": "WvRUdlL1lB0dTRZSs5XcQOd5q9MYNk90GkbmRmiCvRHThWiojkpGqWdmEDJdXyHbxG/BhE5hmVbMfRLXW9FJVA==", "contentHash": "JlYi9XVvIREURRUlGMr1F6vOFLk7YSY4p1vHo4kX3tQ0AGrjqlRWHDi66ImHhy6qwXBG3BJ6Y1QlYQ+Qz6Xgww==",
"dependencies": { "dependencies": {
"System.Diagnostics.EventLog": "7.0.0", "System.Diagnostics.EventLog": "8.0.0",
"System.Security.Cryptography.ProtectedData": "7.0.0", "System.Security.Cryptography.ProtectedData": "8.0.0"
"System.Security.Permissions": "7.0.0"
} }
}, },
"System.Diagnostics.EventLog": { "System.Diagnostics.EventLog": {
"type": "Transitive", "type": "Transitive",
"resolved": "7.0.0", "resolved": "8.0.0",
"contentHash": "eUDP47obqQm3SFJfP6z+Fx2nJ4KKTQbXB4Q9Uesnzw9SbYdhjyoGXuvDn/gEmFY6N5Z3bFFbpAQGA7m6hrYJCw==" "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A=="
},
"System.Drawing.Common": {
"type": "Transitive",
"resolved": "7.0.0",
"contentHash": "KIX+oBU38pxkKPxvLcLfIkOV5Ien8ReN78wro7OF5/erwcmortzeFx+iBswlh2Vz6gVne0khocQudGwaO1Ey6A==",
"dependencies": {
"Microsoft.Win32.SystemEvents": "7.0.0"
}
}, },
"System.Formats.Asn1": { "System.Formats.Asn1": {
"type": "Transitive", "type": "Transitive",
@@ -220,10 +212,10 @@
}, },
"System.Reflection.Metadata": { "System.Reflection.Metadata": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.1", "resolved": "7.0.0",
"contentHash": "III/lNMSn0ZRBuM9m5Cgbiho5j81u0FAEagFX5ta2DKbljZ3T0IpD8j+BIiHQPeKqJppWS9bGEp6JnKnWKze0g==", "contentHash": "MclTG61lsD9sYdpNz9xsKBzjsmsfCtcMZYXz/IUr2zlhaTaABonlr1ESeompTgM+Xk+IwtGYU7/voh3YWB/fWw==",
"dependencies": { "dependencies": {
"System.Collections.Immutable": "6.0.0" "System.Collections.Immutable": "7.0.0"
} }
}, },
"System.Runtime.CompilerServices.Unsafe": { "System.Runtime.CompilerServices.Unsafe": {
@@ -246,8 +238,8 @@
}, },
"System.Security.Cryptography.ProtectedData": { "System.Security.Cryptography.ProtectedData": {
"type": "Transitive", "type": "Transitive",
"resolved": "7.0.0", "resolved": "8.0.0",
"contentHash": "xSPiLNlHT6wAHtugASbKAJwV5GVqQK351crnILAucUioFqqieDN79evO1rku1ckt/GfjIn+b17UaSskoY03JuA==" "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg=="
}, },
"System.Security.Cryptography.Xml": { "System.Security.Cryptography.Xml": {
"type": "Transitive", "type": "Transitive",
@@ -258,72 +250,39 @@
"System.Security.Cryptography.Pkcs": "6.0.1" "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": { "System.Security.Principal.Windows": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.0.0", "resolved": "5.0.0",
"contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" "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": { "pluginloader": {
"type": "Project", "type": "Project",
"dependencies": { "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, )" "Steamworks.NET": "[20.1.0, )"
} }
} }
}, },
"net7.0-windows10.0.19041/win-x64": { "net8.0-windows10.0.19041/win-x64": {
"System.Diagnostics.PerformanceCounter": { "System.Diagnostics.PerformanceCounter": {
"type": "Direct", "type": "Direct",
"requested": "[7.0.0, )", "requested": "[8.0.0, )",
"resolved": "7.0.0", "resolved": "8.0.0",
"contentHash": "L+zIMEaXp1vA4wZk1KLMpk6tvU0xy94R0IfmhkmTWeC4KwShsmAfbg5I19LgjsCTYp6GVdXZ2aHluVWL0QqBdA==", "contentHash": "lX6DXxtJqVGWw7N/QmVoiCyVQ+Q/Xp+jVXPr3gLK1jJExSn1qmAjJQeb8gnOYeeBTG3E3PmG1nu92eYj/TEjpg==",
"dependencies": { "dependencies": {
"System.Configuration.ConfigurationManager": "7.0.0" "System.Configuration.ConfigurationManager": "8.0.0"
} }
}, },
"System.Management": { "System.Management": {
"type": "Direct", "type": "Direct",
"requested": "[7.0.1, )", "requested": "[8.0.0, )",
"resolved": "7.0.1", "resolved": "8.0.0",
"contentHash": "pHg4hGr/dn5wYdJ+kolMY4gkCIzFDRj/HFqoPq7e5h7OGii6BCBmS2/+ysC2SSoB5WvIDS29DMM5DowxxSY/oA==", "contentHash": "jrK22i5LRzxZCfGb+tGmke2VH7oE0DvcDlJ1HAKYU8cPmD8XnpUT0bYn2Gy98GEhGjtfbR/sxKTVb+dE770pfA==",
"dependencies": { "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": { "Steamworks.NET": {
"type": "Transitive", "type": "Transitive",
"resolved": "20.1.0", "resolved": "20.1.0",
@@ -331,16 +290,8 @@
}, },
"System.Diagnostics.EventLog": { "System.Diagnostics.EventLog": {
"type": "Transitive", "type": "Transitive",
"resolved": "7.0.0", "resolved": "8.0.0",
"contentHash": "eUDP47obqQm3SFJfP6z+Fx2nJ4KKTQbXB4Q9Uesnzw9SbYdhjyoGXuvDn/gEmFY6N5Z3bFFbpAQGA7m6hrYJCw==" "contentHash": "fdYxcRjQqTTacKId/2IECojlDSFvp7LP5N78+0z/xH7v/Tuw5ZAxu23Y6PTCRinqyu2ePx+Gn1098NC6jM6d+A=="
},
"System.Drawing.Common": {
"type": "Transitive",
"resolved": "7.0.0",
"contentHash": "KIX+oBU38pxkKPxvLcLfIkOV5Ien8ReN78wro7OF5/erwcmortzeFx+iBswlh2Vz6gVne0khocQudGwaO1Ey6A==",
"dependencies": {
"Microsoft.Win32.SystemEvents": "7.0.0"
}
}, },
"System.Security.AccessControl": { "System.Security.AccessControl": {
"type": "Transitive", "type": "Transitive",
@@ -355,31 +306,10 @@
"System.Formats.Asn1": "6.0.0" "System.Formats.Asn1": "6.0.0"
} }
}, },
"System.Security.Cryptography.ProtectedData": {
"type": "Transitive",
"resolved": "7.0.0",
"contentHash": "xSPiLNlHT6wAHtugASbKAJwV5GVqQK351crnILAucUioFqqieDN79evO1rku1ckt/GfjIn+b17UaSskoY03JuA=="
},
"System.Security.Principal.Windows": { "System.Security.Principal.Windows": {
"type": "Transitive", "type": "Transitive",
"resolved": "5.0.0", "resolved": "5.0.0",
"contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" "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"
}
} }
} }
} }

7
PluginLoader/PluginLoader.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.Net.SDK"> <Project Sdk="Microsoft.Net.SDK">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework> <TargetFramework>net8.0-windows10.0.19041.0</TargetFramework>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings> <ImplicitUsings>true</ImplicitUsings>
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
@@ -9,8 +9,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Lib.Harmony" Version="2.3.0-prerelease.2" /> <PackageReference Include="MonoMod.RuntimeDetour" Version="25.0.2-daily.23.11.20.3" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" IncludeAssets="compile" PrivateAssets="all" /> <PackageReference Include="HarmonyX" Version="2.10.2-prerelease.6" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.505.1" IncludeAssets="compile" PrivateAssets="all" /> <PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.505.1" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="Steamworks.NET" Version="20.1.0" /> <PackageReference Include="Steamworks.NET" Version="20.1.0" />
</ItemGroup> </ItemGroup>

105
PluginLoader/packages.lock.json
View File

@@ -1,24 +1,36 @@
{ {
"version": 1, "version": 1,
"dependencies": { "dependencies": {
"net7.0-windows10.0.19041": { "net8.0-windows10.0.19041": {
"Lib.Harmony": { "HarmonyX": {
"type": "Direct", "type": "Direct",
"requested": "[2.3.0-prerelease.2, )", "requested": "[2.10.2-prerelease.6, )",
"resolved": "2.3.0-prerelease.2", "resolved": "2.10.2-prerelease.6",
"contentHash": "96ijLrds6W9otxxKIopzQS68tAm6sFbfWBSxfnxkWb9QmE84NJJH/6mutr8sqQ+Dv5Oqg6fAZBdcM6WfB6khVA==", "contentHash": "CPCUR/t5AQ5DDs40bTJ5OwUVTCoZONaJGbWKKjAOwg7c7Ct4KEbfybH6T+KvRGVjf5eN1oyGY5BN7EfWxUh9Xg==",
"dependencies": { "dependencies": {
"MonoMod.Core": "1.0.0-prerelease.2", "MonoMod.RuntimeDetour": "25.0.0"
"System.Text.Json": "5.0.2"
} }
}, },
"Microsoft.CodeAnalysis.CSharp": { "Microsoft.CodeAnalysis.CSharp": {
"type": "Direct", "type": "Direct",
"requested": "[4.5.0, )", "requested": "[4.8.0, )",
"resolved": "4.5.0", "resolved": "4.8.0",
"contentHash": "cM59oMKAOxvdv76bdmaKPy5hfj+oR+zxikWoueEB7CwTko7mt9sVKZI8Qxlov0C/LuKEG+WQwifepqL3vuTiBQ==", "contentHash": "+3+qfdb/aaGD8PZRCrsdobbzGs1m9u119SkkJt8e/mk3xLJz/udLtS2T6nY27OTXxBBw10HzAbC8Z9w08VyP/g==",
"dependencies": { "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": { "SpaceEngineersDedicated.ReferenceAssemblies": {
@@ -38,19 +50,18 @@
}, },
"Microsoft.CodeAnalysis.Analyzers": { "Microsoft.CodeAnalysis.Analyzers": {
"type": "Transitive", "type": "Transitive",
"resolved": "3.3.3", "resolved": "3.3.4",
"contentHash": "j/rOZtLMVJjrfLRlAMckJLPW/1rze9MT1yfWqSIbUPGRu1m1P0fuo9PmqapwsmePfGB5PJrudQLvmUOAMF0DqQ==" "contentHash": "AxkxcPR+rheX0SmvpLVIGLhOUXAKG56a64kV9VQZ4y9gR9ZmPXnqZvHJnmwLSwzrEP6junUF11vuc+aqo5r68g=="
}, },
"Microsoft.CodeAnalysis.Common": { "Microsoft.CodeAnalysis.Common": {
"type": "Transitive", "type": "Transitive",
"resolved": "4.5.0", "resolved": "4.8.0",
"contentHash": "lwAbIZNdnY0SUNoDmZHkVUwLO8UyNnyyh1t/4XsbFxi4Ounb3xszIYZaWhyj5ZjyfcwqwmtMbE7fUTVCqQEIdQ==", "contentHash": "/jR+e/9aT+BApoQJABlVCKnnggGQbvGh7BKq2/wI1LamxC+LbzhcLj4Vj7gXCofl1n4E521YfF9w0WcASGg/KA==",
"dependencies": { "dependencies": {
"Microsoft.CodeAnalysis.Analyzers": "3.3.3", "Microsoft.CodeAnalysis.Analyzers": "3.3.4",
"System.Collections.Immutable": "6.0.0", "System.Collections.Immutable": "7.0.0",
"System.Reflection.Metadata": "6.0.1", "System.Reflection.Metadata": "7.0.0",
"System.Runtime.CompilerServices.Unsafe": "6.0.0", "System.Runtime.CompilerServices.Unsafe": "6.0.0"
"System.Text.Encoding.CodePages": "6.0.0"
} }
}, },
"Mono.Cecil": { "Mono.Cecil": {
@@ -60,36 +71,36 @@
}, },
"MonoMod.Backports": { "MonoMod.Backports": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.0.0-prerelease.2", "resolved": "1.0.1-daily.23.11.20.3",
"contentHash": "x7ap9fLFhLllTNorvWt8IuVP4NwH3+qfpO/AmoTM/Fcq11DgTyo0up+udsMFdw2nCpxh1//xmVydpac96ulqlg==", "contentHash": "+NF0Jq7emWRJqCFPyZ17UjH9KXitH0JEwSE6aFbpbuaMJh8KhfzbNteyDbwG3Gc+dyv7IqY887vIGm42k2czJA==",
"dependencies": { "dependencies": {
"MonoMod.ILHelpers": "1.0.0-prerelease.2" "MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3"
} }
}, },
"MonoMod.Core": { "MonoMod.Core": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.0.0-prerelease.2", "resolved": "1.0.1-daily.23.11.20.3",
"contentHash": "nQYYvooFTMfH7KljHXg1eHCm5CpCmYgJTTdEMVgkhKOdfco/Gw9h/KYC1EXOMNjQdmi/hwcFP5PgF7W6XWVMRg==", "contentHash": "yoIQLUi2nXV0DnRPUIpeVoBZ+U2uTt6GmEw0P7IdMCp+9wo03R5iW3RHrF9GC6XSixG/A9zMjOxH54NGdMsyqw==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.4", "Mono.Cecil": "0.11.4",
"MonoMod.Backports": "1.0.0-prerelease.2", "MonoMod.Backports": "1.0.1-daily.23.11.20.3",
"MonoMod.ILHelpers": "1.0.0-prerelease.2", "MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3",
"MonoMod.Utils": "25.0.0-prerelease.2" "MonoMod.Utils": "25.0.3-daily.23.11.20.3"
} }
}, },
"MonoMod.ILHelpers": { "MonoMod.ILHelpers": {
"type": "Transitive", "type": "Transitive",
"resolved": "1.0.0-prerelease.2", "resolved": "1.0.0-daily.23.11.20.3",
"contentHash": "jB1JpcLGtKsWFIPItn/eQgmKwzPBKoDJnnBRDxWV3Ma4am6wPx8ynXXTwoTZOFi5gfHvkqK0RIu9MwJbwRCmow==" "contentHash": "sbgc1RwynZBjSP82HrLb9j4Prf8jXh+GKqEIJhzWTMUak+LGPkIHEBSlWWj7M5hUwekCjnheRA4WUhuw+yLGPA=="
}, },
"MonoMod.Utils": { "MonoMod.Utils": {
"type": "Transitive", "type": "Transitive",
"resolved": "25.0.0-prerelease.2", "resolved": "25.0.3-daily.23.11.20.3",
"contentHash": "8NWKe2Kc/CIt8BpK+DcZnc+23XP5+LG+nuUP8ELQ32qxad1JOBjLMRmCXLfxpk74z37XuBpTJUABa9pwPY2MXg==", "contentHash": "QCAYLKttu68kfCFmPoeCvmjvgM4nr8Y2m+S6BQzDlw5m4zBHzfVc5nbVwYGJa+d9cATJdX/gLwj/GXWrnX7AMg==",
"dependencies": { "dependencies": {
"Mono.Cecil": "0.11.4", "Mono.Cecil": "0.11.4",
"MonoMod.Backports": "1.0.0-prerelease.2", "MonoMod.Backports": "1.0.1-daily.23.11.20.3",
"MonoMod.ILHelpers": "1.0.0-prerelease.2" "MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3"
} }
}, },
"protobuf-net": { "protobuf-net": {
@@ -99,37 +110,21 @@
}, },
"System.Collections.Immutable": { "System.Collections.Immutable": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0", "resolved": "7.0.0",
"contentHash": "l4zZJ1WU2hqpQQHXz1rvC3etVZN+2DLmQMO79FhOTZHMn8tDRr+WU287sbomD0BETlmKDn0ygUgVy9k5xkkJdA==", "contentHash": "dQPcs0U1IKnBdRDBkrCTi1FoajSTBzLcVTpjO4MBCMC7f4pDOIPzgBoX8JjG7X6uZRJ8EBxsi8+DR1JuwjnzOQ=="
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
}
}, },
"System.Reflection.Metadata": { "System.Reflection.Metadata": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.1", "resolved": "7.0.0",
"contentHash": "III/lNMSn0ZRBuM9m5Cgbiho5j81u0FAEagFX5ta2DKbljZ3T0IpD8j+BIiHQPeKqJppWS9bGEp6JnKnWKze0g==", "contentHash": "MclTG61lsD9sYdpNz9xsKBzjsmsfCtcMZYXz/IUr2zlhaTaABonlr1ESeompTgM+Xk+IwtGYU7/voh3YWB/fWw==",
"dependencies": { "dependencies": {
"System.Collections.Immutable": "6.0.0" "System.Collections.Immutable": "7.0.0"
} }
}, },
"System.Runtime.CompilerServices.Unsafe": { "System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive", "type": "Transitive",
"resolved": "6.0.0", "resolved": "6.0.0",
"contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg==" "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=="
} }
} }
} }

6
nuget.config Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="MonodModDevBuilds" value="https://pkgs.dev.azure.com/MonoMod/MonoMod/_packaging/DevBuilds/nuget/v3/index.json" />
</packageSources>
</configuration>