Merge branch 'main' into develop

Author: AndyButland

src/Umbraco.AuthorizedServices/AuthorizedServicesComposer.cs

@@ -4,13 +4,11 @@
 using Microsoft.Extensions.Options;
 using Umbraco.AuthorizedServices.Configuration;
 using Umbraco.AuthorizedServices.Manifests;
-using Umbraco.AuthorizedServices.Migrations;
 using Umbraco.AuthorizedServices.Services;
 using Umbraco.AuthorizedServices.Services.Implement;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.DependencyInjection;
-using Umbraco.Cms.Core.Notifications;
 using Umbraco.Extensions;
 
 namespace Umbraco.AuthorizedServices;
@@ -66,7 +64,5 @@ public void Compose(IUmbracoBuilder builder)
         builder.Services.AddUnique<ITokenStorage, DatabaseTokenStorage>();
 
         builder.Services.AddSingleton<JsonSerializerFactory>();
-
-        builder.AddNotificationHandler<UmbracoApplicationStartingNotification, DatabaseMigrationHandler>();
     }
 }

src/Umbraco.AuthorizedServices/Constants.cs

@@ -1,14 +1,39 @@
-using System.Diagnostics;
+using System.Reflection;
+using Umbraco.Cms.Core.Semver;
+using Umbraco.Extensions;
 
 namespace Umbraco.AuthorizedServices;
 
 public static class Constants
 {
+    internal const string PackageName = "Umbraco Authorized Services";
+
     public const string PluginName = "UmbracoAuthorizedServices";
 
     public const string Separator = "-";
 
-    public static readonly string InformationalVersion = FileVersionInfo.GetVersionInfo(typeof(Constants).Assembly.Location).ProductVersion!;
+    public static readonly string InformationalVersion = GetInformationalVersion();
+
+    private static string GetInformationalVersion()
+    {
+        Assembly assembly = typeof(Constants).Assembly;
+        AssemblyInformationalVersionAttribute? assemblyInformationalVersionAttribute = assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
+        if (assemblyInformationalVersionAttribute is not null &&
+            SemVersion.TryParse(assemblyInformationalVersionAttribute.InformationalVersion, out SemVersion? semVersion))
+        {
+            return semVersion!.ToSemanticStringWithoutBuild();
+        }
+        else
+        {
+            AssemblyName assemblyName = assembly.GetName();
+            if (assemblyName.Version is not null)
+            {
+                return assemblyName.Version.ToString(3);
+            }
+        }
+
+        return string.Empty;
+    }
 
     public static class Trees
     {

src/Umbraco.AuthorizedServices/Manifests/AuthorizedServicesManifestFilter.cs

@@ -10,7 +10,7 @@ public void Filter(List<PackageManifest> manifests)
         {
             AllowPackageTelemetry = true,
             Version = Constants.InformationalVersion,
-            PackageName = "Umbraco Authorized Services",
+            PackageName = Constants.PackageName,
             BundleOptions = BundleOptions.None,
             Scripts = new[]
             {

src/Umbraco.AuthorizedServices/Migrations/AuthorizedServicesMigrationPlan.cs

@@ -0,0 +1,25 @@
+using Umbraco.Cms.Core.Packaging;
+
+namespace Umbraco.AuthorizedServices.Migrations;
+
+/// <summary>
+/// Defines the migration plan for the Authorized Services package.
+/// </summary>
+public class AuthorizedServicesMigrationPlan : PackageMigrationPlan
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AuthorizedServicesMigrationPlan" /> class.
+    /// </summary>
+    public AuthorizedServicesMigrationPlan()
+        : base(Constants.PackageName, Constants.Migrations.MigrationPlan)
+    { }
+
+    /// <inheritdoc />
+    public override bool IgnoreCurrentState => false;
+
+    /// <inheritdoc />
+    protected override void DefinePlan()
+    {
+        To<AddDatabaseTokenStorageTable>(Constants.Migrations.TargetState);
+    }
+}