ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump Magick.NET

This commit is contained in:
YoshiRulz 2024-06-01 18:03:49 +10:00
parent 64db1febbb
commit a81adfff41
No known key found for this signature in database
GPG Key ID: C4DE31C245353FB7
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Packages.props
View File

@ -5,7 +5,7 @@
<PackageVersion Include="Google.FlatBuffers" Version="23.5.26" /> <!-- last version with .NET Standard 2.0 support --> <PackageVersion Include="Google.FlatBuffers" Version="23.5.26" /> <!-- last version with .NET Standard 2.0 support -->
<PackageVersion Include="ImGui.NET" Version="1.90.6.1" /> <PackageVersion Include="ImGui.NET" Version="1.90.6.1" />
<PackageVersion Include="JunitXml.TestLogger" Version="3.0.124" /> <PackageVersion Include="JunitXml.TestLogger" Version="3.0.124" />
<PackageVersion Include="Magick.NET-Q8-AnyCPU" Version="13.6.0" /> <PackageVersion Include="Magick.NET-Q8-AnyCPU" Version="13.9.0" />
<PackageVersion Include="Menees.Analyzers" Version="3.0.10" /> <PackageVersion Include="Menees.Analyzers" Version="3.0.10" />
<PackageVersion Include="Meziantou.Analyzer" Version="2.0.33" /> <PackageVersion Include="Meziantou.Analyzer" Version="2.0.33" />
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" /> <PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />

15
src/BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj
View File

@ -16,21 +16,14 @@
<DefineConstants>$(DefineConstants);SAVE_IMAGES_ON_FAIL;SAVE_IMAGES_ON_PASS</DefineConstants> <DefineConstants>$(DefineConstants);SAVE_IMAGES_ON_FAIL;SAVE_IMAGES_ON_PASS</DefineConstants>
</PropertyGroup> </PropertyGroup>
<!-- BIZHAWKTEST_SAVE_IMAGES=none => no extra defines --> <!-- BIZHAWKTEST_SAVE_IMAGES=none => no extra defines -->
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
<MagickCopyNativeLinux>true</MagickCopyNativeLinux>
</PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Magick.NET-Q8-AnyCPU" GeneratePathProperty="true" /> <PackageReference Include="Magick.NET-Q8-AnyCPU" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj" /> <ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Client.Common/BizHawk.Client.Common.csproj" /> <ProjectReference Include="$(ProjectDir)../BizHawk.Client.Common/BizHawk.Client.Common.csproj" />
<EmbeddedResource Include="res/**/*" /> <EmbeddedResource Include="res/**/*" />
<Content Include="$(ProjectDir)../../Assets/gamedb/**/*" LinkBase="gamedb" CopyToOutputDirectory="PreserveNewest" /> <Content Include="$(ProjectDir)../../Assets/gamedb/**/*" LinkBase="gamedb" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup> </ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition=" '$(OS)' != 'WINDOWS_NT' ">
<!-- ExcludeAssets="runtime" didn't work, making this necessary, and might as well do everything here -->
<!-- may be able to simplify copy in future, see https://github.com/dlemstra/Magick.NET/pull/1633, but would still want delete probably? -->
<ItemGroup>
<ToDelete Include="$(OutputPath)Magick.Native-*.dll" />
<ToCopy Include="$(PkgMagick_NET-Q8-AnyCPU)/runtimes/linux-x64/native/*.dll.so" />
</ItemGroup>
<Delete Files="@(ToDelete)" />
<Copy SourceFiles="@(ToCopy)" DestinationFiles="@(ToCopy->'$(OutputPath)lib%(Filename)%(Extension)')" /> <!-- not sure why they're using `*.dll.so` without the `lib*` part -->
</Target>
</Project> </Project>