Skip to content
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.

Sign up for GitHub

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

[develop] Release 2024.5 #102

Merged
merged 2 commits into from
Apr 23, 2024
Merged

[develop] Release 2024.5 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
069378a
Dependencies: Update SixLabors.ImageSharp & SixLabors.ImageSharp.…
mee-ironsoftware Apr 23, 2024
78242ca
Tests: Add default Data Folder path if not exist
mee-ironsoftware Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ftware.Drawing/IronSoftware.Drawing.Common.Tests/IronSoftware.Drawing.Common.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<PackageReference Include="FluentAssertions" Version="6.10.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="Microsoft.Maui.Graphics" Version="7.0.92" />
<PackageReference Include="SkiaSharp" Version="2.88.6" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
<PackageReference Include="SkiaSharp" Version="2.88.7" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.7" />
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
Expand Down
5 changes: 5 additions & 0 deletions IronSoftware.Drawing/IronSoftware.Drawing.Common.Tests/TargetFramework.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ public static string GetAppSettingsValue(string key)
{
if (!Environment.GetEnvironmentVariables().Contains(key))
{
if (key == "IronSoftware.Drawing.Common.Tests.DataFolder")
{
return "../../../Data";
}

throw new InvalidOperationException($"Can not find the Environment variable by the name='{key}'");
}

Expand Down
8 changes: 4 additions & 4 deletions IronSoftware.Drawing/IronSoftware.Drawing.Common/IronSoftware.Drawing.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<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.6" />
<PackageReference Include="SkiaSharp" Version="2.88.7" />
<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" />
Expand All @@ -34,13 +34,13 @@
<Choose>
<When Condition="'$(TargetFramework)' == 'net60'">
<ItemGroup>
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.2" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.4" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.3" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.7" />
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.8" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0" />
</ItemGroup>
</Otherwise>
Expand Down
12 changes: 6 additions & 6 deletions NuGet/IronSoftware.Drawing.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,30 +39,30 @@ Supports:

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>- TIFF images no longer load thumbnails as separate frames.</releaseNotes>
<releaseNotes>- Update SixLabors.ImageSharp &amp; SixLabors.ImageSharp.Drawing to address known vulnerabilities.</releaseNotes>
<copyright>Copyright © Iron Software 2022-2024</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="SixLabors.ImageSharp" version="2.1.7" />
<dependency id="SixLabors.ImageSharp" version="2.1.8" />
<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="SixLabors.ImageSharp" version="3.1.3" />
<dependency id="SixLabors.ImageSharp.Drawing" version="2.1.2" />
<dependency id="SixLabors.ImageSharp" version="3.1.4" />
<dependency id="SixLabors.ImageSharp.Drawing" version="2.1.3" />
<dependency id="BitMiracle.LibTiff.NET" version="2.4.649" />
<dependency id="System.Memory" version="4.5.5" />
</group>
<group targetFramework="MonoAndroid10.0">
<dependency id="SixLabors.ImageSharp" version="2.1.7" />
<dependency id="SixLabors.ImageSharp" version="2.1.8" />
<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" />
<dependency id="Microsoft.Maui.Graphics" version="7.0.92" />
<dependency id="SkiaSharp" version="2.88.6" />
<dependency id="SkiaSharp" version="2.88.7" />
<dependency id="SkiaSharp.Svg" version="1.60.0" />
</group>
</dependencies>
Expand Down