PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

revert to net7

Browse Source
This commit is contained in:
zznty
2023-12-06 17:23:15 +07:00
parent 579b090c85
commit 563c611e3e
8 changed files with 97 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/release.yaml vendored
View File

@@ -7,7 +7,7 @@ on:
jobs:
build:
name: Build
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
env:
BUILD_CONFIGURATION: Release
DOTNET_NOLOGO: true

2
Directory.Build.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<RuntimeIdentifier>win-x64</RuntimeIdentifier>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<EnableWindowsTargeting>true</EnableWindowsTargeting>

4
Torch.API/packages.lock.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net8.0-windows7.0": {
"net7.0-windows7.0": {
"JorgeSerrano.Json.JsonSnakeCaseNamingPolicy": {
"type": "Direct",
"requested": "[0.9.0, )",
@@ -201,7 +201,7 @@
"contentHash": "cJV7ScGW7EhatRsjehfvvYVBvtiSMKgN8bOVI0bQhnF5bU7vnHVIsH49Kva7i7GWaWYvmEzkYVk1TC+gZYBEog=="
}
},
"net8.0-windows7.0/win-x64": {
"net7.0-windows7.0/win-x64": {
"System.Security.Cryptography.Pkcs": {
"type": "Transitive",
"resolved": "6.0.4",

46
Torch.Server.Tests/packages.lock.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net8.0-windows7.0": {
"net7.0-windows7.0": {
"Microsoft.NET.Test.Sdk": {
"type": "Direct",
"requested": "[17.8.0, )",
@@ -319,48 +319,48 @@
},
"MonoMod.Backports": {
"type": "Transitive",
"resolved": "1.0.1-daily.23.11.20.3",
"contentHash": "+NF0Jq7emWRJqCFPyZ17UjH9KXitH0JEwSE6aFbpbuaMJh8KhfzbNteyDbwG3Gc+dyv7IqY887vIGm42k2czJA==",
"resolved": "1.0.1",
"contentHash": "LWIzLvkkmXlucCWL9gg17WBHhmw9hBpMjiFFBfVKJ4Cova6BLoLqjT+yjZM7RW70ezXJ/ry7zsicvvTV67Hxnw==",
"dependencies": {
"MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3"
"MonoMod.ILHelpers": "1.0.0"
}
},
"MonoMod.Core": {
"type": "Transitive",
"resolved": "1.0.1-daily.23.11.20.3",
"contentHash": "yoIQLUi2nXV0DnRPUIpeVoBZ+U2uTt6GmEw0P7IdMCp+9wo03R5iW3RHrF9GC6XSixG/A9zMjOxH54NGdMsyqw==",
"resolved": "1.0.1",
"contentHash": "VL7d4L+/JU9LR1eXe+Wo2NquCzPExeMorBe23S/7Rn8cydb4Ex+wMpFhnlUfwT9jbLV/TiNbaVGJtR73fBwVCw==",
"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"
"MonoMod.Backports": "1.0.1",
"MonoMod.ILHelpers": "1.0.0",
"MonoMod.Utils": "25.0.3"
}
},
"MonoMod.ILHelpers": {
"type": "Transitive",
"resolved": "1.0.0-daily.23.11.20.3",
"contentHash": "sbgc1RwynZBjSP82HrLb9j4Prf8jXh+GKqEIJhzWTMUak+LGPkIHEBSlWWj7M5hUwekCjnheRA4WUhuw+yLGPA=="
"resolved": "1.0.0",
"contentHash": "dTjGA+dYl7W5yQ0oG/Wr57tsa+ueoFUrwPtz9MZF9iheun4n70u7lge52F8UJi9i0zMHRfS2mAY6+nPuRZHQyQ=="
},
"MonoMod.RuntimeDetour": {
"type": "Transitive",
"resolved": "25.0.2-daily.23.11.20.3",
"contentHash": "JU5K+pvq+U03DBTLP2mnSkFxHK0ILdL+X5wvYVIIAg5fFPDZCNoCyBthrRcohGZVBFROmpB/SXgoX+nxn9UOoQ==",
"resolved": "25.0.2",
"contentHash": "7HuQGIMMtu9q0PEnJYl7xztT14TmGSP56B4unBYWuZvPgWCZWX9hGOmTm7zDYhwMsjUQcCTl9iiqOlI1+NHVLg==",
"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.Backports": "1.0.1",
"MonoMod.Core": "1.0.1",
"MonoMod.ILHelpers": "1.0.0",
"MonoMod.Utils": "25.0.3"
}
},
"MonoMod.Utils": {
"type": "Transitive",
"resolved": "25.0.3-daily.23.11.20.3",
"contentHash": "QCAYLKttu68kfCFmPoeCvmjvgM4nr8Y2m+S6BQzDlw5m4zBHzfVc5nbVwYGJa+d9cATJdX/gLwj/GXWrnX7AMg==",
"resolved": "25.0.3",
"contentHash": "+/lFnYwNB728wnqAzkzCny88Ik++dueJiDAE+mRuMQf8NYHvWhNgLyZQ1VTN4x8iTelQGL1SzaY0I2bBPNNAog==",
"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.Backports": "1.0.1",
"MonoMod.ILHelpers": "1.0.0"
}
},
"NETStandard.Library": {
@@ -1506,7 +1506,7 @@
"MahApps.Metro": "[2.4.10, )",
"Microsoft.CodeAnalysis.CSharp": "[4.8.0, )",
"Microsoft.CodeAnalysis.Common": "[4.8.0, )",
"MonoMod.RuntimeDetour": "[25.0.2-daily.23.11.20.3, )",
"MonoMod.RuntimeDetour": "[25.0.2, )",
"NLog": "[5.2.7, )",
"System.ComponentModel.Annotations": "[5.0.0, )",
"Torch.API": "[1.0.0, )",
@@ -1557,7 +1557,7 @@
}
}
},
"net8.0-windows7.0/win-x64": {
"net7.0-windows7.0/win-x64": {
"Microsoft.Win32.Primitives": {
"type": "Transitive",
"resolved": "4.3.0",

46
Torch.Server/packages.lock.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net8.0-windows7.0": {
"net7.0-windows7.0": {
"AutoCompleteTextBox": {
"type": "Direct",
"requested": "[1.7.2, )",
@@ -314,48 +314,48 @@
},
"MonoMod.Backports": {
"type": "Transitive",
"resolved": "1.0.1-daily.23.11.20.3",
"contentHash": "+NF0Jq7emWRJqCFPyZ17UjH9KXitH0JEwSE6aFbpbuaMJh8KhfzbNteyDbwG3Gc+dyv7IqY887vIGm42k2czJA==",
"resolved": "1.0.1",
"contentHash": "LWIzLvkkmXlucCWL9gg17WBHhmw9hBpMjiFFBfVKJ4Cova6BLoLqjT+yjZM7RW70ezXJ/ry7zsicvvTV67Hxnw==",
"dependencies": {
"MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3"
"MonoMod.ILHelpers": "1.0.0"
}
},
"MonoMod.Core": {
"type": "Transitive",
"resolved": "1.0.1-daily.23.11.20.3",
"contentHash": "yoIQLUi2nXV0DnRPUIpeVoBZ+U2uTt6GmEw0P7IdMCp+9wo03R5iW3RHrF9GC6XSixG/A9zMjOxH54NGdMsyqw==",
"resolved": "1.0.1",
"contentHash": "VL7d4L+/JU9LR1eXe+Wo2NquCzPExeMorBe23S/7Rn8cydb4Ex+wMpFhnlUfwT9jbLV/TiNbaVGJtR73fBwVCw==",
"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"
"MonoMod.Backports": "1.0.1",
"MonoMod.ILHelpers": "1.0.0",
"MonoMod.Utils": "25.0.3"
}
},
"MonoMod.ILHelpers": {
"type": "Transitive",
"resolved": "1.0.0-daily.23.11.20.3",
"contentHash": "sbgc1RwynZBjSP82HrLb9j4Prf8jXh+GKqEIJhzWTMUak+LGPkIHEBSlWWj7M5hUwekCjnheRA4WUhuw+yLGPA=="
"resolved": "1.0.0",
"contentHash": "dTjGA+dYl7W5yQ0oG/Wr57tsa+ueoFUrwPtz9MZF9iheun4n70u7lge52F8UJi9i0zMHRfS2mAY6+nPuRZHQyQ=="
},
"MonoMod.RuntimeDetour": {
"type": "Transitive",
"resolved": "25.0.2-daily.23.11.20.3",
"contentHash": "JU5K+pvq+U03DBTLP2mnSkFxHK0ILdL+X5wvYVIIAg5fFPDZCNoCyBthrRcohGZVBFROmpB/SXgoX+nxn9UOoQ==",
"resolved": "25.0.2",
"contentHash": "7HuQGIMMtu9q0PEnJYl7xztT14TmGSP56B4unBYWuZvPgWCZWX9hGOmTm7zDYhwMsjUQcCTl9iiqOlI1+NHVLg==",
"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.Backports": "1.0.1",
"MonoMod.Core": "1.0.1",
"MonoMod.ILHelpers": "1.0.0",
"MonoMod.Utils": "25.0.3"
}
},
"MonoMod.Utils": {
"type": "Transitive",
"resolved": "25.0.3-daily.23.11.20.3",
"contentHash": "QCAYLKttu68kfCFmPoeCvmjvgM4nr8Y2m+S6BQzDlw5m4zBHzfVc5nbVwYGJa+d9cATJdX/gLwj/GXWrnX7AMg==",
"resolved": "25.0.3",
"contentHash": "+/lFnYwNB728wnqAzkzCny88Ik++dueJiDAE+mRuMQf8NYHvWhNgLyZQ1VTN4x8iTelQGL1SzaY0I2bBPNNAog==",
"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.Backports": "1.0.1",
"MonoMod.ILHelpers": "1.0.0"
}
},
"Newtonsoft.Json": {
@@ -563,7 +563,7 @@
"MahApps.Metro": "[2.4.10, )",
"Microsoft.CodeAnalysis.CSharp": "[4.8.0, )",
"Microsoft.CodeAnalysis.Common": "[4.8.0, )",
"MonoMod.RuntimeDetour": "[25.0.2-daily.23.11.20.3, )",
"MonoMod.RuntimeDetour": "[25.0.2, )",
"NLog": "[5.2.7, )",
"System.ComponentModel.Annotations": "[5.0.0, )",
"Torch.API": "[1.0.0, )",
@@ -584,7 +584,7 @@
}
}
},
"net8.0-windows7.0/win-x64": {
"net7.0-windows7.0/win-x64": {
"Steamworks.NET": {
"type": "Direct",
"requested": "[20.1.0, )",

46
Torch.Tests/packages.lock.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net8.0-windows7.0": {
"net7.0-windows7.0": {
"Microsoft.NET.Test.Sdk": {
"type": "Direct",
"requested": "[17.8.0, )",
@@ -177,48 +177,48 @@
},
"MonoMod.Backports": {
"type": "Transitive",
"resolved": "1.0.1-daily.23.11.20.3",
"contentHash": "+NF0Jq7emWRJqCFPyZ17UjH9KXitH0JEwSE6aFbpbuaMJh8KhfzbNteyDbwG3Gc+dyv7IqY887vIGm42k2czJA==",
"resolved": "1.0.1",
"contentHash": "LWIzLvkkmXlucCWL9gg17WBHhmw9hBpMjiFFBfVKJ4Cova6BLoLqjT+yjZM7RW70ezXJ/ry7zsicvvTV67Hxnw==",
"dependencies": {
"MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3"
"MonoMod.ILHelpers": "1.0.0"
}
},
"MonoMod.Core": {
"type": "Transitive",
"resolved": "1.0.1-daily.23.11.20.3",
"contentHash": "yoIQLUi2nXV0DnRPUIpeVoBZ+U2uTt6GmEw0P7IdMCp+9wo03R5iW3RHrF9GC6XSixG/A9zMjOxH54NGdMsyqw==",
"resolved": "1.0.1",
"contentHash": "VL7d4L+/JU9LR1eXe+Wo2NquCzPExeMorBe23S/7Rn8cydb4Ex+wMpFhnlUfwT9jbLV/TiNbaVGJtR73fBwVCw==",
"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"
"MonoMod.Backports": "1.0.1",
"MonoMod.ILHelpers": "1.0.0",
"MonoMod.Utils": "25.0.3"
}
},
"MonoMod.ILHelpers": {
"type": "Transitive",
"resolved": "1.0.0-daily.23.11.20.3",
"contentHash": "sbgc1RwynZBjSP82HrLb9j4Prf8jXh+GKqEIJhzWTMUak+LGPkIHEBSlWWj7M5hUwekCjnheRA4WUhuw+yLGPA=="
"resolved": "1.0.0",
"contentHash": "dTjGA+dYl7W5yQ0oG/Wr57tsa+ueoFUrwPtz9MZF9iheun4n70u7lge52F8UJi9i0zMHRfS2mAY6+nPuRZHQyQ=="
},
"MonoMod.RuntimeDetour": {
"type": "Transitive",
"resolved": "25.0.2-daily.23.11.20.3",
"contentHash": "JU5K+pvq+U03DBTLP2mnSkFxHK0ILdL+X5wvYVIIAg5fFPDZCNoCyBthrRcohGZVBFROmpB/SXgoX+nxn9UOoQ==",
"resolved": "25.0.2",
"contentHash": "7HuQGIMMtu9q0PEnJYl7xztT14TmGSP56B4unBYWuZvPgWCZWX9hGOmTm7zDYhwMsjUQcCTl9iiqOlI1+NHVLg==",
"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.Backports": "1.0.1",
"MonoMod.Core": "1.0.1",
"MonoMod.ILHelpers": "1.0.0",
"MonoMod.Utils": "25.0.3"
}
},
"MonoMod.Utils": {
"type": "Transitive",
"resolved": "25.0.3-daily.23.11.20.3",
"contentHash": "QCAYLKttu68kfCFmPoeCvmjvgM4nr8Y2m+S6BQzDlw5m4zBHzfVc5nbVwYGJa+d9cATJdX/gLwj/GXWrnX7AMg==",
"resolved": "25.0.3",
"contentHash": "+/lFnYwNB728wnqAzkzCny88Ik++dueJiDAE+mRuMQf8NYHvWhNgLyZQ1VTN4x8iTelQGL1SzaY0I2bBPNNAog==",
"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.Backports": "1.0.1",
"MonoMod.ILHelpers": "1.0.0"
}
},
"NETStandard.Library": {
@@ -1338,7 +1338,7 @@
"MahApps.Metro": "[2.4.10, )",
"Microsoft.CodeAnalysis.CSharp": "[4.8.0, )",
"Microsoft.CodeAnalysis.Common": "[4.8.0, )",
"MonoMod.RuntimeDetour": "[25.0.2-daily.23.11.20.3, )",
"MonoMod.RuntimeDetour": "[25.0.2, )",
"NLog": "[5.2.7, )",
"System.ComponentModel.Annotations": "[5.0.0, )",
"Torch.API": "[1.0.0, )",
@@ -1359,7 +1359,7 @@
}
}
},
"net8.0-windows7.0/win-x64": {
"net7.0-windows7.0/win-x64": {
"Microsoft.Win32.Primitives": {
"type": "Transitive",
"resolved": "4.3.0",

2
Torch/Torch.csproj
View File

@@ -14,7 +14,7 @@
<Import Project="..\Torch.Mod\Torch.Mod.projitems" Label="Shared" />
<ItemGroup>
<PackageReference Include="MonoMod.RuntimeDetour" Version="25.0.2-daily.23.11.20.3" />
<PackageReference Include="MonoMod.RuntimeDetour" Version="25.0.2" />
<PackageReference Include="HarmonyX" Version="2.10.2-prerelease.6" />
<PackageReference Include="ControlzEx" Version="5.0.2" />

46
Torch/packages.lock.json
View File

@@ -1,7 +1,7 @@
{
"version": 1,
"dependencies": {
"net8.0-windows7.0": {
"net7.0-windows7.0": {
"ControlzEx": {
"type": "Direct",
"requested": "[5.0.2, )",
@@ -62,15 +62,15 @@
},
"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.0.2, )",
"resolved": "25.0.2",
"contentHash": "7HuQGIMMtu9q0PEnJYl7xztT14TmGSP56B4unBYWuZvPgWCZWX9hGOmTm7zDYhwMsjUQcCTl9iiqOlI1+NHVLg==",
"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.Backports": "1.0.1",
"MonoMod.Core": "1.0.1",
"MonoMod.ILHelpers": "1.0.0",
"MonoMod.Utils": "25.0.3"
}
},
"NLog": {
@@ -188,36 +188,36 @@
},
"MonoMod.Backports": {
"type": "Transitive",
"resolved": "1.0.1-daily.23.11.20.3",
"contentHash": "+NF0Jq7emWRJqCFPyZ17UjH9KXitH0JEwSE6aFbpbuaMJh8KhfzbNteyDbwG3Gc+dyv7IqY887vIGm42k2czJA==",
"resolved": "1.0.1",
"contentHash": "LWIzLvkkmXlucCWL9gg17WBHhmw9hBpMjiFFBfVKJ4Cova6BLoLqjT+yjZM7RW70ezXJ/ry7zsicvvTV67Hxnw==",
"dependencies": {
"MonoMod.ILHelpers": "1.0.0-daily.23.11.20.3"
"MonoMod.ILHelpers": "1.0.0"
}
},
"MonoMod.Core": {
"type": "Transitive",
"resolved": "1.0.1-daily.23.11.20.3",
"contentHash": "yoIQLUi2nXV0DnRPUIpeVoBZ+U2uTt6GmEw0P7IdMCp+9wo03R5iW3RHrF9GC6XSixG/A9zMjOxH54NGdMsyqw==",
"resolved": "1.0.1",
"contentHash": "VL7d4L+/JU9LR1eXe+Wo2NquCzPExeMorBe23S/7Rn8cydb4Ex+wMpFhnlUfwT9jbLV/TiNbaVGJtR73fBwVCw==",
"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"
"MonoMod.Backports": "1.0.1",
"MonoMod.ILHelpers": "1.0.0",
"MonoMod.Utils": "25.0.3"
}
},
"MonoMod.ILHelpers": {
"type": "Transitive",
"resolved": "1.0.0-daily.23.11.20.3",
"contentHash": "sbgc1RwynZBjSP82HrLb9j4Prf8jXh+GKqEIJhzWTMUak+LGPkIHEBSlWWj7M5hUwekCjnheRA4WUhuw+yLGPA=="
"resolved": "1.0.0",
"contentHash": "dTjGA+dYl7W5yQ0oG/Wr57tsa+ueoFUrwPtz9MZF9iheun4n70u7lge52F8UJi9i0zMHRfS2mAY6+nPuRZHQyQ=="
},
"MonoMod.Utils": {
"type": "Transitive",
"resolved": "25.0.3-daily.23.11.20.3",
"contentHash": "QCAYLKttu68kfCFmPoeCvmjvgM4nr8Y2m+S6BQzDlw5m4zBHzfVc5nbVwYGJa+d9cATJdX/gLwj/GXWrnX7AMg==",
"resolved": "25.0.3",
"contentHash": "+/lFnYwNB728wnqAzkzCny88Ik++dueJiDAE+mRuMQf8NYHvWhNgLyZQ1VTN4x8iTelQGL1SzaY0I2bBPNNAog==",
"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.Backports": "1.0.1",
"MonoMod.ILHelpers": "1.0.0"
}
},
"Newtonsoft.Json": {
@@ -400,7 +400,7 @@
}
}
},
"net8.0-windows7.0/win-x64": {
"net7.0-windows7.0/win-x64": {
"System.Security.Cryptography.Pkcs": {
"type": "Transitive",
"resolved": "6.0.4",