From a3c99531bf29aefecfd267712fd341660aa43734 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sat, 3 Sep 2016 10:23:17 +0200 Subject: [PATCH] U4-8898 Blank login screen after upgrade to 7.5.x Moves the updating of the CDF version to the very beginning before we even redirect to the login screen so it is nicely cachebusted --- src/Umbraco.Web/Install/Controllers/InstallController.cs | 4 ++++ src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web/Install/Controllers/InstallController.cs b/src/Umbraco.Web/Install/Controllers/InstallController.cs index 572bd0a192..360e35efda 100644 --- a/src/Umbraco.Web/Install/Controllers/InstallController.cs +++ b/src/Umbraco.Web/Install/Controllers/InstallController.cs @@ -44,6 +44,10 @@ namespace Umbraco.Web.Install.Controllers if (ApplicationContext.Current.IsUpgrading) { + // Update ClientDependency version + var clientDependencyConfig = new ClientDependencyConfiguration(ApplicationContext.Current.ProfilingLogger.Logger); + var clientDependencyUpdated = clientDependencyConfig.IncreaseVersionNumber(); + var result = _umbracoContext.Security.ValidateCurrentUser(false); switch (result) diff --git a/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs b/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs index 78fe6d3766..0de405ebef 100644 --- a/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs +++ b/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs @@ -49,10 +49,6 @@ namespace Umbraco.Web.Install.InstallSteps // Update configurationStatus GlobalSettings.ConfigurationStatus = UmbracoVersion.GetSemanticVersion().ToSemanticString(); - - // Update ClientDependency version - var clientDependencyConfig = new ClientDependencyConfiguration(_applicationContext.ProfilingLogger.Logger); - var clientDependencyUpdated = clientDependencyConfig.IncreaseVersionNumber(); //reports the ended install ih.InstallStatus(true, "");