Merge remote-tracking branch 'pve/master'
All checks were successful
Build / Build Launcher (push) Successful in 2m14s

This commit is contained in:
2024-03-04 02:17:29 -05:00
5 changed files with 109 additions and 82 deletions

View File

@@ -15,8 +15,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
<PackageReference Include="NLog" Version="5.2.7" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.505.1" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="NLog" Version="5.2.8" />
<PackageReference Include="SpaceEngineersDedicated.ReferenceAssemblies" Version="1.203.630" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
<PackageReference Include="System.Management" Version="8.0.0" />
<PackageReference Include="System.Private.ServiceModel" Version="4.10.3" />

View File

@@ -13,15 +13,15 @@
},
"NLog": {
"type": "Direct",
"requested": "[5.2.7, )",
"resolved": "5.2.7",
"contentHash": "Ww/0b6V1NL8iqpFKtRKVQFFX03LoowNzYeNG6FpVzmhgCfLAkW0h/4lT3+V8mHfyvtHptNoV8Cz0YePLFRUaPA=="
"requested": "[5.2.8, )",
"resolved": "5.2.8",
"contentHash": "jAIELkWBs1CXFPp986KSGpDFQZHCFccO+LMbKBTTNm42KifaI1mYzFMFQQfuGmGMTrCx0TFPhDjHDE4cLAZWiQ=="
},
"SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Direct",
"requested": "[1.203.505.1, )",
"resolved": "1.203.505.1",
"contentHash": "YokcOxKdIvtJ2fYdkF48/wvbdaDlNl+bbUd11vkdPRdHaprRj5b2F1wUk7faL0J0UIX87lyhgC/HsNn9rHVbJw==",
"requested": "[1.203.630, )",
"resolved": "1.203.630",
"contentHash": "PJKIi0D3M3NcUP/ZIPSOC1ufbINyFxtX6ilnFXPXTeM0gdyxFF9KwHC9g9jDz+mcyRzk0vKLkYWUyD3fz+WNcA==",
"dependencies": {
"protobuf-net": "1.0.0"
}
@@ -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": {
@@ -104,53 +105,53 @@
},
"Mono.Cecil": {
"type": "Transitive",
"resolved": "0.11.4",
"contentHash": "IC1h5g0NeJGHIUgzM1P82ld57knhP0IcQfrYITDPXlNpMYGUrsG5TxuaWTjaeqDNQMBDNZkB8L0rBnwsY6JHuQ=="
"resolved": "0.11.5",
"contentHash": "fxfX+0JGTZ8YQeu1MYjbBiK2CYTSzDyEeIixt+yqKKTn7FW8rv7JMY70qevup4ZJfD7Kk/VG/jDzQQTpfch87g=="
},
"MonoMod.Backports": {
"type": "Transitive",
"resolved": "1.0.1-daily.23.11.20.3",
"contentHash": "+NF0Jq7emWRJqCFPyZ17UjH9KXitH0JEwSE6aFbpbuaMJh8KhfzbNteyDbwG3Gc+dyv7IqY887vIGm42k2czJA==",
"resolved": "1.1.0-prerelease.2",
"contentHash": "OqZEgKt2DhgRNIoxJWxWndA7lSfpssF5BQmeqqn2UzImlpfw1re12NEGHnWRUyoausTOHua9oqlvT5QRVtJTvg==",
"dependencies": {
"MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3"
"MonoMod.ILHelpers": "1.0.1-prerelease.2"
}
},
"MonoMod.Core": {
"type": "Transitive",
"resolved": "1.0.1-daily.23.11.20.3",
"contentHash": "yoIQLUi2nXV0DnRPUIpeVoBZ+U2uTt6GmEw0P7IdMCp+9wo03R5iW3RHrF9GC6XSixG/A9zMjOxH54NGdMsyqw==",
"resolved": "1.1.0-prerelease.2",
"contentHash": "K4x49/5DqlIH/uJiVo/xFgHm1BktfPxwjbz/jBO5Je47i4yJ2Xw69utMNI5CrABmWYUJDL8rzkg3knW9/fftaQ==",
"dependencies": {
"Mono.Cecil": "0.11.4",
"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"
"Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.0-prerelease.2",
"MonoMod.ILHelpers": "1.0.1-prerelease.2",
"MonoMod.Utils": "25.0.3-prerelease.2"
}
},
"MonoMod.ILHelpers": {
"type": "Transitive",
"resolved": "1.0.0-daily.23.11.20.3",
"contentHash": "sbgc1RwynZBjSP82HrLb9j4Prf8jXh+GKqEIJhzWTMUak+LGPkIHEBSlWWj7M5hUwekCjnheRA4WUhuw+yLGPA=="
"resolved": "1.0.1-prerelease.2",
"contentHash": "dQmsczuF+tNAqhxcgL5glEYolGa3f8HrovQ4ehih2S6vEUB5BCsVfsbKkWRLz7iRKf81PMea2AM9Cz6sWyQecw=="
},
"MonoMod.RuntimeDetour": {
"type": "Transitive",
"resolved": "25.0.2-daily.23.11.20.3",
"contentHash": "JU5K+pvq+U03DBTLP2mnSkFxHK0ILdL+X5wvYVIIAg5fFPDZCNoCyBthrRcohGZVBFROmpB/SXgoX+nxn9UOoQ==",
"resolved": "25.1.0-prerelease.2",
"contentHash": "x9j7n02kpkPpiy15BxW6aT7sUNfVpZovfuDs1n/Nl3eJiVUClX4EVif3GAFtnP95dIYf8oci60El1OrS4EkW7g==",
"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"
"Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.0-prerelease.2",
"MonoMod.Core": "1.1.0-prerelease.2",
"MonoMod.ILHelpers": "1.0.1-prerelease.2",
"MonoMod.Utils": "25.0.3-prerelease.2"
}
},
"MonoMod.Utils": {
"type": "Transitive",
"resolved": "25.0.3-daily.23.11.20.3",
"contentHash": "QCAYLKttu68kfCFmPoeCvmjvgM4nr8Y2m+S6BQzDlw5m4zBHzfVc5nbVwYGJa+d9cATJdX/gLwj/GXWrnX7AMg==",
"resolved": "25.0.3-prerelease.2",
"contentHash": "xqYOoAtSqIwqCT0NUX4f6Wt8Gxgd8UDQifSiWbVFY4X2E5nACnUwBC6XGSErKfgfMv/ED/V8Wm05a/Gs2/gQ0A==",
"dependencies": {
"Mono.Cecil": "0.11.4",
"MonoMod.Backports": "1.0.1-daily.23.11.20.3",
"MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3"
"Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.0-prerelease.2",
"MonoMod.ILHelpers": "1.0.1-prerelease.2"
}
},
"protobuf-net": {
@@ -255,11 +256,24 @@
"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, )",
"MonoMod.RuntimeDetour": "[25.0.2-daily.23.11.20.3, )",
"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=="
}
}
}

View File

@@ -9,10 +9,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MonoMod.RuntimeDetour" Version="25.0.2-daily.23.11.20.3" />
<PackageReference Include="HarmonyX" Version="2.10.2-prerelease.6" />
<PackageReference Include="Lib.Harmony" Version="2.3.0-prerelease.5" />
<PackageReference Include="MonoMod.RuntimeDetour" Version="25.1.0-prerelease.2" />
<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.630" IncludeAssets="compile" PrivateAssets="all" />
<PackageReference Include="Steamworks.NET" Version="20.1.0" />
</ItemGroup>

View File

@@ -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": {
@@ -22,22 +23,22 @@
},
"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==",
"requested": "[25.1.0-prerelease.2, )",
"resolved": "25.1.0-prerelease.2",
"contentHash": "x9j7n02kpkPpiy15BxW6aT7sUNfVpZovfuDs1n/Nl3eJiVUClX4EVif3GAFtnP95dIYf8oci60El1OrS4EkW7g==",
"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"
"Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.0-prerelease.2",
"MonoMod.Core": "1.1.0-prerelease.2",
"MonoMod.ILHelpers": "1.0.1-prerelease.2",
"MonoMod.Utils": "25.0.3-prerelease.2"
}
},
"SpaceEngineersDedicated.ReferenceAssemblies": {
"type": "Direct",
"requested": "[1.203.505.1, )",
"resolved": "1.203.505.1",
"contentHash": "YokcOxKdIvtJ2fYdkF48/wvbdaDlNl+bbUd11vkdPRdHaprRj5b2F1wUk7faL0J0UIX87lyhgC/HsNn9rHVbJw==",
"requested": "[1.203.630, )",
"resolved": "1.203.630",
"contentHash": "PJKIi0D3M3NcUP/ZIPSOC1ufbINyFxtX6ilnFXPXTeM0gdyxFF9KwHC9g9jDz+mcyRzk0vKLkYWUyD3fz+WNcA==",
"dependencies": {
"protobuf-net": "1.0.0"
}
@@ -66,41 +67,41 @@
},
"Mono.Cecil": {
"type": "Transitive",
"resolved": "0.11.4",
"contentHash": "IC1h5g0NeJGHIUgzM1P82ld57knhP0IcQfrYITDPXlNpMYGUrsG5TxuaWTjaeqDNQMBDNZkB8L0rBnwsY6JHuQ=="
"resolved": "0.11.5",
"contentHash": "fxfX+0JGTZ8YQeu1MYjbBiK2CYTSzDyEeIixt+yqKKTn7FW8rv7JMY70qevup4ZJfD7Kk/VG/jDzQQTpfch87g=="
},
"MonoMod.Backports": {
"type": "Transitive",
"resolved": "1.0.1-daily.23.11.20.3",
"contentHash": "+NF0Jq7emWRJqCFPyZ17UjH9KXitH0JEwSE6aFbpbuaMJh8KhfzbNteyDbwG3Gc+dyv7IqY887vIGm42k2czJA==",
"resolved": "1.1.0-prerelease.2",
"contentHash": "OqZEgKt2DhgRNIoxJWxWndA7lSfpssF5BQmeqqn2UzImlpfw1re12NEGHnWRUyoausTOHua9oqlvT5QRVtJTvg==",
"dependencies": {
"MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3"
"MonoMod.ILHelpers": "1.0.1-prerelease.2"
}
},
"MonoMod.Core": {
"type": "Transitive",
"resolved": "1.0.1-daily.23.11.20.3",
"contentHash": "yoIQLUi2nXV0DnRPUIpeVoBZ+U2uTt6GmEw0P7IdMCp+9wo03R5iW3RHrF9GC6XSixG/A9zMjOxH54NGdMsyqw==",
"resolved": "1.1.0-prerelease.2",
"contentHash": "K4x49/5DqlIH/uJiVo/xFgHm1BktfPxwjbz/jBO5Je47i4yJ2Xw69utMNI5CrABmWYUJDL8rzkg3knW9/fftaQ==",
"dependencies": {
"Mono.Cecil": "0.11.4",
"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"
"Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.0-prerelease.2",
"MonoMod.ILHelpers": "1.0.1-prerelease.2",
"MonoMod.Utils": "25.0.3-prerelease.2"
}
},
"MonoMod.ILHelpers": {
"type": "Transitive",
"resolved": "1.0.0-daily.23.11.20.3",
"contentHash": "sbgc1RwynZBjSP82HrLb9j4Prf8jXh+GKqEIJhzWTMUak+LGPkIHEBSlWWj7M5hUwekCjnheRA4WUhuw+yLGPA=="
"resolved": "1.0.1-prerelease.2",
"contentHash": "dQmsczuF+tNAqhxcgL5glEYolGa3f8HrovQ4ehih2S6vEUB5BCsVfsbKkWRLz7iRKf81PMea2AM9Cz6sWyQecw=="
},
"MonoMod.Utils": {
"type": "Transitive",
"resolved": "25.0.3-daily.23.11.20.3",
"contentHash": "QCAYLKttu68kfCFmPoeCvmjvgM4nr8Y2m+S6BQzDlw5m4zBHzfVc5nbVwYGJa+d9cATJdX/gLwj/GXWrnX7AMg==",
"resolved": "25.0.3-prerelease.2",
"contentHash": "xqYOoAtSqIwqCT0NUX4f6Wt8Gxgd8UDQifSiWbVFY4X2E5nACnUwBC6XGSErKfgfMv/ED/V8Wm05a/Gs2/gQ0A==",
"dependencies": {
"Mono.Cecil": "0.11.4",
"MonoMod.Backports": "1.0.1-daily.23.11.20.3",
"MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3"
"Mono.Cecil": "0.11.5",
"MonoMod.Backports": "1.1.0-prerelease.2",
"MonoMod.ILHelpers": "1.0.1-prerelease.2"
}
},
"protobuf-net": {
@@ -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"
}
}
}
}

View File

@@ -1,6 +0,0 @@
<?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>