Skip to content

Commit ab0e303

Browse files
djrecipedjrecipe
authored
Merge pull request #113 from iron-software/hotfix/2024.8.1
[master] Hotfix/2024.8.1
2 parents e534614 + 22ceb6a commit ab0e303

2 files changed

Lines changed: 132 additions & 134 deletions

File tree

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

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +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;netstandard2.1;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="SkiaSharp.Svg" Version="1.60.0" />
29-
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
30-
<PackageReference Include="System.Memory" Version="4.5.5" />
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.4" />
38-
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.3" />
39-
</ItemGroup>
40-
</When>
41-
<Otherwise>
42-
<ItemGroup>
43-
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.8" />
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>
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;netstandard2.1;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="SkiaSharp.Svg" Version="1.60.0" />
29+
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
30+
<PackageReference Include="System.Memory" Version="4.5.5" />
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.5" />
38+
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.4" />
39+
</ItemGroup>
40+
</When>
41+
<Otherwise>
42+
<ItemGroup>
43+
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.9" />
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: 78 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,79 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
3-
<metadata>
4-
<id>IronSoftware.System.Drawing</id>
5-
<version>$version$</version>
6-
<title>IronSoftware.System.Drawing</title>
7-
<authors>https://ironsoftware.com/</authors>
8-
<owners></owners>
9-
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10-
<license type="file">LICENSE.txt</license>
11-
<projectUrl>https://github.com/iron-software/IronSoftware.Drawing.Common/</projectUrl>
12-
<icon>images/ironsoftware-logo.png</icon>
13-
<readme>docs\README.md</readme>
14-
<description>IronSoftware.System.Drawing - The C# Image Library
15-
16-
A universally compatible Bitmap format for .NET 8, .NET 7, .NET 6, and .NET 5, .NET Core on Windows, macOS, Linux, Docker, AWS, Azure, NanoServer, IIS, Mobile, Xamarin, iOS, Android, and Google Compute.
17-
18-
Works seamlessly with popular Image and Bitmap formats such as System.Drawing.Bitmap, SkiaSharp, SixLabors.ImageSharp, Microsoft.Maui.Graphics.
19-
20-
Implicit casting means that using this class to input and output Bitmap and image types from public API's gives full compatibility to all image type fully supported by Microsoft.
21-
22-
Key library features include:
23-
* AnyBitmap: A universally compatible Bitmap class. Implicit casting between System.Drawing.Bitmap, System.Drawing.Image, SkiaSharp.SKBitmap, SkiaSharp.SKImage, SixLabors.ImageSharp, Microsoft.Maui.Graphics.Platform.PlatformImage to IronSoftware.Drawing.AnyBitmap
24-
* Color: A universally compatible Color class. Implicit casting between System.Drawing.Color, SkiaSharp.SKColor, SixLabors.ImageSharp.Color, SixLabors.ImageSharp.PixelFormats to IronSoftware.Drawing.Color
25-
* Rectangle: A universally compatible Rectangle class. Implicit casting between System.Drawing.Rectangle, SkiaSharp.SKRect, SkiaSharp.SKRectI, SixLabors.ImageSharp.Rectangle to IronSoftware.Drawing.Rectangle
26-
* Font: A universally compatible Font class. Implicit casting between System.Drawing.Font, SkiaSharp.SKFont, SixLabors.Fonts.Font to IronSoftware.Drawing.Font
27-
* Point: A universally compatible Point class. Implicit casting between System.Drawing.Point, SixLabors.ImageSharp.Point, SkiaSharp.SKPointI to IronSoftware.Drawing.Point
28-
* Size: A universally compatible Size class. Implicit casting between System.Drawing.Size, SixLabors.ImageSharp.Size, SkiaSharp.SKSizeI to IronSoftware.Drawing.Size
29-
30-
IronSoftware.Drawing can be used within C#, VB.NET, F#, ASP.NET projects, MVC, Web Services, Console &amp; Desktop Applications.
31-
32-
Supports:
33-
* .NET 8
34-
* .NET 7
35-
* .NET 6
36-
* .NET 5
37-
* .NET Core 2.0 +
38-
* .NET Framework 4.6.2 +
39-
40-
For general support and technical inquiries, please email us at: support@ironsoftware.com</description>
41-
<summary>IronSoftware.System.Drawing is an open-source solution for .NET developers to replace System.Drawing.Common with a universal and flexible library.</summary>
42-
<releaseNotes>- Efficient compression significantly reduces output TIFF file size (Up to 80%).
43-
- Automatic compression when creating multi-frame TIFFs.
44-
- Fix the issue of exception error thrown when converting Bitmap to AnyBitmap.</releaseNotes>
45-
<copyright>Copyright © Iron Software 2022-2024</copyright>
46-
<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>
47-
<repository type="git" url="https://github.com/iron-software/IronSoftware.Drawing.Common" commit="$commit$" />
48-
<dependencies>
49-
<group targetFramework="netstandard2.0">
50-
<dependency id="SixLabors.ImageSharp" version="2.1.8" />
51-
<dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0" />
52-
<dependency id="BitMiracle.LibTiff.NET" version="2.4.649" />
53-
<dependency id="System.Memory" version="4.5.5" />
54-
</group>
55-
<group targetFramework="net60">
56-
<dependency id="SixLabors.ImageSharp" version="3.1.4" />
57-
<dependency id="SixLabors.ImageSharp.Drawing" version="2.1.3" />
58-
<dependency id="BitMiracle.LibTiff.NET" version="2.4.649" />
59-
<dependency id="System.Memory" version="4.5.5" />
60-
</group>
61-
<group targetFramework="MonoAndroid10.0">
62-
<dependency id="SixLabors.ImageSharp" version="2.1.8" />
63-
<dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0" />
64-
<dependency id="BitMiracle.LibTiff.NET" version="2.4.649" />
65-
<dependency id="System.Memory" version="4.5.5" />
66-
<dependency id="Microsoft.Maui.Graphics" version="7.0.92" />
67-
<dependency id="SkiaSharp" version="2.88.7" />
68-
<dependency id="SkiaSharp.Svg" version="1.60.0" />
69-
</group>
70-
</dependencies>
71-
</metadata>
72-
<files>
73-
<file src=".\ironsoftware-logo.png" target=".\images\" />
74-
<file src=".\LICENSE.txt" target=".\" />
75-
<file src=".\README.txt" target=".\" />
76-
<file src=".\README.md" target="docs\" />
77-
<file src="..\bin\$configuration$\netstandard2.0\IronSoftware.Drawing.Common.*" target="lib\netstandard2.0" />
78-
<file src="..\bin\$configuration$\net60\IronSoftware.Drawing.Common.*" target="lib\net60" />
79-
</files>
80-
</package>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
3+
<metadata>
4+
<id>IronSoftware.System.Drawing</id>
5+
<version>$version$</version>
6+
<title>IronSoftware.System.Drawing</title>
7+
<authors>https://ironsoftware.com/</authors>
8+
<owners></owners>
9+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10+
<license type="file">LICENSE.txt</license>
11+
<projectUrl>https://github.com/iron-software/IronSoftware.Drawing.Common/</projectUrl>
12+
<icon>images/ironsoftware-logo.png</icon>
13+
<readme>docs\README.md</readme>
14+
<description>IronSoftware.System.Drawing - The C# Image Library
15+
16+
A universally compatible Bitmap format for .NET 8, .NET 7, .NET 6, and .NET 5, .NET Core on Windows, macOS, Linux, Docker, AWS, Azure, NanoServer, IIS, Mobile, Xamarin, iOS, Android, and Google Compute.
17+
18+
Works seamlessly with popular Image and Bitmap formats such as System.Drawing.Bitmap, SkiaSharp, SixLabors.ImageSharp, Microsoft.Maui.Graphics.
19+
20+
Implicit casting means that using this class to input and output Bitmap and image types from public API's gives full compatibility to all image type fully supported by Microsoft.
21+
22+
Key library features include:
23+
* AnyBitmap: A universally compatible Bitmap class. Implicit casting between System.Drawing.Bitmap, System.Drawing.Image, SkiaSharp.SKBitmap, SkiaSharp.SKImage, SixLabors.ImageSharp, Microsoft.Maui.Graphics.Platform.PlatformImage to IronSoftware.Drawing.AnyBitmap
24+
* Color: A universally compatible Color class. Implicit casting between System.Drawing.Color, SkiaSharp.SKColor, SixLabors.ImageSharp.Color, SixLabors.ImageSharp.PixelFormats to IronSoftware.Drawing.Color
25+
* Rectangle: A universally compatible Rectangle class. Implicit casting between System.Drawing.Rectangle, SkiaSharp.SKRect, SkiaSharp.SKRectI, SixLabors.ImageSharp.Rectangle to IronSoftware.Drawing.Rectangle
26+
* Font: A universally compatible Font class. Implicit casting between System.Drawing.Font, SkiaSharp.SKFont, SixLabors.Fonts.Font to IronSoftware.Drawing.Font
27+
* Point: A universally compatible Point class. Implicit casting between System.Drawing.Point, SixLabors.ImageSharp.Point, SkiaSharp.SKPointI to IronSoftware.Drawing.Point
28+
* Size: A universally compatible Size class. Implicit casting between System.Drawing.Size, SixLabors.ImageSharp.Size, SkiaSharp.SKSizeI to IronSoftware.Drawing.Size
29+
30+
IronSoftware.Drawing can be used within C#, VB.NET, F#, ASP.NET projects, MVC, Web Services, Console &amp; Desktop Applications.
31+
32+
Supports:
33+
* .NET 8
34+
* .NET 7
35+
* .NET 6
36+
* .NET 5
37+
* .NET Core 2.0 +
38+
* .NET Framework 4.6.2 +
39+
40+
For general support and technical inquiries, please email us at: support@ironsoftware.com</description>
41+
<summary>IronSoftware.System.Drawing is an open-source solution for .NET developers to replace System.Drawing.Common with a universal and flexible library.</summary>
42+
<releaseNotes>- Update SixLabors.ImageSharp &amp; SixLabors.ImageSharp.Drawing to address known vulnerabilities.</releaseNotes>
43+
<copyright>Copyright © Iron Software 2022-2024</copyright>
44+
<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>
45+
<repository type="git" url="https://github.com/iron-software/IronSoftware.Drawing.Common" commit="$commit$" />
46+
<dependencies>
47+
<group targetFramework="netstandard2.0">
48+
<dependency id="SixLabors.ImageSharp" version="2.1.9" />
49+
<dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0" />
50+
<dependency id="BitMiracle.LibTiff.NET" version="2.4.649" />
51+
<dependency id="System.Memory" version="4.5.5" />
52+
</group>
53+
<group targetFramework="net60">
54+
<dependency id="SixLabors.ImageSharp" version="3.1.5" />
55+
<dependency id="SixLabors.ImageSharp.Drawing" version="2.1.4" />
56+
<dependency id="BitMiracle.LibTiff.NET" version="2.4.649" />
57+
<dependency id="System.Memory" version="4.5.5" />
58+
</group>
59+
<group targetFramework="MonoAndroid10.0">
60+
<dependency id="SixLabors.ImageSharp" version="2.1.9" />
61+
<dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0" />
62+
<dependency id="BitMiracle.LibTiff.NET" version="2.4.649" />
63+
<dependency id="System.Memory" version="4.5.5" />
64+
<dependency id="Microsoft.Maui.Graphics" version="7.0.92" />
65+
<dependency id="SkiaSharp" version="2.88.7" />
66+
<dependency id="SkiaSharp.Svg" version="1.60.0" />
67+
</group>
68+
</dependencies>
69+
</metadata>
70+
<files>
71+
<file src=".\ironsoftware-logo.png" target=".\images\" />
72+
<file src=".\LICENSE.txt" target=".\" />
73+
<file src=".\README.txt" target=".\" />
74+
<file src=".\README.md" target="docs\" />
75+
<file src="..\bin\$configuration$\netstandard2.0\IronSoftware.Drawing.Common.*" target="lib\netstandard2.0" />
76+
<file src="..\bin\$configuration$\net60\IronSoftware.Drawing.Common.*" target="lib\net60" />
77+
</files>
78+
</package>
8179

0 commit comments

Comments
 (0)