-
-
Notifications
You must be signed in to change notification settings - Fork 20
[OCR-372] Update System.Memory #148
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
jordi-ironsoftware
wants to merge
9
commits into
develop
Choose a base branch
from
ocr-372-alt
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+126
−128
Open
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
b5c447d
Merge pull request #122 from iron-software/releases/2024.12
mee-ironsoftware 4b1ac8c
Merge pull request #128 from iron-software/develop
djrecipe 5872fe9
Merge pull request #135 from iron-software/develop
first-ironsoftware d099a44
Merge pull request #138 from iron-software/releases/2025.7
first-ironsoftware 837de64
Merge pull request #140 from iron-software/releases/2025.8
first-ironsoftware f8576b4
Merge pull request #144 from iron-software/releases/2025.9
mee-ironsoftware 288276d
Updating system.memory
jordi-ironsoftware 1b31c88
Merge branch 'develop' into ocr-372-alt
jordi-ironsoftware 535fb85
Removing "System.Memory" depedency
jordi-ironsoftware File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
110 changes: 55 additions & 55 deletions
110
IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,55 +1,55 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| <AssemblyOriginatorKeyFile>IronSoftware.Drawing.Common.snk</AssemblyOriginatorKeyFile> | ||
| <Configurations>Debug;Release</Configurations> | ||
| <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild> | ||
| <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies> | ||
| <EmbedUntrackedSources>true</EmbedUntrackedSources> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| <GeneratePackageOnBuild>false</GeneratePackageOnBuild> | ||
| <LangVersion>latest</LangVersion> | ||
| <NoWarn>CS8002</NoWarn> | ||
| <Platforms>AnyCPU</Platforms> | ||
| <SignAssembly>true</SignAssembly> | ||
| <TargetFrameworks>netstandard2.0;net60</TargetFrameworks> | ||
| <TransformOnBuild>true</TransformOnBuild> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'"> | ||
| <PlatformTarget>AnyCPU</PlatformTarget> | ||
| <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageReference Include="BitMiracle.LibTiff.NET" Version="2.4.649" /> | ||
| <PackageReference Include="Microsoft.Maui.Graphics" Version="7.0.92" /> | ||
| <PackageReference Include="SkiaSharp" Version="2.88.7" /> | ||
| <PackageReference Include="IronSoftware.Drawing.Abstractions" Version="2026.1.2" /> | ||
| <PackageReference Include="SkiaSharp.Svg" Version="1.60.0" /> | ||
| <PackageReference Include="System.Drawing.Common" Version="6.0.0" /> | ||
| <PackageReference Include="System.Memory" Version="4.5.5" /> | ||
| <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" /> | ||
| </ItemGroup> | ||
| <Choose> | ||
| <When Condition="'$(TargetFramework)' == 'net60'"> | ||
| <ItemGroup> | ||
| <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" /> | ||
| <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" /> | ||
| </ItemGroup> | ||
| </When> | ||
| <Otherwise> | ||
| <ItemGroup> | ||
| <PackageReference Include="SixLabors.ImageSharp" Version="2.1.13" /> | ||
| <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0" /> | ||
| </ItemGroup> | ||
| </Otherwise> | ||
| </Choose> | ||
| <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'"> | ||
| <DebugType>portable</DebugType> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| </PropertyGroup> | ||
| </Project> | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <AssemblyOriginatorKeyFile>IronSoftware.Drawing.Common.snk</AssemblyOriginatorKeyFile> | ||
| <Configurations>Debug;Release</Configurations> | ||
| <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild> | ||
| <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies> | ||
| <EmbedUntrackedSources>true</EmbedUntrackedSources> | ||
| <GenerateDocumentationFile>true</GenerateDocumentationFile> | ||
| <GeneratePackageOnBuild>false</GeneratePackageOnBuild> | ||
| <LangVersion>latest</LangVersion> | ||
| <NoWarn>CS8002</NoWarn> | ||
| <Platforms>AnyCPU</Platforms> | ||
| <SignAssembly>true</SignAssembly> | ||
| <TargetFrameworks>netstandard2.0;net60</TargetFrameworks> | ||
| <TransformOnBuild>true</TransformOnBuild> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'"> | ||
| <PlatformTarget>AnyCPU</PlatformTarget> | ||
| <DefineConstants>DEBUG;TRACE</DefineConstants> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="BitMiracle.LibTiff.NET" Version="2.4.649" /> | ||
| <PackageReference Include="Microsoft.Maui.Graphics" Version="7.0.92" /> | ||
| <PackageReference Include="SkiaSharp" Version="2.88.7" /> | ||
| <PackageReference Include="IronSoftware.Drawing.Abstractions" Version="2026.1.2" /> | ||
| <PackageReference Include="SkiaSharp.Svg" Version="1.60.0" /> | ||
| <PackageReference Include="System.Drawing.Common" Version="6.0.0" /> | ||
| <PackageReference Include="System.Memory" Version="4.6.3" /> | ||
| <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" /> | ||
| </ItemGroup> | ||
|
|
||
| <Choose> | ||
| <When Condition="'$(TargetFramework)' == 'net60'"> | ||
| <ItemGroup> | ||
| <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" /> | ||
| <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" /> | ||
| </ItemGroup> | ||
| </When> | ||
| <Otherwise> | ||
| <ItemGroup> | ||
| <PackageReference Include="SixLabors.ImageSharp" Version="2.1.13" /> | ||
| <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0" /> | ||
| </ItemGroup> | ||
| </Otherwise> | ||
| </Choose> | ||
|
|
||
| <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'"> | ||
| <DebugType>portable</DebugType> | ||
| <DebugSymbols>true</DebugSymbols> | ||
| </PropertyGroup> | ||
|
|
||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,74 +1,72 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd"> | ||
| <metadata> | ||
| <id>IronSoftware.System.Drawing</id> | ||
| <version>$version$</version> | ||
| <title>IronSoftware.System.Drawing</title> | ||
| <authors>https://ironsoftware.com/</authors> | ||
| <owners></owners> | ||
| <requireLicenseAcceptance>false</requireLicenseAcceptance> | ||
| <license type="file">LICENSE.txt</license> | ||
| <projectUrl>https://github.com/iron-software/IronSoftware.Drawing.Common/</projectUrl> | ||
| <icon>images/ironsoftware-logo.png</icon> | ||
| <readme>docs\README.md</readme> | ||
| <description>IronSoftware.System.Drawing - The C# Image Library | ||
|
|
||
| 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. | ||
|
|
||
| Works seamlessly with popular Image and Bitmap formats such as System.Drawing.Bitmap, SkiaSharp, SixLabors.ImageSharp, Microsoft.Maui.Graphics. | ||
|
|
||
| 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. | ||
|
|
||
| Key library features include: | ||
| * 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 | ||
| * Color: A universally compatible Color class. Implicit casting between System.Drawing.Color, SkiaSharp.SKColor, SixLabors.ImageSharp.Color, SixLabors.ImageSharp.PixelFormats to IronSoftware.Drawing.Color | ||
| * Rectangle: A universally compatible Rectangle class. Implicit casting between System.Drawing.Rectangle, SkiaSharp.SKRect, SkiaSharp.SKRectI, SixLabors.ImageSharp.Rectangle to IronSoftware.Drawing.Rectangle | ||
| * Font: A universally compatible Font class. Implicit casting between System.Drawing.Font, SkiaSharp.SKFont, SixLabors.Fonts.Font to IronSoftware.Drawing.Font | ||
| * Point: A universally compatible Point class. Implicit casting between System.Drawing.Point, SixLabors.ImageSharp.Point, SkiaSharp.SKPointI to IronSoftware.Drawing.Point | ||
| * Size: A universally compatible Size class. Implicit casting between System.Drawing.Size, SixLabors.ImageSharp.Size, SkiaSharp.SKSizeI to IronSoftware.Drawing.Size | ||
|
|
||
| IronSoftware.Drawing can be used within C#, VB.NET, F#, ASP.NET projects, MVC, Web Services, Console & Desktop Applications. | ||
|
|
||
| Supports: | ||
| * .NET 9 | ||
| * .NET 8 | ||
| * .NET 7 | ||
| * .NET 6 | ||
| * .NET 5 | ||
| * .NET Core 2.0 + | ||
| * .NET Framework 4.6.2 + | ||
|
|
||
| For general support and technical inquiries, please email us at: support@ironsoftware.com</description> | ||
| <summary>IronSoftware.System.Drawing is an open-source solution for .NET developers to replace System.Drawing.Common with a universal and flexible library.</summary> | ||
| <releaseNotes>- Updates IronSoftware.Drawing.Abstractions to 2026.1.2. | ||
| - Updates SixLabors.ImageSharp to 2.1.13 (netstandard2.0) and 3.1.12 (net6.0).</releaseNotes> | ||
| <copyright>Copyright © Iron Software 2022-2026</copyright> | ||
| <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> | ||
| <repository type="git" url="https://github.com/iron-software/IronSoftware.Drawing.Common" commit="$commit$" /> | ||
| <dependencies> | ||
| <group targetFramework="netstandard2.0"> | ||
| <dependency id="IronSoftware.Drawing.Abstractions" version="2026.1.2" /> | ||
| <dependency id="SixLabors.ImageSharp" version="2.1.13" /> | ||
| <dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0" /> | ||
| <dependency id="BitMiracle.LibTiff.NET" version="2.4.649" /> | ||
| <dependency id="System.Memory" version="4.5.5" /> | ||
| </group> | ||
| <group targetFramework="net60"> | ||
| <dependency id="IronSoftware.Drawing.Abstractions" version="2026.1.2" /> | ||
| <dependency id="SixLabors.ImageSharp" version="3.1.12" /> | ||
| <dependency id="SixLabors.ImageSharp.Drawing" version="2.1.7" /> | ||
| <dependency id="BitMiracle.LibTiff.NET" version="2.4.649" /> | ||
| <dependency id="System.Memory" version="4.5.5" /> | ||
| </group> | ||
| </dependencies> | ||
| </metadata> | ||
| <files> | ||
| <file src=".\ironsoftware-logo.png" target=".\images\" /> | ||
| <file src=".\LICENSE.txt" target=".\" /> | ||
| <file src=".\README.txt" target=".\" /> | ||
| <file src=".\README.md" target="docs\" /> | ||
| <file src="..\bin\$configuration$\netstandard2.0\IronSoftware.Drawing.Common.*" target="lib\netstandard2.0" /> | ||
| <file src="..\bin\$configuration$\net60\IronSoftware.Drawing.Common.*" target="lib\net60" /> | ||
| </files> | ||
| </package> | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd"> | ||
| <metadata> | ||
| <id>IronSoftware.System.Drawing</id> | ||
| <version>$version$</version> | ||
| <title>IronSoftware.System.Drawing</title> | ||
| <authors>https://ironsoftware.com/</authors> | ||
| <owners></owners> | ||
| <requireLicenseAcceptance>false</requireLicenseAcceptance> | ||
| <license type="file">LICENSE.txt</license> | ||
| <projectUrl>https://github.com/iron-software/IronSoftware.Drawing.Common/</projectUrl> | ||
| <icon>images/ironsoftware-logo.png</icon> | ||
| <readme>docs\README.md</readme> | ||
| <description>IronSoftware.System.Drawing - The C# Image Library | ||
|
|
||
| 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. | ||
|
|
||
| Works seamlessly with popular Image and Bitmap formats such as System.Drawing.Bitmap, SkiaSharp, SixLabors.ImageSharp, Microsoft.Maui.Graphics. | ||
|
|
||
| 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. | ||
|
|
||
| Key library features include: | ||
| * 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 | ||
| * Color: A universally compatible Color class. Implicit casting between System.Drawing.Color, SkiaSharp.SKColor, SixLabors.ImageSharp.Color, SixLabors.ImageSharp.PixelFormats to IronSoftware.Drawing.Color | ||
| * Rectangle: A universally compatible Rectangle class. Implicit casting between System.Drawing.Rectangle, SkiaSharp.SKRect, SkiaSharp.SKRectI, SixLabors.ImageSharp.Rectangle to IronSoftware.Drawing.Rectangle | ||
| * Font: A universally compatible Font class. Implicit casting between System.Drawing.Font, SkiaSharp.SKFont, SixLabors.Fonts.Font to IronSoftware.Drawing.Font | ||
| * Point: A universally compatible Point class. Implicit casting between System.Drawing.Point, SixLabors.ImageSharp.Point, SkiaSharp.SKPointI to IronSoftware.Drawing.Point | ||
| * Size: A universally compatible Size class. Implicit casting between System.Drawing.Size, SixLabors.ImageSharp.Size, SkiaSharp.SKSizeI to IronSoftware.Drawing.Size | ||
|
|
||
| IronSoftware.Drawing can be used within C#, VB.NET, F#, ASP.NET projects, MVC, Web Services, Console & Desktop Applications. | ||
|
|
||
| Supports: | ||
| * .NET 9 | ||
| * .NET 8 | ||
| * .NET 7 | ||
| * .NET 6 | ||
| * .NET 5 | ||
| * .NET Core 2.0 + | ||
| * .NET Framework 4.6.2 + | ||
|
|
||
| For general support and technical inquiries, please email us at: support@ironsoftware.com</description> | ||
| <summary>IronSoftware.System.Drawing is an open-source solution for .NET developers to replace System.Drawing.Common with a universal and flexible library.</summary> | ||
| <releaseNotes>- Updates IronSoftware.Drawing.Abstractions to 2026.1.2. | ||
| - Updates SixLabors.ImageSharp to 2.1.13 (netstandard2.0) and 3.1.12 (net6.0).</releaseNotes> | ||
| <copyright>Copyright © Iron Software 2022-2026</copyright> | ||
| <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> | ||
| <repository type="git" url="https://github.com/iron-software/IronSoftware.Drawing.Common" commit="$commit$" /> | ||
| <dependencies> | ||
| <group targetFramework="netstandard2.0"> | ||
| <dependency id="IronSoftware.Drawing.Abstractions" version="2026.1.2" /> | ||
| <dependency id="SixLabors.ImageSharp" version="2.1.13" /> | ||
| <dependency id="SixLabors.ImageSharp.Drawing" version="1.0.0" /> | ||
| <dependency id="BitMiracle.LibTiff.NET" version="2.4.649" /> | ||
| </group> | ||
| <group targetFramework="net60"> | ||
| <dependency id="IronSoftware.Drawing.Abstractions" version="2026.1.2" /> | ||
| <dependency id="SixLabors.ImageSharp" version="3.1.12" /> | ||
| <dependency id="SixLabors.ImageSharp.Drawing" version="2.1.7" /> | ||
| <dependency id="BitMiracle.LibTiff.NET" version="2.4.649" /> | ||
| </group> | ||
| </dependencies> | ||
| </metadata> | ||
| <files> | ||
| <file src=".\ironsoftware-logo.png" target=".\images\" /> | ||
| <file src=".\LICENSE.txt" target=".\" /> | ||
| <file src=".\README.txt" target=".\" /> | ||
| <file src=".\README.md" target="docs\" /> | ||
| <file src="..\bin\$configuration$\netstandard2.0\IronSoftware.Drawing.Common.*" target="lib\netstandard2.0" /> | ||
| <file src="..\bin\$configuration$\net60\IronSoftware.Drawing.Common.*" target="lib\net60" /> | ||
| </files> | ||
| </package> | ||
|
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should remove
System.Memoryout since we already did in nuspec. If we still keepingSystem.Memoryit will introduce the same issue you try to solve.