Skip to content

Commit 3600025

Browse files
mee-ironsoftwaremee-ironsoftware
authored
Merge pull request #148 from iron-software/ocr-372-alt
[OCR-372] Remove System.Memory dependency to resolve .NET Framework FileLoadException
2 parents d265305 + bc2a3a2 commit 3600025

2 files changed

Lines changed: 55 additions & 59 deletions

File tree

‎IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj‎

Lines changed: 54 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,54 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<AssemblyOriginatorKeyFile>IronSoftware.Drawing.Common.snk</AssemblyOriginatorKeyFile>
5-
<Configurations>Debug;Release</Configurations>
6-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
7-
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
8-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
9-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10-
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
11-
<LangVersion>latest</LangVersion>
12-
<NoWarn>CS8002</NoWarn>
13-
<Platforms>AnyCPU</Platforms>
14-
<SignAssembly>true</SignAssembly>
15-
<TargetFrameworks>netstandard2.0;net60</TargetFrameworks>
16-
<TransformOnBuild>true</TransformOnBuild>
17-
</PropertyGroup>
18-
19-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
20-
<PlatformTarget>AnyCPU</PlatformTarget>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
</PropertyGroup>
23-
24-
<ItemGroup>
25-
<PackageReference Include="BitMiracle.LibTiff.NET" Version="2.4.649" />
26-
<PackageReference Include="Microsoft.Maui.Graphics" Version="7.0.92" />
27-
<PackageReference Include="SkiaSharp" Version="2.88.7" />
28-
<PackageReference Include="IronSoftware.Drawing.Abstractions" Version="2026.1.2" />
29-
<PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
30-
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
31-
<PackageReference Include="System.Memory" Version="4.5.5" />
32-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
33-
</ItemGroup>
34-
35-
<Choose>
36-
<When Condition="'$(TargetFramework)' == 'net60'">
37-
<ItemGroup>
38-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
39-
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
40-
</ItemGroup>
41-
</When>
42-
<Otherwise>
43-
<ItemGroup>
44-
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.13" />
45-
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0" />
46-
</ItemGroup>
47-
</Otherwise>
48-
</Choose>
49-
50-
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
51-
<DebugType>portable</DebugType>
52-
<DebugSymbols>true</DebugSymbols>
53-
</PropertyGroup>
54-
55-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<AssemblyOriginatorKeyFile>IronSoftware.Drawing.Common.snk</AssemblyOriginatorKeyFile>
5+
<Configurations>Debug;Release</Configurations>
6+
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
7+
<CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
8+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
9+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
11+
<LangVersion>latest</LangVersion>
12+
<NoWarn>CS8002</NoWarn>
13+
<Platforms>AnyCPU</Platforms>
14+
<SignAssembly>true</SignAssembly>
15+
<TargetFrameworks>netstandard2.0;net60</TargetFrameworks>
16+
<TransformOnBuild>true</TransformOnBuild>
17+
</PropertyGroup>
18+
19+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
20+
<PlatformTarget>AnyCPU</PlatformTarget>
21+
<DefineConstants>DEBUG;TRACE</DefineConstants>
22+
</PropertyGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Include="BitMiracle.LibTiff.NET" Version="2.4.649" />
26+
<PackageReference Include="Microsoft.Maui.Graphics" Version="7.0.92" />
27+
<PackageReference Include="SkiaSharp" Version="2.88.7" />
28+
<PackageReference Include="IronSoftware.Drawing.Abstractions" Version="2026.1.2" />
29+
<PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
30+
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
31+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
32+
</ItemGroup>
33+
34+
<Choose>
35+
<When Condition="'$(TargetFramework)' == 'net60'">
36+
<ItemGroup>
37+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
38+
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
39+
</ItemGroup>
40+
</When>
41+
<Otherwise>
42+
<ItemGroup>
43+
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.13" />
44+
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0" />
45+
</ItemGroup>
46+
</Otherwise>
47+
</Choose>
48+
49+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
50+
<DebugType>portable</DebugType>
51+
<DebugSymbols>true</DebugSymbols>
52+
</PropertyGroup>
53+
54+
</Project>

‎NuGet/IronSoftware.Drawing.nuspec‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ Supports:
4040

4141
For general support and technical inquiries, please email us at: support@ironsoftware.com</description>
4242
<summary>IronSoftware.System.Drawing is an open-source solution for .NET developers to replace System.Drawing.Common with a universal and flexible library.</summary>
43-
<releaseNotes>- Updates IronSoftware.Drawing.Abstractions to 2026.1.2.
44-
- Updates SixLabors.ImageSharp to 2.1.13 (netstandard2.0) and 3.1.12 (net6.0).</releaseNotes>
43+
<releaseNotes>- Removed explicit System.Memory dependency to resolve .NET Framework assembly version conflict.</releaseNotes>
4544
<copyright>Copyright © Iron Software 2022-2026</copyright>
4645
<tags>Images, Bitmap, SkiaSharp, SixLabors, BitMiracle, Maui, SVG, TIFF, TIF, GIF, JPEG, PNG, Color, Rectangle, Drawing, C#, VB.NET, ASPX, create, render, generate, standard, netstandard2.0, core, netcore</tags>
4746
<repository type="git" url="https://github.com/iron-software/IronSoftware.Drawing.Common" commit="$commit$" />
@@ -51,14 +50,12 @@ For general support and technical inquiries, please email us at: support@ironsof
5150
<dependency id="SixLabors.ImageSharp" version="2.1.13" />
5251
<dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0" />
5352
<dependency id="BitMiracle.LibTiff.NET" version="2.4.649" />
54-
<dependency id="System.Memory" version="4.5.5" />
5553
</group>
5654
<group targetFramework="net60">
5755
<dependency id="IronSoftware.Drawing.Abstractions" version="2026.1.2" />
5856
<dependency id="SixLabors.ImageSharp" version="3.1.12" />
5957
<dependency id="SixLabors.ImageSharp.Drawing" version="2.1.7" />
6058
<dependency id="BitMiracle.LibTiff.NET" version="2.4.649" />
61-
<dependency id="System.Memory" version="4.5.5" />
6259
</group>
6360
</dependencies>
6461
</metadata>

0 commit comments

Comments
 (0)