Merge pull request #45 from jcdcdev/dev/v15

15.0.1

Author: jcdcdev

src/Umbraco.Community.FileSystemProviders.B2.TestSite/Umbraco.Community.FileSystemProviders.B2.TestSite.csproj

@@ -6,8 +6,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Umbraco.Cms" Version="[15.0.0,16.0.0)" />
-        <PackageReference Include="uSync" Version="15.0.1"/>
+        <PackageReference Include="Umbraco.Cms" Version="15.3.1" />
+        <PackageReference Include="uSync" Version="15.1.6"/>
     </ItemGroup>
 
     <ItemGroup>

src/Umbraco.Community.FileSystemProviders.B2.TestSite/packages.lock.json

@@ -0,0 +1,23 @@
+using System.Reflection;
+using jcdcdev.Umbraco.Core.Extensions;
+using Umbraco.Cms.Core.Manifest;
+using Umbraco.Cms.Infrastructure.Manifest;
+
+namespace Umbraco.Community.FileSystemProviders.B2.Composing;
+
+public class PackageManifestReader : IPackageManifestReader
+{
+    public Task<IEnumerable<PackageManifest>> ReadPackageManifestsAsync()
+    {
+        var packageManifest = new PackageManifest
+        {
+            Name = Constants.PackageName,
+            Version = Assembly.GetAssembly(typeof(PackageManifestReader))?.GetName().Version?.ToSemVer()?.ToString() ?? "0.1.0",
+            AllowPublicAccess = false,
+            AllowTelemetry = true,
+            Extensions = []
+        };
+
+        return Task.FromResult<IEnumerable<PackageManifest>>([packageManifest]);
+    }
+}

src/Umbraco.Community.FileSystemProviders.B2/Composing/PackageManifestReader.cs

@@ -16,6 +16,7 @@
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Infrastructure.DependencyInjection;
+using Umbraco.Cms.Infrastructure.Manifest;
 using Umbraco.Cms.Web.Common.ApplicationBuilder;
 using Umbraco.Community.FileSystemProviders.B2.HealthChecks;
 using Umbraco.Community.FileSystemProviders.B2.Models;
@@ -88,6 +89,8 @@ public static void AddB2MediaFileSystem(this IUmbracoBuilder builder)
             {
                 PrePipeline = app => app.UseB2MediaFileSystem()
             }));
+
+        builder.Services.AddSingleton<IPackageManifestReader, PackageManifestReader>();
     }
 
     private static AmazonS3Client CreateS3Client(IServiceProvider x)

src/Umbraco.Community.FileSystemProviders.B2/Composing/UmbracoBuilderExtensions.cs

@@ -11,56 +11,62 @@ namespace Umbraco.Community.FileSystemProviders.B2.HealthChecks;
     Constants.HealthChecks.Api.Name,
     Description = Constants.HealthChecks.Api.Description,
     Group = Constants.HealthChecks.Groups.ApiClient)]
-internal class ApiHealthCheck(B2FileSystemProvider mediaFileManager, ILogger<ApiHealthCheck> logger, ILocalizedTextService textService) : HealthCheck
+internal class ApiHealthCheck(
+    B2FileSystemProvider mediaFileManager,
+    ILogger<ApiHealthCheck> logger,
+    ILocalizedTextService textService)
+    : HealthCheck
 {
     private readonly ILogger _logger = logger;
 
-    public override async Task<IEnumerable<HealthCheckStatus>> GetStatus()
+    public override Task<IEnumerable<HealthCheckStatus>> GetStatusAsync() => Task.FromResult(GetStatusInternal());
+
+    private IEnumerable<HealthCheckStatus> GetStatusInternal()
     {
-        if (!TryGetFileSystem(mediaFileManager, out var fs) || fs is null)
+        if (!TryGetFileSystem(out var fs) || fs is null)
         {
-            return new List<HealthCheckStatus>
-            {
-                new(textService.Localize("healthcheck", "b2FileSystemNotAvailable"))
+            return
+            [
+                new HealthCheckStatus(textService.Localize("healthcheck", "b2FileSystemNotAvailable"))
                 {
                     Description = null,
                     View = null,
                     ResultType = StatusResultType.Error,
                     ReadMoreLink = Constants.HealthChecks.Api.ReadMoreLink
                 }
-            };
+            ];
         }
 
         try
         {
             var files = fs.GetDirectories("");
-            return new List<HealthCheckStatus>
-            {
-                new(textService.Localize("healthcheck", "b2FileSystemAvailable"))
+            return
+            [
+                new HealthCheckStatus(textService.Localize("healthcheck", "b2FileSystemAvailable"))
                 {
-                    Description = textService.Localize("healthcheck", "b2FileSystemMediaFolderCount", new[] { files.Count().ToString() }),
+                    Description = textService.Localize("healthcheck", "b2FileSystemMediaFolderCount", [files.Count().ToString()]),
 
                     View = null,
                     ResultType = StatusResultType.Success
                 }
-            };
+            ];
         }
         catch (Exception ex)
         {
-            return new List<HealthCheckStatus>
-            {
-                new(textService.Localize("healthcheck", "b2FileSystemError"))
+            return
+            [
+                new HealthCheckStatus(textService.Localize("healthcheck", "b2FileSystemError"))
                 {
                     Description = $"{ex.Message}",
                     View = null,
                     ResultType = StatusResultType.Error,
                     ReadMoreLink = Constants.HealthChecks.Api.ReadMoreLink
                 }
-            };
+            ];
         }
     }
 
-    private bool TryGetFileSystem(B2FileSystemProvider mediaFileManager, out IFileSystem? fs)
+    private bool TryGetFileSystem(out IFileSystem? fs)
     {
         fs = null;
         try

src/Umbraco.Community.FileSystemProviders.B2/HealthChecks/ApiHealthCheck.cs

@@ -23,9 +23,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Umbraco.Cms.Core" Version="[15.0.0,16.0.0)" />
-        <PackageReference Include="Umbraco.Cms.Web.Common" Version="[15.0.0,16.0.0)" />
-        <PackageReference Include="Umbraco.Cms.Imaging.ImageSharp" Version="[15.0.0,16.0.0)" />
+        <PackageReference Include="Umbraco.Cms.Core" Version="[15.3.0,16.0.0)" />
+        <PackageReference Include="Umbraco.Cms.Web.Common" Version="[15.3.0,16.0.0)" />
+        <PackageReference Include="Umbraco.Cms.Imaging.ImageSharp" Version="[15.3.0,16.0.0)" />
         <PackageReference Include="jcdcdev.Umbraco.Core" Version="[15.0.0,16.0.0)" />
         <PackageReference Include="Our.Umbraco.StorageProviders.AWSS3" Version="1.3.0" />
     </ItemGroup>