From adf6b5941bde6abde522103d94e358a0ceacb551 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Thu, 1 Jul 2021 20:22:30 +0200 Subject: [PATCH] Fixed issue with pending migrations not using plan name. --- .../Services/Implement/PackagingService.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs b/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs index dc97f2b23e..8cb981f5da 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/PackagingService.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -80,7 +80,7 @@ namespace Umbraco.Cms.Core.Services.Implement XDocument xml; using (StreamReader streamReader = System.IO.File.OpenText(packageXmlFile.FullName)) { - xml = XDocument.Load(streamReader); + xml = XDocument.Load(streamReader); } return InstallCompiledPackageData(xml, userId); } @@ -124,11 +124,11 @@ namespace Umbraco.Cms.Core.Services.Implement { PackageName = plan.PackageName }; - installedPackages.Add(plan.PackageName, installedPackage); + installedPackages.Add(plan.PackageName, installedPackage); } var currentPlans = installedPackage.PackageMigrationPlans.ToList(); - keyValues.TryGetValue(Constants.Conventions.Migrations.KeyValuePrefix + plan.PackageName, out var currentState); + keyValues.TryGetValue(Constants.Conventions.Migrations.KeyValuePrefix + plan.Name, out var currentState); currentPlans.Add(new InstalledPackageMigrationPlans { CurrentMigrationId = currentState,