Skip to content

Commit 11e1889

Browse files
committed
fix: PackageManifest version
1 parent 17254ab commit 11e1889

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

src/Umbraco.Community.BackOfficeOrganiser/Composing/Composer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ public void Compose(IUmbracoBuilder builder)
3636
builder.AddNotificationAsyncHandler<MemberTypeSavedNotification, BackofficeOrganiserNotificationHandler>();
3737
builder.AddNotificationAsyncHandler<ContentTypeSavedNotification, BackofficeOrganiserNotificationHandler>();
3838

39-
builder.Services.AddSingleton<IPackageManifestReader, BackOfficeOrganiserPackageManifestReader>();
39+
builder.Services.AddSingleton<IPackageManifestReader, PackageManifestReader>();
4040
}
4141
}

src/Umbraco.Community.BackOfficeOrganiser/Composing/BackOfficeOrganiserPackageManifestReader.cs renamed to src/Umbraco.Community.BackOfficeOrganiser/Composing/PackageManifestReader.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1+
using System.Reflection;
12
using jcdcdev.Umbraco.Core.Extensions;
23
using jcdcdev.Umbraco.Core.Web.Models.Manifests;
34
using Umbraco.Cms.Core.Manifest;
45
using Umbraco.Cms.Infrastructure.Manifest;
56

67
namespace Umbraco.Community.BackOfficeOrganiser.Composing;
78

8-
public class BackOfficeOrganiserPackageManifestReader : IPackageManifestReader
9+
public class PackageManifestReader : IPackageManifestReader
910
{
10-
public async Task<IEnumerable<PackageManifest>> ReadPackageManifestsAsync()
11+
public Task<IEnumerable<PackageManifest>> ReadPackageManifestsAsync()
1112
{
1213
var extensions = new List<IManifest>();
1314
var packageManifest = new PackageManifest
1415
{
1516
Name = Constants.PackageName,
16-
Version = EnvironmentExtensions.CurrentAssemblyVersion().ToSemVer()?.ToString() ?? "0.1.0",
17+
Version = Assembly.GetAssembly(typeof(PackageManifestReader))?.GetName().Version?.ToSemVer()?.ToString() ?? "0.1.0",
1718
AllowPublicAccess = false,
1819
AllowTelemetry = false,
1920
Extensions = []
@@ -27,6 +28,6 @@ public async Task<IEnumerable<PackageManifest>> ReadPackageManifestsAsync()
2728
});
2829

2930
packageManifest.Extensions = extensions.OfType<object>().ToArray();
30-
return [packageManifest];
31+
return Task.FromResult<IEnumerable<PackageManifest>>([packageManifest]);
3132
}
3233
}

0 commit comments

Comments
 (0)