Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

API11 #9

Merged
merged 4 commits into from
Nov 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 19 additions & 7 deletions FantasyPlayer.Mock/FantasyPlayer.Mock.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@
</PropertyGroup>

<PropertyGroup>
<DalamudLibPath>$(AppData)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
<DalamudLibPath Condition="$([MSBuild]::IsOSPlatform('Windows'))">$(appdata)\XIVLauncher\addon\Hooks\dev\</DalamudLibPath>
<DalamudLibPath Condition="$([MSBuild]::IsOSPlatform('Linux'))">$(HOME)/.xlcore/dalamud/Hooks/dev/</DalamudLibPath>
<DalamudLibPath Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(HOME)/Library/Application Support/XIV on Mac/dalamud/Hooks/dev/</DalamudLibPath>
<DalamudLibPath Condition="$(DALAMUD_HOME) != ''">$(DALAMUD_HOME)/</DalamudLibPath>
</PropertyGroup>

<PropertyGroup>
Expand Down Expand Up @@ -56,17 +59,17 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="DalaMock.Core" Version="2.0.5" />
<PackageReference Include="DalaMock.Shared" Version="2.0.5" />
<PackageReference Include="DalaMock.Core" Version="2.1.1" />
<PackageReference Include="DalaMock.Shared" Version="2.1.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3-beta1" />
<PackageReference Include="StbiSharp" Version="1.2.1" />
<PackageReference Include="Veldrid" Version="4.9.0" />
<PackageReference Include="Veldrid.SDL2" Version="4.9.0" />
<PackageReference Include="Veldrid.StartupUtilities" Version="4.9.0" />
<PackageReference Include="Serilog" Version="2.11.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog" Version="4.1.0-dev-02312" />
<PackageReference Include="Serilog.Sinks.Async" Version="2.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
</ItemGroup>

<ItemGroup>
Expand All @@ -88,6 +91,15 @@
<None Update="cimplot.pdb">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="cimgui.so">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="cimguizmo.so">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="cimplot.so">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Shaders/GLSL/imgui-vertex.glsl" LogicalName="imgui-vertex.glsl" />
Expand Down
1 change: 0 additions & 1 deletion FantasyPlayer.Mock/MockPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ namespace FantasyPlayer.Mock;
using DalaMock.Core.Mocks;
using DalaMock.Core.Windows;
using DalaMock.Shared.Interfaces;
using Dalamud.Interface.Windowing;
using Dalamud.Plugin;
using Dalamud.Plugin.Services;

Expand Down
Binary file added FantasyPlayer.Mock/cimgui.so
Binary file not shown.
Binary file added FantasyPlayer.Mock/cimguizmo.so
Binary file not shown.
Binary file added FantasyPlayer.Mock/cimplot.so
Binary file not shown.
4 changes: 2 additions & 2 deletions FantasyPlayer/FantasyPlayer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autofac" Version="8.0.0" />
<PackageReference Include="DalaMock.Host" Version="2.0.5" />
<PackageReference Include="DalaMock.Shared" Version="2.0.5" />
<PackageReference Include="DalaMock.Host" Version="2.1.1" />
<PackageReference Include="DalaMock.Shared" Version="2.1.1" />
<PackageReference Include="DalamudPackager" Version="2.1.12" />
<PackageReference Include="SpotifyAPI.Web" Version="7.0.0" />
</ItemGroup>
Expand Down
26 changes: 16 additions & 10 deletions FantasyPlayer/packages.lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,15 @@
},
"DalaMock.Host": {
"type": "Direct",
"requested": "[2.0.5, )",
"resolved": "2.0.5",
"contentHash": "aACvYvdMqmOokuO8XKjtoKClumw2xGXpniZVXJAFfz1PpfNWt7yZb8W60K+Q4acSzlDp4nd9ahZDxQjBrf2tOA==",
"requested": "[2.1.1, )",
"resolved": "2.1.1",
"contentHash": "qgdiiJ/vKRMna3GOzgwJ/GhaMlNI0xfCHND9lEob5u2xfJVSUHpI/g6KbY6Jp9xB4YOt6FGPPJ/qjbmJSrce8w==",
"dependencies": {
"Autofac.Extensions.DependencyInjection": "9.0.0",
"DalaMock.Shared": "2.0.5",
"DalaMock.Shared": "2.1.1",
"Microsoft.Extensions.Hosting": "8.0.0",
"Microsoft.Extensions.Hosting.Abstractions": "8.0.0",
"Microsoft.Extensions.ObjectPool": "9.0.0-preview.6.24328.4",
"Serilog": "2.11.0",
"Serilog.Sinks.Async": "1.5.0",
"Serilog.Sinks.Console": "4.0.1",
Expand All @@ -29,9 +30,9 @@
},
"DalaMock.Shared": {
"type": "Direct",
"requested": "[2.0.5, )",
"resolved": "2.0.5",
"contentHash": "CJOdmfCLFVXh70XQsaNq/J3X4HP8Wou7sBV9NmeM8ND9Y0RJyE2u5Lqsnl3bgzwFj2xOa2UI4ioRKSTLaFEIlA==",
"requested": "[2.1.1, )",
"resolved": "2.1.1",
"contentHash": "atV+mzv6vpepSMTO0IBAMyFDx1gSxVbjsKWAHIesRUVqetvC3BD6wpx4JaVAjS1OIVIRnXueDvyXV9UYMnGYNA==",
"dependencies": {
"Autofac.Extensions.DependencyInjection": "9.0.0",
"Microsoft.Extensions.Hosting": "8.0.0",
Expand All @@ -40,9 +41,9 @@
},
"DalamudPackager": {
"type": "Direct",
"requested": "[2.1.13, )",
"resolved": "2.1.13",
"contentHash": "rMN1omGe8536f4xLMvx9NwfvpAc9YFFfeXJ1t4P4PE6Gu8WCIoFliR1sh07hM+bfODmesk/dvMbji7vNI+B/pQ=="
"requested": "[11.0.0, )",
"resolved": "11.0.0",
"contentHash": "bjT7XUlhIJSmsE/O76b7weUX+evvGQctbQB8aKXt94o+oPWxHpCepxAGMs7Thow3AzCyqWs7cOpp9/2wcgRRQA=="
},
"SpotifyAPI.Web": {
"type": "Direct",
Expand Down Expand Up @@ -331,6 +332,11 @@
"System.Text.Json": "8.0.0"
}
},
"Microsoft.Extensions.ObjectPool": {
"type": "Transitive",
"resolved": "9.0.0-preview.6.24328.4",
"contentHash": "gtSoyW2B38YGz5TWzlZbi8AoPUryq00xvVBCGkN288lHU7e9oap/GSOwoi7bXGNOWnLJGske1yUZFDDj+3QGkw=="
},
"Microsoft.Extensions.Options": {
"type": "Transitive",
"resolved": "8.0.0",
Expand Down
Loading