updated imagesharp references, moved custom web processor from the core class library to the web project puckweb

Author: yohsii

core/core.csproj

@@ -54,8 +54,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.0" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0007" />
-    <PackageReference Include="SixLabors.ImageSharp.Web" Version="1.0.0-beta0009" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-rc0001" />
     <PackageReference Include="System.Collections.Concurrent" Version="4.3.0" />
   </ItemGroup>
 

core/ImageSharp/WebProcessors/CropWebProcessor.cs renamed to puckweb/Areas/puck/ImageSharp/WebProcessors/CropWebProcessor.cs

@@ -3,12 +3,13 @@
 
 using System.Collections.Generic;
 using Microsoft.Extensions.Logging;
+using SixLabors.ImageSharp;
 using SixLabors.ImageSharp.Processing;
 using SixLabors.ImageSharp.Processing.Processors.Transforms;
 using SixLabors.ImageSharp.Web;
 using SixLabors.ImageSharp.Web.Commands;
 using SixLabors.ImageSharp.Web.Processors;
-using SixLabors.Primitives;
+
 
 namespace puck.core.ImageSharp.WebProcessors
 {

puckweb/Startup.cs

@@ -30,6 +30,7 @@
 using puckweb.Data.Contexts;
 using puckweb.Data.Entities;
 using Microsoft.AspNetCore.Authentication.Cookies;
+using SixLabors.ImageSharp.Web.Providers.Azure;
 
 namespace puckweb
 {
@@ -69,7 +70,7 @@ public void ConfigureServices(IServiceCollection services)
 
             PhysicalFileSystemProvider PhysicalProviderFactory(IServiceProvider provider)
             {
-                var env = provider.GetRequiredService<Microsoft.AspNetCore.Hosting.IHostingEnvironment>();
+                var env = provider.GetRequiredService<Microsoft.AspNetCore.Hosting.IWebHostEnvironment>();
                 env.WebRootFileProvider = new PhysicalFileProvider(env.WebRootPath);
                 var p = new PhysicalFileSystemProvider(
                     env,
@@ -108,16 +109,19 @@ AzureBlobStorageImageProvider AzureProviderFactory(IServiceProvider provider)
                     {
                         return new PhysicalFileSystemCache(
                             provider.GetRequiredService<IOptions<PhysicalFileSystemCacheOptions>>(),
-                            provider.GetRequiredService<Microsoft.AspNetCore.Hosting.IHostingEnvironment>(),
+                            provider.GetRequiredService<Microsoft.AspNetCore.Hosting.IWebHostEnvironment>(),
                             provider.GetRequiredService<IOptions<ImageSharpMiddlewareOptions>>(),
                             provider.GetRequiredService<FormatUtilities>());
                     })
                     .SetCacheHash<CacheHash>()
                     .AddProvider(AzureProviderFactory)
                     .Configure<AzureBlobStorageImageProviderOptions>(options =>
                     {
-                        options.ConnectionString = Configuration.GetValue<string>("AzureBlobStorageConnectionString");
-                        options.ContainerName = Configuration.GetValue<string>("AzureImageTransformer_ContainerName");
+                        options.BlobContainers.Add(new AzureBlobContainerClientOptions
+                        {
+                            ConnectionString = Configuration.GetValue<string>("AzureBlobStorageConnectionString"),
+                            ContainerName = Configuration.GetValue<string>("AzureImageTransformer_ContainerName")
+                        });
                     })
                     .AddProvider(PhysicalProviderFactory)
                     .AddProcessor<CropWebProcessor>()
@@ -132,7 +136,7 @@ AzureBlobStorageImageProvider AzureProviderFactory(IServiceProvider provider)
                     {
                         return new PhysicalFileSystemCache(
                             provider.GetRequiredService<IOptions<PhysicalFileSystemCacheOptions>>(),
-                            provider.GetRequiredService<Microsoft.AspNetCore.Hosting.IHostingEnvironment>(),
+                            provider.GetRequiredService<Microsoft.AspNetCore.Hosting.IWebHostEnvironment>(),
                             provider.GetRequiredService<IOptions<ImageSharpMiddlewareOptions>>(),
                             provider.GetRequiredService<FormatUtilities>());
                     })

puckweb/puckweb.csproj

@@ -42,10 +42,10 @@
     <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.1.0" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.0" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0007" />
-    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0007" />
-    <PackageReference Include="SixLabors.ImageSharp.Web" Version="1.0.0-beta0009" />
-    <PackageReference Include="SixLabors.ImageSharp.Web.Providers.Azure" Version="1.0.0-beta0009" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-rc0001" />
+    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta0008" />
+    <PackageReference Include="SixLabors.ImageSharp.Web" Version="1.0.0-rc0001" />
+    <PackageReference Include="SixLabors.ImageSharp.Web.Providers.Azure" Version="1.0.0-rc0002" />
   </ItemGroup>
 
   <Target Name="CopyCustomContentOnPublish" AfterTargets="Publish">