anna
/
ExpandedSearchInfo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: update for net7

This commit is contained in:
Anna 2023-04-15 14:41:04 -04:00
parent 661d76b664
commit a2da0058df
3 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ExpandedSearchInfo/ExpandedSearchInfo.csproj
View File

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6-windows</TargetFramework>
<TargetFramework>net7-windows</TargetFramework>
<Version>1.3.10</Version>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
@ -47,9 +47,9 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="AngleSharp" Version="1.0.0-alpha-844"/>
<PackageReference Include="DalamudPackager" Version="2.1.8"/>
<PackageReference Include="AngleSharp" Version="1.0.1"/>
<PackageReference Include="DalamudPackager" Version="2.1.11"/>
<PackageReference Include="Nager.PublicSuffix" Version="2.4.0"/>
</ItemGroup>
</Project>
</Project>

5
ExpandedSearchInfo/GameFunctions.cs
View File

@ -19,7 +19,7 @@ namespace ExpandedSearchInfo {
this.Plugin = plugin;
var sidPtr = this.Plugin.SigScanner.ScanText("48 89 5C 24 ?? 48 89 6C 24 ?? 56 48 83 EC 20 49 8B E8 8B DA");
this._searchInfoDownloadedHook = new Hook<SearchInfoDownloadedDelegate>(sidPtr, this.SearchInfoDownloaded);
this._searchInfoDownloadedHook = Hook<SearchInfoDownloadedDelegate>.FromAddress(sidPtr, this.SearchInfoDownloaded);
this._searchInfoDownloadedHook.Enable();
}
@ -33,12 +33,13 @@ namespace ExpandedSearchInfo {
try {
// Updated: 4.5
var actorId = *(uint*) (data + 48);
PluginLog.Log($"actorId: {actorId:x8}");
var searchInfo = Util.ReadRawSeString(searchInfoPtr);
this.ReceiveSearchInfo?.Invoke(actorId, searchInfo);
} catch (Exception ex) {
PluginLog.LogError($"Error in SearchInfoDownloaded hook\n{ex}");
PluginLog.LogError(ex, "Error in SearchInfoDownloaded hook");
}
return result;

36
ExpandedSearchInfo/packages.lock.json Normal file → Executable file
View File

@ -1,21 +1,22 @@
{
"version": 1,
"dependencies": {
"net6.0-windows7.0": {
"net7.0-windows7.0": {
"AngleSharp": {
"type": "Direct",
"requested": "[1.0.0-alpha-844, )",
"resolved": "1.0.0-alpha-844",
"contentHash": "gQ/S3ZClscQJvFpyc8pRa75cRDMolqJ1TjIrRii9REPwI8w4hVGPM9Bdx+ONBnj56HFmCUAzLKSi+KUIFohXjA==",
"requested": "[1.0.1, )",
"resolved": "1.0.1",
"contentHash": "uIezZhHZqWEb4zw/D5Xnskqb/sivIFwfWcUX2srPWTE10IYahfrdhWTIk859BpEmPmxSlMoL+S0JimFTaWGaHA==",
"dependencies": {
"System.Text.Encoding.CodePages": "4.5.0"
"System.Buffers": "4.5.1",
"System.Text.Encoding.CodePages": "7.0.0"
}
},
"DalamudPackager": {
"type": "Direct",
"requested": "[2.1.8, )",
"resolved": "2.1.8",
"contentHash": "YqagNXs9InxmqkXzq7kLveImxnodkBEicAhydMXVp7dFjC7xb76U6zGgAax4/BWIWfZeWzr5DJyQSev31kj81A=="
"requested": "[2.1.11, )",
"resolved": "2.1.11",
"contentHash": "9qlAWoRRTiL/geAvuwR/g6Bcbrd/bJJgVnB/RurBiyKs6srsP0bvpoo8IK+Eg8EA6jWeM6/YJWs66w4FIAzqPw=="
},
"Nager.PublicSuffix": {
"type": "Direct",
@ -23,24 +24,15 @@
"resolved": "2.4.0",
"contentHash": "eRlS+m5cVqN4Lmg0cJaL+ClBf6gURL6hDax8fmPanMjBS/8VtGqUeuxBbonBR6sq4dvkQo04oUYuS0v4NZhHXw=="
},
"Microsoft.NETCore.Platforms": {
"System.Buffers": {
"type": "Transitive",
"resolved": "2.0.0",
"contentHash": "VdLJOCXhZaEMY7Hm2GKiULmn7IEPFE4XC5LPSfBVCUIA8YLZVh846gtfBJalsPQF2PlzdD7ecX7DZEulJ402ZQ=="
},
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
"resolved": "4.5.0",
"contentHash": "YrzNWduCDHhUaSRBxHxL11UkM2fD6y8hITHis4/LbQZ6vj3vdRjoH3IoPWWC9uDXK2wHIqn+b5gv1Np/VKyM1g=="
"resolved": "4.5.1",
"contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
},
"System.Text.Encoding.CodePages": {
"type": "Transitive",
"resolved": "4.5.0",
"contentHash": "S0wEUiKcLvRlkFUXca8uio1UQ5bYQzYgOmOKtCqaBQC3GR9AJjh43otcM32IGsAyvadFTaAMw9Irm6dS4Evfng==",
"dependencies": {
"Microsoft.NETCore.Platforms": "2.0.0",
"System.Runtime.CompilerServices.Unsafe": "4.5.0"
}
"resolved": "7.0.0",
"contentHash": "LSyCblMpvOe0N3E+8e0skHcrIhgV2huaNcjUUEa8hRtgEAm36aGkRoC8Jxlb6Ra6GSfF29ftduPNywin8XolzQ=="
}
}
}