Skip to content
Closed
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
10 changes: 9 additions & 1 deletion TextureMerge/App.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Magick.NET-Q16-x64" publicKeyToken="2004825badfa91ec" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-14.7.0.0" newVersion="14.7.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
12 changes: 8 additions & 4 deletions TextureMerge/TextureMerge.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,13 @@
<ApplicationIcon>TextureMerge-Icon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="Magick.NET-Q16-x64, Version=13.3.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=AMD64">
<HintPath>..\packages\Magick.NET-Q16-x64.13.3.0\lib\netstandard20\Magick.NET-Q16-x64.dll</HintPath>
<Reference Include="Magick.NET-Q16-x64, Version=14.7.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec">
<HintPath>..\packages\Magick.NET-Q16-x64.14.7.0\lib\netstandard20\Magick.NET-Q16-x64.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Magick.NET.Core, Version=13.3.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
<HintPath>..\packages\Magick.NET.Core.13.3.0\lib\netstandard20\Magick.NET.Core.dll</HintPath>
<Reference Include="Magick.NET.Core, Version=14.7.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec">
<HintPath>..\packages\Magick.NET.Core.14.7.0\lib\netstandard20\Magick.NET.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Expand Down Expand Up @@ -192,5 +194,7 @@
<ErrorText>Tenhle projekt odkazuje na balíčky NuGet, které nejsou v tomhle počítači k dispozici. Když je chcete stáhnout, použijte funkci obnovení balíčků NuGet. Další informace najdete na adrese http://go.microsoft.com/fwlink/?LinkID=322105. Chybějícím souborem je soubor {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Magick.NET-Q16-x64.13.3.0\build\netstandard20\Magick.NET-Q16-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Magick.NET-Q16-x64.13.3.0\build\netstandard20\Magick.NET-Q16-x64.targets'))" />
<Error Condition="!Exists('../packages/Magick.NET-Q16-x64.14.7.0/build/netstandard20/Magick.NET-Q16-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '../packages/Magick.NET-Q16-x64.14.7.0/build/netstandard20/Magick.NET-Q16-x64.targets'))" />
</Target>
<Import Project="../packages/Magick.NET-Q16-x64.14.7.0/build/netstandard20/Magick.NET-Q16-x64.targets" Condition="Exists('../packages/Magick.NET-Q16-x64.14.7.0/build/netstandard20/Magick.NET-Q16-x64.targets')" />
</Project>
4 changes: 2 additions & 2 deletions TextureMerge/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Magick.NET.Core" version="13.3.0" targetFramework="net48" />
<package id="Magick.NET-Q16-x64" version="13.3.0" targetFramework="net48" />
<package id="Magick.NET.Core" version="14.7.0" targetFramework="net48" />
<package id="Magick.NET-Q16-x64" version="14.7.0" targetFramework="net48" />
</packages>
Loading