yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring logic for updating ClientDependency version and deleting its temp directories

Browse Source
This commit is contained in:
Elitsa Marinovska
2020-03-17 15:45:34 +01:00
parent 30516bfa12
commit 3dc5e438d0
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web/Editors/PackageInstallController.cs
View File

@@ -20,7 +20,6 @@ using Umbraco.Core.Runtime;
using Umbraco.Core.Services;
using Umbraco.Core.Strings;
using Umbraco.Net;
using Umbraco.Web.JavaScript;
using Umbraco.Web.Models;
using Umbraco.Web.Models.ContentEditing;
using Umbraco.Web.Mvc;
@@ -385,9 +384,7 @@ namespace Umbraco.Web.Editors
zipFile.Delete();
//bump cdf to be safe
var clientDependencyConfig = new ClientDependencyConfiguration(Logger, _ioHelper, _runtimeMinifier);
var clientDependencyUpdated = clientDependencyConfig.UpdateVersionNumber(
_umbracoVersion.SemanticVersion, DateTime.UtcNow, "yyyyMMdd");
_runtimeMinifier.Reset();
var redirectUrl = "";
if (!packageInfo.PackageView.IsNullOrWhiteSpace())

7
src/Umbraco.Web/Install/Controllers/InstallController.cs
View File

@@ -59,10 +59,9 @@ namespace Umbraco.Web.Install.Controllers
if (_runtime.Level == RuntimeLevel.Upgrade)
{
// Update ClientDependency version
var clientDependencyConfig = new ClientDependencyConfiguration(_logger, _ioHelper, _runtimeMinifier);
var clientDependencyUpdated = clientDependencyConfig.UpdateVersionNumber(
_umbracoVersion.SemanticVersion, DateTime.UtcNow, "yyyyMMdd");
// Update ClientDependency version and delete its temp directories to make sure we get fresh caches
_runtimeMinifier.Reset();
// Delete ClientDependency temp directories to make sure we get fresh caches
var clientDependencyTempFilesDeleted = clientDependencyConfig.ClearTempFiles(HttpContext);