Skip to content

3.1 release compatibility #341

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

Merged
merged 4 commits into from
Nov 6, 2023
Merged

3.1 release compatibility #341

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
12eb5a4
Added Feedz.io source for alpha builds
mdupras Oct 19, 2023
bdc50a5
Added missing using
mdupras Oct 27, 2023
ed3f443
Removed unused NuGet.Config
mdupras Oct 27, 2023
7c49794
Added missing using for docs
mdupras Oct 27, 2023
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
7 changes: 7 additions & 0 deletions NuGet.Config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This shouldn’t be required. The feed details are inherited in a props file via the shared infrastructure sub module

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ohh good to know, removed it

<configuration>
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="feedz.io" value="https://f.feedz.io/sixlabors/sixlabors/nuget/index.json" />
</packageSources>
</configuration>
1 change: 1 addition & 0 deletions src/ImageSharp.Web/ExifOrientationUtilities.cs
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
using System.Numerics;
using System.Runtime.CompilerServices;
using SixLabors.ImageSharp.Metadata.Profiles.Exif;
using SixLabors.ImageSharp.Processing;

namespace SixLabors.ImageSharp.Web;

4 changes: 2 additions & 2 deletions src/ImageSharp.Web/FormattedImage.cs
View file
Original file line number Diff line number Diff line change
@@ -2,9 +2,9 @@
// Licensed under the Six Labors Split License.

using System.Diagnostics.CodeAnalysis;
using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.Formats;
using SixLabors.ImageSharp.Metadata.Profiles.Exif;
using SixLabors.ImageSharp.PixelFormats;

namespace SixLabors.ImageSharp.Web;

@@ -38,7 +38,7 @@ public FormattedImage(Image image, IImageFormat format)
private FormattedImage(Image image, IImageFormat format, bool keepOpen)
{
this.Image = image;
this.imageFormatsManager = image.GetConfiguration().ImageFormatsManager;
this.imageFormatsManager = image.Configuration.ImageFormatsManager;
this.format = format;
this.encoder = this.imageFormatsManager.GetEncoder(format);
this.keepOpen = keepOpen;
2 changes: 1 addition & 1 deletion src/ImageSharp.Web/ImageSharp.Web.csproj
View file
Original file line number Diff line number Diff line change
@@ -46,7 +46,7 @@
<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.0.1" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.0-alpha.0.43" />
</ItemGroup>

<Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />
1 change: 1 addition & 0 deletions src/ImageSharp.Web/Processors/AutoOrientWebProcessor.cs
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@

using System.Globalization;
using Microsoft.Extensions.Logging;
using SixLabors.ImageSharp.Processing;
using SixLabors.ImageSharp.Web.Commands;

namespace SixLabors.ImageSharp.Web.Processors;
1 change: 1 addition & 0 deletions src/ImageSharp.Web/Processors/BackgroundColorWebProcessor.cs
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,7 @@

using System.Globalization;
using Microsoft.Extensions.Logging;
using SixLabors.ImageSharp.Processing;
using SixLabors.ImageSharp.Web.Commands;

namespace SixLabors.ImageSharp.Web.Processors;
5 changes: 2 additions & 3 deletions src/ImageSharp.Web/Processors/QualityWebProcessor.cs
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,6 @@

using System.Globalization;
using Microsoft.Extensions.Logging;
using SixLabors.ImageSharp.Advanced;
using SixLabors.ImageSharp.Formats.Jpeg;
using SixLabors.ImageSharp.Formats.Webp;
using SixLabors.ImageSharp.Web.Commands;
@@ -46,7 +45,7 @@ public FormattedImage Process(
{
JpegEncoder reference =
(JpegEncoder)image.Image
.GetConfiguration()
.Configuration
.ImageFormatsManager
.GetEncoder(image.Format);

@@ -65,7 +64,7 @@ public FormattedImage Process(
{
WebpEncoder reference =
(WebpEncoder)image.Image
.GetConfiguration()
.Configuration
.ImageFormatsManager
.GetEncoder(image.Format);

1 change: 1 addition & 0 deletions src/ImageSharp.Web/Processors/ResizeWebProcessor.cs
View file
Original file line number Diff line number Diff line change
@@ -5,6 +5,7 @@
using System.Numerics;
using Microsoft.Extensions.Logging;
using SixLabors.ImageSharp.Metadata.Profiles.Exif;
using SixLabors.ImageSharp.Processing;
using SixLabors.ImageSharp.Processing.Processors.Transforms;
using SixLabors.ImageSharp.Web.Commands;

1 change: 1 addition & 0 deletions src/ImageSharp.Web/TagHelpers/ImageTagHelper.cs
View file
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@
using Microsoft.AspNetCore.Mvc.TagHelpers;
using Microsoft.AspNetCore.Razor.TagHelpers;
using Microsoft.Extensions.Options;
using SixLabors.ImageSharp.Processing;
using SixLabors.ImageSharp.Web.Commands;
using SixLabors.ImageSharp.Web.Middleware;
using SixLabors.ImageSharp.Web.Processors;