From e56eb1fdb9170ba60a7e227a8c08d4220a91d149 Mon Sep 17 00:00:00 2001 From: JD Pierce Date: Fri, 16 Aug 2024 11:29:11 +0700 Subject: [PATCH 1/8] remove netstandard2.1 build remove netstandard2.1 build; only test net472/net80 --- CI/job_templates/build_drawing_libraries.yml | 20 ------- CI/stage_templates/run_tests_on_pool.yml | 54 ++----------------- .../IronSoftware.Drawing.Common.Tests.csproj | 2 +- .../IronSoftware.Drawing.Common.csproj | 2 +- 4 files changed, 5 insertions(+), 73 deletions(-) diff --git a/CI/job_templates/build_drawing_libraries.yml b/CI/job_templates/build_drawing_libraries.yml index 9160f53..6b77086 100644 --- a/CI/job_templates/build_drawing_libraries.yml +++ b/CI/job_templates/build_drawing_libraries.yml @@ -31,26 +31,6 @@ jobs: - checkout: self displayName: Checkout IronSoftware.Drawing repository lfs: true - - task: UseDotNet@2 - displayName: 'Install .Netcoreapp3.1 Core sdk' - inputs: - packageType: 'sdk' - version: '3.x' - - task: UseDotNet@2 - displayName: 'Install .NET5 sdk' - inputs: - packageType: 'sdk' - version: '5.x' - - task: UseDotNet@2 - displayName: 'Install .NET6 sdk' - inputs: - packageType: 'sdk' - version: '6.x' - - task: UseDotNet@2 - displayName: 'Install .NET7 sdk' - inputs: - packageType: 'sdk' - version: '7.x' - task: UseDotNet@2 displayName: 'Install .NET7 sdk' inputs: diff --git a/CI/stage_templates/run_tests_on_pool.yml b/CI/stage_templates/run_tests_on_pool.yml index 898be51..b2abb23 100644 --- a/CI/stage_templates/run_tests_on_pool.yml +++ b/CI/stage_templates/run_tests_on_pool.yml @@ -32,59 +32,11 @@ stages: framework: 'net472' architecture: '' buildConfiguration: $(Configuration) - # Windows .NET Core x64 Tests - - template: ../job_templates/test_drawing_libraries.yml - parameters: - name: UnitTest${{ parameters.OSPlatform }}netcore - OSPlatform: ${{ parameters.OSPlatform }} - framework: 'netcoreapp3.1' - architecture: '' - buildConfiguration: $(Configuration) - # Windows .NET Core x86 Tests - - template: ../job_templates/test_drawing_libraries.yml - parameters: - name: UnitTest${{ parameters.OSPlatform }}netcorex86 - OSPlatform: ${{ parameters.OSPlatform }} - framework: 'netcoreapp3.1' - architecture: '.x86' - buildConfiguration: $(Configuration) - # Windows .NET 6.0 x86 Tests - - template: ../job_templates/test_drawing_libraries.yml - parameters: - name: UnitTest${{ parameters.OSPlatform }}net60x86 - OSPlatform: ${{ parameters.OSPlatform }} - framework: 'net60' - architecture: '.x86' - buildConfiguration: $(Configuration) - # Windows .NET 7.0 x86 Tests - - template: ../job_templates/test_drawing_libraries.yml - parameters: - name: UnitTest${{ parameters.OSPlatform }}net70x86 - OSPlatform: ${{ parameters.OSPlatform }} - framework: 'net70' - architecture: '.x86' - buildConfiguration: $(Configuration) - # .NET 5.0 Tests - - template: ../job_templates/test_drawing_libraries.yml - parameters: - name: UnitTest${{ parameters.OSPlatform }}net50 - OSPlatform: ${{ parameters.OSPlatform }} - framework: 'net50' - architecture: '' - buildConfiguration: $(Configuration) - # .NET 6.0 x64 Tests - - template: ../job_templates/test_drawing_libraries.yml - parameters: - name: UnitTest${{ parameters.OSPlatform }}net60 - OSPlatform: ${{ parameters.OSPlatform }} - framework: 'net60' - architecture: '' - buildConfiguration: $(Configuration) - # .NET 7.0 x64 Tests + # .NET 8.0 Tests - template: ../job_templates/test_drawing_libraries.yml parameters: - name: UnitTest${{ parameters.OSPlatform }}net70 + name: UnitTest${{ parameters.OSPlatform }}net80 OSPlatform: ${{ parameters.OSPlatform }} - framework: 'net70' + framework: 'net80' architecture: '' buildConfiguration: $(Configuration) diff --git a/IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/IronSoftware.Drawing.Common.Tests.csproj b/IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/IronSoftware.Drawing.Common.Tests.csproj index a53beb4..ba9c9e3 100644 --- a/IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/IronSoftware.Drawing.Common.Tests.csproj +++ b/IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/IronSoftware.Drawing.Common.Tests.csproj @@ -1,7 +1,7 @@  - net472;netcoreapp3.1;net50;net60;net70 + net472;net80 latest false false diff --git a/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj b/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj index a31eefc..f1fe053 100644 --- a/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj +++ b/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj @@ -12,7 +12,7 @@ CS8002 AnyCPU true - netstandard2.0;netstandard2.1;net60 + netstandard2.0;net60 true From ce15a1e57fcd53cbe78bdc9d13afef8738c67876 Mon Sep 17 00:00:00 2001 From: JD Pierce Date: Thu, 15 Aug 2024 16:53:07 +0700 Subject: [PATCH 2/8] ref common and use anyimage ref common and use anyimage update commons update commons fixup fixup fixup fixup --- .../IronSoftware.Drawing.Common/AnyBitmap.cs | 8 +++++++- .../IronSoftware.Drawing.Common.csproj | 3 ++- IronSoftware.Drawing/nuget.config | 1 + NuGet/IronSoftware.Drawing.nuspec | 3 +++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/IronSoftware.Drawing/IronSoftware.Drawing.Common/AnyBitmap.cs b/IronSoftware.Drawing/IronSoftware.Drawing.Common/AnyBitmap.cs index 4a6c546..03595eb 100644 --- a/IronSoftware.Drawing/IronSoftware.Drawing.Common/AnyBitmap.cs +++ b/IronSoftware.Drawing/IronSoftware.Drawing.Common/AnyBitmap.cs @@ -44,7 +44,7 @@ namespace IronSoftware.Drawing /// self-memory-managing and does not need to be explicitly 'used' /// or 'disposed'. /// - public partial class AnyBitmap : IDisposable + public partial class AnyBitmap : IDisposable, IAnyImage { private bool _disposed = false; private Image Image { get; set; } @@ -182,6 +182,12 @@ public byte[] ExportBytes( return byteArray; } + /// + public byte[] ExportBytesAsJpg() + { + return this.ExportBytes(ImageFormat.Jpeg); + } + /// /// Exports the Bitmap as a file encoded in the /// of your choice. diff --git a/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj b/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj index a31eefc..2cb74a4 100644 --- a/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj +++ b/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj @@ -24,7 +24,8 @@ - + + diff --git a/IronSoftware.Drawing/nuget.config b/IronSoftware.Drawing/nuget.config index a46022e..a0693a4 100644 --- a/IronSoftware.Drawing/nuget.config +++ b/IronSoftware.Drawing/nuget.config @@ -3,5 +3,6 @@ + diff --git a/NuGet/IronSoftware.Drawing.nuspec b/NuGet/IronSoftware.Drawing.nuspec index d0f5104..822d279 100644 --- a/NuGet/IronSoftware.Drawing.nuspec +++ b/NuGet/IronSoftware.Drawing.nuspec @@ -47,18 +47,21 @@ For general support and technical inquiries, please email us at: support@ironsof + + + From 5a4eebcfc3ce5a7396b01a8ef33e0c9506c803dd Mon Sep 17 00:00:00 2001 From: JD Pierce Date: Mon, 19 Aug 2024 13:58:49 +0700 Subject: [PATCH 3/8] update commons and image sharp update commons and image sharp Co-authored-by: djrecipe Co-authored-by: mee-ironsoftware --- .../IronSoftware.Drawing.Common.csproj | 6 +++--- NuGet/IronSoftware.Drawing.nuspec | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj b/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj index 2cb74a4..dc59361 100644 --- a/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj +++ b/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj @@ -25,7 +25,7 @@ - + @@ -35,8 +35,8 @@ - - + + diff --git a/NuGet/IronSoftware.Drawing.nuspec b/NuGet/IronSoftware.Drawing.nuspec index 822d279..cd2f642 100644 --- a/NuGet/IronSoftware.Drawing.nuspec +++ b/NuGet/IronSoftware.Drawing.nuspec @@ -47,21 +47,21 @@ For general support and technical inquiries, please email us at: support@ironsof - + - - - + + + - + From 569a0273131140cd6caafd99f511a68c34a76bd1 Mon Sep 17 00:00:00 2001 From: first-ironsoftware Date: Fri, 23 Aug 2024 11:37:51 +0700 Subject: [PATCH 4/8] Update release notes --- NuGet/IronSoftware.Drawing.nuspec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/NuGet/IronSoftware.Drawing.nuspec b/NuGet/IronSoftware.Drawing.nuspec index cd2f642..5b29be8 100644 --- a/NuGet/IronSoftware.Drawing.nuspec +++ b/NuGet/IronSoftware.Drawing.nuspec @@ -39,9 +39,7 @@ Supports: For general support and technical inquiries, please email us at: support@ironsoftware.com IronSoftware.System.Drawing is an open-source solution for .NET developers to replace System.Drawing.Common with a universal and flexible library. - - Efficient compression significantly reduces output TIFF file size (Up to 80%). -- Automatic compression when creating multi-frame TIFFs. -- Fix the issue of exception error thrown when converting Bitmap to AnyBitmap. + - Internal improvement of the library functionality Copyright © Iron Software 2022-2024 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 From 6e4e623b18b5a090124b64ab861147fbeae3237f Mon Sep 17 00:00:00 2001 From: JD Pierce Date: Fri, 30 Aug 2024 15:11:46 +0700 Subject: [PATCH 5/8] update commons update commons update drawing ver update drawing ver ROLL ROLL --- .../IronSoftware.Drawing.Common.csproj | 2 +- NuGet/IronSoftware.Drawing.nuspec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj b/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj index 3375629..2e2e605 100644 --- a/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj +++ b/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj @@ -25,7 +25,7 @@ - + diff --git a/NuGet/IronSoftware.Drawing.nuspec b/NuGet/IronSoftware.Drawing.nuspec index cd2f642..630cc3b 100644 --- a/NuGet/IronSoftware.Drawing.nuspec +++ b/NuGet/IronSoftware.Drawing.nuspec @@ -47,21 +47,21 @@ For general support and technical inquiries, please email us at: support@ironsof - + - + - + From 24299043fe984b00caa1a134752f0ced70b81718 Mon Sep 17 00:00:00 2001 From: first-ironsoftware Date: Mon, 9 Sep 2024 14:44:02 +0700 Subject: [PATCH 6/8] Upgrade the dependency --- .../IronSoftware.Drawing.Common.csproj | 2 +- NuGet/IronSoftware.Drawing.nuspec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj b/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj index 3375629..ef8f270 100644 --- a/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj +++ b/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj @@ -41,7 +41,7 @@ - + diff --git a/NuGet/IronSoftware.Drawing.nuspec b/NuGet/IronSoftware.Drawing.nuspec index 5b29be8..1236bd0 100644 --- a/NuGet/IronSoftware.Drawing.nuspec +++ b/NuGet/IronSoftware.Drawing.nuspec @@ -46,7 +46,7 @@ For general support and technical inquiries, please email us at: support@ironsof - + @@ -60,7 +60,7 @@ For general support and technical inquiries, please email us at: support@ironsof - + From 03174282007081d4d686029ccca9c6243147bb93 Mon Sep 17 00:00:00 2001 From: JD Pierce Date: Fri, 30 Aug 2024 15:11:46 +0700 Subject: [PATCH 7/8] update commons update commons update drawing ver update drawing ver ROLL ROLL --- .../IronSoftware.Drawing.Common.csproj | 2 +- NuGet/IronSoftware.Drawing.nuspec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj b/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj index 3375629..35be3b4 100644 --- a/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj +++ b/IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj @@ -25,7 +25,7 @@ - + diff --git a/NuGet/IronSoftware.Drawing.nuspec b/NuGet/IronSoftware.Drawing.nuspec index cd2f642..5ef4efc 100644 --- a/NuGet/IronSoftware.Drawing.nuspec +++ b/NuGet/IronSoftware.Drawing.nuspec @@ -47,21 +47,21 @@ For general support and technical inquiries, please email us at: support@ironsof - + - + - + From 20aec1e057729d9022454cb8e7d5e0d1efceb374 Mon Sep 17 00:00:00 2001 From: JD Pierce Date: Wed, 2 Oct 2024 08:49:54 +0700 Subject: [PATCH 8/8] roll deps roll deps --- NuGet/IronSoftware.Drawing.nuspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NuGet/IronSoftware.Drawing.nuspec b/NuGet/IronSoftware.Drawing.nuspec index 1236bd0..cae3054 100644 --- a/NuGet/IronSoftware.Drawing.nuspec +++ b/NuGet/IronSoftware.Drawing.nuspec @@ -45,21 +45,21 @@ For general support and technical inquiries, please email us at: support@ironsof - + - + - +