From 635d9b83f9e1837cd9a640a024b54bae2bdf9644 Mon Sep 17 00:00:00 2001
From: Ronald Barendse <ronald@barend.se>
Date: Thu, 26 Sep 2024 07:51:16 +0200
Subject: [PATCH] Use version of the assembly with the same name as the package
 ID (#16544)

(cherry picked from commit 14a0e622781278ec6212c4daebd873de04677df4)
---
 .../Services/Implement/PackagingService.cs    | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs b/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs
index c4e152e0b5..53d6c8ba6c 100644
--- a/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs
+++ b/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs
@@ -1,3 +1,6 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+using System.Runtime.Loader;
 using System.Xml.Linq;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
@@ -354,8 +357,16 @@ public class PackagingService : IPackagingService
 
             if (!string.IsNullOrEmpty(packageManifest.Version))
             {
+                // Always use package version from manifest
                 installedPackage.Version = packageManifest.Version;
             }
+            else if (string.IsNullOrEmpty(installedPackage.Version) &&
+                string.IsNullOrEmpty(installedPackage.PackageId) is false &&
+                TryGetAssemblyInformationalVersion(installedPackage.PackageId, out string? version))
+            {
+                // Use version of the assembly with the same name as the package ID
+                installedPackage.Version = version;
+            }
         }
 
         // Return all packages with an ID or name in the package manifest or package migrations
@@ -414,4 +425,20 @@ public class PackagingService : IPackagingService
 
         return packageFile.CreateReadStream();
     }
+
+    private static bool TryGetAssemblyInformationalVersion(string name, [NotNullWhen(true)] out string? version)
+    {
+        foreach (Assembly assembly in AssemblyLoadContext.Default.Assemblies)
+        {
+            AssemblyName assemblyName = assembly.GetName();
+            if (string.Equals(assemblyName.Name, name, StringComparison.OrdinalIgnoreCase) &&
+                assembly.TryGetInformationalVersion(out version))
+            {
+                return true;
+            }
+        }
+
+        version = null;
+        return false;
+    }
 }