Skip to content

Commit 8e641ce

Browse files
committed
Updated Magick.NET
1 parent 65de3fd commit 8e641ce

2 files changed

Lines changed: 12 additions & 10 deletions

File tree

MagickViewer/MagickViewer.csproj

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,16 @@
8383
<ManifestTimestampUrl>http://timestamp.digicert.com</ManifestTimestampUrl>
8484
</PropertyGroup>
8585
<ItemGroup>
86-
<Reference Include="Magick.NET-Q16-x64, Version=14.9.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=AMD64">
87-
<HintPath>..\packages\Magick.NET-Q16-x64.14.9.1\lib\netstandard20\Magick.NET-Q16-x64.dll</HintPath>
86+
<Reference Include="Magick.NET-Q16-x64, Version=14.10.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=AMD64">
87+
<HintPath>..\packages\Magick.NET-Q16-x64.14.10.0\lib\netstandard20\Magick.NET-Q16-x64.dll</HintPath>
88+
<Private>True</Private>
8889
</Reference>
89-
<Reference Include="Magick.NET.Core, Version=14.9.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
90-
<HintPath>..\packages\Magick.NET.Core.14.9.1\lib\netstandard20\Magick.NET.Core.dll</HintPath>
90+
<Reference Include="Magick.NET.Core, Version=14.10.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
91+
<HintPath>..\packages\Magick.NET.Core.14.10.0\lib\netstandard20\Magick.NET.Core.dll</HintPath>
9192
</Reference>
9293
<Reference Include="Magick.NET.SystemWindowsMedia, Version=8.0.0.0, Culture=neutral, PublicKeyToken=2004825badfa91ec, processorArchitecture=MSIL">
93-
<HintPath>..\packages\Magick.NET.SystemWindowsMedia.8.0.12\lib\net462\Magick.NET.SystemWindowsMedia.dll</HintPath>
94+
<HintPath>..\packages\Magick.NET.SystemWindowsMedia.8.0.13\lib\net462\Magick.NET.SystemWindowsMedia.dll</HintPath>
95+
<Private>True</Private>
9496
</Reference>
9597
<Reference Include="System" />
9698
<Reference Include="System.Data" />
@@ -214,11 +216,11 @@
214216
</ItemGroup>
215217
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
216218
<Import Project="ClickOnce\PublishClickOnce.targets" Condition="'$(PublishClickOnce)' == 'true'" />
217-
<Import Project="..\packages\Magick.NET-Q16-x64.14.9.1\build\netstandard20\Magick.NET-Q16-x64.targets" Condition="Exists('..\packages\Magick.NET-Q16-x64.14.9.1\build\netstandard20\Magick.NET-Q16-x64.targets')" />
219+
<Import Project="..\packages\Magick.NET-Q16-x64.14.10.0\build\netstandard20\Magick.NET-Q16-x64.targets" Condition="Exists('..\packages\Magick.NET-Q16-x64.14.10.0\build\netstandard20\Magick.NET-Q16-x64.targets')" />
218220
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
219221
<PropertyGroup>
220222
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
221223
</PropertyGroup>
222-
<Error Condition="!Exists('..\packages\Magick.NET-Q16-x64.14.9.1\build\netstandard20\Magick.NET-Q16-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Magick.NET-Q16-x64.14.9.1\build\netstandard20\Magick.NET-Q16-x64.targets'))" />
224+
<Error Condition="!Exists('..\packages\Magick.NET-Q16-x64.14.10.0\build\netstandard20\Magick.NET-Q16-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Magick.NET-Q16-x64.14.10.0\build\netstandard20\Magick.NET-Q16-x64.targets'))" />
223225
</Target>
224226
</Project>

MagickViewer/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Magick.NET.Core" version="14.9.1" targetFramework="net48" />
4-
<package id="Magick.NET.SystemWindowsMedia" version="8.0.12" targetFramework="net48" />
5-
<package id="Magick.NET-Q16-x64" version="14.9.1" targetFramework="net48" />
3+
<package id="Magick.NET.Core" version="14.10.0" targetFramework="net48" />
4+
<package id="Magick.NET.SystemWindowsMedia" version="8.0.13" targetFramework="net48" />
5+
<package id="Magick.NET-Q16-x64" version="14.10.0" targetFramework="net48" />
66
<package id="StyleCop.Analyzers" version="1.2.0-beta.556" targetFramework="net48" developmentDependency="true" />
77
<package id="StyleCop.Analyzers.Unstable" version="1.2.0.556" targetFramework="net48" developmentDependency="true" />
88
</packages>

0 commit comments

Comments
 (0)